grape 1.6.0 → 1.6.2

data/spec/grape/validations_spec.rb

@@ -489,18 +489,24 @@ describe Grape::Validations do
     end
 
     context 'custom validator for a Hash' do
-      module ValuesSpec
-        module DateRangeValidations
-          class DateRangeValidator < Grape::Validations::Base
-            def validate_param!(attr_name, params)
-              return if params[attr_name][:from] <= params[attr_name][:to]
+      let(:date_range_validator) do
+        Class.new(Grape::Validations::Validators::Base) do
+          def validate_param!(attr_name, params)
+            return if params[attr_name][:from] <= params[attr_name][:to]
 
-              raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: "'from' must be lower or equal to 'to'")
-            end
+            raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: "'from' must be lower or equal to 'to'")
           end
         end
       end
 
+      before do
+        described_class.register_validator('date_range', date_range_validator)
+      end
+
+      after do
+        described_class.deregister_validator('date_range')
+      end
+
       before do
         subject.params do
           optional :date_range, date_range: true, type: Hash do
@@ -1183,8 +1189,8 @@ describe Grape::Validations do
     end
 
     context 'custom validation' do
-      module CustomValidations
-        class Customvalidator < Grape::Validations::Base
+      let(:custom_validator) do
+        Class.new(Grape::Validations::Validators::Base) do
           def validate_param!(attr_name, params)
             return if params[attr_name] == 'im custom'
 
@@ -1193,6 +1199,14 @@ describe Grape::Validations do
         end
       end
 
+      before do
+        described_class.register_validator('customvalidator', custom_validator)
+      end
+
+      after do
+        described_class.deregister_validator('customvalidator')
+      end
+
       context 'when using optional with a custom validator' do
         before do
           subject.params do
@@ -1332,8 +1346,8 @@ describe Grape::Validations do
       end
 
       context 'when using options on param' do
-        module CustomValidations
-          class CustomvalidatorWithOptions < Grape::Validations::Base
+        let(:custom_validator_with_options) do
+          Class.new(Grape::Validations::Validators::Base) do
             def validate_param!(attr_name, params)
               return if params[attr_name] == @option[:text]
 
@@ -1342,6 +1356,14 @@ describe Grape::Validations do
           end
         end
 
+        before do
+          described_class.register_validator('customvalidator_with_options', custom_validator_with_options)
+        end
+
+        after do
+          described_class.deregister_validator('customvalidator_with_options')
+        end
+
         before do
           subject.params do
             optional :custom, customvalidator_with_options: { text: 'im custom with options', message: 'is not custom with options!' }
@@ -1436,21 +1458,25 @@ describe Grape::Validations do
             }
           end
         end
+
         it 'returns defaults' do
           get '/order'
           expect(last_response.status).to eq(200)
           expect(last_response.body).to eq({ order: :asc, order_by: :created_at }.to_json)
         end
+
         it 'overrides default value for order' do
           get '/order?order=desc'
           expect(last_response.status).to eq(200)
           expect(last_response.body).to eq({ order: :desc, order_by: :created_at }.to_json)
         end
+
         it 'overrides default value for order_by' do
           get '/order?order_by=name'
           expect(last_response.status).to eq(200)
           expect(last_response.body).to eq({ order: :asc, order_by: :name }.to_json)
         end
+
         it 'fails with invalid value' do
           get '/order?order=invalid'
           expect(last_response.status).to eq(400)
@@ -1475,7 +1501,7 @@ describe Grape::Validations do
 
     context 'all or none' do
       context 'optional params' do
-        before :each do
+        before do
           subject.resource :custom_message do
             params do
               optional :beer
@@ -1488,17 +1514,20 @@ describe Grape::Validations do
             end
           end
         end
+
         context 'with a custom validation message' do
           it 'errors when any one is present' do
             get '/custom_message/all_or_none', beer: 'string'
             expect(last_response.status).to eq(400)
             expect(last_response.body).to eq 'beer, wine, juice all params are required or none is required'
           end
+
           it 'works when all params are present' do
             get '/custom_message/all_or_none', beer: 'string', wine: 'anotherstring', juice: 'anotheranotherstring'
             expect(last_response.status).to eq(200)
             expect(last_response.body).to eq 'all_or_none works!'
           end
+
           it 'works when none are present' do
             get '/custom_message/all_or_none'
             expect(last_response.status).to eq(200)
@@ -1662,7 +1691,7 @@ describe Grape::Validations do
 
     context 'exactly one of' do
       context 'params' do
-        before :each do
+        before do
           subject.resources :custom_message do
             params do
               optional :beer
@@ -1726,7 +1755,7 @@ describe Grape::Validations do
       end
 
       context 'nested params' do
-        before :each do
+        before do
           subject.params do
             requires :nested, type: Hash do
               optional :beer_nested
@@ -1768,7 +1797,7 @@ describe Grape::Validations do
 
     context 'at least one of' do
       context 'params' do
-        before :each do
+        before do
           subject.resources :custom_message do
             params do
               optional :beer
@@ -1832,7 +1861,7 @@ describe Grape::Validations do
       end
 
       context 'nested params' do
-        before :each do
+        before do
           subject.params do
             requires :nested, type: Hash do
               optional :beer

data/spec/integration/eager_load/eager_load_spec.rb

@@ -6,10 +6,10 @@ require 'grape'
 describe Grape do
   it 'eager_load!' do
     require 'grape/eager_load'
-    expect { Grape.eager_load! }.to_not raise_error
+    expect { described_class.eager_load! }.not_to raise_error
   end
 
   it 'compile!' do
-    expect { Class.new(Grape::API).compile! }.to_not raise_error
+    expect { Class.new(Grape::API).compile! }.not_to raise_error
   end
 end

data/spec/integration/multi_json/json_spec.rb

@@ -4,6 +4,6 @@ require 'spec_helper'
 
 describe Grape::Json do
   it 'uses multi_json' do
-    expect(Grape::Json).to eq(::MultiJson)
+    expect(described_class).to eq(::MultiJson)
   end
 end

data/spec/integration/multi_xml/xml_spec.rb

@@ -4,6 +4,6 @@ require 'spec_helper'
 
 describe Grape::Xml do
   it 'uses multi_xml' do
-    expect(Grape::Xml).to eq(::MultiXml)
+    expect(described_class).to eq(::MultiXml)
   end
 end

data/spec/shared/versioning_examples.rb

@@ -35,14 +35,14 @@ shared_examples_for 'versioning' do
     end
 
     versioned_get '/awesome', 'v1', **macro_options
-    expect(last_response.status).to eql 404
+    expect(last_response.status).to be 404
 
     versioned_get '/awesome', 'v2', **macro_options
-    expect(last_response.status).to eql 200
+    expect(last_response.status).to be 200
     versioned_get '/legacy', 'v1', **macro_options
-    expect(last_response.status).to eql 200
+    expect(last_response.status).to be 200
     versioned_get '/legacy', 'v2', **macro_options
-    expect(last_response.status).to eql 404
+    expect(last_response.status).to be 404
   end
 
   it 'is able to specify multiple versions' do
@@ -52,11 +52,11 @@ shared_examples_for 'versioning' do
     end
 
     versioned_get '/awesome', 'v1', **macro_options
-    expect(last_response.status).to eql 200
+    expect(last_response.status).to be 200
     versioned_get '/awesome', 'v2', **macro_options
-    expect(last_response.status).to eql 200
+    expect(last_response.status).to be 200
     versioned_get '/awesome', 'v3', **macro_options
-    expect(last_response.status).to eql 404
+    expect(last_response.status).to be 404
   end
 
   context 'with different versions for the same endpoint' do
@@ -117,6 +117,7 @@ shared_examples_for 'versioning' do
         before do
           @output ||= 'v2-'
         end
+
         get 'version' do
           @output += 'version'
         end
@@ -126,6 +127,7 @@ shared_examples_for 'versioning' do
         before do
           @output ||= 'v1-'
         end
+
         get 'version' do
           @output += 'version'
         end
@@ -170,6 +172,7 @@ shared_examples_for 'versioning' do
       end
       klass
     end
+
     before do
       subject.format :txt
 

data/spec/spec_helper.rb

@@ -5,6 +5,15 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'support'))
 
 require 'grape'
+require 'test_prof/recipes/rspec/let_it_be'
+
+class NullAdapter
+  def begin_transaction; end
+
+  def rollback_transaction; end
+end
+
+TestProf::BeforeAll.adapter = NullAdapter.new
 
 require 'rubygems'
 require 'bundler'
@@ -27,7 +36,8 @@ RSpec.configure do |config|
   config.filter_run_when_matching :focus
   config.warnings = true
 
-  config.before(:each) { Grape::Util::InheritableSetting.reset_global! }
+  config.before(:all) { Grape::Util::InheritableSetting.reset_global! }
+  config.before { Grape::Util::InheritableSetting.reset_global! }
 
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = '.rspec_status'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-04 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -371,9 +371,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/ruby-grape/grape/issues
-  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.6.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/grape/1.6.0
-  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.6.0
+  changelog_uri: https://github.com/ruby-grape/grape/blob/v1.6.2/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/grape/1.6.2
+  source_code_uri: https://github.com/ruby-grape/grape/tree/v1.6.2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -389,123 +389,123 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.3.0.dev
 signing_key:
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
 test_files:
-- spec/spec_helper.rb
-- spec/integration/eager_load/eager_load_spec.rb
-- spec/integration/multi_xml/xml_spec.rb
-- spec/integration/multi_json/json_spec.rb
-- spec/shared/versioning_examples.rb
-- spec/support/basic_auth_encode_helpers.rb
-- spec/support/endpoint_faker.rb
-- spec/support/chunks.rb
-- spec/support/file_streamer.rb
-- spec/support/versioned_helpers.rb
-- spec/support/content_type_helpers.rb
-- spec/support/eager_load.rb
-- spec/support/integer_helpers.rb
-- spec/grape/middleware/error_spec.rb
-- spec/grape/middleware/globals_spec.rb
-- spec/grape/middleware/formatter_spec.rb
-- spec/grape/middleware/auth/strategies_spec.rb
-- spec/grape/middleware/auth/dsl_spec.rb
-- spec/grape/middleware/auth/base_spec.rb
-- spec/grape/middleware/stack_spec.rb
-- spec/grape/middleware/exception_spec.rb
-- spec/grape/middleware/versioner_spec.rb
-- spec/grape/middleware/versioner/accept_version_header_spec.rb
-- spec/grape/middleware/versioner/header_spec.rb
-- spec/grape/middleware/versioner/path_spec.rb
-- spec/grape/middleware/versioner/param_spec.rb
-- spec/grape/middleware/base_spec.rb
+- spec/grape/api/custom_validations_spec.rb
+- spec/grape/api/deeply_included_options_spec.rb
+- spec/grape/api/defines_boolean_in_params_spec.rb
+- spec/grape/api/inherited_helpers_spec.rb
+- spec/grape/api/instance_spec.rb
+- spec/grape/api/invalid_format_spec.rb
+- spec/grape/api/namespace_parameters_in_route_spec.rb
+- spec/grape/api/nested_helpers_spec.rb
+- spec/grape/api/optional_parameters_in_route_spec.rb
+- spec/grape/api/parameters_modification_spec.rb
+- spec/grape/api/patch_method_helpers_spec.rb
+- spec/grape/api/recognize_path_spec.rb
+- spec/grape/api/required_parameters_in_route_spec.rb
+- spec/grape/api/required_parameters_with_invalid_method_spec.rb
+- spec/grape/api/routes_with_requirements_spec.rb
+- spec/grape/api/shared_helpers_exactly_one_of_spec.rb
+- spec/grape/api/shared_helpers_spec.rb
+- spec/grape/api_remount_spec.rb
+- spec/grape/api_spec.rb
 - spec/grape/config_spec.rb
-- spec/grape/loading_spec.rb
+- spec/grape/dsl/callbacks_spec.rb
+- spec/grape/dsl/configuration_spec.rb
+- spec/grape/dsl/desc_spec.rb
+- spec/grape/dsl/headers_spec.rb
+- spec/grape/dsl/helpers_spec.rb
+- spec/grape/dsl/inside_route_spec.rb
+- spec/grape/dsl/logger_spec.rb
+- spec/grape/dsl/middleware_spec.rb
+- spec/grape/dsl/parameters_spec.rb
+- spec/grape/dsl/request_response_spec.rb
+- spec/grape/dsl/routing_spec.rb
+- spec/grape/dsl/settings_spec.rb
+- spec/grape/dsl/validations_spec.rb
+- spec/grape/endpoint/declared_spec.rb
 - spec/grape/endpoint_spec.rb
-- spec/grape/api_spec.rb
-- spec/grape/util/reverse_stackable_values_spec.rb
-- spec/grape/util/stackable_values_spec.rb
-- spec/grape/util/inheritable_setting_spec.rb
-- spec/grape/util/strict_hash_configuration_spec.rb
-- spec/grape/util/inheritable_values_spec.rb
-- spec/grape/integration/rack_spec.rb
-- spec/grape/integration/rack_sendfile_spec.rb
-- spec/grape/integration/global_namespace_function_spec.rb
-- spec/grape/validations_spec.rb
 - spec/grape/entity_spec.rb
-- spec/grape/exceptions/validation_spec.rb
-- spec/grape/exceptions/invalid_accept_header_spec.rb
-- spec/grape/exceptions/missing_option_spec.rb
-- spec/grape/exceptions/invalid_response_spec.rb
+- spec/grape/exceptions/base_spec.rb
 - spec/grape/exceptions/body_parse_errors_spec.rb
+- spec/grape/exceptions/invalid_accept_header_spec.rb
 - spec/grape/exceptions/invalid_formatter_spec.rb
+- spec/grape/exceptions/invalid_response_spec.rb
+- spec/grape/exceptions/invalid_versioner_option_spec.rb
 - spec/grape/exceptions/missing_mime_type_spec.rb
+- spec/grape/exceptions/missing_option_spec.rb
 - spec/grape/exceptions/unknown_options_spec.rb
-- spec/grape/exceptions/validation_errors_spec.rb
 - spec/grape/exceptions/unknown_validator_spec.rb
-- spec/grape/exceptions/invalid_versioner_option_spec.rb
-- spec/grape/exceptions/base_spec.rb
+- spec/grape/exceptions/validation_errors_spec.rb
+- spec/grape/exceptions/validation_spec.rb
+- spec/grape/extensions/param_builders/hash_spec.rb
+- spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb
+- spec/grape/extensions/param_builders/hashie/mash_spec.rb
+- spec/grape/integration/global_namespace_function_spec.rb
+- spec/grape/integration/rack_sendfile_spec.rb
+- spec/grape/integration/rack_spec.rb
+- spec/grape/loading_spec.rb
+- spec/grape/middleware/auth/base_spec.rb
+- spec/grape/middleware/auth/dsl_spec.rb
+- spec/grape/middleware/auth/strategies_spec.rb
+- spec/grape/middleware/base_spec.rb
+- spec/grape/middleware/error_spec.rb
+- spec/grape/middleware/exception_spec.rb
+- spec/grape/middleware/formatter_spec.rb
+- spec/grape/middleware/globals_spec.rb
+- spec/grape/middleware/stack_spec.rb
+- spec/grape/middleware/versioner/accept_version_header_spec.rb
+- spec/grape/middleware/versioner/header_spec.rb
+- spec/grape/middleware/versioner/param_spec.rb
+- spec/grape/middleware/versioner/path_spec.rb
+- spec/grape/middleware/versioner_spec.rb
+- spec/grape/named_api_spec.rb
+- spec/grape/parser_spec.rb
+- spec/grape/path_spec.rb
 - spec/grape/presenters/presenter_spec.rb
-- spec/grape/validations/single_attribute_iterator_spec.rb
+- spec/grape/request_spec.rb
+- spec/grape/util/inheritable_setting_spec.rb
+- spec/grape/util/inheritable_values_spec.rb
+- spec/grape/util/reverse_stackable_values_spec.rb
+- spec/grape/util/stackable_values_spec.rb
+- spec/grape/util/strict_hash_configuration_spec.rb
 - spec/grape/validations/attributes_iterator_spec.rb
-- spec/grape/validations/types/primitive_coercer_spec.rb
-- spec/grape/validations/types/set_coercer_spec.rb
-- spec/grape/validations/types/array_coercer_spec.rb
-- spec/grape/validations/params_scope_spec.rb
 - spec/grape/validations/instance_behaivour_spec.rb
 - spec/grape/validations/multiple_attributes_iterator_spec.rb
+- spec/grape/validations/params_scope_spec.rb
+- spec/grape/validations/single_attribute_iterator_spec.rb
+- spec/grape/validations/types/array_coercer_spec.rb
+- spec/grape/validations/types/primitive_coercer_spec.rb
+- spec/grape/validations/types/set_coercer_spec.rb
 - spec/grape/validations/types_spec.rb
-- spec/grape/validations/validators/regexp_spec.rb
-- spec/grape/validations/validators/mutual_exclusion_spec.rb
+- spec/grape/validations/validators/all_or_none_spec.rb
+- spec/grape/validations/validators/allow_blank_spec.rb
+- spec/grape/validations/validators/at_least_one_of_spec.rb
+- spec/grape/validations/validators/coerce_spec.rb
+- spec/grape/validations/validators/default_spec.rb
 - spec/grape/validations/validators/exactly_one_of_spec.rb
 - spec/grape/validations/validators/except_values_spec.rb
+- spec/grape/validations/validators/mutual_exclusion_spec.rb
 - spec/grape/validations/validators/presence_spec.rb
-- spec/grape/validations/validators/all_or_none_spec.rb
-- spec/grape/validations/validators/allow_blank_spec.rb
+- spec/grape/validations/validators/regexp_spec.rb
 - spec/grape/validations/validators/same_as_spec.rb
-- spec/grape/validations/validators/default_spec.rb
 - spec/grape/validations/validators/values_spec.rb
-- spec/grape/validations/validators/at_least_one_of_spec.rb
-- spec/grape/validations/validators/coerce_spec.rb
 - spec/grape/validations/validators/zh-CN.yml
-- spec/grape/extensions/param_builders/hashie/mash_spec.rb
-- spec/grape/extensions/param_builders/hash_spec.rb
-- spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb
-- spec/grape/parser_spec.rb
-- spec/grape/request_spec.rb
-- spec/grape/endpoint/declared_spec.rb
-- spec/grape/api/parameters_modification_spec.rb
-- spec/grape/api/patch_method_helpers_spec.rb
-- spec/grape/api/required_parameters_with_invalid_method_spec.rb
-- spec/grape/api/nested_helpers_spec.rb
-- spec/grape/api/defines_boolean_in_params_spec.rb
-- spec/grape/api/invalid_format_spec.rb
-- spec/grape/api/required_parameters_in_route_spec.rb
-- spec/grape/api/instance_spec.rb
-- spec/grape/api/namespace_parameters_in_route_spec.rb
-- spec/grape/api/recognize_path_spec.rb
-- spec/grape/api/shared_helpers_exactly_one_of_spec.rb
-- spec/grape/api/inherited_helpers_spec.rb
-- spec/grape/api/shared_helpers_spec.rb
-- spec/grape/api/deeply_included_options_spec.rb
-- spec/grape/api/routes_with_requirements_spec.rb
-- spec/grape/api/custom_validations_spec.rb
-- spec/grape/api/optional_parameters_in_route_spec.rb
-- spec/grape/api_remount_spec.rb
-- spec/grape/named_api_spec.rb
-- spec/grape/dsl/request_response_spec.rb
-- spec/grape/dsl/desc_spec.rb
-- spec/grape/dsl/logger_spec.rb
-- spec/grape/dsl/configuration_spec.rb
-- spec/grape/dsl/validations_spec.rb
-- spec/grape/dsl/parameters_spec.rb
-- spec/grape/dsl/helpers_spec.rb
-- spec/grape/dsl/middleware_spec.rb
-- spec/grape/dsl/headers_spec.rb
-- spec/grape/dsl/callbacks_spec.rb
-- spec/grape/dsl/settings_spec.rb
-- spec/grape/dsl/routing_spec.rb
-- spec/grape/dsl/inside_route_spec.rb
-- spec/grape/path_spec.rb
+- spec/grape/validations_spec.rb
+- spec/integration/eager_load/eager_load_spec.rb
+- spec/integration/multi_json/json_spec.rb
+- spec/integration/multi_xml/xml_spec.rb
+- spec/shared/versioning_examples.rb
+- spec/spec_helper.rb
+- spec/support/basic_auth_encode_helpers.rb
+- spec/support/chunks.rb
+- spec/support/content_type_helpers.rb
+- spec/support/eager_load.rb
+- spec/support/endpoint_faker.rb
+- spec/support/file_streamer.rb
+- spec/support/integer_helpers.rb
+- spec/support/versioned_helpers.rb