Now it doesn't throw a 400 error

Didn't account for regular POST content being in
the body on some requests, even if JSON is
expected as the result. It now fails gracefully.

Author: Ted Kulp

lib/grape/middleware/formatter.rb

@@ -52,14 +52,15 @@ def before
         fmt = format_from_extension || format_from_header || options[:default_format]
 
         if content_types.key?(fmt)
-          if !env['rack.input'].nil? and (body = env['rack.input'].read).length != 0
+          if !env['rack.input'].nil? and (body = env['rack.input'].read).strip.length != 0
             parser = parser_for fmt
             unless parser.nil?
               begin
-                env['rack.request.form_hash'] = !env['rack.request.form_hash'].nil? ? env['rack.request.form_hash'].merge(parser.call(body)) : parser.call(body)
+                body = parser.call(body)
+                env['rack.request.form_hash'] = !env['rack.request.form_hash'].nil? ? env['rack.request.form_hash'].merge(body) : body
                 env['rack.request.form_input'] = env['rack.input']
               rescue
-                throw :error, :status => 400, :message => 'Body content could not be parsed.'
+                # It's possible that it's just regular POST content -- just back off
               end
             end
             env['rack.input'].rewind

spec/grape/middleware/formatter_spec.rb

@@ -130,9 +130,9 @@ def serializable_hash
       subject.env['rack.request.form_hash']['is_boolean'].should be_true
       subject.env['rack.request.form_hash']['string'].should == 'thing'
     end
-    it 'should be able to fail gracefully if the body is invalid' do
-      err = catch(:error){ subject.call({'PATH_INFO' => '/info', 'Accept' => 'application/json', 'rack.input' => StringIO.new('{"is_boolean":true,string:"thing"}')}) }
-      err.should == {:status => 400, :message => "Body content could not be parsed."}
+    it 'should be able to fail gracefully if the body is regular POST content' do
+      subject.call({'PATH_INFO' => '/info', 'Accept' => 'application/json', 'rack.input' => StringIO.new('name=Other+Test+Thing')})
+      subject.env['rack.request.form_hash'].should be_nil
     end
   end
 end