grape 0.11.0 → 0.12.0

data/spec/grape/endpoint_spec.rb

@@ -11,13 +11,13 @@ describe Grape::Endpoint do
     after { Grape::Endpoint.before_each(nil) }
 
     it 'should be settable via block' do
-      block = lambda { |endpoint| 'noop' }
+      block = lambda { |_endpoint| 'noop' }
       Grape::Endpoint.before_each(&block)
       expect(Grape::Endpoint.before_each).to eq(block)
     end
 
     it 'should be settable via reference' do
-      block = lambda { |endpoint| 'noop' }
+      block = lambda { |_endpoint| 'noop' }
       Grape::Endpoint.before_each block
       expect(Grape::Endpoint.before_each).to eq(block)
     end
@@ -116,8 +116,8 @@ describe Grape::Endpoint do
     it 'includes request headers' do
       get '/headers'
       expect(JSON.parse(last_response.body)).to eq(
-          'Host' => 'example.org',
-          'Cookie' => ''
+        'Host' => 'example.org',
+        'Cookie' => ''
       )
     end
     it 'includes additional request headers' do
@@ -153,7 +153,7 @@ describe Grape::Endpoint do
         'cookie4=secret+code+here',
         'my-awesome-cookie1=is+cool',
         'my-awesome-cookie2=is+cool+too; domain=my.example.com; path=/; secure'
-     ]
+      ]
     end
 
     it 'sets browser cookies and does not set response cookies' do
@@ -295,6 +295,44 @@ describe Grape::Endpoint do
       expect(inner_params[:nested].size).to eq 2
     end
 
+    it 'builds nested params' do
+      inner_params = nil
+      subject.get '/declared' do
+        inner_params = declared(params)
+        ''
+      end
+
+      get '/declared?first=present&nested[fourth]=1'
+      expect(last_response.status).to eq(200)
+      expect(inner_params[:nested].keys.size).to eq 1
+    end
+
+    context 'sets nested array when the param is missing' do
+      it 'to be array when include_missing is true' do
+        inner_params = nil
+        subject.get '/declared' do
+          inner_params = declared(params, include_missing: true)
+          ''
+        end
+
+        get '/declared?first=present'
+        expect(last_response.status).to eq(200)
+        expect(inner_params[:nested]).to be_a(Array)
+      end
+
+      it 'to be nil when include_missing is false' do
+        inner_params = nil
+        subject.get '/declared' do
+          inner_params = declared(params, include_missing: false)
+          ''
+        end
+
+        get '/declared?first=present'
+        expect(last_response.status).to eq(200)
+        expect(inner_params[:nested]).to be_nil
+      end
+    end
+
     it 'filters out any additional params that are given' do
       inner_params = nil
       subject.get '/declared' do
@@ -889,4 +927,18 @@ describe Grape::Endpoint do
       expect(last_response.status).to eq(406)
     end
   end
+
+  context 'binary' do
+    before do
+      subject.get do
+        file FileStreamer.new(__FILE__)
+      end
+    end
+
+    it 'suports stream objects in response' do
+      get '/'
+      expect(last_response.status).to eq 200
+      expect(last_response.body).to eq File.read(__FILE__)
+    end
+  end
 end

data/spec/grape/entity_spec.rb

@@ -114,7 +114,7 @@ describe Grape::Entity do
 
     it 'does not run autodetection for Entity when explicitely provided' do
       entity = Class.new(Grape::Entity)
-      some_array = Array.new
+      some_array = []
 
       subject.get '/example' do
         present some_array, with: entity

data/spec/grape/exceptions/body_parse_errors_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 describe Grape::Exceptions::ValidationErrors do
   context 'api with rescue_from :all handler' do
     subject { Class.new(Grape::API) }
-    before {
-      subject.rescue_from :all do |e|
+    before do
+      subject.rescue_from :all do |_e|
         rack_response 'message was processed', 400
       end
       subject.params do
@@ -13,7 +13,7 @@ describe Grape::Exceptions::ValidationErrors do
       subject.post '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject
@@ -54,14 +54,14 @@ describe Grape::Exceptions::ValidationErrors do
 
   context 'api without a rescue handler' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.params do
         requires :beer
       end
       subject.post '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject

data/spec/grape/exceptions/invalid_accept_header_spec.rb

@@ -34,7 +34,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
   context 'API with cascade=false and rescue_from :all handler' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.version 'v99', using: :header, vendor: 'vendorname', format: :json, cascade: false
       subject.rescue_from :all do |e|
         rack_response 'message was processed', 400, e[:headers]
@@ -42,7 +42,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       subject.get '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject
@@ -55,17 +55,17 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
     context 'that receives' do
       context 'an invalid version in the request' do
-        before {
+        before do
           get '/beer', {}, 'HTTP_ACCEPT' => 'application/vnd.vendorname-v77',
                            'CONTENT_TYPE' => 'application/json'
-        }
+        end
         it_should_behave_like 'a rescued request'
       end
       context 'an invalid vendor in the request' do
-        before {
+        before do
           get '/beer', {}, 'HTTP_ACCEPT' => 'application/vnd.invalidvendor-v99',
                            'CONTENT_TYPE' => 'application/json'
-        }
+        end
         it_should_behave_like 'a rescued request'
       end
     end
@@ -73,12 +73,12 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
   context 'API with cascade=false and without a rescue handler' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.version 'v99', using: :header, vendor: 'vendorname', format: :json, cascade: false
       subject.get '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject
@@ -103,7 +103,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
   context 'API with cascade=false and with rescue_from :all handler and http_codes' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.version 'v99', using: :header, vendor: 'vendorname', format: :json, cascade: false
       subject.rescue_from :all do |e|
         rack_response 'message was processed', 400, e[:headers]
@@ -116,7 +116,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       subject.get '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject
@@ -129,17 +129,17 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
     context 'that receives' do
       context 'an invalid version in the request' do
-        before {
+        before do
           get '/beer', {}, 'HTTP_ACCEPT' => 'application/vnd.vendorname-v77',
                            'CONTENT_TYPE' => 'application/json'
-        }
+        end
         it_should_behave_like 'a rescued request'
       end
       context 'an invalid vendor in the request' do
-        before {
+        before do
           get '/beer', {}, 'HTTP_ACCEPT' => 'application/vnd.invalidvendor-v99',
                            'CONTENT_TYPE' => 'application/json'
-        }
+        end
         it_should_behave_like 'a rescued request'
       end
     end
@@ -147,7 +147,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
   context 'API with cascade=false, http_codes but without a rescue handler' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.version 'v99', using: :header, vendor: 'vendorname', format: :json, cascade: false
       subject.desc 'Get beer' do
         failure [[400, 'Bad Request'], [401, 'Unauthorized'], [403, 'Forbidden'],
@@ -157,7 +157,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       subject.get '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject
@@ -182,7 +182,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
   context 'API with cascade=true and rescue_from :all handler' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.version 'v99', using: :header, vendor: 'vendorname', format: :json, cascade: true
       subject.rescue_from :all do |e|
         rack_response 'message was processed', 400, e[:headers]
@@ -190,7 +190,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       subject.get '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject
@@ -203,17 +203,17 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
     context 'that receives' do
       context 'an invalid version in the request' do
-        before {
+        before do
           get '/beer', {}, 'HTTP_ACCEPT' => 'application/vnd.vendorname-v77',
                            'CONTENT_TYPE' => 'application/json'
-        }
+        end
         it_should_behave_like 'a cascaded request'
       end
       context 'an invalid vendor in the request' do
-        before {
+        before do
           get '/beer', {}, 'HTTP_ACCEPT' => 'application/vnd.invalidvendor-v99',
                            'CONTENT_TYPE' => 'application/json'
-        }
+        end
         it_should_behave_like 'a cascaded request'
       end
     end
@@ -221,12 +221,12 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
   context 'API with cascade=true and without a rescue handler' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.version 'v99', using: :header, vendor: 'vendorname', format: :json, cascade: true
       subject.get '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject
@@ -251,7 +251,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
   context 'API with cascade=true and with rescue_from :all handler and http_codes' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.version 'v99', using: :header, vendor: 'vendorname', format: :json, cascade: true
       subject.rescue_from :all do |e|
         rack_response 'message was processed', 400, e[:headers]
@@ -264,7 +264,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       subject.get '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject
@@ -277,17 +277,17 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
     context 'that receives' do
       context 'an invalid version in the request' do
-        before {
+        before do
           get '/beer', {}, 'HTTP_ACCEPT' => 'application/vnd.vendorname-v77',
                            'CONTENT_TYPE' => 'application/json'
-        }
+        end
         it_should_behave_like 'a cascaded request'
       end
       context 'an invalid vendor in the request' do
-        before {
+        before do
           get '/beer', {}, 'HTTP_ACCEPT' => 'application/vnd.invalidvendor-v99',
                            'CONTENT_TYPE' => 'application/json'
-        }
+        end
         it_should_behave_like 'a cascaded request'
       end
     end
@@ -295,7 +295,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
 
   context 'API with cascade=true, http_codes but without a rescue handler' do
     subject { Class.new(Grape::API) }
-    before {
+    before do
       subject.version 'v99', using: :header, vendor: 'vendorname', format: :json, cascade: true
       subject.desc 'Get beer' do
         failure [[400, 'Bad Request'], [401, 'Unauthorized'], [403, 'Forbidden'],
@@ -305,7 +305,7 @@ describe Grape::Exceptions::InvalidAcceptHeader do
       subject.get '/beer' do
         'beer received'
       end
-    }
+    end
 
     def app
       subject

data/spec/grape/exceptions/validation_errors_spec.rb

@@ -27,7 +27,7 @@ describe Grape::Exceptions::ValidationErrors do
     it 'can return structured json with separate fields' do
       subject.format :json
       subject.rescue_from Grape::Exceptions::ValidationErrors do |e|
-        rack_response e.to_json, 400
+        error!(e, 400)
       end
       subject.params do
         optional :beer

data/spec/grape/integration/rack_spec.rb

@@ -19,9 +19,10 @@ describe Rack do
       }
       env = Rack::MockRequest.env_for('/', options)
 
-      # requires Rack 1.6.0 to pass
-      # can't check explicitly version of Rack because of https://github.com/rack/rack/issues/773
-      pending 'Rack 1.6.0 is required' unless ::Rack.const_defined?(:TempfileReaper) || RUBY_PLATFORM == 'java'
+      unless RUBY_PLATFORM == 'java'
+        major, minor, release = Rack.release.split('.').map(&:to_i)
+        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 1 && ((minor == 5 && release >= 3) || (minor >= 6))
+      end
 
       expect(JSON.parse(app.call(env)[2].body.first)['params_keys']).to match_array('test')
     ensure

data/spec/grape/middleware/auth/strategies_spec.rb

@@ -9,12 +9,12 @@ describe Grape::Middleware::Auth::Strategies do
       Rack::Builder.new do |b|
         b.use Grape::Middleware::Error
         b.use(Grape::Middleware::Auth::Base, type: :http_basic, proc: proc)
-        b.run lambda { |env| [200, {}, ['Hello there.']] }
+        b.run ->(_env) { [200, {}, ['Hello there.']] }
       end
     end
 
     it 'throws a 401 if no auth is given' do
-      @proc = lambda { false }
+      @proc = -> { false }
       get '/whatever'
       expect(last_response.status).to eq(401)
     end

data/spec/grape/middleware/base_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Grape::Middleware::Base do
   subject { Grape::Middleware::Base.new(blank_app) }
-  let(:blank_app) { lambda { |_| [200, {}, 'Hi there.'] } }
+  let(:blank_app) { ->(_) { [200, {}, 'Hi there.'] } }
 
   before do
     # Keep it one object for testing.
@@ -36,7 +36,7 @@ describe Grape::Middleware::Base do
 
   describe '#response' do
     subject { Grape::Middleware::Base.new(response) }
-    let(:response) { lambda { |_| [204, { abc: 1 }, 'test'] } }
+    let(:response) { ->(_) { [204, { abc: 1 }, 'test'] } }
 
     it 'status' do
       subject.call({})

data/spec/grape/middleware/error_spec.rb

@@ -17,7 +17,7 @@ describe Grape::Middleware::Error do
       attr_accessor :error
       attr_accessor :format
 
-      def call(env)
+      def call(_env)
         throw :error, error
       end
     end

data/spec/grape/middleware/exception_spec.rb

@@ -5,7 +5,7 @@ describe Grape::Middleware::Error do
   # raises a text exception
   class ExceptionApp
     class << self
-      def call(env)
+      def call(_env)
         fail 'rain!'
       end
     end
@@ -18,7 +18,7 @@ describe Grape::Middleware::Error do
         throw :error, message: { error: message, detail: 'missing widget' }, status: status
       end
 
-      def call(env)
+      def call(_env)
         error!('rain!', 401)
       end
     end
@@ -31,7 +31,7 @@ describe Grape::Middleware::Error do
         throw :error, message: message, status: status
       end
 
-      def call(env)
+      def call(_env)
         error!('Access Denied', 401)
       end
     end
@@ -43,7 +43,7 @@ describe Grape::Middleware::Error do
 
   class CustomErrorApp
     class << self
-      def call(env)
+      def call(_env)
         fail CustomError, status: 400, message: 'failed validation'
       end
     end
@@ -160,7 +160,7 @@ describe Grape::Middleware::Error do
         use Grape::Middleware::Error, rescue_all: true,
                                       format: :custom,
                                       error_formatters: {
-                                        custom: lambda do |message, backtrace, options, env|
+                                        custom: lambda do |message, _backtrace, _options, _env|
                                           { custom_formatter: message }.inspect
                                         end
                                       }