grape 1.6.0 → 1.6.2

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

@@ -2,73 +2,67 @@
 
 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

@@ -2,24 +2,139 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::AllowBlankValidator do
-  module ValidationsSpec
-    module AllowBlankValidatorSpec
-      class API < Grape::API
-        default_format :json
+describe Grape::Validations::Validators::AllowBlankValidator do
+  let_it_be(:app) do
+    Class.new(Grape::API) do
+      default_format :json
 
-        params do
+      params do
+        requires :name, allow_blank: false
+      end
+      get '/disallow_blank'
+
+      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 +149,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 +184,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 +209,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 +217,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 +283,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"}')

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

@@ -2,73 +2,67 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::AtLeastOneOfValidator do
-  describe '#validate!' do
-    subject(:validate) { post path, params }
-
-    module ValidationsSpec
-      module AtLeastOneOfValidatorSpec
-        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::AtLeastOneOfValidator 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, :grapefruit
-            at_least_one_of :beer, :wine, :grapefruit
-          end
-          post do
-          end
+      params do
+        optional :beer, :wine, :grapefruit
+        at_least_one_of :beer, :wine, :grapefruit
+      end
+      post do
+      end
 
-          params do
-            optional :beer, :wine, :grapefruit, :other
-            at_least_one_of :beer, :wine, :grapefruit
-          end
-          post 'mixed-params' do
-          end
+      params do
+        optional :beer, :wine, :grapefruit, :other
+        at_least_one_of :beer, :wine, :grapefruit
+      end
+      post 'mixed-params' do
+      end
 
-          params do
-            optional :beer, :wine, :grapefruit
-            at_least_one_of :beer, :wine, :grapefruit, message: 'you should choose something'
-          end
-          post '/custom-message' do
-          end
+      params do
+        optional :beer, :wine, :grapefruit
+        at_least_one_of :beer, :wine, :grapefruit, message: 'you should choose something'
+      end
+      post '/custom-message' do
+      end
 
-          params do
-            requires :item, type: Hash do
-              optional :beer, :wine, :grapefruit
-              at_least_one_of :beer, :wine, :grapefruit, message: 'fail'
-            end
-          end
-          post '/nested-hash' do
-          end
+      params do
+        requires :item, type: Hash do
+          optional :beer, :wine, :grapefruit
+          at_least_one_of :beer, :wine, :grapefruit, message: 'fail'
+        end
+      end
+      post '/nested-hash' do
+      end
 
-          params do
-            requires :items, type: Array do
-              optional :beer, :wine, :grapefruit
-              at_least_one_of :beer, :wine, :grapefruit, message: 'fail'
-            end
-          end
-          post '/nested-array' do
-          end
+      params do
+        requires :items, type: Array do
+          optional :beer, :wine, :grapefruit
+          at_least_one_of :beer, :wine, :grapefruit, message: 'fail'
+        end
+      end
+      post '/nested-array' do
+      end
 
-          params do
-            requires :items, type: Array do
-              requires :nested_items, type: Array do
-                optional :beer, :wine, :grapefruit
-                at_least_one_of :beer, :wine, :grapefruit, message: 'fail'
-              end
-            end
-          end
-          post '/deeply-nested-array' do
+      params do
+        requires :items, type: Array do
+          requires :nested_items, type: Array do
+            optional :beer, :wine, :grapefruit
+            at_least_one_of :beer, :wine, :grapefruit, message: 'fail'
           end
         end
       end
+      post '/deeply-nested-array' do
+      end
     end
+  end
 
-    def app
-      ValidationsSpec::AtLeastOneOfValidatorSpec::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/coerce_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::CoerceValidator do
+describe Grape::Validations::Validators::CoerceValidator do
   subject do
     Class.new(Grape::API)
   end
@@ -23,7 +23,7 @@ describe Grape::Validations::CoerceValidator do
     end
 
     context 'i18n' do
-      after :each do
+      after do
         I18n.available_locales = %i[en]
         I18n.locale = :en
         I18n.default_locale = :en
@@ -83,7 +83,7 @@ describe Grape::Validations::CoerceValidator do
       context 'on custom coercion rules' do
         before do
           subject.params do
-            requires :a, types: { value: [Boolean, String], message: 'type cast is invalid' }, coerce_with: (lambda do |val|
+            requires :a, types: { value: [Grape::API::Boolean, String], message: 'type cast is invalid' }, coerce_with: (lambda do |val|
               case val
               when 'yup'
                 true
@@ -171,9 +171,9 @@ describe Grape::Validations::CoerceValidator do
           expect(last_response.body).to eq('BigDecimal 45.1')
         end
 
-        it 'Boolean' do
+        it 'Grape::API::Boolean' do
           subject.params do
-            requires :boolean, type: Boolean
+            requires :boolean, type: Grape::API::Boolean
           end
           subject.post '/boolean' do
             params[:boolean]
@@ -370,9 +370,9 @@ describe Grape::Validations::CoerceValidator do
         end
       end
 
-      it 'Boolean' do
+      it 'Grape::API::Boolean' do
         subject.params do
-          requires :boolean, type: Boolean
+          requires :boolean, type: Grape::API::Boolean
         end
         subject.get '/boolean' do
           params[:boolean].class
@@ -1018,11 +1018,9 @@ describe Grape::Validations::CoerceValidator do
     end
 
     context 'multiple types' do
-      Boolean = Grape::API::Boolean
-
       it 'coerces to first possible type' do
         subject.params do
-          requires :a, types: [Boolean, Integer, String]
+          requires :a, types: [Grape::API::Boolean, Integer, String]
         end
         subject.get '/' do
           params[:a].class.to_s
@@ -1043,7 +1041,7 @@ describe Grape::Validations::CoerceValidator do
 
       it 'fails when no coercion is possible' do
         subject.params do
-          requires :a, types: [Boolean, Integer]
+          requires :a, types: [Grape::API::Boolean, Integer]
         end
         subject.get '/' do
           params[:a].class.to_s
@@ -1202,7 +1200,7 @@ describe Grape::Validations::CoerceValidator do
       context 'custom coercion rules' do
         before do
           subject.params do
-            requires :a, types: [Boolean, String], coerce_with: (lambda do |val|
+            requires :a, types: [Grape::API::Boolean, String], coerce_with: (lambda do |val|
               case val
               when 'yup'
                 true