From 3f9387d917d16b1d54d66b5ea57d3aeb36cec58c Mon Sep 17 00:00:00 2001
From: Eduardo Gurgel <edgurgel@gmail.com>
Date: Tue, 14 Jan 2014 17:37:30 -0300
Subject: [PATCH] Accept octet-stream and text-plain on /post /put and /patch

---
 lib/httparrot/p_handler.ex |  8 +++++++-
 test/p_handler_test.exs    | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/httparrot/p_handler.ex b/lib/httparrot/p_handler.ex
index 056d414..f47c622 100644
--- a/lib/httparrot/p_handler.ex
+++ b/lib/httparrot/p_handler.ex
@@ -19,6 +19,8 @@ defmodule HTTParrot.PHandler do
 
   def content_types_accepted(req, state) do
     {[{{"application", "json", :*}, :post_json},
+      {{"application", "octet-stream", :*}, :post_json},
+      {{"text", "plain", :*}, :post_json},
       {{"application", "x-www-form-urlencoded", :*}, :post_form}], req, state}
   end
 
@@ -33,7 +35,11 @@ defmodule HTTParrot.PHandler do
 
   def post_json(req, _state) do
     {:ok, body, req} = :cowboy_req.body(req)
-    post(req, [form: [{}], data: body, json: JSEX.decode!(body)])
+    if JSEX.is_json?(body) do
+      post(req, [form: [{}], data: body, json: JSEX.decode!(body)])
+    else
+      post(req, [form: [{}], data: body, json: nil])
+    end
   end
 
   defp post(req, body) do
diff --git a/test/p_handler_test.exs b/test/p_handler_test.exs
index 28c33eb..ced7201 100644
--- a/test/p_handler_test.exs
+++ b/test/p_handler_test.exs
@@ -42,6 +42,7 @@ defmodule HTTParrot.PHandlerTest do
     expect(:cowboy_req, :body, 1, {:ok, :body, :req2})
     expect(:cowboy_req, :set_resp_body, [{[:response, :req3], :req4}])
     expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req3})
+    expect(JSEX, :is_json?, 1, true)
     expect(JSEX, :decode!, 1, :decoded_json)
     expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, :body}, {:json, :decoded_json}]], :response}])
 
@@ -49,4 +50,16 @@ defmodule HTTParrot.PHandlerTest do
 
     assert validate HTTParrot.GeneralRequestInfo
   end
+
+  test "returns json with general info and P[OST, ATCH, UT] non-JSON body data" do
+    expect(:cowboy_req, :body, 1, {:ok, :body, :req2})
+    expect(:cowboy_req, :set_resp_body, [{[:response, :req3], :req4}])
+    expect(HTTParrot.GeneralRequestInfo, :retrieve, 1, {[:info], :req3})
+    expect(JSEX, :is_json?, 1, false)
+    expect(JSEX, :encode!, [{[[:info, {:form, [{}]}, {:data, :body}, {:json, nil}]], :response}])
+
+    assert post_json(:req1, :state) == {true, :req4, nil}
+
+    assert validate HTTParrot.GeneralRequestInfo
+  end
 end