Merged with master.

Author: dblock

CHANGELOG.markdown

@@ -2,6 +2,7 @@ Next Release
 ============
 
 * [#201](https://github.com/intridea/grape/pull/201): Rewritten `params` DSL, including support for coercion and validations - [@schmurfy](https://github.com/schmurfy).
+* [#205](https://github.com/intridea/grape/pull/205): Fix: Corrected parsing of empty JSON body on POST/PUT - [@tim-vandecasteele](https://github.com/tim-vandecasteele).
 * [#181](https://github.com/intridea/grape/pull/181): Fix: Corrected JSON serialization of nested hashes containing `Grape::Entity` instances - [@benrosenblum](https://github.com/benrosenblum).
 * [#203](https://github.com/intridea/grape/pull/203): Added a check to `Entity#serializable_hash` that verifies an entity exists on an object - [@adamgotterer](https://github.com/adamgotterer).
 

lib/grape/endpoint.rb

@@ -125,7 +125,7 @@ def params
 
     # Pull out request body params if the content type matches and we're on a POST or PUT
     def body_params
-      if ['POST', 'PUT'].include?(request.request_method.to_s.upcase)
+      if ['POST', 'PUT'].include?(request.request_method.to_s.upcase) && request.body.size > 0
         return case env['CONTENT_TYPE']
           when 'application/json'
             MultiJson.decode(request.body.read)

spec/grape/endpoint_spec.rb

@@ -191,6 +191,11 @@ def app; subject end
         last_response.body.should == 'Bobby T.'
       end
 
+      it 'should not convert empty JSON bodies to params' do
+        put '/request_body', '', {'CONTENT_TYPE' => 'application/json'}
+        last_response.body.should == ''
+      end
+
       it 'should convert XML bodies to params' do
         post '/request_body', '<user>Bobby T.</user>', {'CONTENT_TYPE' => 'application/xml'}
         last_response.body.should == 'Bobby T.'