grape 0.11.0 → 0.12.0

data/spec/grape/middleware/formatter_spec.rb

@@ -4,7 +4,7 @@ describe Grape::Middleware::Formatter do
   subject { Grape::Middleware::Formatter.new(app) }
   before { allow(subject).to receive(:dup).and_return(subject) }
 
-  let(:app) { lambda { |env| [200, {}, [@body || { 'foo' => 'bar' }]] } }
+  let(:app) { ->(_env) { [200, {}, [@body || { 'foo' => 'bar' }]] } }
 
   context 'serialization' do
     it 'looks at the bodies for possibly serializable data' do
@@ -21,7 +21,7 @@ describe Grape::Middleware::Formatter do
         end
       end
 
-      subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json').last.each { |b| expect(b).to eq('"bar"') }
+      subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('"bar"') }
     end
 
     it 'calls #to_json if the content type is jsonapi' do
@@ -32,7 +32,7 @@ describe Grape::Middleware::Formatter do
         end
       end
 
-      subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/vnd.api+json').last.each { |b| expect(b).to eq('{"foos":[{"bar":"baz"}] }') }
+      subject.call('PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/vnd.api+json').to_a.last.each { |b| expect(b).to eq('{"foos":[{"bar":"baz"}] }') }
     end
 
     it 'calls #to_xml if the content type is xml' do
@@ -43,7 +43,7 @@ describe Grape::Middleware::Formatter do
         end
       end
 
-      subject.call('PATH_INFO' => '/somewhere.xml', 'HTTP_ACCEPT' => 'application/json').last.each { |b| expect(b).to eq('<bar/>') }
+      subject.call('PATH_INFO' => '/somewhere.xml', 'HTTP_ACCEPT' => 'application/json').to_a.last.each { |b| expect(b).to eq('<bar/>') }
     end
   end
 
@@ -145,21 +145,21 @@ describe Grape::Middleware::Formatter do
 
   context 'content-type' do
     it 'is set for json' do
-      _, headers, _ = subject.call('PATH_INFO' => '/info.json')
+      _, headers, = subject.call('PATH_INFO' => '/info.json')
       expect(headers['Content-type']).to eq('application/json')
     end
     it 'is set for xml' do
-      _, headers, _ = subject.call('PATH_INFO' => '/info.xml')
+      _, headers, = subject.call('PATH_INFO' => '/info.xml')
       expect(headers['Content-type']).to eq('application/xml')
     end
     it 'is set for txt' do
-      _, headers, _ = subject.call('PATH_INFO' => '/info.txt')
+      _, headers, = subject.call('PATH_INFO' => '/info.txt')
       expect(headers['Content-type']).to eq('text/plain')
     end
     it 'is set for custom' do
       subject.options[:content_types] = {}
       subject.options[:content_types][:custom] = 'application/x-custom'
-      _, headers, _ = subject.call('PATH_INFO' => '/info.custom')
+      _, headers, = subject.call('PATH_INFO' => '/info.custom')
       expect(headers['Content-type']).to eq('application/x-custom')
     end
   end
@@ -168,7 +168,7 @@ describe Grape::Middleware::Formatter do
     it 'uses custom formatter' do
       subject.options[:content_types] = {}
       subject.options[:content_types][:custom] = "don't care"
-      subject.options[:formatters][:custom] = lambda { |obj, env| 'CUSTOM FORMAT' }
+      subject.options[:formatters][:custom] = ->(_obj, _env) { 'CUSTOM FORMAT' }
       _, _, body = subject.call('PATH_INFO' => '/info.custom')
       expect(body.body).to eq(['CUSTOM FORMAT'])
     end
@@ -178,7 +178,7 @@ describe Grape::Middleware::Formatter do
       expect(body.body).to eq(['["blah"]'])
     end
     it 'uses custom json formatter' do
-      subject.options[:formatters][:json] = lambda { |obj, env| 'CUSTOM JSON FORMAT' }
+      subject.options[:formatters][:json] = ->(_obj, _env) { 'CUSTOM JSON FORMAT' }
       _, _, body = subject.call('PATH_INFO' => '/info.json')
       expect(body.body).to eq(['CUSTOM JSON FORMAT'])
     end

data/spec/grape/middleware/globals_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Grape::Middleware::Globals do
+  subject { Grape::Middleware::Globals.new(blank_app) }
+  before { allow(subject).to receive(:dup).and_return(subject) }
+
+  let(:blank_app) { ->(_env) { [200, {}, 'Hi there.'] } }
+
+  it 'calls through to the app' do
+    expect(subject.call({})).to eq([200, {}, 'Hi there.'])
+  end
+
+  context 'environment' do
+    it 'should set the grape.request environment' do
+      subject.call({})
+      expect(subject.env['grape.request']).to be_a(Grape::Request)
+    end
+    it 'should set the grape.request.headers environment' do
+      subject.call({})
+      expect(subject.env['grape.request.headers']).to be_a(Hash)
+    end
+    it 'should set the grape.request.params environment' do
+      subject.call('QUERY_STRING' => 'test=1', 'rack.input' => StringIO.new)
+      expect(subject.env['grape.request.params']).to be_a(Hash)
+    end
+  end
+end

data/spec/grape/middleware/versioner/accept_version_header_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::AcceptVersionHeader do
-  let(:app) { lambda { |env| [200, env, env] } }
+  let(:app) { ->(env) { [200, env, env] } }
   subject { Grape::Middleware::Versioner::AcceptVersionHeader.new(app, @options || {}) }
 
   before do

data/spec/grape/middleware/versioner/header_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::Header do
-  let(:app) { lambda { |env| [200, env, env] } }
+  let(:app) { ->(env) { [200, env, env] } }
   subject { Grape::Middleware::Versioner::Header.new(app, @options || {}) }
 
   before do

data/spec/grape/middleware/versioner/param_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::Param do
-  let(:app) { lambda { |env| [200, env, env['api.version']] } }
+  let(:app) { ->(env) { [200, env, env['api.version']] } }
   subject { Grape::Middleware::Versioner::Param.new(app, @options || {}) }
 
   it 'sets the API version based on the default param (apiver)' do

data/spec/grape/middleware/versioner/path_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::Path do
-  let(:app) { lambda { |env| [200, env, env['api.version']] } }
+  let(:app) { ->(env) { [200, env, env['api.version']] } }
   subject { Grape::Middleware::Versioner::Path.new(app, @options || {}) }
 
   it 'sets the API version based on the first path' do

data/spec/grape/path_spec.rb

@@ -182,11 +182,12 @@ module Grape
 
     describe '#suffix' do
       context 'when using a specific format' do
-        it 'is empty' do
+        it 'accepts specified format' do
           path = Path.new(nil, nil, {})
           allow(path).to receive(:uses_specific_format?) { true }
+          allow(path).to receive(:settings) { { format: :json } }
 
-          expect(path.suffix).to eql('')
+          expect(path.suffix).to eql('(.json)')
         end
       end
 
@@ -237,12 +238,13 @@ module Grape
       end
 
       context 'when using a specific format' do
-        it 'does not have a suffix' do
+        it 'might have a suffix with specified format' do
           path = Path.new(nil, nil, {})
           allow(path).to receive(:path) { '/the/path' }
           allow(path).to receive(:uses_specific_format?) { true }
+          allow(path).to receive(:settings) { { format: :json } }
 
-          expect(path.path_with_suffix).to eql('/the/path')
+          expect(path.path_with_suffix).to eql('/the/path(.json)')
         end
       end
     end

data/spec/grape/presenters/presenter_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+
+module Grape
+  module Presenters
+    module InsideRouteSpec
+      class Dummy
+        include Grape::DSL::InsideRoute
+
+        attr_reader :env, :request, :new_settings
+
+        def initialize
+          @env = {}
+          @header = {}
+          @new_settings = { namespace_inheritable: {}, namespace_stackable: {} }
+        end
+      end
+    end
+
+    describe Presenter do
+      describe 'represent' do
+        let(:object_mock) do
+          Object.new
+        end
+
+        it 'represent object' do
+          expect(Presenter.represent(object_mock)).to eq object_mock
+        end
+      end
+
+      subject { InsideRouteSpec::Dummy.new }
+
+      describe 'present' do
+        let(:hash_mock) do
+          { key: :value }
+        end
+
+        describe 'instance' do
+          before do
+            subject.present hash_mock, with: Grape::Presenters::Presenter
+          end
+          it 'presents dummy hash' do
+            expect(subject.body).to eq hash_mock
+          end
+        end
+
+        describe 'multiple presenter' do
+          let(:hash_mock1) do
+            { key1: :value1 }
+          end
+
+          let(:hash_mock2) do
+            { key2: :value2 }
+          end
+
+          describe 'instance' do
+            before do
+              subject.present hash_mock1, with: Grape::Presenters::Presenter
+              subject.present hash_mock2, with: Grape::Presenters::Presenter
+            end
+
+            it 'presents both dummy presenter' do
+              expect(subject.body[:key1]).to eq hash_mock1[:key1]
+              expect(subject.body[:key2]).to eq hash_mock2[:key2]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/grape/util/inheritable_values_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 module Grape
   module Util
     describe InheritableValues do
-      let(:parent){ InheritableValues.new }
+      let(:parent) { InheritableValues.new }
       subject { InheritableValues.new(parent) }
 
       describe '#delete' do

data/spec/grape/util/stackable_values_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 module Grape
   module Util
     describe StackableValues do
-      let(:parent){ StackableValues.new }
+      let(:parent) { StackableValues.new }
       subject { StackableValues.new(parent) }
 
       describe '#keys' do

data/spec/grape/util/strict_hash_configuration_spec.rb

@@ -31,7 +31,7 @@ module Grape
                                        config2: 'beta',
                                        config3: { config4: 'gamma' },
                                        config5: { config6: { config7: 7, config8: 8 } }
-                                    )
+                                      )
       end
     end
   end

data/spec/grape/validations/params_scope_spec.rb

@@ -9,6 +9,70 @@ describe Grape::Validations::ParamsScope do
     subject
   end
 
+  context 'setting a default' do
+    let(:documentation) { subject.routes.first.route_params }
+
+    context 'when the default value is truthy' do
+      before do
+        subject.params do
+          optional :int, type: Integer, default: 42
+        end
+        subject.get
+      end
+
+      it 'adds documentation about the default value' do
+        expect(documentation).to have_key('int')
+        expect(documentation['int']).to have_key(:default)
+        expect(documentation['int'][:default]).to eq(42)
+      end
+    end
+
+    context 'when the default value is false' do
+      before do
+        subject.params do
+          optional :bool, type: Virtus::Attribute::Boolean, default: false
+        end
+        subject.get
+      end
+
+      it 'adds documentation about the default value' do
+        expect(documentation).to have_key('bool')
+        expect(documentation['bool']).to have_key(:default)
+        expect(documentation['bool'][:default]).to eq(false)
+      end
+    end
+
+    context 'when the default value is nil' do
+      before do
+        subject.params do
+          optional :object, type: Object, default: nil
+        end
+        subject.get
+      end
+
+      it 'adds documentation about the default value' do
+        expect(documentation).to have_key('object')
+        expect(documentation['object']).to have_key(:default)
+        expect(documentation['object'][:default]).to eq(nil)
+      end
+    end
+  end
+
+  context 'without a default' do
+    before do
+      subject.params do
+        optional :object, type: Object
+      end
+      subject.get
+    end
+
+    it 'does not add documentation for the default value' do
+      documentation = subject.routes.first.route_params
+      expect(documentation).to have_key('object')
+      expect(documentation['object']).not_to have_key(:default)
+    end
+  end
+
   context 'setting description' do
     [:desc, :description].each do |description_type|
       it "allows setting #{description_type}" do

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

@@ -66,6 +66,11 @@ describe Grape::Validations::AllowBlankValidator do
         end
         get '/allow_boolean_blank'
 
+        params do
+          requires :val, type: Boolean, allow_blank: false
+        end
+        get '/disallow_boolean_blank'
+
         params do
           optional :user, type: Hash do
             requires :name, allow_blank: false
@@ -201,6 +206,11 @@ describe Grape::Validations::AllowBlankValidator do
       get '/allow_boolean_blank', val: ''
       expect(last_response.status).to eq(200)
     end
+
+    it 'accepts false when boolean allow_blank' do
+      get '/disallow_boolean_blank', val: false
+      expect(last_response.status).to eq(200)
+    end
   end
 
   context 'in an optional group' do

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

@@ -122,30 +122,60 @@ describe Grape::Validations::CoerceValidator do
         expect(last_response.body).to eq('Fixnum')
       end
 
-      it 'Array of Integers' do
-        subject.params do
-          requires :arry, coerce: Array[Integer]
-        end
-        subject.get '/array' do
-          params[:arry][0].class
+      context 'Array' do
+        it 'Array of Integers' do
+          subject.params do
+            requires :arry, coerce: Array[Integer]
+          end
+          subject.get '/array' do
+            params[:arry][0].class
+          end
+
+          get '/array', arry: %w(1 2 3)
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eq('Fixnum')
         end
 
-        get '/array', arry: %w(1 2 3)
-        expect(last_response.status).to eq(200)
-        expect(last_response.body).to eq('Fixnum')
-      end
+        it 'Array of Bools' do
+          subject.params do
+            requires :arry, coerce: Array[Virtus::Attribute::Boolean]
+          end
+          subject.get '/array' do
+            params[:arry][0].class
+          end
 
-      it 'Array of Bools' do
-        subject.params do
-          requires :arry, coerce: Array[Virtus::Attribute::Boolean]
+          get 'array', arry: [1, 0]
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eq('TrueClass')
         end
-        subject.get '/array' do
-          params[:arry][0].class
+      end
+
+      context 'Set' do
+        it 'Set of Integers' do
+          subject.params do
+            requires :set, coerce: Set[Integer]
+          end
+          subject.get '/set' do
+            params[:set].first.class
+          end
+
+          get '/set', set: Set.new([1, 2, 3, 4]).to_a
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eq('Fixnum')
         end
 
-        get 'array', arry: [1, 0]
-        expect(last_response.status).to eq(200)
-        expect(last_response.body).to eq('TrueClass')
+        it 'Set of Bools' do
+          subject.params do
+            requires :set, coerce: Set[Virtus::Attribute::Boolean]
+          end
+          subject.get '/set' do
+            params[:set].first.class
+          end
+
+          get '/set', set: Set.new([1, 0]).to_a
+          expect(last_response.status).to eq(200)
+          expect(last_response.body).to eq('TrueClass')
+        end
       end
 
       it 'Bool' do