merge

Author: dj2

lib/goliath/rack/params.rb

@@ -38,17 +38,21 @@ def retrieve_params(env)
 body=env['rack.input'].read
 env['rack.input'].rewind
 
-begin
-post_params=case(env['CONTENT_TYPE'])
-whenURL_ENCODEDthen
- ::Rack::Utils.parse_nested_query(body)
-whenJSON_ENCODEDthen
-MultiJson.decode(body)
-else
-{}
+unlessbody.empty?
+begin
+post_params=case(env['CONTENT_TYPE'])
+whenURL_ENCODEDthen
+ ::Rack::Utils.parse_nested_query(body)
+whenJSON_ENCODEDthen
+MultiJson.decode(body)
+else
+{}
+end
+rescueStandardError=>e
+raiseGoliath::Validation::BadRequestError,"Invalid parameters: #{e.class.to_s}"
 end
-rescueStandardError=>e
-raiseGoliath::Validation::BadRequestError.new("Invalid parameters: #{e.class.to_s}")
+else
+post_params={}
 end
 end
 

spec/unit/rack/params_spec.rb

@@ -141,6 +141,14 @@
 ret=@params.retrieve_params(@env)
 ret['foo'].should == 'bar'
 end
+
+it"handles empty input gracefully on JSON"do
+@env['CONTENT_TYPE']='application/json'
+@env['rack.input']=StringIO.new
+
+ret=@params.retrieve_params(@env)
+ret.shouldbe_empty
+end
 
 it"raises a BadRequestError on invalid JSON"do
 @env['CONTENT_TYPE']='application/json'
@@ -151,7 +159,6 @@
 lambda{@params.retrieve_params(@env)}.shouldraise_error(Goliath::Validation::BadRequestError)
 end
 
-
 it"doesn't parse unknown content types"do
 @env['CONTENT_TYPE']='fake/form -- type'
 @env['rack.input']=StringIO.new