grape 0.18.0 → 0.19.0

data/spec/grape/validations/params_scope_spec.rb

@@ -585,6 +585,25 @@ describe Grape::Validations::ParamsScope do
     expect(JSON.parse(last_response.body)).to eq('bar' => { 'a' => 'x', 'c' => { 'b' => 'yes' } })
   end
 
+  it 'includes deeply nested parameters within #declared(params)' do
+    subject.params do
+      requires :arr1, type: Array do
+        requires :hash1, type: Hash do
+          requires :arr2, type: Array do
+            requires :hash2, type: Hash do
+              requires :something, type: String
+            end
+          end
+        end
+      end
+    end
+    subject.get('/nested_deep') { declared(params).to_json }
+
+    get '/nested_deep', arr1: [{ hash1: { arr2: [{ hash2: { something: 'value' } }] } }]
+    expect(last_response.status).to eq(200)
+    expect(JSON.parse(last_response.body)).to eq('arr1' => [{ 'hash1' => { 'arr2' => [{ 'hash2' => { 'something' => 'value' } }] } }])
+  end
+
   context 'failing fast' do
     context 'when fail_fast is not defined' do
       it 'does not stop validation' do
@@ -624,4 +643,167 @@ describe Grape::Validations::ParamsScope do
       end
     end
   end
+
+  context 'when params have group attributes' do
+    context 'with validations' do
+      before do
+        subject.params do
+          with(allow_blank: false) do
+            requires :id
+            optional :name
+            optional :address, allow_blank: true
+          end
+        end
+        subject.get('test')
+      end
+
+      context 'when data is invalid' do
+        before do
+          get 'test', id: '', name: ''
+        end
+
+        it 'returns a validation error' do
+          expect(last_response.status).to eq(400)
+        end
+
+        it 'applies group validations for every parameter' do
+          expect(last_response.body).to eq('id is empty, name is empty')
+        end
+      end
+
+      context 'when parameter has the same validator as a group' do
+        before do
+          get 'test', id: 'id', address: ''
+        end
+
+        it 'returns a successful response' do
+          expect(last_response.status).to eq(200)
+        end
+
+        it 'prioritizes parameter validation over group validation' do
+          expect(last_response.body).to_not include('address is empty')
+        end
+      end
+    end
+
+    context 'with types' do
+      before do
+        subject.params do
+          with(type: Date) do
+            requires :created_at
+          end
+        end
+        subject.get('test') { params[:created_at] }
+      end
+
+      context 'when invalid date provided' do
+        before do
+          get 'test', created_at: 'not_a_date'
+        end
+
+        it 'responds with HTTP error' do
+          expect(last_response.status).to eq(400)
+        end
+
+        it 'returns a validation error' do
+          expect(last_response.body).to eq('created_at is invalid')
+        end
+      end
+
+      context 'when created_at receives a valid date' do
+        before do
+          get 'test', created_at: '2016-01-01'
+        end
+
+        it 'returns a successful response' do
+          expect(last_response.status).to eq(200)
+        end
+
+        it 'returns a date' do
+          expect(last_response.body).to eq('2016-01-01')
+        end
+      end
+    end
+
+    context 'with several group attributes' do
+      before do
+        subject.params do
+          with(values: [1]) do
+            requires :id, type: Integer
+          end
+
+          with(allow_blank: false) do
+            optional :address, type: String
+          end
+
+          requires :name
+        end
+        subject.get('test')
+      end
+
+      context 'when data is invalid' do
+        before do
+          get 'test', id: 2, address: ''
+        end
+
+        it 'responds with HTTP error' do
+          expect(last_response.status).to eq(400)
+        end
+
+        it 'returns a validation error' do
+          expect(last_response.body).to eq('id does not have a valid value, address is empty, name is missing')
+        end
+      end
+
+      context 'when correct data is provided' do
+        before do
+          get 'test', id: 1, address: 'Some street', name: 'John'
+        end
+
+        it 'returns a successful response' do
+          expect(last_response.status).to eq(200)
+        end
+      end
+    end
+
+    context 'with nested groups' do
+      before do
+        subject.params do
+          with(type: Integer) do
+            requires :id
+
+            with(type: Date) do
+              requires :created_at
+              optional :updated_at
+            end
+          end
+        end
+        subject.get('test')
+      end
+
+      context 'when data is invalid' do
+        before do
+          get 'test', id: 'wrong', created_at: 'not_a_date', updated_at: '2016-01-01'
+        end
+
+        it 'responds with HTTP error' do
+          expect(last_response.status).to eq(400)
+        end
+
+        it 'returns a validation error' do
+          expect(last_response.body).to eq('id is invalid, created_at is invalid')
+        end
+      end
+
+      context 'when correct data is provided' do
+        before do
+          get 'test', id: 1, created_at: '2016-01-01'
+        end
+
+        it 'returns a successful response' do
+          expect(last_response.status).to eq(200)
+        end
+      end
+    end
+  end
 end

data/spec/grape/validations/validators/default_spec.rb

@@ -93,9 +93,7 @@ describe Grape::Validations::DefaultValidator do
     params = { some_things:
                 [{ foo: 'one', options: [{ name: 'wat', value: 'nope' }] },
                  { foo: 'two' },
-                 { foo: 'three', options: [{ name: 'wooop', value: 'yap' }] }
-                ]
-             }
+                 { foo: 'three', options: [{ name: 'wooop', value: 'yap' }] }] }
     get '/nested_optional_array', root: params
     expect(last_response.status).to eq(200)
     expect(last_response.body).to eq({ root: params }.to_json)

data/spec/grape/validations/validators/presence_spec.rb

@@ -105,6 +105,34 @@ describe Grape::Validations::PresenceValidator do
     end
   end
 
+  context 'with multiple parameters per requires' do
+    before do
+      subject.params do
+        requires :one, :two
+      end
+      subject.get '/single-requires' do
+        'Hello'
+      end
+
+      subject.params do
+        requires :one
+        requires :two
+      end
+      subject.get '/multiple-requires' do
+        'Hello'
+      end
+    end
+    it 'validates for all defined params' do
+      get '/single-requires'
+      expect(last_response.status).to eq(400)
+      single_requires_error = last_response.body
+
+      get '/multiple-requires'
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq(single_requires_error)
+    end
+  end
+
   context 'with required parameters and no type' do
     before do
       subject.params do
@@ -117,7 +145,7 @@ describe Grape::Validations::PresenceValidator do
     it 'validates name, company' do
       get '/'
       expect(last_response.status).to eq(400)
-      expect(last_response.body).to eq('{"error":"name is missing"}')
+      expect(last_response.body).to eq('{"error":"name is missing, company is missing"}')
 
       get '/', name: 'Bob'
       expect(last_response.status).to eq(400)

data/spec/grape/validations/validators/regexp_spec.rb

@@ -12,6 +12,12 @@ describe Grape::Validations::RegexpValidator do
           end
           get do
           end
+
+          params do
+            requires :names, type: { value: Array[String], message: 'can\'t be nil' }, regexp: { value: /^[a-z]+$/, message: 'format is invalid' }
+          end
+          get 'regexp_with_array' do
+          end
         end
 
         params do
@@ -19,6 +25,20 @@ describe Grape::Validations::RegexpValidator do
         end
         get do
         end
+
+        params do
+          requires :names, type: Array[String], regexp: /^[a-z]+$/
+        end
+        get 'regexp_with_array' do
+        end
+
+        params do
+          requires :people, type: Hash do
+            requires :names, type: Array[String], regexp: /^[a-z]+$/
+          end
+        end
+        get 'nested_regexp_with_array' do
+        end
       end
     end
   end
@@ -51,6 +71,36 @@ describe Grape::Validations::RegexpValidator do
       get '/custom_message', name: 'bob'
       expect(last_response.status).to eq(200)
     end
+
+    context 'regexp with array' do
+      it 'refuses inapppopriate items' do
+        get '/custom_message/regexp_with_array', names: ['invalid name', 'abc']
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('{"error":"names format is invalid"}')
+      end
+
+      it 'refuses empty items' do
+        get '/custom_message/regexp_with_array', names: ['', 'abc']
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('{"error":"names format is invalid"}')
+      end
+
+      it 'refuses nil items' do
+        get '/custom_message/regexp_with_array', names: [nil, 'abc']
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('{"error":"names can\'t be nil"}')
+      end
+
+      it 'accepts valid items' do
+        get '/custom_message/regexp_with_array', names: ['bob']
+        expect(last_response.status).to eq(200)
+      end
+
+      it 'accepts nil instead of array' do
+        get '/custom_message/regexp_with_array', names: nil
+        expect(last_response.status).to eq(200)
+      end
+    end
   end
 
   context 'invalid input' do
@@ -76,4 +126,42 @@ describe Grape::Validations::RegexpValidator do
     get '/', name: 'bob'
     expect(last_response.status).to eq(200)
   end
+
+  context 'regexp with array' do
+    it 'refuses inapppopriate items' do
+      get '/regexp_with_array', names: ['invalid name', 'abc']
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq('{"error":"names is invalid"}')
+    end
+
+    it 'refuses empty items' do
+      get '/regexp_with_array', names: ['', 'abc']
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq('{"error":"names is invalid"}')
+    end
+
+    it 'refuses nil items' do
+      get '/regexp_with_array', names: [nil, 'abc']
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq('{"error":"names is invalid"}')
+    end
+
+    it 'accepts valid items' do
+      get '/regexp_with_array', names: ['bob']
+      expect(last_response.status).to eq(200)
+    end
+
+    it 'accepts nil instead of array' do
+      get '/regexp_with_array', names: nil
+      expect(last_response.status).to eq(200)
+    end
+  end
+
+  context 'nested regexp with array' do
+    it 'refuses inapppopriate' do
+      get '/nested_regexp_with_array', people: 'invalid name'
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq('{"error":"people is invalid, people[names] is missing, people[names] is invalid"}')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -157,9 +157,11 @@ files:
 - UPGRADING.md
 - benchmark/simple.rb
 - gemfiles/rack_1.5.2.gemfile
+- gemfiles/rack_edge.gemfile
 - gemfiles/rails_3.gemfile
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
+- gemfiles/rails_edge.gemfile
 - grape.gemspec
 - grape.png
 - lib/grape.rb
@@ -275,7 +277,7 @@ files:
 - lib/grape/validations/validators/regexp.rb
 - lib/grape/validations/validators/values.rb
 - lib/grape/version.rb
-- pkg/grape-0.18.0.gem
+- pkg/grape-0.17.0.gem
 - spec/grape/api/custom_validations_spec.rb
 - spec/grape/api/deeply_included_options_spec.rb
 - spec/grape/api/invalid_format_spec.rb