Merge 53196aeee4 into a0a9a76a78

lib/httparrot/cookies_handler.ex

@@ -9,8 +9,8 @@ defmodule HTTParrot.CookiesHandler do
   end
 
   def get_json(req, state) do
-    {cookies, req} = :cowboy_req.cookies(req)
-    if cookies == [], do: cookies = [{}]
+    {cow_cookies, req} = :cowboy_req.cookies(req)
+    cookies = if cow_cookies == [] do [{}] else cow_cookies end
     {response(cookies), req, state}
   end
 

lib/httparrot/general_request_info.ex

@@ -20,13 +20,9 @@ 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
+    Enum.group_by(args, &elem(&1, 0), &elem(&1, 1))
+    |> Enum.map(fn {k, v} -> {k, flatten_if_list_of_one(v)} end)
+    |> Map.new
   end
 
   defp flatten_if_list_of_one([h]), do: h

lib/httparrot/stream_bytes_handler.ex

@@ -2,7 +2,6 @@ defmodule HTTParrot.StreamBytesHandler do
   @moduledoc """
   Streams n bytes of data, with chunked transfer encoding.
   """
-  alias HTTParrot.GeneralRequestInfo
   use HTTParrot.Cowboy, methods: ~w(GET)
 
   def content_types_provided(req, state) do
@@ -35,9 +34,9 @@ defmodule HTTParrot.StreamBytesHandler do
       Stream.repeatedly(fn -> :random.uniform(255) end)
         |> Stream.take(n)
         |> Enum.chunk(chunk_size, chunk_size, [])
-        |> Enum.each fn chunk ->
+        |> Enum.each(fn chunk ->
           send_func.(List.to_string(chunk))
-        end
+        end)
     end
   end
 end