From dc7a819abcfb73569623e565b29480fa20ff21bd Mon Sep 17 00:00:00 2001
From: Jordan Day <jordan@roboninja.com>
Date: Sun, 11 Jan 2015 22:31:46 -0600
Subject: [PATCH] add support for chunked request bodies, fix a few test names

---
 lib/httparrot/p_handler.ex | 11 ++++++++-
 test/p_handler_test.exs    | 50 +++++++++++++++++++++++++++++++++++---
 2 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/lib/httparrot/p_handler.ex b/lib/httparrot/p_handler.ex
index d795d49..db6ac32 100644
--- a/lib/httparrot/p_handler.ex
+++ b/lib/httparrot/p_handler.ex
@@ -35,7 +35,7 @@ defmodule HTTParrot.PHandler do
   end
 
   def post_binary(req, _state) do
-    {:ok, body, req} = :cowboy_req.body(req)
+    {:ok, body, req} = handle_binary(req)
     if String.valid?(body) do
       if JSEX.is_json?(body) do
         post(req, [form: [{}], data: body, json: JSEX.decode!(body)])
@@ -49,6 +49,15 @@ defmodule HTTParrot.PHandler do
     end
   end
 
+  defp handle_binary(req, chunks \\ []) do
+    case :cowboy_req.body(req) do
+      {:ok, chunk, req} ->
+        {:ok, Enum.join(chunks ++ [chunk]), req}
+      {:more, chunk, req} ->
+        handle_binary(req, chunks ++ [chunk])
+    end
+  end
+
   defp post(req, body) do
     {info, req} = GeneralRequestInfo.retrieve(req)
     req = :cowboy_req.set_resp_body(response(info, body), req)
diff --git a/test/p_handler_test.exs b/test/p_handler_test.exs
index e9e9653..7755caa 100644
--- a/test/p_handler_test.exs
+++ b/test/p_handler_test.exs
@@ -71,7 +71,51 @@ defmodule HTTParrot.PHandlerTest do
     assert validate HTTParrot.GeneralRequestInfo
   end
 
-  test "returns json with general info and P[OST, ATCH, UT] octet-stream body data for multipart request (simple)" do
+  test "returns json with general info and P[OST, UT, ATCH] non-JSON body data for a chunked request" do
+    first_chunk = "first chunk"
+    second_chunk = "second chunk"
+    expect(:cowboy_req, :body, fn req ->
+      case req do
+        :req1 ->
+          {:more, first_chunk, :req2}
+        :req2 ->
+          {:ok, second_chunk, :req3}
+      end
+    end)
+
+    expect(:cowboy_req, :set_resp_body, [{[:response, :req4], :req5}])
+    expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req4})
+    expect(JSEX, :is_json?, 1, false)
+    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, first_chunk <> second_chunk}, {:json, nil}]], :response}])
+
+    assert post_binary(:req1, :state) == {true, :req5, nil}
+
+    assert validate HTTParrot.GeneralRequestInfo
+  end
+
+  test "returns json with general info and P[OST, UT, ATCH] octect-stream body data for a chunked request" do
+    first_chunk = "first chunk" <> <<0xffff :: 16>>
+    second_chunk = "second chunk"
+    expect(:cowboy_req, :body, fn req ->
+      case req do
+        :req1 ->
+          {:more, first_chunk, :req2}
+        :req2 ->
+          {:ok, second_chunk, :req3}
+      end
+    end)
+
+    expect(:cowboy_req, :set_resp_body, [{[:response, :req4], :req5}])
+    expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req4})
+    expect(JSEX, :is_json?, 1, false)
+    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, "data:application/octet-stream;base64,#{Base.encode64(first_chunk <> second_chunk)}"}, {:json, nil}]], :response}])
+
+    assert post_binary(:req1, :state) == {true, :req5, nil}
+
+    assert validate HTTParrot.GeneralRequestInfo
+  end
+
+  test "returns json with general info and P[OST, ATCH, UT] form data for multipart request (simple)" do
     expect(:cowboy_req, :part, fn req ->
       case req do
         :req1 ->
@@ -96,7 +140,7 @@ defmodule HTTParrot.PHandlerTest do
     assert validate HTTParrot.GeneralRequestInfo
   end
 
-  test "returns json with general info and P[OST, ATCH, UT] octet-stream body data for multipart requests (multiple parts)" do
+  test "returns json with general info and P[OST, ATCH, UT] form data for multipart requests (multiple parts)" do
     expect(:cowboy_req, :part, fn req ->
       case req do
         :req1 ->
@@ -154,7 +198,7 @@ defmodule HTTParrot.PHandlerTest do
     assert validate HTTParrot.GeneralRequestInfo
   end
 
-  test "returns json with general info and P[OST, UT, ATCH] file data (form-data plus one file)" do
+  test "returns json with general info and P[OST, UT, ATCH] form data and file data (form-data plus one file)" do
     expect(:cowboy_req, :part, fn req ->
       case req do
         :req1 ->