grape 1.5.2 → 1.6.2

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

@@ -2,95 +2,89 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::ExactlyOneOfValidator do
-  describe '#validate!' do
-    subject(:validate) { post path, params }
-
-    module ValidationsSpec
-      module ExactlyOneOfValidatorSpec
-        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::ExactlyOneOfValidator 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
-            optional :wine
-            optional :grapefruit
-            exactly_one_of :beer, :wine, :grapefruit
-          end
-          post do
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        exactly_one_of :beer, :wine, :grapefruit
+      end
+      post do
+      end
 
-          params do
-            optional :beer
-            optional :wine
-            optional :grapefruit
-            optional :other
-            exactly_one_of :beer, :wine, :grapefruit
-          end
-          post 'mixed-params' do
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        optional :other
+        exactly_one_of :beer, :wine, :grapefruit
+      end
+      post 'mixed-params' do
+      end
 
-          params do
-            optional :beer
-            optional :wine
-            optional :grapefruit
-            exactly_one_of :beer, :wine, :grapefruit, message: 'you should choose one'
-          end
-          post '/custom-message' do
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        exactly_one_of :beer, :wine, :grapefruit, message: 'you should choose one'
+      end
+      post '/custom-message' do
+      end
 
-          params do
-            requires :item, type: Hash do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              exactly_one_of :beer, :wine, :grapefruit
-            end
-          end
-          post '/nested-hash' do
-          end
+      params do
+        requires :item, type: Hash do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          exactly_one_of :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-hash' do
+      end
 
-          params do
-            optional :item, type: Hash do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              exactly_one_of :beer, :wine, :grapefruit
-            end
-          end
-          post '/nested-optional-hash' do
-          end
+      params do
+        optional :item, type: Hash do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          exactly_one_of :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-optional-hash' do
+      end
 
-          params do
-            requires :items, type: Array do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              exactly_one_of :beer, :wine, :grapefruit
-            end
-          end
-          post '/nested-array' do
-          end
+      params do
+        requires :items, type: Array do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          exactly_one_of :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-array' do
+      end
 
-          params do
-            requires :items, type: Array do
-              requires :nested_items, type: Array do
-                optional :beer, :wine, :grapefruit, type: Boolean
-                exactly_one_of :beer, :wine, :grapefruit
-              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, type: Grape::API::Boolean
+            exactly_one_of :beer, :wine, :grapefruit
           end
         end
       end
+      post '/deeply-nested-array' do
+      end
     end
+  end
 
-    def app
-      ValidationsSpec::ExactlyOneOfValidatorSpec::API
-    end
+  describe '#validate!' do
+    subject(:validate) { post path, params }
 
     context 'when all params are present' do
       let(:path) { '/' }

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

@@ -2,10 +2,10 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::ExceptValuesValidator do
+describe Grape::Validations::Validators::ExceptValuesValidator do
   module ValidationsSpec
     class ExceptValuesModel
-      DEFAULT_EXCEPTS = ['invalid-type1', 'invalid-type2', 'invalid-type3'].freeze
+      DEFAULT_EXCEPTS = %w[invalid-type1 invalid-type2 invalid-type3].freeze
       class << self
         attr_accessor :excepts
 
@@ -170,7 +170,7 @@ describe Grape::Validations::ExceptValuesValidator do
   it 'raises IncompatibleOptionValues when type is incompatible with values array' do
     subject = Class.new(Grape::API)
     expect do
-      subject.params { optional :type, except_values: ['valid-type1', 'valid-type2', 'valid-type3'], type: Symbol }
+      subject.params { optional :type, except_values: %w[valid-type1 valid-type2 valid-type3], type: Symbol }
     end.to raise_error Grape::Exceptions::IncompatibleOptionValues
   end
 

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

@@ -2,95 +2,89 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::MutualExclusionValidator do
-  describe '#validate!' do
-    subject(:validate) { post path, params }
-
-    module ValidationsSpec
-      module MutualExclusionValidatorSpec
-        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::MutualExclusionValidator 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
-            optional :wine
-            optional :grapefruit
-            mutually_exclusive :beer, :wine, :grapefruit
-          end
-          post do
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        mutually_exclusive :beer, :wine, :grapefruit
+      end
+      post do
+      end
 
-          params do
-            optional :beer
-            optional :wine
-            optional :grapefruit
-            optional :other
-            mutually_exclusive :beer, :wine, :grapefruit
-          end
-          post 'mixed-params' do
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        optional :other
+        mutually_exclusive :beer, :wine, :grapefruit
+      end
+      post 'mixed-params' do
+      end
 
-          params do
-            optional :beer
-            optional :wine
-            optional :grapefruit
-            mutually_exclusive :beer, :wine, :grapefruit, message: 'you should not mix beer and wine'
-          end
-          post '/custom-message' do
-          end
+      params do
+        optional :beer
+        optional :wine
+        optional :grapefruit
+        mutually_exclusive :beer, :wine, :grapefruit, message: 'you should not mix beer and wine'
+      end
+      post '/custom-message' do
+      end
 
-          params do
-            requires :item, type: Hash do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              mutually_exclusive :beer, :wine, :grapefruit
-            end
-          end
-          post '/nested-hash' do
-          end
+      params do
+        requires :item, type: Hash do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          mutually_exclusive :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-hash' do
+      end
 
-          params do
-            optional :item, type: Hash do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              mutually_exclusive :beer, :wine, :grapefruit
-            end
-          end
-          post '/nested-optional-hash' do
-          end
+      params do
+        optional :item, type: Hash do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          mutually_exclusive :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-optional-hash' do
+      end
 
-          params do
-            requires :items, type: Array do
-              optional :beer
-              optional :wine
-              optional :grapefruit
-              mutually_exclusive :beer, :wine, :grapefruit
-            end
-          end
-          post '/nested-array' do
-          end
+      params do
+        requires :items, type: Array do
+          optional :beer
+          optional :wine
+          optional :grapefruit
+          mutually_exclusive :beer, :wine, :grapefruit
+        end
+      end
+      post '/nested-array' do
+      end
 
-          params do
-            requires :items, type: Array do
-              requires :nested_items, type: Array do
-                optional :beer, :wine, :grapefruit, type: Boolean
-                mutually_exclusive :beer, :wine, :grapefruit
-              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, type: Grape::API::Boolean
+            mutually_exclusive :beer, :wine, :grapefruit
           end
         end
       end
+      post '/deeply-nested-array' do
+      end
     end
+  end
 
-    def app
-      ValidationsSpec::MutualExclusionValidatorSpec::API
-    end
+  describe '#validate!' do
+    subject(:validate) { post path, params }
 
     context 'when all mutually exclusive params are present' do
       let(:path) { '/' }

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

@@ -2,12 +2,13 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::PresenceValidator do
+describe Grape::Validations::Validators::PresenceValidator do
   subject do
     Class.new(Grape::API) do
       format :json
     end
   end
+
   def app
     subject
   end
@@ -20,6 +21,7 @@ describe Grape::Validations::PresenceValidator do
         end
       end
     end
+
     it 'does not validate for any params' do
       get '/bacons'
       expect(last_response.status).to eq(200)
@@ -38,15 +40,18 @@ describe Grape::Validations::PresenceValidator do
         end
       end
     end
+
     it 'requires when missing' do
       get '/requires'
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"email is required, email has no value"}')
     end
+
     it 'requires when empty' do
       get '/requires', email: ''
       expect(last_response.body).to eq('{"error":"email has no value, email format is invalid"}')
     end
+
     it 'valid when set' do
       get '/requires', email: 'bob@example.com'
       expect(last_response.status).to eq(200)
@@ -64,6 +69,7 @@ describe Grape::Validations::PresenceValidator do
         { ret: params[:id] }
       end
     end
+
     it 'validates id' do
       post '/'
       expect(last_response.status).to eq(400)
@@ -90,16 +96,19 @@ describe Grape::Validations::PresenceValidator do
         'Hello'
       end
     end
+
     it 'requires when missing' do
       get '/'
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"email is missing, email is empty"}')
     end
+
     it 'requires when empty' do
       get '/', email: ''
       expect(last_response.status).to eq(400)
       expect(last_response.body).to eq('{"error":"email is empty, email is invalid"}')
     end
+
     it 'valid when set' do
       get '/', email: 'bob@example.com'
       expect(last_response.status).to eq(200)
@@ -124,6 +133,7 @@ describe Grape::Validations::PresenceValidator do
         'Hello'
       end
     end
+
     it 'validates for all defined params' do
       get '/single-requires'
       expect(last_response.status).to eq(400)
@@ -144,6 +154,7 @@ describe Grape::Validations::PresenceValidator do
         'Hello'
       end
     end
+
     it 'validates name, company' do
       get '/'
       expect(last_response.status).to eq(400)
@@ -171,6 +182,7 @@ describe Grape::Validations::PresenceValidator do
         'Nested'
       end
     end
+
     it 'validates nested parameters' do
       get '/nested'
       expect(last_response.status).to eq(400)
@@ -203,6 +215,7 @@ describe Grape::Validations::PresenceValidator do
         'Nested triple'
       end
     end
+
     it 'validates triple nested parameters' do
       get '/nested_triple'
       expect(last_response.status).to eq(400)
@@ -252,6 +265,7 @@ describe Grape::Validations::PresenceValidator do
         'Hello optional'
       end
     end
+
     it 'works with required' do
       get '/required'
       expect(last_response.status).to eq(400)
@@ -261,6 +275,7 @@ describe Grape::Validations::PresenceValidator do
       expect(last_response.status).to eq(200)
       expect(last_response.body).to eq('Hello required'.to_json)
     end
+
     it 'works with optional' do
       get '/optional'
       expect(last_response.status).to eq(200)

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

@@ -2,53 +2,47 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::RegexpValidator do
-  module ValidationsSpec
-    module RegexpValidatorSpec
-      class API < Grape::API
-        default_format :json
-
-        resources :custom_message do
-          params do
-            requires :name, regexp: { value: /^[a-z]+$/, message: 'format is invalid' }
-          end
-          get do
-          end
-
-          params do
-            requires :names, type: { value: Array[String], message: 'can\'t be nil' }, regexp: { value: /^[a-z]+$/, message: 'format is invalid' }
-          end
-          get 'regexp_with_array' do
-          end
-        end
+describe Grape::Validations::Validators::RegexpValidator do
+  let_it_be(:app) do
+    Class.new(Grape::API) do
+      default_format :json
 
+      resources :custom_message do
         params do
-          requires :name, regexp: /^[a-z]+$/
+          requires :name, regexp: { value: /^[a-z]+$/, message: 'format is invalid' }
         end
         get do
         end
 
         params do
-          requires :names, type: Array[String], regexp: /^[a-z]+$/
+          requires :names, type: { value: Array[String], message: 'can\'t be nil' }, regexp: { value: /^[a-z]+$/, message: 'format is invalid' }
         end
         get 'regexp_with_array' do
         end
+      end
 
-        params do
-          requires :people, type: Hash do
-            requires :names, type: Array[String], regexp: /^[a-z]+$/
-          end
-        end
-        get 'nested_regexp_with_array' do
+      params do
+        requires :name, regexp: /^[a-z]+$/
+      end
+      get do
+      end
+
+      params do
+        requires :names, type: Array[String], regexp: /^[a-z]+$/
+      end
+      get 'regexp_with_array' do
+      end
+
+      params do
+        requires :people, type: Hash do
+          requires :names, type: Array[String], regexp: /^[a-z]+$/
         end
       end
+      get 'nested_regexp_with_array' do
+      end
     end
   end
 
-  def app
-    ValidationsSpec::RegexpValidatorSpec::API
-  end
-
   context 'custom validation message' do
     context 'with invalid input' do
       it 'refuses inapppopriate' do

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

@@ -2,31 +2,25 @@
 
 require 'spec_helper'
 
-describe Grape::Validations::SameAsValidator do
-  module ValidationsSpec
-    module SameAsValidatorSpec
-      class API < Grape::API
-        params do
-          requires :password
-          requires :password_confirmation, same_as: :password
-        end
-        post do
-        end
+describe Grape::Validations::Validators::SameAsValidator do
+  let_it_be(:app) do
+    Class.new(Grape::API) do
+      params do
+        requires :password
+        requires :password_confirmation, same_as: :password
+      end
+      post do
+      end
 
-        params do
-          requires :password
-          requires :password_confirmation, same_as: { value: :password, message: 'not match' }
-        end
-        post '/custom-message' do
-        end
+      params do
+        requires :password
+        requires :password_confirmation, same_as: { value: :password, message: 'not match' }
+      end
+      post '/custom-message' do
       end
     end
   end
 
-  def app
-    ValidationsSpec::SameAsValidatorSpec::API
-  end
-
   describe '/' do
     context 'is the same' do
       it do