grape 1.2.5 → 1.3.1

data/spec/grape/extensions/param_builders/hash_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Extensions::Hash::ParamBuilder do

data/spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Extensions::ActiveSupport::HashWithIndifferentAccess::ParamBuilder do

data/spec/grape/extensions/param_builders/hashie/mash_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Extensions::Hashie::Mash::ParamBuilder do

data/spec/grape/integration/global_namespace_function_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # see https://github.com/ruby-grape/grape/issues/1348
 
 require 'spec_helper'

data/spec/grape/integration/rack_sendfile_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Rack::Sendfile do

data/spec/grape/integration/rack_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Rack do
@@ -19,7 +21,7 @@ describe Rack do
       }
       env = Rack::MockRequest.env_for('/', options)
 
-      expect(JSON.parse(app.call(env)[2].body.first)['params_keys']).to match_array('test')
+      expect(JSON.parse(read_chunks(app.call(env)[2]).join)['params_keys']).to match_array('test')
     ensure
       input.close
       input.unlink

data/spec/grape/loading_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::API do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'base64'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Auth::DSL do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'base64'

data/spec/grape/middleware/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Base do

data/spec/grape/middleware/error_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'grape-entity'
 

data/spec/grape/middleware/exception_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Error do
@@ -53,7 +55,7 @@ describe Grape::Middleware::Error do
     class CustomErrorApp
       class << self
         def call(_env)
-          raise CustomError, status: 400, message: 'failed validation'
+          raise CustomError.new(status: 400, message: 'failed validation')
         end
       end
     end

data/spec/grape/middleware/formatter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Formatter do
@@ -41,7 +43,7 @@ describe Grape::Middleware::Formatter do
     end
 
     context 'xml' do
-      let(:body) { 'string' }
+      let(:body) { +'string' }
       it 'calls #to_xml if the content type is xml' do
         body.instance_eval do
           def to_xml
@@ -194,19 +196,19 @@ describe Grape::Middleware::Formatter do
       subject.options[:content_types][:custom] = "don't care"
       subject.options[:formatters][:custom] = ->(_obj, _env) { 'CUSTOM FORMAT' }
       _, _, body = subject.call('PATH_INFO' => '/info.custom')
-      expect(body.body).to eq(['CUSTOM FORMAT'])
+      expect(read_chunks(body)).to eq(['CUSTOM FORMAT'])
     end
     context 'default' do
       let(:body) { ['blah'] }
       it 'uses default json formatter' do
         _, _, body = subject.call('PATH_INFO' => '/info.json')
-        expect(body.body).to eq(['["blah"]'])
+        expect(read_chunks(body)).to eq(['["blah"]'])
       end
     end
     it 'uses custom json formatter' do
       subject.options[:formatters][:json] = ->(_obj, _env) { 'CUSTOM JSON FORMAT' }
       _, _, body = subject.call('PATH_INFO' => '/info.json')
-      expect(body.body).to eq(['CUSTOM JSON FORMAT'])
+      expect(read_chunks(body)).to eq(['CUSTOM JSON FORMAT'])
     end
   end
 
@@ -377,12 +379,17 @@ describe Grape::Middleware::Formatter do
   end
 
   context 'send file' do
-    let(:body) { Grape::ServeFile::FileResponse.new('file') }
-    let(:app) { ->(_env) { [200, {}, body] } }
+    let(:file) { double(File) }
+    let(:file_body) { Grape::ServeFile::FileResponse.new(file) }
+    let(:app) { ->(_env) { [200, {}, file_body] } }
 
-    it 'returns Grape::Uril::SendFileReponse' do
+    it 'returns a file response' do
+      expect(file).to receive(:each).and_yield('data')
       env = { 'PATH_INFO' => '/somewhere', 'HTTP_ACCEPT' => 'application/json' }
-      expect(subject.call(env)).to be_a(Grape::ServeFile::SendfileResponse)
+      status, headers, body = subject.call(env)
+      expect(status).to be == 200
+      expect(headers).to be == { 'Content-Type' => 'application/json' }
+      expect(read_chunks(body)).to be == ['data']
     end
   end
 
@@ -395,17 +402,17 @@ describe Grape::Middleware::Formatter do
     let(:app) { ->(_env) { [200, {}, ['']] } }
     before do
       Grape::Formatter.register :invalid, InvalidFormatter
-      Grape::ContentTypes::CONTENT_TYPES[:invalid] = 'application/x-invalid'
+      Grape::ContentTypes.register :invalid, 'application/x-invalid'
     end
     after do
-      Grape::ContentTypes::CONTENT_TYPES.delete(:invalid)
+      Grape::ContentTypes.default_elements.delete(:invalid)
       Grape::Formatter.default_elements.delete(:invalid)
     end
 
     it 'returns response by invalid formatter' do
       env = { 'PATH_INFO' => '/hello.invalid', 'HTTP_ACCEPT' => 'application/x-invalid' }
-      _, _, bodies = *subject.call(env)
-      expect(bodies.body.first).to eq({ message: 'invalid' }.to_json)
+      _, _, body = *subject.call(env)
+      expect(read_chunks(body).join).to eq({ message: 'invalid' }.to_json)
     end
   end
 

data/spec/grape/middleware/globals_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Globals do

data/spec/grape/middleware/stack_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Stack do
@@ -109,6 +111,15 @@ describe Grape::Middleware::Stack do
       expect(subject[1]).to eq(StackSpec::BlockMiddleware)
       expect(subject[2]).to eq(StackSpec::BarMiddleware)
     end
+
+    context 'middleware spec with proc declaration exists' do
+      let(:middleware_spec_with_proc) { [:use, StackSpec::FooMiddleware, proc] }
+
+      it 'properly forwards spec arguments' do
+        expect(subject).to receive(:use).with(StackSpec::FooMiddleware)
+        subject.merge_with([middleware_spec_with_proc])
+      end
+    end
   end
 
   describe '#build' do

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::AcceptVersionHeader do
   let(:app) { ->(env) { [200, env, env] } }
-  subject { Grape::Middleware::Versioner::AcceptVersionHeader.new(app, @options || {}) }
+  subject { Grape::Middleware::Versioner::AcceptVersionHeader.new(app, **(@options || {})) }
 
   before do
     @options = {

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::Header do
   let(:app) { ->(env) { [200, env, env] } }
-  subject { Grape::Middleware::Versioner::Header.new(app, @options || {}) }
+  subject { Grape::Middleware::Versioner::Header.new(app, **(@options || {})) }
 
   before do
     @options = {

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::Param do
   let(:app) { ->(env) { [200, env, env['api.version']] } }
   let(:options) { {} }
-  subject { Grape::Middleware::Versioner::Param.new(app, options) }
+  subject { Grape::Middleware::Versioner::Param.new(app, **options) }
 
   it 'sets the API version based on the default param (apiver)' do
     env = Rack::MockRequest.env_for('/awesome', params: { 'apiver' => 'v1' })

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

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner::Path do
   let(:app) { ->(env) { [200, env, env['api.version']] } }
   let(:options) { {} }
-  subject { Grape::Middleware::Versioner::Path.new(app, options) }
+  subject { Grape::Middleware::Versioner::Path.new(app, **options) }
 
   it 'sets the API version based on the first path' do
     expect(subject.call('PATH_INFO' => '/v1/awesome').last).to eq('v1')

data/spec/grape/middleware/versioner_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Middleware::Versioner do

data/spec/grape/named_api_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'A named API' do

data/spec/grape/parser_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Parser do
@@ -15,11 +17,11 @@ describe Grape::Parser do
 
   describe '.parsers' do
     it 'returns an instance of Hash' do
-      expect(subject.parsers({})).to be_an_instance_of(Hash)
+      expect(subject.parsers(**{})).to be_an_instance_of(Hash)
     end
 
     it 'includes built-in parsers' do
-      expect(subject.parsers({})).to include(subject.builtin_parsers)
+      expect(subject.parsers(**{})).to include(subject.builtin_parsers)
     end
 
     context 'with :parsers option' do
@@ -33,7 +35,7 @@ describe Grape::Parser do
       let(:added_parser) { Class.new }
       before { subject.register :added, added_parser }
       it 'includes added parser' do
-        expect(subject.parsers({})).to include(added: added_parser)
+        expect(subject.parsers(**{})).to include(added: added_parser)
       end
     end
   end
@@ -42,8 +44,8 @@ describe Grape::Parser do
     let(:options) { {} }
 
     it 'calls .parsers' do
-      expect(subject).to receive(:parsers).with(options).and_return(subject.builtin_parsers)
-      subject.parser_for(:json, options)
+      expect(subject).to receive(:parsers).with(any_args).and_return(subject.builtin_parsers)
+      subject.parser_for(:json, **options)
     end
 
     it 'returns parser correctly' do

data/spec/grape/path_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Grape

data/spec/grape/presenters/presenter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Grape

data/spec/grape/request_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module Grape

data/spec/grape/util/inheritable_setting_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 module Grape
   module Util

data/spec/grape/util/inheritable_values_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 module Grape
   module Util

data/spec/grape/util/reverse_stackable_values_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 module Grape
   module Util

data/spec/grape/util/stackable_values_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 module Grape
   module Util
@@ -6,7 +8,7 @@ module Grape
       subject { StackableValues.new(parent) }
 
       describe '#keys' do
-        it 'returns all key' do
+        it 'returns all keys' do
           subject[:some_thing] = :foo_bar
           subject[:some_thing_else] = :foo_bar
           expect(subject.keys).to eq %i[some_thing some_thing_else].sort

data/spec/grape/util/strict_hash_configuration_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 module Grape
   module Util

data/spec/grape/validations/attributes_iterator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Validations::AttributesIterator do

data/spec/grape/validations/instance_behaivour_spec.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Validator with instance variables' do
   let(:validator_type) do
     Class.new(Grape::Validations::Base) do
       def validate_param!(_attr_name, _params)
-        if @instance_variable
-          raise Grape::Exceptions::Validation, params: ['params'],
-                                               message: 'This should never happen'
+        if instance_variable_defined?(:@instance_variable) && @instance_variable
+          raise Grape::Exceptions::Validation.new(params: ['params'],
+                                                  message: 'This should never happen')
         end
         @instance_variable = true
       end

data/spec/grape/validations/multiple_attributes_iterator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Validations::MultipleAttributesIterator do

data/spec/grape/validations/params_scope_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Validations::ParamsScope do
@@ -30,7 +32,7 @@ describe Grape::Validations::ParamsScope do
     context 'when the default value is false' do
       before do
         subject.params do
-          optional :bool, type: Virtus::Attribute::Boolean, default: false
+          optional :bool, type: Grape::API::Boolean, default: false
         end
         subject.get
       end

data/spec/grape/validations/single_attribute_iterator_spec.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Validations::SingleAttributeIterator do
   describe '#each' do
     subject(:iterator) { described_class.new(validator, scope, params) }
     let(:scope) { Grape::Validations::ParamsScope.new(api: Class.new(Grape::API)) }
-    let(:validator) { double(attrs: %i[first second third]) }
+    let(:validator) { double(attrs: %i[first second]) }
 
     context 'when params is a hash' do
       let(:params) do
@@ -13,7 +15,7 @@ describe Grape::Validations::SingleAttributeIterator do
 
       it 'yields params and every single attribute from the list' do
         expect { |b| iterator.each(&b) }
-          .to yield_successive_args([params, :first], [params, :second], [params, :third])
+          .to yield_successive_args([params, :first, false], [params, :second, false])
       end
     end
 
@@ -24,10 +26,22 @@ describe Grape::Validations::SingleAttributeIterator do
 
       it 'yields every single attribute from the list for each of the array elements' do
         expect { |b| iterator.each(&b) }.to yield_successive_args(
-          [params[0], :first], [params[0], :second], [params[0], :third],
-          [params[1], :first], [params[1], :second], [params[1], :third]
+          [params[0], :first, false], [params[0], :second, false],
+          [params[1], :first, false], [params[1], :second, false]
         )
       end
+
+      context 'empty values' do
+        let(:params) { [{}, '', 10] }
+
+        it 'marks params with empty values' do
+          expect { |b| iterator.each(&b) }.to yield_successive_args(
+            [params[0], :first, true], [params[0], :second, true],
+            [params[1], :first, true], [params[1], :second, true],
+            [params[2], :first, false], [params[2], :second, false]
+          )
+        end
+      end
     end
   end
 end

data/spec/grape/validations/types/primitive_coercer_spec.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Grape::Validations::Types::PrimitiveCoercer do
+  let(:strict) { false }
+
+  subject { described_class.new(type, strict) }
+
+  describe '.call' do
+    context 'Boolean' do
+      let(:type) { Grape::API::Boolean }
+
+      [true, 'true', 1].each do |val|
+        it "coerces '#{val}' to true" do
+          expect(subject.call(val)).to eq(true)
+        end
+      end
+
+      [false, 'false', 0].each do |val|
+        it "coerces '#{val}' to false" do
+          expect(subject.call(val)).to eq(false)
+        end
+      end
+
+      it 'returns an error when the given value cannot be coerced' do
+        expect(subject.call(123)).to be_instance_of(Grape::Validations::Types::InvalidValue)
+      end
+    end
+
+    context 'String' do
+      let(:type) { String }
+
+      it 'coerces to String' do
+        expect(subject.call(10)).to eq('10')
+      end
+    end
+
+    context 'BigDecimal' do
+      let(:type) { BigDecimal }
+
+      it 'coerces to BigDecimal' do
+        expect(subject.call(5)).to eq(BigDecimal(5))
+      end
+    end
+
+    context 'the strict mode' do
+      let(:strict) { true }
+
+      context 'Boolean' do
+        let(:type) { Grape::API::Boolean }
+
+        it 'returns an error when the given value is not Boolean' do
+          expect(subject.call(1)).to be_instance_of(Grape::Validations::Types::InvalidValue)
+        end
+
+        it 'returns a value as it is when the given value is Boolean' do
+          expect(subject.call(true)).to eq(true)
+        end
+      end
+
+      context 'BigDecimal' do
+        let(:type) { BigDecimal }
+
+        it 'returns an error when the given value is not BigDecimal' do
+          expect(subject.call(1)).to be_instance_of(Grape::Validations::Types::InvalidValue)
+        end
+
+        it 'returns a value as it is when the given value is BigDecimal' do
+          expect(subject.call(BigDecimal(0))).to eq(BigDecimal(0))
+        end
+      end
+    end
+  end
+end

data/spec/grape/validations/types_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Validations::Types do
@@ -11,29 +13,10 @@ describe Grape::Validations::Types do
     end
   end
 
-  VirtusA = Virtus::Attribute.build(String)
-
-  module VirtusModule
-    include Virtus.module
-  end
-
-  class VirtusB
-    include VirtusModule
-  end
-
-  class VirtusC
-    include Virtus.model
-  end
-
-  MyAxiom = Axiom::Types::String.new do
-    minimum_length 1
-    maximum_length 30
-  end
-
   describe '::primitive?' do
     [
       Integer, Float, Numeric, BigDecimal,
-      Virtus::Attribute::Boolean, String, Symbol,
+      Grape::API::Boolean, String, Symbol,
       Date, DateTime, Time, Rack::Multipart::UploadedFile
     ].each do |type|
       it "recognizes #{type} as a primitive" do
@@ -57,16 +40,6 @@ describe Grape::Validations::Types do
     end
   end
 
-  describe '::recognized?' do
-    [
-      VirtusA, VirtusB, VirtusC, MyAxiom
-    ].each do |type|
-      it "recognizes #{type}" do
-        expect(described_class.recognized?(type)).to be_truthy
-      end
-    end
-  end
-
   describe '::special?' do
     [
       JSON, Array[JSON], File, Rack::Multipart::UploadedFile
@@ -97,14 +70,14 @@ describe Grape::Validations::Types do
       expect(described_class.instance_variable_get(:@__cache_write_lock)).to be_a(Mutex)
     end
 
-    it 'caches the result of the Virtus::Attribute.build method' do
+    it 'caches the result of the build_coercer method' do
       original_cache = described_class.instance_variable_get(:@__cache)
       described_class.instance_variable_set(:@__cache, {})
 
-      coercer = 'TestCoercer'
-      expect(Virtus::Attribute).to receive(:build).once.and_return(coercer)
-      expect(described_class.build_coercer(Array[String])).to eq(coercer)
-      expect(described_class.build_coercer(Array[String])).to eq(coercer)
+      a_coercer = described_class.build_coercer(Array[String])
+      b_coercer = described_class.build_coercer(Array[String])
+
+      expect(a_coercer.object_id).to eq(b_coercer.object_id)
 
       described_class.instance_variable_set(:@__cache, original_cache)
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Validations::AllOrNoneOfValidator do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Validations::AllowBlankValidator do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Grape::Validations::AtLeastOneOfValidator do