grape 1.5.2 → 1.7.0

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

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Validations::Types::PrimitiveCoercer do
-  let(:strict) { false }
-
   subject { described_class.new(type, strict) }
 
+  let(:strict) { false }
+
   describe '#call' do
     context 'BigDecimal' do
       let(:type) { BigDecimal }
 
       it 'coerces to BigDecimal' do
-        expect(subject.call(5)).to eq(BigDecimal(5))
+        expect(subject.call(5)).to eq(BigDecimal('5'))
       end
 
       it 'coerces an empty string to nil' do
@@ -25,13 +23,13 @@ describe Grape::Validations::Types::PrimitiveCoercer do
 
       [true, 'true', 1].each do |val|
         it "coerces '#{val}' to true" do
-          expect(subject.call(val)).to eq(true)
+          expect(subject.call(val)).to be(true)
         end
       end
 
       [false, 'false', 0].each do |val|
         it "coerces '#{val}' to false" do
-          expect(subject.call(val)).to eq(false)
+          expect(subject.call(val)).to be(false)
         end
       end
 
@@ -66,6 +64,10 @@ describe Grape::Validations::Types::PrimitiveCoercer do
       it 'coerces an empty string to nil' do
         expect(subject.call('')).to be_nil
       end
+
+      it 'accepts non-nil value' do
+        expect(subject.call(42)).to be_a(Integer)
+      end
     end
 
     context 'Numeric' do
@@ -74,6 +76,10 @@ describe Grape::Validations::Types::PrimitiveCoercer do
       it 'coerces an empty string to nil' do
         expect(subject.call('')).to be_nil
       end
+
+      it 'accepts a non-nil value' do
+        expect(subject.call(42)).to be_a(Numeric) # in fact Integer
+      end
     end
 
     context 'Time' do
@@ -104,6 +110,15 @@ describe Grape::Validations::Types::PrimitiveCoercer do
       end
     end
 
+    context 'a type unknown in Dry-types' do
+      let(:type) { Complex }
+
+      it 'raises error on init' do
+        expect(DryTypes::Params.constants).not_to include(type.name.to_sym)
+        expect { subject }.to raise_error(/type Complex should support coercion/)
+      end
+    end
+
     context 'the strict mode' do
       let(:strict) { true }
 
@@ -115,7 +130,7 @@ describe Grape::Validations::Types::PrimitiveCoercer do
         end
 
         it 'returns a value as it is when the given value is Boolean' do
-          expect(subject.call(true)).to eq(true)
+          expect(subject.call(true)).to be(true)
         end
       end
 
@@ -127,7 +142,7 @@ describe Grape::Validations::Types::PrimitiveCoercer do
         end
 
         it 'returns a value as it is when the given value is BigDecimal' do
-          expect(subject.call(BigDecimal(0))).to eq(BigDecimal(0))
+          expect(subject.call(BigDecimal('0'))).to eq(BigDecimal('0'))
         end
       end
     end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Validations::Types::SetCoercer do
   subject { described_class.new(type) }
 

data/spec/grape/validations/types_spec.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
 describe Grape::Validations::Types do
   module TypesSpec
     class FooType
@@ -20,13 +18,13 @@ describe Grape::Validations::Types do
       Date, DateTime, Time
     ].each do |type|
       it "recognizes #{type} as a primitive" do
-        expect(described_class.primitive?(type)).to be_truthy
+        expect(described_class).to be_primitive(type)
       end
     end
 
     it 'identifies unknown types' do
-      expect(described_class.primitive?(Object)).to be_falsy
-      expect(described_class.primitive?(TypesSpec::FooType)).to be_falsy
+      expect(described_class).not_to be_primitive(Object)
+      expect(described_class).not_to be_primitive(TypesSpec::FooType)
     end
   end
 
@@ -35,7 +33,7 @@ describe Grape::Validations::Types do
       Hash, Array, Set
     ].each do |type|
       it "recognizes #{type} as a structure" do
-        expect(described_class.structure?(type)).to be_truthy
+        expect(described_class).to be_structure(type)
       end
     end
   end
@@ -45,22 +43,50 @@ describe Grape::Validations::Types do
       JSON, Array[JSON], File, Rack::Multipart::UploadedFile
     ].each do |type|
       it "provides special handling for #{type.inspect}" do
-        expect(described_class.special?(type)).to be_truthy
+        expect(described_class).to be_special(type)
       end
     end
   end
 
+  describe 'special types' do
+    subject { described_class::SPECIAL[type] }
+
+    context 'when JSON' do
+      let(:type) { JSON }
+
+      it { is_expected.to eq(Grape::Validations::Types::Json) }
+    end
+
+    context 'when Array[JSON]' do
+      let(:type) { Array[JSON] }
+
+      it { is_expected.to eq(Grape::Validations::Types::JsonArray) }
+    end
+
+    context 'when File' do
+      let(:type) { File }
+
+      it { is_expected.to eq(Grape::Validations::Types::File) }
+    end
+
+    context 'when Rack::Multipart::UploadedFile' do
+      let(:type) { Rack::Multipart::UploadedFile }
+
+      it { is_expected.to eq(Grape::Validations::Types::File) }
+    end
+  end
+
   describe '::custom?' do
     it 'returns false if the type does not respond to :parse' do
-      expect(described_class.custom?(Object)).to be_falsy
+      expect(described_class).not_to be_custom(Object)
     end
 
     it 'returns true if the type responds to :parse with one argument' do
-      expect(described_class.custom?(TypesSpec::FooType)).to be_truthy
+      expect(described_class).to be_custom(TypesSpec::FooType)
     end
 
     it 'returns false if the type\'s #parse method takes other than one argument' do
-      expect(described_class.custom?(TypesSpec::BarType)).to be_falsy
+      expect(described_class).not_to be_custom(TypesSpec::BarType)
     end
   end
 

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

@@ -1,74 +1,66 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
-
-describe Grape::Validations::AllOrNoneOfValidator do
-  describe '#validate!' do
-    subject(:validate) { post path, params }
-
-    module ValidationsSpec
-      module AllOrNoneOfValidatorSpec
-        class API < Grape::API
-          rescue_from Grape::Exceptions::ValidationErrors do |e|
-            error!(e.errors.transform_keys! { |key| key.join(',') }, 400)
-          end
+describe Grape::Validations::Validators::AllOrNoneOfValidator do
+  let_it_be(:app) do
+    Class.new(Grape::API) do
+      rescue_from Grape::Exceptions::ValidationErrors do |e|
+        error!(e.errors.transform_keys! { |key| key.join(',') }, 400)
+      end
 
-          params do
-            optional :beer, :wine, type: Boolean
-            all_or_none_of :beer, :wine
-          end
-          post do
-          end
+      params do
+        optional :beer, :wine, type: Grape::API::Boolean
+        all_or_none_of :beer, :wine
+      end
+      post do
+      end
 
-          params do
-            optional :beer, :wine, :other, type: Boolean
-            all_or_none_of :beer, :wine
-          end
-          post 'mixed-params' do
-          end
+      params do
+        optional :beer, :wine, :other, type: Grape::API::Boolean
+        all_or_none_of :beer, :wine
+      end
+      post 'mixed-params' do
+      end
 
-          params do
-            optional :beer, :wine, type: Boolean
-            all_or_none_of :beer, :wine, message: 'choose all or none'
-          end
-          post '/custom-message' do
-          end
+      params do
+        optional :beer, :wine, type: Grape::API::Boolean
+        all_or_none_of :beer, :wine, message: 'choose all or none'
+      end
+      post '/custom-message' do
+      end
 
-          params do
-            requires :item, type: Hash do
-              optional :beer, :wine, type: Boolean
-              all_or_none_of :beer, :wine
-            end
-          end
-          post '/nested-hash' do
-          end
+      params do
+        requires :item, type: Hash do
+          optional :beer, :wine, type: Grape::API::Boolean
+          all_or_none_of :beer, :wine
+        end
+      end
+      post '/nested-hash' do
+      end
 
-          params do
-            requires :items, type: Array do
-              optional :beer, :wine, type: Boolean
-              all_or_none_of :beer, :wine
-            end
-          end
-          post '/nested-array' do
-          end
+      params do
+        requires :items, type: Array do
+          optional :beer, :wine, type: Grape::API::Boolean
+          all_or_none_of :beer, :wine
+        end
+      end
+      post '/nested-array' do
+      end
 
-          params do
-            requires :items, type: Array do
-              requires :nested_items, type: Array do
-                optional :beer, :wine, type: Boolean
-                all_or_none_of :beer, :wine
-              end
-            end
-          end
-          post '/deeply-nested-array' do
+      params do
+        requires :items, type: Array do
+          requires :nested_items, type: Array do
+            optional :beer, :wine, type: Grape::API::Boolean
+            all_or_none_of :beer, :wine
           end
         end
       end
+      post '/deeply-nested-array' do
+      end
     end
+  end
 
-    def app
-      ValidationsSpec::AllOrNoneOfValidatorSpec::API
-    end
+  describe '#validate!' do
+    subject(:validate) { post path, params }
 
     context 'when all restricted params are present' do
       let(:path) { '/' }

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

@@ -1,25 +1,138 @@
 # frozen_string_literal: true
 
-require 'spec_helper'
+describe Grape::Validations::Validators::AllowBlankValidator do
+  let_it_be(:app) do
+    Class.new(Grape::API) do
+      default_format :json
 
-describe Grape::Validations::AllowBlankValidator do
-  module ValidationsSpec
-    module AllowBlankValidatorSpec
-      class API < Grape::API
-        default_format :json
+      params do
+        requires :name, allow_blank: false
+      end
+      get '/disallow_blank'
 
-        params do
+      params do
+        optional :name, type: String, allow_blank: false
+      end
+      get '/opt_disallow_string_blank'
+
+      params do
+        optional :name, allow_blank: false
+      end
+      get '/disallow_blank_optional_param'
+
+      params do
+        requires :name, allow_blank: true
+      end
+      get '/allow_blank'
+
+      params do
+        requires :val, type: DateTime, allow_blank: true
+      end
+      get '/allow_datetime_blank'
+
+      params do
+        requires :val, type: DateTime, allow_blank: false
+      end
+      get '/disallow_datetime_blank'
+
+      params do
+        requires :val, type: DateTime
+      end
+      get '/default_allow_datetime_blank'
+
+      params do
+        requires :val, type: Date, allow_blank: true
+      end
+      get '/allow_date_blank'
+
+      params do
+        requires :val, type: Integer, allow_blank: true
+      end
+      get '/allow_integer_blank'
+
+      params do
+        requires :val, type: Float, allow_blank: true
+      end
+      get '/allow_float_blank'
+
+      params do
+        requires :val, type: Integer, allow_blank: true
+      end
+      get '/allow_integer_blank'
+
+      params do
+        requires :val, type: Symbol, allow_blank: true
+      end
+      get '/allow_symbol_blank'
+
+      params do
+        requires :val, type: Grape::API::Boolean, allow_blank: true
+      end
+      get '/allow_boolean_blank'
+
+      params do
+        requires :val, type: Grape::API::Boolean, allow_blank: false
+      end
+      get '/disallow_boolean_blank'
+
+      params do
+        optional :user, type: Hash do
+          requires :name, allow_blank: false
+        end
+      end
+      get '/disallow_blank_required_param_in_an_optional_group'
+
+      params do
+        optional :user, type: Hash do
+          requires :name, type: Date, allow_blank: true
+        end
+      end
+      get '/allow_blank_date_param_in_an_optional_group'
+
+      params do
+        optional :user, type: Hash do
+          optional :name, allow_blank: false
+          requires :age
+        end
+      end
+      get '/disallow_blank_optional_param_in_an_optional_group'
+
+      params do
+        requires :user, type: Hash do
           requires :name, allow_blank: false
         end
-        get '/disallow_blank'
+      end
+      get '/disallow_blank_required_param_in_a_required_group'
 
+      params do
+        requires :user, type: Hash do
+          requires :name, allow_blank: false
+        end
+      end
+      get '/disallow_string_value_in_a_required_hash_group'
+
+      params do
+        requires :user, type: Hash do
+          optional :name, allow_blank: false
+        end
+      end
+      get '/disallow_blank_optional_param_in_a_required_group'
+
+      params do
+        optional :user, type: Hash do
+          optional :name, allow_blank: false
+        end
+      end
+      get '/disallow_string_value_in_an_optional_hash_group'
+
+      resources :custom_message do
         params do
-          optional :name, type: String, allow_blank: false
+          requires :name, allow_blank: { value: false, message: 'has no value' }
         end
-        get '/opt_disallow_string_blank'
+        get
 
         params do
-          optional :name, allow_blank: false
+          optional :name, allow_blank: { value: false, message: 'has no value' }
         end
         get '/disallow_blank_optional_param'
 
@@ -34,7 +147,7 @@ describe Grape::Validations::AllowBlankValidator do
         get '/allow_datetime_blank'
 
         params do
-          requires :val, type: DateTime, allow_blank: false
+          requires :val, type: DateTime, allow_blank: { value: false, message: 'has no value' }
         end
         get '/disallow_datetime_blank'
 
@@ -69,18 +182,18 @@ describe Grape::Validations::AllowBlankValidator do
         get '/allow_symbol_blank'
 
         params do
-          requires :val, type: Boolean, allow_blank: true
+          requires :val, type: Grape::API::Boolean, allow_blank: true
         end
         get '/allow_boolean_blank'
 
         params do
-          requires :val, type: Boolean, allow_blank: false
+          requires :val, type: Grape::API::Boolean, allow_blank: { value: false, message: 'has no value' }
         end
         get '/disallow_boolean_blank'
 
         params do
           optional :user, type: Hash do
-            requires :name, allow_blank: false
+            requires :name, allow_blank: { value: false, message: 'has no value' }
           end
         end
         get '/disallow_blank_required_param_in_an_optional_group'
@@ -94,7 +207,7 @@ describe Grape::Validations::AllowBlankValidator do
 
         params do
           optional :user, type: Hash do
-            optional :name, allow_blank: false
+            optional :name, allow_blank: { value: false, message: 'has no value' }
             requires :age
           end
         end
@@ -102,156 +215,35 @@ describe Grape::Validations::AllowBlankValidator do
 
         params do
           requires :user, type: Hash do
-            requires :name, allow_blank: false
+            requires :name, allow_blank: { value: false, message: 'has no value' }
           end
         end
         get '/disallow_blank_required_param_in_a_required_group'
 
         params do
           requires :user, type: Hash do
-            requires :name, allow_blank: false
+            requires :name, allow_blank: { value: false, message: 'has no value' }
           end
         end
         get '/disallow_string_value_in_a_required_hash_group'
 
         params do
           requires :user, type: Hash do
-            optional :name, allow_blank: false
+            optional :name, allow_blank: { value: false, message: 'has no value' }
           end
         end
         get '/disallow_blank_optional_param_in_a_required_group'
 
         params do
           optional :user, type: Hash do
-            optional :name, allow_blank: false
-          end
-        end
-        get '/disallow_string_value_in_an_optional_hash_group'
-
-        resources :custom_message do
-          params do
-            requires :name, allow_blank: { value: false, message: 'has no value' }
-          end
-          get
-
-          params do
             optional :name, allow_blank: { value: false, message: 'has no value' }
           end
-          get '/disallow_blank_optional_param'
-
-          params do
-            requires :name, allow_blank: true
-          end
-          get '/allow_blank'
-
-          params do
-            requires :val, type: DateTime, allow_blank: true
-          end
-          get '/allow_datetime_blank'
-
-          params do
-            requires :val, type: DateTime, allow_blank: { value: false, message: 'has no value' }
-          end
-          get '/disallow_datetime_blank'
-
-          params do
-            requires :val, type: DateTime
-          end
-          get '/default_allow_datetime_blank'
-
-          params do
-            requires :val, type: Date, allow_blank: true
-          end
-          get '/allow_date_blank'
-
-          params do
-            requires :val, type: Integer, allow_blank: true
-          end
-          get '/allow_integer_blank'
-
-          params do
-            requires :val, type: Float, allow_blank: true
-          end
-          get '/allow_float_blank'
-
-          params do
-            requires :val, type: Integer, allow_blank: true
-          end
-          get '/allow_integer_blank'
-
-          params do
-            requires :val, type: Symbol, allow_blank: true
-          end
-          get '/allow_symbol_blank'
-
-          params do
-            requires :val, type: Boolean, allow_blank: true
-          end
-          get '/allow_boolean_blank'
-
-          params do
-            requires :val, type: Boolean, allow_blank: { value: false, message: 'has no value' }
-          end
-          get '/disallow_boolean_blank'
-
-          params do
-            optional :user, type: Hash do
-              requires :name, allow_blank: { value: false, message: 'has no value' }
-            end
-          end
-          get '/disallow_blank_required_param_in_an_optional_group'
-
-          params do
-            optional :user, type: Hash do
-              requires :name, type: Date, allow_blank: true
-            end
-          end
-          get '/allow_blank_date_param_in_an_optional_group'
-
-          params do
-            optional :user, type: Hash do
-              optional :name, allow_blank: { value: false, message: 'has no value' }
-              requires :age
-            end
-          end
-          get '/disallow_blank_optional_param_in_an_optional_group'
-
-          params do
-            requires :user, type: Hash do
-              requires :name, allow_blank: { value: false, message: 'has no value' }
-            end
-          end
-          get '/disallow_blank_required_param_in_a_required_group'
-
-          params do
-            requires :user, type: Hash do
-              requires :name, allow_blank: { value: false, message: 'has no value' }
-            end
-          end
-          get '/disallow_string_value_in_a_required_hash_group'
-
-          params do
-            requires :user, type: Hash do
-              optional :name, allow_blank: { value: false, message: 'has no value' }
-            end
-          end
-          get '/disallow_blank_optional_param_in_a_required_group'
-
-          params do
-            optional :user, type: Hash do
-              optional :name, allow_blank: { value: false, message: 'has no value' }
-            end
-          end
-          get '/disallow_string_value_in_an_optional_hash_group'
         end
+        get '/disallow_string_value_in_an_optional_hash_group'
       end
     end
   end
 
-  def app
-    ValidationsSpec::AllowBlankValidatorSpec::API
-  end
-
   context 'invalid input' do
     it 'refuses empty string' do
       get '/disallow_blank', name: ''
@@ -289,10 +281,12 @@ describe Grape::Validations::AllowBlankValidator do
         get '/custom_message', name: ''
         expect(last_response.body).to eq('{"error":"name has no value"}')
       end
+
       it 'refuses empty string for an optional param' do
         get '/custom_message/disallow_blank_optional_param', name: ''
         expect(last_response.body).to eq('{"error":"name has no value"}')
       end
+
       it 'refuses only whitespaces' do
         get '/custom_message', name: '   '
         expect(last_response.body).to eq('{"error":"name has no value"}')