Merge pull request ruby-grape#207 from tim-vandecasteele/adapt_validation

Add support for Rack::Multipart::UploadedFile and don't care about parameter presence

Author: dblock

lib/grape/validations/coerce.rb

@@ -16,6 +16,7 @@ def validate_param!(attr_name, params)
         end
       end
 
+      class InvalidValue; end
     private
 
       def _valid_array_type?(type, values)
@@ -25,8 +26,12 @@ def _valid_array_type?(type, values)
       end
 
       def _valid_single_type?(klass, val)
+        # allow nil, to ignore when a parameter is absent
+        return true if val.nil?
         if klass == Virtus::Attribute::Boolean
           val.is_a?(TrueClass) || val.is_a?(FalseClass)
+        elsif klass == Rack::Multipart::UploadedFile
+          val.is_a?(Hashie::Mash) && val.key?(:tempfile)
         else
           val.is_a?(klass)
         end
@@ -47,7 +52,7 @@ def coerce_value(type, val)
       # not the prettiest but some invalid coercion can currently trigger
       # errors in Virtus (see coerce_spec.rb)
       rescue
-        nil
+        InvalidValue.new
       end
 
     end

spec/grape/validations/coerce_spec.rb

@@ -8,7 +8,7 @@ class User
         attribute :id, Integer
         attribute :name, String
       end
-    
+
       class API < Grape::API
         default_format :json
 
@@ -32,6 +32,7 @@ class API < Grape::API
 
         params do
           requires :int, :coerce => Integer
+          optional :int2, :coerce => Integer
           optional :arr, :coerce => Array[Integer]
           optional :bool, :coerce => Array[Boolean]
         end
@@ -42,52 +43,69 @@ class API < Grape::API
             :bool   => params[:bool] ? (params[:bool][0] == true) && (params[:bool][1] == false) : nil
           }
         end
+        params do
+          requires :uploaded_file, :type => Rack::Multipart::UploadedFile
+        end
+        post '/file' do
+          {
+            :dpx_file => params[:uploaded_file]
+          }
+        end
       end
     end
   end
-  
+
   def app
     ValidationsSpec::CoerceValidatorSpec::API
   end
-    
+
   it "should return an error on malformed input" do
     get '/single', :int => "43a"
     last_response.status.should == 400
-    
+
     get '/single', :int => "43"
     last_response.status.should == 200
   end
-  
+
   it "should return an error on malformed input (array)" do
     get '/arr', :ids => ["1", "2", "az"]
     last_response.status.should == 400
-    
+
     get '/arr', :ids => ["1", "2", "890"]
     last_response.status.should == 200
   end
-  
+
   it "should return an error on malformed input (complex object)" do
     # this request does raise an error inside Virtus
     get '/user', :user => "32"
     last_response.status.should == 400
-    
+
     get '/user', :user => { :id => 32, :name => "Bob"}
     last_response.status.should == 200
   end
-  
+
   it 'should coerce inputs' do
-    get('/coerce', :int => "43")
+    get('/coerce', :int => "43", :int2 => "42")
     last_response.status.should == 200
     ret = MultiJson.load(last_response.body)
     ret["int"].should == "Fixnum"
-    
-    get('/coerce', :int => "40", :arr => ["1","20","3"], :bool => [1, 0])
+
+    get('/coerce', :int => "40", :int2 => "42", :arr => ["1","20","3"], :bool => [1, 0])
     # last_response.body.should == ""
     last_response.status.should == 200
     ret = MultiJson.load(last_response.body)
     ret["int"].should == "Fixnum"
     ret["arr"].should == "Fixnum"
     ret["bool"].should == true
   end
-  
+
+  it 'should not return an error when an optional parameter is nil' do
+    get('/coerce', :int => "40")
+    last_response.status.should == 200
+  end
+
+  it 'should coerce a file' do
+    post('/file', :uploaded_file => Rack::Test::UploadedFile.new(__FILE__))
+    last_response.status.should == 201
+  end
 end