From 6bc207baf2ef8e5700a4372f82d63fcfdbbf6b09 Mon Sep 17 00:00:00 2001
From: Cody Russell <cody@jhu.edu>
Date: Tue, 21 Jun 2016 23:45:58 -0500
Subject: [PATCH 1/3] Fix group_by_keys/1 for Elixir 1.3

Enum.group_by/3 is deprecated now, and it seems to be breaking some
tests. This fixes the failing doctest and the other failing test.
---
 lib/httparrot/general_request_info.ex | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/lib/httparrot/general_request_info.ex b/lib/httparrot/general_request_info.ex
index 2dda687..9e147e4 100644
--- a/lib/httparrot/general_request_info.ex
+++ b/lib/httparrot/general_request_info.ex
@@ -20,15 +20,12 @@ defmodule HTTParrot.GeneralRequestInfo do
   @spec group_by_keys(list) :: map
   def group_by_keys([]), do: %{}
   def group_by_keys(args) do
-    groups = Enum.group_by(args, %{}, fn {k, _} -> k end)
-    for {k1, v1} <- groups, into: %{} do
-      values = Enum.map(v1, fn {_, v2} -> v2 end)
-        |> Enum.reverse
-        |> flatten_if_list_of_one
-      {k1, values}
-    end
+    args
+    |> Enum.map(fn {k, v} -> %{k => v} end)
+    |> Enum.reduce(fn m, acc ->
+      Map.merge(m, acc, fn _k, v1, v2 ->
+        [v2, v1]
+      end)
+    end)
   end
-
-  defp flatten_if_list_of_one([h]), do: h
-  defp flatten_if_list_of_one(list), do: list
 end

From c545b44d2cb5a6457b0f7cc940fcb4c83bc66237 Mon Sep 17 00:00:00 2001
From: Cody Russell <cody@jhu.edu>
Date: Wed, 22 Jun 2016 09:43:29 -0500
Subject: [PATCH 2/3] Bump Travis Erlang to 18+

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ecb2176..f17cfcc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ notifications:
 elixir:
   - 1.0.2
 otp_release:
-  - 17.0
-  - 17.1
+  - 18.0
+  - 18.1
 sudo: false
 script: mix test --no-start

From 9152dff745c3d575bdfe35ac473e449819c40554 Mon Sep 17 00:00:00 2001
From: Cody Russell <cody@jhu.edu>
Date: Wed, 22 Jun 2016 09:48:42 -0500
Subject: [PATCH 3/3] Bump Elixir to 1.3.0

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f17cfcc..fc6d48b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ notifications:
   recipients:
     - eduardo@gurgel.me
 elixir:
-  - 1.0.2
+  - 1.3.0
 otp_release:
   - 18.0
   - 18.1