anthonycicc/httparrot
1
0
Fork 0
mirror of https://github.com/edgurgel/httparrot synced 2025-04-05 08:12:31 -04:00
Code Issues Releases Wiki Activity

Merge pull request #10 from jordan0day/transfer-encoding-chunked_requests

Browse source 
add support for chunked request bodies, fix a few test names
This commit is contained in:
Eduardo Gurgel 2015-01-12 23:12:45 +13:00
commit becd95f680
2 changed files with 57 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/httparrot/p_handler.ex
View file

@ -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)

50
test/p_handler_test.exs
View file

@ -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 ->