Merge pull request #799 from bwalex/fix_778

Address #778 - don't restrict options to Hash/Array types

Author: dblock

CHANGELOG.md

@@ -7,6 +7,7 @@
 * [#745](https://github.com/intridea/grape/pull/745): Added `:binary, application/octet-stream` content-type - [@akabraham](https://github.com/akabraham).
 * [#757](https://github.com/intridea/grape/pull/757): Changed `desc` can now be used with a block syntax - [@dspaeth-faber](https://github.com/dspaeth-faber).
 * [#779](https://github.com/intridea/grape/pull/779): Fixed using `values` with a `default` proc - [@ShPakvel](https://github.com/ShPakvel).
+* [#799](https://github.com/intridea/grape/pull/799): Fixed custom validators with required `Hash`, `Array` types - [@bwalex](https://github.com/bwalex).
 * Your contribution here.
 
 0.9.0 (8/27/2014)

lib/grape/validations/params_scope.rb

@@ -73,7 +73,6 @@ def validate_attributes(attrs, opts, &block)
 
       def new_scope(attrs, optional = false, &block)
         opts = attrs[1] || { type: Array }
-        raise ArgumentError unless opts.keys.to_set.subset? [:type].to_set
         ParamsScope.new(api: @api, element: attrs.first, parent: self, optional: optional, type: opts[:type], &block)
       end
 

spec/grape/validations_spec.rb

@@ -227,16 +227,6 @@ def define_requires_none
         expect(JSON.parse(last_response.body)).to eq('items' => [])
       end
 
-      it "doesn't allow any key in the options hash other than type" do
-        expect {
-          subject.params do
-            requires(:items, desc: 'Foo') do
-              requires :key
-            end
-          end
-        }.to raise_error ArgumentError
-      end
-
       it 'adds to declared parameters' do
         subject.params do
           requires :items do
@@ -281,16 +271,6 @@ def define_requires_none
         expect(last_response.body).to eq('required works')
       end
 
-      it "doesn't allow any key in the options hash other than type" do
-        expect {
-          subject.params do
-            requires(:items, desc: 'Foo') do
-              requires :key
-            end
-          end
-        }.to raise_error ArgumentError
-      end
-
       it 'adds to declared parameters' do
         subject.params do
           requires :items do
@@ -335,6 +315,63 @@ def define_requires_none
       end
     end
 
+    context 'custom validator for a Hash' do
+      module DateRangeValidations
+        class DateRangeValidator < Grape::Validations::Base
+          def validate_param!(attr_name, params)
+            unless params[attr_name][:from] <= params[attr_name][:to]
+              raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: "'from' must be lower or equal to 'to'"
+            end
+          end
+        end
+      end
+
+      before do
+        subject.params do
+          optional :date_range, date_range: true, type: Hash do
+            requires :from, type: Integer
+            requires :to, type: Integer
+          end
+        end
+        subject.get('/optional') do
+          'optional works'
+        end
+        subject.params do
+          requires :date_range, date_range: true, type: Hash do
+            requires :from, type: Integer
+            requires :to, type: Integer
+          end
+        end
+        subject.get('/required') do
+          'required works'
+        end
+      end
+
+      context 'which is optional' do
+        it "doesn't throw an error if the validation passes" do
+          get '/optional', date_range: { from: 1, to: 2 }
+          expect(last_response.status).to eq(200)
+        end
+
+        it 'errors if the validation fails' do
+          get '/optional', date_range: { from: 2, to: 1 }
+          expect(last_response.status).to eq(400)
+        end
+      end
+
+      context 'which is required' do
+        it "doesn't throw an error if the validation passes" do
+          get '/required', date_range: { from: 1, to: 2 }
+          expect(last_response.status).to eq(200)
+        end
+
+        it 'errors if the validation fails' do
+          get '/required', date_range: { from: 2, to: 1 }
+          expect(last_response.status).to eq(400)
+        end
+      end
+    end
+
     context 'validation within arrays' do
       before do
         subject.params do