added more tests and fixed params validation when value or except in values is a proc

Author: jonmchan

lib/grape/validations/params_scope.rb

@@ -349,6 +349,10 @@ def validate(type, options, attrs, doc_attrs)
       def validate_value_coercion(coerce_type, values)
         return unless coerce_type && values
         return if values.is_a?(Proc)
+        if values.is_a?(Hash)
+          return values[:value] && values[:value].is_a?(Proc)
+          return if values[:except] && values[:except].is_a?(Proc)
+        end
         coerce_type = coerce_type.first if coerce_type.is_a?(Array)
         value_types = values.is_a?(Range) ? [values.begin, values.end] : values
         if coerce_type == Virtus::Attribute::Boolean

spec/grape/validations/params_scope_spec.rb

@@ -157,6 +157,36 @@ def initialize(value)
     end
   end
 
+  context 'coercing values validation with proc' do
+    it 'allows the proc to pass validation without checking' do
+      subject.params { requires :numbers, type: Integer, values: -> { [0,1,2] } }
+
+      subject.post('/required') { 'coercion with proc works' }
+      post '/required', numbers: '1'
+      expect(last_response.status).to eq(201)
+      expect(last_response.body).to eq('coercion with proc works')
+    end
+
+    it 'allows the proc to pass validation without checking in value' do
+      subject.params { requires :numbers, type: Integer, values: { value: -> { [0,1,2] } } }
+
+      subject.post('/required') { 'coercion with proc works' }
+      post '/required', numbers: '1'
+      expect(last_response.status).to eq(201)
+      expect(last_response.body).to eq('coercion with proc works')
+    end
+
+    it 'allows the proc to pass validation without checking in except' do
+      subject.params { requires :numbers, type: Integer, values: { except: -> { [0,1,2] } } }
+
+      subject.post('/required') { 'coercion with proc works' }
+      post '/required', numbers: '10'
+      p last_response.body
+      expect(last_response.status).to eq(201)
+      expect(last_response.body).to eq('coercion with proc works')
+    end
+  end
+
   context 'with range values' do
     context "when left range endpoint isn't #kind_of? the type" do
       it 'raises exception' do

spec/grape/validations/validators/values_spec.rb

@@ -438,7 +438,7 @@ def app
     it 'allows any other value outside excepts' do
       get '/except/exclusive/lambda/coercion', type: '10010000'
       expect(last_response.status).to eq 200
-      expect(last_response.body).to eq({ type: 'value' }.to_json)
+      expect(last_response.body).to eq({ type: 10010000 }.to_json)
     end
 
     it 'rejects values that matches except' do