grape 0.17.0 → 0.18.0

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

@@ -9,7 +9,12 @@ describe Grape::Validations::AllowBlankValidator do
         params do
           requires :name, allow_blank: false
         end
-        get
+        get '/disallow_blank'
+
+        params do
+          optional :name, type: String, allow_blank: false
+        end
+        get '/opt_disallow_string_blank'
 
         params do
           optional :name, allow_blank: false
@@ -247,7 +252,7 @@ describe Grape::Validations::AllowBlankValidator do
 
   context 'invalid input' do
     it 'refuses empty string' do
-      get '/', name: ''
+      get '/disallow_blank', name: ''
       expect(last_response.status).to eq(400)
 
       get '/disallow_datetime_blank', val: ''
@@ -255,18 +260,23 @@ describe Grape::Validations::AllowBlankValidator do
     end
 
     it 'refuses only whitespaces' do
-      get '/', name: '   '
+      get '/disallow_blank', name: '   '
       expect(last_response.status).to eq(400)
 
-      get '/', name: "  \n "
+      get '/disallow_blank', name: "  \n "
       expect(last_response.status).to eq(400)
 
-      get '/', name: "\n"
+      get '/disallow_blank', name: "\n"
       expect(last_response.status).to eq(400)
     end
 
     it 'refuses nil' do
-      get '/', name: nil
+      get '/disallow_blank', name: nil
+      expect(last_response.status).to eq(400)
+    end
+
+    it 'refuses missing' do
+      get '/disallow_blank'
       expect(last_response.status).to eq(400)
     end
   end
@@ -432,8 +442,13 @@ describe Grape::Validations::AllowBlankValidator do
   end
 
   context 'valid input' do
+    it 'allows missing optional strings' do
+      get 'opt_disallow_string_blank'
+      expect(last_response.status).to eq(200)
+    end
+
     it 'accepts valid input' do
-      get '/', name: 'bob'
+      get '/disallow_blank', name: 'bob'
       expect(last_response.status).to eq(200)
     end
 

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

@@ -625,7 +625,7 @@ describe Grape::Validations::CoerceValidator do
 
           get '/', a: %w(the other)
           expect(last_response.status).to eq(200)
-          expect(last_response.body).to eq('["the", "other"]')
+          expect(last_response.body).to eq('#<Hashie::Array ["the", "other"]>')
 
           get '/', a: { a: 1, b: 2 }
           expect(last_response.status).to eq(400)
@@ -633,27 +633,27 @@ describe Grape::Validations::CoerceValidator do
 
           get '/', a: [1, 2, 3]
           expect(last_response.status).to eq(200)
-          expect(last_response.body).to eq('["1", "2", "3"]')
+          expect(last_response.body).to eq('#<Hashie::Array ["1", "2", "3"]>')
         end
 
         it 'allows multiple collection types' do
           get '/', b: [1, 2, 3]
           expect(last_response.status).to eq(200)
-          expect(last_response.body).to eq('[1, 2, 3]')
+          expect(last_response.body).to eq('#<Hashie::Array [1, 2, 3]>')
 
           get '/', b: %w(1 2 3)
           expect(last_response.status).to eq(200)
-          expect(last_response.body).to eq('[1, 2, 3]')
+          expect(last_response.body).to eq('#<Hashie::Array [1, 2, 3]>')
 
           get '/', b: [1, true, 'three']
           expect(last_response.status).to eq(200)
-          expect(last_response.body).to eq('["1", "true", "three"]')
+          expect(last_response.body).to eq('#<Hashie::Array ["1", "true", "three"]>')
         end
 
         it 'allows collections with multiple types' do
           get '/', c: [1, '2', true, 'three']
           expect(last_response.status).to eq(200)
-          expect(last_response.body).to eq('[1, 2, "true", "three"]')
+          expect(last_response.body).to eq('#<Hashie::Array [1, 2, "true", "three"]>')
 
           get '/', d: '1'
           expect(last_response.status).to eq(200)

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

@@ -4,6 +4,7 @@ describe Grape::Validations::ValuesValidator do
   module ValidationsSpec
     class ValuesModel
       DEFAULT_VALUES = ['valid-type1', 'valid-type2', 'valid-type3'].freeze
+      DEFAULT_EXCEPTS = ['invalid-type1', 'invalid-type2', 'invalid-type3'].freeze
       class << self
         def values
           @values ||= []
@@ -14,6 +15,16 @@ describe Grape::Validations::ValuesValidator do
           @values ||= []
           @values << value
         end
+
+        def excepts
+          @excepts ||= []
+          [DEFAULT_EXCEPTS + @excepts].flatten.uniq
+        end
+
+        def add_except(except)
+          @excepts ||= []
+          @excepts << except
+        end
       end
     end
 
@@ -35,6 +46,27 @@ describe Grape::Validations::ValuesValidator do
           get '/lambda' do
             { type: params[:type] }
           end
+
+          params do
+            requires :type, values: { except: ValuesModel.excepts, except_message: 'value is on exclusions list', message: 'default exclude message' }
+          end
+          get '/exclude/exclude_message' do
+            { type: params[:type] }
+          end
+
+          params do
+            requires :type, values: { except: -> { ValuesModel.excepts }, except_message: 'value is on exclusions list' }
+          end
+          get '/exclude/lambda/exclude_message' do
+            { type: params[:type] }
+          end
+
+          params do
+            requires :type, values: { except: ValuesModel.excepts, message: 'default exclude message' }
+          end
+          get '/exclude/fallback_message' do
+            { type: params[:type] }
+          end
         end
 
         params do
@@ -99,6 +131,34 @@ describe Grape::Validations::ValuesValidator do
           end
         end
         get '/optional_with_required_values'
+
+        params do
+          requires :type, values: { except: ValuesModel.excepts }
+        end
+        get '/except/exclusive' do
+          { type: params[:type] }
+        end
+
+        params do
+          requires :type, values: { except: -> { ValuesModel.excepts } }
+        end
+        get '/except/exclusive/lambda' do
+          { type: params[:type] }
+        end
+
+        params do
+          requires :type, type: Integer, values: { except: -> { [3, 4, 5] } }
+        end
+        get '/except/exclusive/lambda/coercion' do
+          { type: params[:type] }
+        end
+
+        params do
+          requires :type, type: Integer, values: { value: 1..5, except: [3] }
+        end
+        get '/mixed/value/except' do
+          { type: params[:type] }
+        end
       end
     end
   end
@@ -135,6 +195,30 @@ describe Grape::Validations::ValuesValidator do
     end
   end
 
+  context 'with a custom exclude validation message' do
+    it 'does not allow an invalid value for a parameter' do
+      get('/custom_message/exclude/exclude_message', type: 'invalid-type1')
+      expect(last_response.status).to eq 400
+      expect(last_response.body).to eq({ error: 'type value is on exclusions list' }.to_json)
+    end
+  end
+
+  context 'with a custom exclude validation message' do
+    it 'does not allow an invalid value for a parameter' do
+      get('/custom_message/exclude/lambda/exclude_message', type: 'invalid-type1')
+      expect(last_response.status).to eq 400
+      expect(last_response.body).to eq({ error: 'type value is on exclusions list' }.to_json)
+    end
+  end
+
+  context 'exclude with a standard custom validation message' do
+    it 'does not allow an invalid value for a parameter' do
+      get('/custom_message/exclude/fallback_message', type: 'invalid-type1')
+      expect(last_response.status).to eq 400
+      expect(last_response.body).to eq({ error: 'type default exclude message' }.to_json)
+    end
+  end
+
   it 'allows a valid value for a parameter' do
     get('/', type: 'valid-type1')
     expect(last_response.status).to eq 200
@@ -321,4 +405,66 @@ describe Grape::Validations::ValuesValidator do
       expect(last_response.body).to eq('values does not have a valid value')
     end
   end
+
+  context 'exclusive excepts' do
+    it 'allows any other value outside excepts' do
+      get '/except/exclusive', type: 'value'
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to eq({ type: 'value' }.to_json)
+    end
+
+    it 'rejects values that matches except' do
+      get '/except/exclusive', type: 'invalid-type1'
+      expect(last_response.status).to eq 400
+      expect(last_response.body).to eq({ error: 'type has a value not allowed' }.to_json)
+    end
+  end
+
+  context 'exclusive excepts with lambda' do
+    it 'allows any other value outside excepts' do
+      get '/except/exclusive/lambda', type: 'value'
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to eq({ type: 'value' }.to_json)
+    end
+
+    it 'rejects values that matches except' do
+      get '/except/exclusive/lambda', type: 'invalid-type1'
+      expect(last_response.status).to eq 400
+      expect(last_response.body).to eq({ error: 'type has a value not allowed' }.to_json)
+    end
+  end
+
+  context 'exclusive excepts with lambda and coercion' do
+    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: 10_010_000 }.to_json)
+    end
+
+    it 'rejects values that matches except' do
+      get '/except/exclusive/lambda/coercion', type: '3'
+      expect(last_response.status).to eq 400
+      expect(last_response.body).to eq({ error: 'type has a value not allowed' }.to_json)
+    end
+  end
+
+  context 'with mixed values and excepts' do
+    it 'allows value, but not in except' do
+      get '/mixed/value/except', type: 2
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to eq({ type: 2 }.to_json)
+    end
+
+    it 'rejects except' do
+      get '/mixed/value/except', type: 3
+      expect(last_response.status).to eq 400
+      expect(last_response.body).to eq({ error: 'type has a value not allowed' }.to_json)
+    end
+
+    it 'rejects outside except and outside value' do
+      get '/mixed/value/except', type: 10
+      expect(last_response.status).to eq 400
+      expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
+    end
+  end
 end

data/spec/grape/validations_spec.rb

@@ -274,6 +274,28 @@ describe Grape::Validations do
       end
     end
 
+    # Ensure there is no leakage between declared Array types and
+    # subsequent Hash types
+    context 'required with an Array and a Hash block' do
+      before do
+        subject.params do
+          requires :cats, type: Array[String], default: []
+          requires :items, type: Hash do
+            requires :key
+          end
+        end
+        subject.get '/required' do
+          'required works'
+        end
+      end
+
+      it 'does not output index [0] for Hash types' do
+        get '/required', cats: ['Garfield'], items: { foo: 'bar' }
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('items[key] is missing')
+      end
+    end
+
     context 'required with a Hash block' do
       before do
         subject.params do
@@ -292,6 +314,12 @@ describe Grape::Validations do
         expect(last_response.body).to eq('items is missing, items[key] is missing')
       end
 
+      it 'errors when nested param not present' do
+        get '/required', items: { foo: 'bar' }
+        expect(last_response.status).to eq(400)
+        expect(last_response.body).to eq('items[key] is missing')
+      end
+
       it 'errors when param is not a Hash' do
         get '/required', items: 'hello'
         expect(last_response.status).to eq(400)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: mustermann19
+  name: mustermann-grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rack-accept
   requirement: !ruby/object:Gem::Requirement
@@ -275,6 +275,7 @@ files:
 - lib/grape/validations/validators/regexp.rb
 - lib/grape/validations/validators/values.rb
 - lib/grape/version.rb
+- pkg/grape-0.18.0.gem
 - spec/grape/api/custom_validations_spec.rb
 - spec/grape/api/deeply_included_options_spec.rb
 - spec/grape/api/invalid_format_spec.rb
@@ -474,4 +475,3 @@ test_files:
 - spec/support/endpoint_faker.rb
 - spec/support/file_streamer.rb
 - spec/support/versioned_helpers.rb
-has_rdoc: