From 1f4f7161246702a52bba737335e012d57b433f8e Mon Sep 17 00:00:00 2001
From: Eduardo Gurgel <eduardo@gurgel.me>
Date: Sun, 30 Jun 2019 14:44:33 +1200
Subject: [PATCH] Fix Cowboy 2.5 upgrade issues

---
 lib/httparrot/base64_handler.ex         |  2 +-
 lib/httparrot/basic_auth_handler.ex     |  8 ++++----
 lib/httparrot/delete_cookies_handler.ex |  2 +-
 lib/httparrot/general_request_info.ex   |  1 +
 lib/httparrot/redirect_handler.ex       |  2 +-
 lib/httparrot/set_cookies_handler.ex    |  2 +-
 lib/httparrot/status_code_handler.ex    |  2 +-
 lib/httparrot/store_request_handler.ex  |  2 +-
 lib/httparrot/stream_bytes_handler.ex   | 22 ++++++++++++----------
 lib/httparrot/stream_handler.ex         | 16 +++++++---------
 lib/httparrot/user_agent_handler.ex     |  2 +-
 test/base64_handler_test.exs            |  8 ++++----
 test/basic_auth_handler_test.exs        | 16 ++++++++--------
 test/delete_cookies_handler_test.exs    |  2 +-
 test/redirect_handler_test.exs          |  4 ++--
 test/set_cookies_handler_test.exs       |  2 +-
 test/status_code_handler_test.exs       |  2 +-
 test/stream_bytes_handler_test.exs      | 13 ++++++-------
 test/stream_handler_test.exs            | 11 +++--------
 test/user_agent_test.exs                |  4 ++--
 20 files changed, 59 insertions(+), 64 deletions(-)

diff --git a/lib/httparrot/base64_handler.ex b/lib/httparrot/base64_handler.ex
index 44578c0..8667c8d 100644
--- a/lib/httparrot/base64_handler.ex
+++ b/lib/httparrot/base64_handler.ex
@@ -9,7 +9,7 @@ defmodule HTTParrot.Base64Handler do
   end
 
   def malformed_request(req, state) do
-    {value, req} = :cowboy_req.binding(:value, req)
+    value = :cowboy_req.binding(:value, req)
 
     case decode(value) do
       {:ok, result} -> {false, req, result}
diff --git a/lib/httparrot/basic_auth_handler.ex b/lib/httparrot/basic_auth_handler.ex
index c3c20b4..bbe8010 100644
--- a/lib/httparrot/basic_auth_handler.ex
+++ b/lib/httparrot/basic_auth_handler.ex
@@ -5,12 +5,12 @@ defmodule HTTParrot.BasicAuthHandler do
   use HTTParrot.Cowboy, methods: ~w(GET HEAD OPTIONS)
 
   def is_authorized(req, state) do
-    {user, req} = :cowboy_req.binding(:user, req)
-    {passwd, req} = :cowboy_req.binding(:passwd, req)
-    {:ok, auth, req} = :cowboy_req.parse_header("authorization", req)
+    user = :cowboy_req.binding(:user, req)
+    passwd = :cowboy_req.binding(:passwd, req)
+    auth = :cowboy_req.parse_header("authorization", req)
 
     case auth do
-      {"basic", {^user, ^passwd}} -> {true, req, user}
+      {:basic, ^user, ^passwd} -> {true, req, user}
       _ -> {{false, "Basic realm=\"Fake Realm\""}, req, state}
     end
   end
diff --git a/lib/httparrot/delete_cookies_handler.ex b/lib/httparrot/delete_cookies_handler.ex
index d298f3d..c37daf8 100644
--- a/lib/httparrot/delete_cookies_handler.ex
+++ b/lib/httparrot/delete_cookies_handler.ex
@@ -20,7 +20,7 @@ defmodule HTTParrot.DeleteCookiesHandler do
       end)
 
     req = :cowboy_req.reply(302, %{"location" => "/cookies"}, "Redirecting...", req)
-    {:halt, req, qs_vals}
+    {:stop, req, qs_vals}
   end
 
   defp delete_cookie(name, true, req), do: delete_cookie(name, "", req)
diff --git a/lib/httparrot/general_request_info.ex b/lib/httparrot/general_request_info.ex
index 07e21ad..645d88b 100644
--- a/lib/httparrot/general_request_info.ex
+++ b/lib/httparrot/general_request_info.ex
@@ -8,6 +8,7 @@ defmodule HTTParrot.GeneralRequestInfo do
     ip =
       case ip do
         {127, 0, 0, 1} -> ""
+        :local -> ""
         _ -> :inet_parse.ntoa(ip) |> to_string
       end
 
diff --git a/lib/httparrot/redirect_handler.ex b/lib/httparrot/redirect_handler.ex
index 70a7621..463b55b 100644
--- a/lib/httparrot/redirect_handler.ex
+++ b/lib/httparrot/redirect_handler.ex
@@ -19,7 +19,7 @@ defmodule HTTParrot.RedirectHandler do
   def previously_existed(req, state), do: {true, req, state}
 
   def moved_permanently(req, n) do
-    host_url = IO.iodata_to_binary(:cowboy_req.uri(req))
+    host_url = IO.iodata_to_binary(:cowboy_req.uri(req, %{path: :undefined, qs: :undefined, fragment: :undefined}))
     url = if n > 1, do: "/redirect/#{n - 1}", else: "/get"
     {{true, host_url <> url}, req, nil}
   end
diff --git a/lib/httparrot/set_cookies_handler.ex b/lib/httparrot/set_cookies_handler.ex
index 1efcbda..c7f9541 100644
--- a/lib/httparrot/set_cookies_handler.ex
+++ b/lib/httparrot/set_cookies_handler.ex
@@ -27,7 +27,7 @@ defmodule HTTParrot.SetCookiesHandler do
       end)
 
     req = :cowboy_req.reply(302, %{"location" => "/cookies"}, "Redirecting...", req)
-    {:halt, req, qs_vals}
+    {:stop, req, qs_vals}
   end
 
   defp set_cookie(name, value, req) do
diff --git a/lib/httparrot/status_code_handler.ex b/lib/httparrot/status_code_handler.ex
index 2c87cd2..521765f 100644
--- a/lib/httparrot/status_code_handler.ex
+++ b/lib/httparrot/status_code_handler.ex
@@ -11,6 +11,6 @@ defmodule HTTParrot.StatusCodeHandler do
   def get_json(req, state) do
     code = :cowboy_req.binding(:code, req)
     req = :cowboy_req.reply(code, %{}, "", req)
-    {:halt, req, state}
+    {:stop, req, state}
   end
 end
diff --git a/lib/httparrot/store_request_handler.ex b/lib/httparrot/store_request_handler.ex
index b77e5f6..316b28e 100644
--- a/lib/httparrot/store_request_handler.ex
+++ b/lib/httparrot/store_request_handler.ex
@@ -66,6 +66,6 @@ defmodule HTTParrot.StoreRequestHandler do
     key = :cowboy_req.binding(:key, req)
     HTTParrot.RequestStore.store(key, info ++ body)
     req = :cowboy_req.reply(200, %{}, "{\"saved\": \"true\"}", req)
-    {:halt, req, nil}
+    {:stop, req, nil}
   end
 end
diff --git a/lib/httparrot/stream_bytes_handler.ex b/lib/httparrot/stream_bytes_handler.ex
index 2f97aed..05cdf27 100644
--- a/lib/httparrot/stream_bytes_handler.ex
+++ b/lib/httparrot/stream_bytes_handler.ex
@@ -26,17 +26,19 @@ defmodule HTTParrot.StreamBytesHandler do
   def get_bytes(req, state) do
     {n, seed, chunk_size} = state
     :rand.seed(:exs64, {seed, seed, seed})
-    {{:chunked, stream_response(n, chunk_size)}, req, nil}
+    req = stream_response!(n, chunk_size, req)
+    {:stop, req, nil}
   end
 
-  defp stream_response(n, chunk_size) do
-    fn send_func ->
-      Stream.repeatedly(fn -> :rand.uniform(255) end)
-      |> Stream.take(n)
-      |> Enum.chunk_every(chunk_size, chunk_size, [])
-      |> Enum.each(fn chunk ->
-        send_func.(List.to_string(chunk))
-      end)
-    end
+  defp stream_response!(n, chunk_size, req) do
+    req = :cowboy_req.stream_reply(200, %{ "content-type" => "application/octet-stream" }, req)
+    Stream.repeatedly(fn -> :rand.uniform(255) end)
+    |> Stream.take(n)
+    |> Enum.chunk_every(chunk_size, chunk_size, [])
+    |> Enum.each(fn chunk ->
+      :cowboy_req.stream_body(List.to_string(chunk), :nofin, req)
+    end)
+    :cowboy_req.stream_body("", :fin, req)
+    req
   end
 end
diff --git a/lib/httparrot/stream_handler.ex b/lib/httparrot/stream_handler.ex
index 92267bc..753900f 100644
--- a/lib/httparrot/stream_handler.ex
+++ b/lib/httparrot/stream_handler.ex
@@ -25,14 +25,12 @@ defmodule HTTParrot.StreamHandler do
 
   def get_json(req, n) do
     {info, req} = GeneralRequestInfo.retrieve(req)
-    {{:chunked, stream_response(n, info)}, req, nil}
-  end
-
-  defp stream_response(n, info) do
-    fn send_func ->
-      Enum.each(0..(n - 1), fn i ->
-        send_func.(([id: i] ++ info) |> JSX.encode!())
-      end)
-    end
+    req = :cowboy_req.stream_reply(200, %{ "content-type" => "application/json" }, req)
+    Enum.each(0..(n - 1), fn i ->
+      body = JSX.encode!([id: i] ++ info)
+      :cowboy_req.stream_body(body, :nofin, req)
+    end)
+    :cowboy_req.stream_body("", :fin, req)
+    {:stop, req, nil}
   end
 end
diff --git a/lib/httparrot/user_agent_handler.ex b/lib/httparrot/user_agent_handler.ex
index 77e8d43..5651c2d 100644
--- a/lib/httparrot/user_agent_handler.ex
+++ b/lib/httparrot/user_agent_handler.ex
@@ -9,7 +9,7 @@ defmodule HTTParrot.UserAgentHandler do
   end
 
   def get_json(req, state) do
-    {user_agent, req} = :cowboy_req.header("user-agent", req, "null")
+    user_agent = :cowboy_req.header("user-agent", req, "null")
     {response(user_agent), req, state}
   end
 
diff --git a/test/base64_handler_test.exs b/test/base64_handler_test.exs
index 6ace3a2..3a19062 100644
--- a/test/base64_handler_test.exs
+++ b/test/base64_handler_test.exs
@@ -10,16 +10,16 @@ defmodule HTTParrot.Base64HandlerTest do
   end
 
   test "halts with error" do
-    expect(:cowboy_req, :binding, [{[:value, :req1], {"I=", :req2}}])
+    expect(:cowboy_req, :binding, [{[:value, :req1], "I="}])
 
-    assert malformed_request(:req1, :state) == {true, :req2, :state}
+    assert malformed_request(:req1, :state) == {true, :req1, :state}
     assert validate(:cowboy_req)
   end
 
   test "proceeds with decoded base64 urlsafe" do
-    expect(:cowboy_req, :binding, [{[:value, :req1], {"LytiYXNlNjQrLw", :req2}}])
+    expect(:cowboy_req, :binding, [{[:value, :req1], "LytiYXNlNjQrLw"}])
 
-    assert malformed_request(:req1, :state) == {false, :req2, "/+base64+/"}
+    assert malformed_request(:req1, :state) == {false, :req1, "/+base64+/"}
     assert validate(:cowboy_req)
   end
 
diff --git a/test/basic_auth_handler_test.exs b/test/basic_auth_handler_test.exs
index 7e346f0..dbcfd67 100644
--- a/test/basic_auth_handler_test.exs
+++ b/test/basic_auth_handler_test.exs
@@ -11,22 +11,22 @@ defmodule HTTParrot.BasicAuthHandlerTest do
   end
 
   test "is_authorized returns true if user and passwd match" do
-    expect(:cowboy_req, :binding, [{[:user, :req1], {:user, :req2}},
-                                   {[:passwd, :req2], {:passwd, :req3}}])
-    expect(:cowboy_req, :parse_header, [{["authorization", :req3], {:ok, {"basic", {:user, :passwd}}, :req4}}])
+    expect(:cowboy_req, :binding, [{[:user, :req1], :user},
+                                   {[:passwd, :req1], :passwd}])
+    expect(:cowboy_req, :parse_header, [{["authorization", :req1], {:basic, :user, :passwd}}])
 
-    assert is_authorized(:req1, :state) == {true, :req4, :user}
+    assert is_authorized(:req1, :state) == {true, :req1, :user}
 
     assert validate :cowboy_req
     assert validate JSX
   end
 
   test "is_authorized returns false if user and passwd doesnt match" do
-    expect(:cowboy_req, :binding, [{[:user, :req1], {:user, :req2}},
-                                   {[:passwd, :req2], {:passwd, :req3}}])
-    expect(:cowboy_req, :parse_header, [{["authorization", :req3], {:ok, {"basic", {:not_the_user, :passwd}}, :req4}}])
+    expect(:cowboy_req, :binding, [{[:user, :req1], :user},
+                                   {[:passwd, :req1], :passwd}])
+    expect(:cowboy_req, :parse_header, [{["authorization", :req1], {:basic, :not_the_user, :passwd}}])
 
-    assert is_authorized(:req1, :state) == {{false, "Basic realm=\"Fake Realm\""}, :req4, :state}
+    assert is_authorized(:req1, :state) == {{false, "Basic realm=\"Fake Realm\""}, :req1, :state}
 
     assert validate :cowboy_req
     assert validate JSX
diff --git a/test/delete_cookies_handler_test.exs b/test/delete_cookies_handler_test.exs
index 0bfb6cb..59db5ae 100644
--- a/test/delete_cookies_handler_test.exs
+++ b/test/delete_cookies_handler_test.exs
@@ -20,7 +20,7 @@ defmodule HTTParrot.DeleteCookiesHandlerTest do
     ])
 
     assert get_json(:req1, [{"k1", "v1"}, {"k2", "v2"}]) ==
-             {:halt, :req4, [{"k1", "v1"}, {"k2", "v2"}]}
+             {:stop, :req4, [{"k1", "v1"}, {"k2", "v2"}]}
 
     assert validate(:cowboy_req)
   end
diff --git a/test/redirect_handler_test.exs b/test/redirect_handler_test.exs
index 6c23507..934402d 100644
--- a/test/redirect_handler_test.exs
+++ b/test/redirect_handler_test.exs
@@ -34,7 +34,7 @@ defmodule HTTParrot.RedirectHandlerTest do
   end
 
   test "moved_permanently returns 'redirect/n-1' if n > 1" do
-    expect(:cowboy_req, :uri, 1, "host")
+    expect(:cowboy_req, :uri, 2, "host")
 
     assert moved_permanently(:req1, 4) == {{true, "host/redirect/3"}, :req1, nil}
 
@@ -42,7 +42,7 @@ defmodule HTTParrot.RedirectHandlerTest do
   end
 
   test "moved_permanently returns '/get' if n = 1" do
-    expect(:cowboy_req, :uri, 1, "host")
+    expect(:cowboy_req, :uri, 2, "host")
 
     assert moved_permanently(:req1, 1) == {{true, "host/get"}, :req1, nil}
 
diff --git a/test/set_cookies_handler_test.exs b/test/set_cookies_handler_test.exs
index dc7fe9e..86a43f1 100644
--- a/test/set_cookies_handler_test.exs
+++ b/test/set_cookies_handler_test.exs
@@ -68,7 +68,7 @@ defmodule HTTParrot.SetCookiesHandlerTest do
       {[302, %{"location" => "/cookies"}, "Redirecting...", :req3], :req4}
     ])
 
-    assert get_json(:req1, k1: :v1, k2: :v2) == {:halt, :req4, [k1: :v1, k2: :v2]}
+    assert get_json(:req1, k1: :v1, k2: :v2) == {:stop, :req4, [k1: :v1, k2: :v2]}
 
     assert validate(:cowboy_req)
   end
diff --git a/test/status_code_handler_test.exs b/test/status_code_handler_test.exs
index b114000..245f2b1 100644
--- a/test/status_code_handler_test.exs
+++ b/test/status_code_handler_test.exs
@@ -13,7 +13,7 @@ defmodule HTTParrot.StatusCodeHandlerTest do
     code = 123
     expect(:cowboy_req, :binding, [{[:code, :req1], code}])
     expect(:cowboy_req, :reply, [{[code, %{}, "", :req1], :req2}])
-    assert get_json(:req1, :state) == {:halt, :req2, :state}
+    assert get_json(:req1, :state) == {:stop, :req2, :state}
     assert validate(:cowboy_req)
   end
 end
diff --git a/test/stream_bytes_handler_test.exs b/test/stream_bytes_handler_test.exs
index 4eeb7d6..f519395 100644
--- a/test/stream_bytes_handler_test.exs
+++ b/test/stream_bytes_handler_test.exs
@@ -100,15 +100,14 @@ defmodule HTTParrot.StreamBytesHandlerTest do
   end
 
   test "response must stream chunks" do
-    assert {{:chunked, func}, :req1, nil} = get_bytes(:req1, {9, 3, 4})
-    assert is_function(func)
+    expect(:cowboy_req, :stream_reply, 3, :req2)
+    expect(:cowboy_req, :stream_body, 3, :ok)
 
-    send_func = fn body -> send(self(), {:chunk, body}) end
-    func.(send_func)
+    assert {:stop, :req2, nil} = get_bytes(:req1, {9, 3, 4})
 
-    assert_receive {:chunk, chunk1}
-    assert_receive {:chunk, chunk2}
-    assert_receive {:chunk, chunk3}
+    chunk1 = :meck.capture(1, :cowboy_req, :stream_body, :_, 1)
+    chunk2 = :meck.capture(2, :cowboy_req, :stream_body, :_, 1)
+    chunk3 = :meck.capture(3, :cowboy_req, :stream_body, :_, 1)
 
     assert String.length(chunk1) == 4
     assert String.length(chunk2) == 4
diff --git a/test/stream_handler_test.exs b/test/stream_handler_test.exs
index b4a6a14..c36a811 100644
--- a/test/stream_handler_test.exs
+++ b/test/stream_handler_test.exs
@@ -45,16 +45,11 @@ defmodule HTTParrot.StreamHandlerTest do
 
   test "response must stream chunks" do
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req2})
+    expect(:cowboy_req, :stream_reply, 3, :req2)
+    expect(:cowboy_req, :stream_body, 3, :req2)
     expect(JSX, :encode!, [{[[{:id, 0}, :info]], :json1}, {[[{:id, 1}, :info]], :json2}])
 
-    assert {{:chunked, func}, :req2, nil} = get_json(:req1, 2)
-    assert is_function(func)
-
-    send_func = fn body -> send(self(), {:chunk, body}) end
-    func.(send_func)
-
-    assert_receive {:chunk, :json1}
-    assert_receive {:chunk, :json2}
+    assert {:stop, :req2, nil} = get_json(:req1, 2)
 
     assert validate(HTTParrot.GeneralRequestInfo)
     assert validate(JSX)
diff --git a/test/user_agent_test.exs b/test/user_agent_test.exs
index 57c78c1..d04d5fa 100644
--- a/test/user_agent_test.exs
+++ b/test/user_agent_test.exs
@@ -11,10 +11,10 @@ defmodule HTTParrot.UserAgentHandlerTest do
   end
 
   test "returns prettified json with user agent" do
-    expect(:cowboy_req, :header, [{["user-agent", :req1, "null"], {:user_agent, :req2}}])
+    expect(:cowboy_req, :header, [{["user-agent", :req1, "null"], :user_agent}])
     expect(JSX, :encode!, [{[[{"user-agent", :user_agent}]], :json}])
 
-    assert get_json(:req1, :state) == {:json, :req2, :state}
+    assert get_json(:req1, :state) == {:json, :req1, :state}
 
     assert validate :cowboy_req
     assert validate JSX