grape 1.0.0 → 1.0.1

data/spec/grape/middleware/formatter_spec.rb

@@ -324,4 +324,28 @@ describe Grape::Middleware::Formatter do
       expect(bodies.body.first).to eq({ message: 'invalid' }.to_json)
     end
   end
+
+  context 'custom parser raises exception and rescue options are enabled for backtrace and original_exception' do
+    it 'adds the backtrace and original_exception to the error output' do
+      subject = Grape::Middleware::Formatter.new(
+        app,
+        rescue_options: { backtrace: true, original_exception: true },
+        parsers: { json: ->(_object, _env) { raise StandardError, 'fail' } }
+      )
+      io = StringIO.new('{invalid}')
+      error = catch(:error) {
+        subject.call(
+          'PATH_INFO' => '/info',
+          'REQUEST_METHOD' => 'POST',
+          'CONTENT_TYPE' => 'application/json',
+          'rack.input' => io,
+          'CONTENT_LENGTH' => io.length
+        )
+      }
+
+      expect(error[:message]).to eq 'fail'
+      expect(error[:backtrace].size).to be >= 1
+      expect(error[:original_exception].class).to eq StandardError
+    end
+  end
 end

data/spec/grape/validations/params_scope_spec.rb

@@ -121,6 +121,42 @@ describe Grape::Validations::ParamsScope do
     end
   end
 
+  context 'param alias' do
+    it do
+      subject.params do
+        requires :foo, as: :bar
+        optional :super, as: :hiper
+      end
+      subject.get('/alias') { "#{declared(params)['bar']}-#{declared(params)['hiper']}" }
+      get '/alias', foo: 'any', super: 'any2'
+
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to eq('any-any2')
+    end
+
+    it do
+      subject.params do
+        requires :foo, as: :bar, type: String, coerce_with: ->(c) { c.strip }
+      end
+      subject.get('/alias-coerced') { "#{params['bar']}-#{params['foo']}" }
+      get '/alias-coerced', foo: ' there we go '
+
+      expect(last_response.status).to eq(200)
+      expect(last_response.body).to eq('there we go-')
+    end
+
+    it do
+      subject.params do
+        requires :foo, as: :bar, allow_blank: false
+      end
+      subject.get('/alias-not-blank') {}
+      get '/alias-not-blank', foo: ''
+
+      expect(last_response.status).to eq(400)
+      expect(last_response.body).to eq('foo is empty')
+    end
+  end
+
   context 'array without coerce type explicitly given' do
     it 'sets the type based on first element' do
       subject.params do
@@ -418,6 +454,46 @@ describe Grape::Validations::ParamsScope do
       end.to raise_error(Grape::Exceptions::UnknownParameter)
     end
 
+    it 'does not validate nested requires when given is false' do
+      subject.params do
+        requires :a, type: String, allow_blank: false, values: %w(x y z)
+        given a: ->(val) { val == 'x' } do
+          requires :inner1, type: Hash, allow_blank: false do
+            requires :foo, type: Integer, allow_blank: false
+          end
+        end
+        given a: ->(val) { val == 'y' } do
+          requires :inner2, type: Hash, allow_blank: false do
+            requires :bar, type: Integer, allow_blank: false
+            requires :baz, type: Array, allow_blank: false do
+              requires :baz_category, type: String, allow_blank: false
+            end
+          end
+        end
+        given a: ->(val) { val == 'z' } do
+          requires :inner3, type: Array, allow_blank: false do
+            requires :bar, type: Integer, allow_blank: false
+            requires :baz, type: Array, allow_blank: false do
+              requires :baz_category, type: String, allow_blank: false
+            end
+          end
+        end
+      end
+      subject.get('/varying') { declared(params).to_json }
+
+      get '/varying', a: 'x', inner1: { foo: 1 }
+      expect(last_response.status).to eq(200)
+
+      get '/varying', a: 'y', inner2: { bar: 2, baz: [{ baz_category: 'barstools' }] }
+      expect(last_response.status).to eq(200)
+
+      get '/varying', a: 'y', inner2: { bar: 2, baz: [{ unrelated: 'yep' }] }
+      expect(last_response.status).to eq(400)
+
+      get '/varying', a: 'z', inner3: [{ bar: 3, baz: [{ baz_category: 'barstools' }] }]
+      expect(last_response.status).to eq(200)
+    end
+
     it 'includes the parameter within #declared(params)' do
       get '/test', a: true, b: true
 

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

@@ -110,6 +110,13 @@ describe Grape::Validations::ValuesValidator do
           { type: params[:type] }
         end
 
+        params do
+          requires :number, type: Integer, values: ->(v) { v > 0 }
+        end
+        get '/lambda_int_val' do
+          { number: params[:number] }
+        end
+
         params do
           requires :type, values: -> { [] }
         end
@@ -357,6 +364,24 @@ describe Grape::Validations::ValuesValidator do
     expect(last_response.body).to eq({ error: 'type does not have a valid value' }.to_json)
   end
 
+  it 'does not allow non-numeric string value for int value using lambda' do
+    get('/lambda_int_val', number: 'foo')
+    expect(last_response.status).to eq 400
+    expect(last_response.body).to eq({ error: 'number is invalid, number does not have a valid value' }.to_json)
+  end
+
+  it 'does not allow nil for int value using lambda' do
+    get('/lambda_int_val', number: nil)
+    expect(last_response.status).to eq 400
+    expect(last_response.body).to eq({ error: 'number does not have a valid value' }.to_json)
+  end
+
+  it 'allows numeric string for int value using lambda' do
+    get('/lambda_int_val', number: '3')
+    expect(last_response.status).to eq 200
+    expect(last_response.body).to eq({ number: 3 }.to_json)
+  end
+
   it 'allows value using lambda' do
     get('/lambda_val', type: 'valid-type1')
     expect(last_response.status).to eq 200

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -236,6 +236,7 @@ files:
 - lib/grape/validations/validator_factory.rb
 - lib/grape/validations/validators/all_or_none.rb
 - lib/grape/validations/validators/allow_blank.rb
+- lib/grape/validations/validators/as.rb
 - lib/grape/validations/validators/at_least_one_of.rb
 - lib/grape/validations/validators/base.rb
 - lib/grape/validations/validators/coerce.rb
@@ -248,8 +249,10 @@ files:
 - lib/grape/validations/validators/regexp.rb
 - lib/grape/validations/validators/values.rb
 - lib/grape/version.rb
+- pkg/grape-0.19.1.gem
 - spec/grape/api/custom_validations_spec.rb
 - spec/grape/api/deeply_included_options_spec.rb
+- spec/grape/api/inherited_helpers_spec.rb
 - spec/grape/api/invalid_format_spec.rb
 - spec/grape/api/namespace_parameters_in_route_spec.rb
 - spec/grape/api/nested_helpers_spec.rb
@@ -363,13 +366,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
 test_files:
 - spec/grape/api/custom_validations_spec.rb
 - spec/grape/api/deeply_included_options_spec.rb
+- spec/grape/api/inherited_helpers_spec.rb
 - spec/grape/api/invalid_format_spec.rb
 - spec/grape/api/namespace_parameters_in_route_spec.rb
 - spec/grape/api/nested_helpers_spec.rb