grape 1.2.4 → 1.2.5

data/spec/grape/validations_spec.rb

@@ -540,7 +540,10 @@ describe Grape::Validations do
         ]
 
         expect(last_response.status).to eq(400)
-        expect(last_response.body).to eq('children[0][parents] is missing, children[1][parents] is missing')
+        expect(last_response.body).to eq(
+          'children[0][parents][0][name] is missing, ' \
+          'children[1][parents][0][name] is missing'
+        )
       end
 
       it 'safely handles empty arrays and blank parameters' do
@@ -548,7 +551,14 @@ describe Grape::Validations do
         # should actually return 200, since an empty array is valid.
         get '/within_array', children: []
         expect(last_response.status).to eq(400)
-        expect(last_response.body).to eq('children is missing')
+        expect(last_response.body).to eq(
+          'children[0][name] is missing, ' \
+          'children[0][parents] is missing, ' \
+          'children[0][parents] is invalid, ' \
+          'children[0][parents][0][name] is missing, ' \
+          'children[0][parents][0][name] is empty'
+        )
+
         get '/within_array', children: [name: 'Jay']
         expect(last_response.status).to eq(400)
         expect(last_response.body).to eq('children[0][parents] is missing')
@@ -1223,7 +1233,9 @@ describe Grape::Validations do
             end
             get '/custom_message/mutually_exclusive', beer: 'true', wine: 'true', nested: { scotch: 'true', aquavit: 'true' }, nested2: [{ scotch2: 'true' }, { scotch2: 'true', aquavit2: 'true' }]
             expect(last_response.status).to eq(400)
-            expect(last_response.body).to eq 'beer, wine are mutually exclusive pass only one, scotch, aquavit are mutually exclusive pass only one, scotch2, aquavit2 are mutually exclusive pass only one'
+            expect(last_response.body).to eq(
+              'beer, wine are mutually exclusive pass only one, nested[scotch], nested[aquavit] are mutually exclusive pass only one, nested2[1][scotch2], nested2[1][aquavit2] are mutually exclusive pass only one'
+            )
           end
         end
 
@@ -1249,7 +1261,7 @@ describe Grape::Validations do
 
           get '/mutually_exclusive', beer: 'true', wine: 'true', nested: { scotch: 'true', aquavit: 'true' }, nested2: [{ scotch2: 'true' }, { scotch2: 'true', aquavit2: 'true' }]
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to eq 'beer, wine are mutually exclusive, scotch, aquavit are mutually exclusive, scotch2, aquavit2 are mutually exclusive'
+          expect(last_response.body).to eq 'beer, wine are mutually exclusive, nested[scotch], nested[aquavit] are mutually exclusive, nested2[1][scotch2], nested2[1][aquavit2] are mutually exclusive'
         end
       end
 
@@ -1318,7 +1330,7 @@ describe Grape::Validations do
               optional :beer
               optional :wine
               optional :juice
-              exactly_one_of :beer, :wine, :juice, message: { exactly_one: 'are missing, exactly one parameter is required', mutual_exclusion: 'are mutually exclusive, exactly one parameter is required' }
+              exactly_one_of :beer, :wine, :juice, message: 'are missing, exactly one parameter is required'
             end
             get '/exactly_one_of' do
               'exactly_one_of works!'
@@ -1352,7 +1364,7 @@ describe Grape::Validations do
           it 'errors when two or more are present' do
             get '/custom_message/exactly_one_of', beer: 'string', wine: 'anotherstring'
             expect(last_response.status).to eq(400)
-            expect(last_response.body).to eq 'beer, wine are mutually exclusive, exactly one parameter is required'
+            expect(last_response.body).to eq 'beer, wine, juice are missing, exactly one parameter is required'
           end
         end
 
@@ -1371,7 +1383,7 @@ describe Grape::Validations do
         it 'errors when two or more are present' do
           get '/exactly_one_of', beer: 'string', wine: 'anotherstring'
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to eq 'beer, wine are mutually exclusive'
+          expect(last_response.body).to eq 'beer, wine, juice are missing, exactly one parameter must be provided'
         end
       end
 
@@ -1399,7 +1411,7 @@ describe Grape::Validations do
         it 'errors when none are present' do
           get '/exactly_one_of_nested'
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to eq 'nested is missing, beer_nested, wine_nested, juice_nested are missing, exactly one parameter must be provided'
+          expect(last_response.body).to eq 'nested is missing, nested[beer_nested], nested[wine_nested], nested[juice_nested] are missing, exactly one parameter must be provided'
         end
 
         it 'succeeds when one is present' do
@@ -1411,7 +1423,7 @@ describe Grape::Validations do
         it 'errors when two or more are present' do
           get '/exactly_one_of_nested', nested: { beer_nested: 'string' }, nested2: [{ beer_nested2: 'string', wine_nested2: 'anotherstring' }]
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to eq 'beer_nested2, wine_nested2 are mutually exclusive'
+          expect(last_response.body).to eq 'nested2[0][beer_nested2], nested2[0][wine_nested2], nested2[0][juice_nested2] are missing, exactly one parameter must be provided'
         end
       end
     end
@@ -1485,16 +1497,16 @@ describe Grape::Validations do
         before :each do
           subject.params do
             requires :nested, type: Hash do
-              optional :beer_nested
-              optional :wine_nested
-              optional :juice_nested
-              at_least_one_of :beer_nested, :wine_nested, :juice_nested
+              optional :beer
+              optional :wine
+              optional :juice
+              at_least_one_of :beer, :wine, :juice
             end
             optional :nested2, type: Array do
-              optional :beer_nested2
-              optional :wine_nested2
-              optional :juice_nested2
-              at_least_one_of :beer_nested2, :wine_nested2, :juice_nested2
+              optional :beer
+              optional :wine
+              optional :juice
+              at_least_one_of :beer, :wine, :juice
             end
           end
           subject.get '/at_least_one_of_nested' do
@@ -1505,17 +1517,17 @@ describe Grape::Validations do
         it 'errors when none are present' do
           get '/at_least_one_of_nested'
           expect(last_response.status).to eq(400)
-          expect(last_response.body).to eq 'nested is missing, beer_nested, wine_nested, juice_nested are missing, at least one parameter must be provided'
+          expect(last_response.body).to eq 'nested is missing, nested[beer], nested[wine], nested[juice] are missing, at least one parameter must be provided'
         end
 
         it 'does not error when one is present' do
-          get '/at_least_one_of_nested', nested: { beer_nested: 'string' }, nested2: [{ beer_nested2: 'string' }]
+          get '/at_least_one_of_nested', nested: { beer: 'string' }, nested2: [{ beer: 'string' }]
           expect(last_response.status).to eq(200)
           expect(last_response.body).to eq 'at_least_one_of works!'
         end
 
         it 'does not error when two are present' do
-          get '/at_least_one_of_nested', nested: { beer_nested: 'string', wine_nested: 'string' }, nested2: [{ beer_nested2: 'string', wine_nested2: 'string' }]
+          get '/at_least_one_of_nested', nested: { beer: 'string', wine: 'string' }, nested2: [{ beer: 'string', wine: 'string' }]
           expect(last_response.status).to eq(200)
           expect(last_response.body).to eq 'at_least_one_of works!'
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,31 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
-- Dangerfile
-- Gemfile
-- Gemfile.lock
-- Guardfile
 - LICENSE
 - README.md
-- RELEASING.md
-- Rakefile
 - UPGRADING.md
-- benchmark/simple.rb
-- benchmark/simple_with_type_coercer.rb
-- gemfiles/multi_json.gemfile
-- gemfiles/multi_xml.gemfile
-- gemfiles/rack_1.5.2.gemfile.lock
-- gemfiles/rack_edge.gemfile
-- gemfiles/rails_3.gemfile
-- gemfiles/rails_3.gemfile.lock
-- gemfiles/rails_4.gemfile
-- gemfiles/rails_4.gemfile.lock
-- gemfiles/rails_5.gemfile
-- gemfiles/rails_5.gemfile.lock
-- gemfiles/rails_edge.gemfile
 - grape.gemspec
 - grape.png
 - lib/grape.rb
@@ -148,6 +128,7 @@ files:
 - lib/grape/dsl/routing.rb
 - lib/grape/dsl/settings.rb
 - lib/grape/dsl/validations.rb
+- lib/grape/eager_load.rb
 - lib/grape/endpoint.rb
 - lib/grape/error_formatter.rb
 - lib/grape/error_formatter/base.rb
@@ -197,6 +178,7 @@ files:
 - lib/grape/middleware/filter.rb
 - lib/grape/middleware/formatter.rb
 - lib/grape/middleware/globals.rb
+- lib/grape/middleware/helpers.rb
 - lib/grape/middleware/stack.rb
 - lib/grape/middleware/versioner.rb
 - lib/grape/middleware/versioner/accept_version_header.rb
@@ -218,12 +200,14 @@ files:
 - lib/grape/serve_file/file_body.rb
 - lib/grape/serve_file/file_response.rb
 - lib/grape/serve_file/sendfile_response.rb
+- lib/grape/util/base_inheritable.rb
 - lib/grape/util/content_types.rb
 - lib/grape/util/endpoint_configuration.rb
 - lib/grape/util/env.rb
 - lib/grape/util/inheritable_setting.rb
 - lib/grape/util/inheritable_values.rb
 - lib/grape/util/json.rb
+- lib/grape/util/lazy_block.rb
 - lib/grape/util/lazy_value.rb
 - lib/grape/util/registrable.rb
 - lib/grape/util/reverse_stackable_values.rb
@@ -232,7 +216,9 @@ files:
 - lib/grape/util/xml.rb
 - lib/grape/validations.rb
 - lib/grape/validations/attributes_iterator.rb
+- lib/grape/validations/multiple_attributes_iterator.rb
 - lib/grape/validations/params_scope.rb
+- lib/grape/validations/single_attribute_iterator.rb
 - lib/grape/validations/types.rb
 - lib/grape/validations/types/build_coercer.rb
 - lib/grape/validations/types/custom_type_coercer.rb
@@ -259,11 +245,9 @@ files:
 - lib/grape/validations/validators/same_as.rb
 - lib/grape/validations/validators/values.rb
 - lib/grape/version.rb
-- pkg/grape-1.2.0.gem
-- pkg/grape-1.2.1.gem
-- pkg/grape-1.2.3.gem
 - 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/invalid_format_spec.rb
 - spec/grape/api/namespace_parameters_in_route_spec.rb
@@ -340,7 +324,9 @@ files:
 - spec/grape/util/strict_hash_configuration_spec.rb
 - spec/grape/validations/attributes_iterator_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_spec.rb
 - spec/grape/validations/validators/all_or_none_spec.rb
 - spec/grape/validations/validators/allow_blank_spec.rb
@@ -385,113 +371,115 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A simple Ruby framework for building REST-like APIs.
 test_files:
+- spec/spec_helper.rb
+- spec/integration/multi_xml/xml_spec.rb
+- spec/integration/multi_json/json_spec.rb
 - spec/shared/versioning_examples.rb
-- spec/grape/api/shared_helpers_exactly_one_of_spec.rb
-- spec/grape/api/custom_validations_spec.rb
-- spec/grape/api/parameters_modification_spec.rb
-- spec/grape/api/namespace_parameters_in_route_spec.rb
-- spec/grape/api/deeply_included_options_spec.rb
-- spec/grape/api/shared_helpers_spec.rb
-- spec/grape/api/required_parameters_with_invalid_method_spec.rb
-- spec/grape/api/inherited_helpers_spec.rb
-- spec/grape/api/recognize_path_spec.rb
-- spec/grape/api/required_parameters_in_route_spec.rb
-- spec/grape/api/nested_helpers_spec.rb
-- spec/grape/api/routes_with_requirements_spec.rb
-- spec/grape/api/patch_method_helpers_spec.rb
-- spec/grape/api/optional_parameters_in_route_spec.rb
-- spec/grape/api/invalid_format_spec.rb
-- spec/grape/named_api_spec.rb
-- spec/grape/exceptions/validation_spec.rb
-- spec/grape/exceptions/validation_errors_spec.rb
-- spec/grape/exceptions/missing_option_spec.rb
-- spec/grape/exceptions/unknown_options_spec.rb
-- spec/grape/exceptions/missing_mime_type_spec.rb
-- spec/grape/exceptions/base_spec.rb
-- spec/grape/exceptions/invalid_versioner_option_spec.rb
-- spec/grape/exceptions/invalid_response_spec.rb
-- spec/grape/exceptions/body_parse_errors_spec.rb
-- spec/grape/exceptions/unknown_validator_spec.rb
-- spec/grape/exceptions/invalid_formatter_spec.rb
-- spec/grape/exceptions/invalid_accept_header_spec.rb
-- spec/grape/dsl/routing_spec.rb
-- spec/grape/dsl/logger_spec.rb
-- spec/grape/dsl/request_response_spec.rb
-- spec/grape/dsl/validations_spec.rb
-- spec/grape/dsl/desc_spec.rb
-- spec/grape/dsl/headers_spec.rb
-- spec/grape/dsl/configuration_spec.rb
-- spec/grape/dsl/settings_spec.rb
-- spec/grape/dsl/callbacks_spec.rb
-- spec/grape/dsl/parameters_spec.rb
-- spec/grape/dsl/inside_route_spec.rb
-- spec/grape/dsl/middleware_spec.rb
-- spec/grape/dsl/helpers_spec.rb
-- spec/grape/endpoint_spec.rb
-- spec/grape/validations_spec.rb
-- spec/grape/entity_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/api_remount_spec.rb
-- spec/grape/parser_spec.rb
-- spec/grape/util/inheritable_setting_spec.rb
-- spec/grape/util/reverse_stackable_values_spec.rb
-- spec/grape/util/stackable_values_spec.rb
-- spec/grape/util/inheritable_values_spec.rb
-- spec/grape/util/strict_hash_configuration_spec.rb
-- spec/grape/config_spec.rb
-- spec/grape/presenters/presenter_spec.rb
-- spec/grape/middleware/versioner/header_spec.rb
-- spec/grape/middleware/versioner/accept_version_header_spec.rb
-- spec/grape/middleware/versioner/param_spec.rb
-- spec/grape/middleware/versioner/path_spec.rb
+- spec/support/basic_auth_encode_helpers.rb
+- spec/support/endpoint_faker.rb
+- spec/support/file_streamer.rb
+- spec/support/versioned_helpers.rb
+- spec/support/content_type_helpers.rb
+- spec/support/integer_helpers.rb
 - spec/grape/middleware/error_spec.rb
 - spec/grape/middleware/globals_spec.rb
-- spec/grape/middleware/base_spec.rb
 - spec/grape/middleware/formatter_spec.rb
-- spec/grape/middleware/exception_spec.rb
-- spec/grape/middleware/auth/base_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/request_spec.rb
-- spec/grape/integration/global_namespace_function_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/config_spec.rb
+- spec/grape/loading_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/body_parse_errors_spec.rb
+- spec/grape/exceptions/invalid_formatter_spec.rb
+- spec/grape/exceptions/missing_mime_type_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/presenters/presenter_spec.rb
+- spec/grape/validations/single_attribute_iterator_spec.rb
 - spec/grape/validations/attributes_iterator_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/types_spec.rb
+- spec/grape/validations/validators/regexp_spec.rb
+- spec/grape/validations/validators/mutual_exclusion_spec.rb
 - spec/grape/validations/validators/exactly_one_of_spec.rb
-- spec/grape/validations/validators/values_spec.rb
+- spec/grape/validations/validators/except_values_spec.rb
 - spec/grape/validations/validators/presence_spec.rb
-- spec/grape/validations/validators/coerce_spec.rb
-- spec/grape/validations/validators/at_least_one_of_spec.rb
-- spec/grape/validations/validators/same_as_spec.rb
-- spec/grape/validations/validators/zh-CN.yml
-- spec/grape/validations/validators/default_spec.rb
-- spec/grape/validations/validators/regexp_spec.rb
 - spec/grape/validations/validators/all_or_none_spec.rb
-- spec/grape/validations/validators/except_values_spec.rb
-- spec/grape/validations/validators/mutual_exclusion_spec.rb
 - spec/grape/validations/validators/allow_blank_spec.rb
-- spec/grape/validations/params_scope_spec.rb
-- spec/grape/validations/instance_behaivour_spec.rb
-- spec/grape/validations/types_spec.rb
-- spec/grape/api_spec.rb
-- spec/grape/loading_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/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/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/support/file_streamer.rb
-- spec/support/versioned_helpers.rb
-- spec/support/content_type_helpers.rb
-- spec/support/integer_helpers.rb
-- spec/support/basic_auth_encode_helpers.rb
-- spec/support/endpoint_faker.rb
-- spec/spec_helper.rb
-- spec/integration/multi_json/json_spec.rb
-- spec/integration/multi_xml/xml_spec.rb

data/Appraisals

@@ -1,28 +0,0 @@
-appraise 'rails-3' do
-  gem 'rails', '3.2.22.5'
-  gem 'rack-cache', '<= 1.2' # Pin as next rack-cache version (1.3) removes Ruby1.9 support
-end
-
-appraise 'rails-4' do
-  gem 'rails', '4.2.10'
-end
-
-appraise 'rails-5' do
-  gem 'rails', '5.2.1'
-end
-
-appraise 'rails-edge' do
-  gem 'rails', github: 'rails/rails'
-end
-
-appraise 'rack-edge' do
-  gem 'rack', github: 'rack/rack'
-end
-
-appraise 'multi_json' do
-  gem 'multi_json', require: 'multi_json'
-end
-
-appraise 'multi_xml' do
-  gem 'multi_xml', require: 'multi_xml'
-end