grape 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40277732454d8810e4e96f638da9e6bd4ab818e39ac9c30788791cb4bd429871
-  data.tar.gz: b075dd96ba3dda6fcd05e6b1c126255b5e206b2d6bb9bf9b52f9cd6ec25a6efc
+  metadata.gz: ac7bd232782ed265b59ec7f4ea0dec03a0896b328694ebe1507cf9680e1bee41
+  data.tar.gz: b81cb45c2b6daab5b413af0df615a542907c9fbf1732e3fc46347321dedc4f65
 SHA512:
-  metadata.gz: 61d1ef36c90927e08119b6abf57b87fc5317b7b4ac73587d14bc23c9b671e0e76930b89b22d15ec806861f2c60c582647a4f95bc6a1100dca07066be1853d4e6
-  data.tar.gz: 42a4595d466b2092759dee55ad467a6733e29912b0faaf3abe203c18ab1c84b53b6a1d45868102ac16e6b431254664a6762b3ec0b8e52217c777f99adcf965cc
+  metadata.gz: 1929a95447ec3923443e908a8240195e7e4a0f5a3113f8679e947cc3813e800f45f35c928dfef9495ff277a983bf3bdcb4ca358ab889e28224d890a3d078d7de
+  data.tar.gz: 4d5141c1f331ee07eaa78bd89e1b76f99b6cbcb7d6f0dda3f12f9e6b900c977c9a0757c0d912a6cd53ea5ef9bce8409a211c4a77c4b78a0f5e607ecd1e055480

data/CHANGELOG.md

@@ -1,4 +1,25 @@
-### 1.7.1 (2023/05/14)
+### 1.8.0 (2023/08/30)
+
+#### Features
+
+* [#2326](https://github.com/ruby-grape/grape/pull/2326): Use ActiveSupport extensions - [@ericproulx](https://github.com/ericproulx).
+* [#2327](https://github.com/ruby-grape/grape/pull/2327): Use ActiveSupport deprecation - [@ericproulx](https://github.com/ericproulx).
+* [#2330](https://github.com/ruby-grape/grape/pull/2330): Use ActiveSupport inflector - [@ericproulx](https://github.com/ericproulx).
+* [#2331](https://github.com/ruby-grape/grape/pull/2331): Memory optimization when running validators - [@ericproulx](https://github.com/ericproulx).
+* [#2332](https://github.com/ruby-grape/grape/pull/2332): Use ActiveSupport configurable - [@ericproulx](https://github.com/ericproulx).
+* [#2333](https://github.com/ruby-grape/grape/pull/2333): Use custom messages in parameter validation with arity 1 - [@thedevjoao](https://github.com/TheDevJoao).
+* [#2341](https://github.com/ruby-grape/grape/pull/2341): Stop yielding skip value - [@ericproulx](https://github.com/ericproulx).
+* [#2342](https://github.com/ruby-grape/grape/pull/2342): Allow specifying a handler for grape_exceptions - [@mscrivo](https://github.com/mscrivo).
+* [#2338](https://github.com/ruby-grape/grape/pull/2338): Fix unknown validator when using requires/optional with entity - [@mscrivo](https://github.com/mscrivo).
+
+#### Fixes
+
+* [#2339](https://github.com/ruby-grape/grape/pull/2339): Documentation and specs for remountable configuration in params - [@myxoh](https://github.com/myxoh).
+* [#2328](https://github.com/ruby-grape/grape/pull/2328): Don't cache Class.instance_methods - [@byroot](https://github.com/byroot).
+* [#2337](https://github.com/ruby-grape/grape/pull/2337): Fix: allow custom validators that do not end with _validator - [@ericproulx](https://github.com/ericproulx).
+* [#2346](https://github.com/ruby-grape/grape/pull/2346): Adjust test expectations to conform to rack 3 - [@kbarrette](https://github.com/kbarrette).
+
+## 1.7.1 (2023/05/14)
 
 #### Features
 

data/CONTRIBUTING.md

@@ -145,7 +145,7 @@ git push origin my-feature-branch -f
 
 #### Check on Your Pull Request
 
-Go back to your pull request after a few minutes and see whether it passed muster with Travis-CI. Everything should look green, otherwise fix issues and amend your commit as described above.
+Go back to your pull request after a few minutes and see whether it passed muster with CI. Everything should look green, otherwise fix issues and amend your commit as described above.
 
 #### Be Patient
 

data/README.md

@@ -159,7 +159,7 @@ content negotiation, versioning and much more.
 
 ## Stable Release
 
-You're reading the documentation for the stable release of Grape, 1.7.1.
+You're reading the documentation for the stable release of Grape, **1.8.0**.
 Please read [UPGRADING](UPGRADING.md) when upgrading from a previous version.
 
 ## Project Resources
@@ -524,15 +524,15 @@ end
 ```ruby
 class BasicAPI < Grape::API
   desc 'Statuses index' do
-    params: mounted { configuration[:entity] || API::Entities::Status }.documentation
+    params: (configuration[:entity] || API::Entities::Status).documentation
   end
   params do
-    requires :all, using: mounted { configuration[:entity] || API::Entities::Status }.documentation
+    requires :all, using: (configuration[:entity] || API::Entities::Status).documentation
   end
   get '/statuses' do
     statuses = Status.all
     type = current_user.admin? ? :full : :default
-    present statuses, with: mounted { configuration[:entity] || API::Entities::Status }, type: type
+    present statuses, with: (configuration[:entity] || API::Entities::Status), type: type
   end
 end
 
@@ -2624,6 +2624,14 @@ class Twitter::API < Grape::API
 end
 ```
 
+If you want to customize the shape of grape exceptions returned to the user, to match your `:all` handler for example, you can pass a block to `rescue_from :grape_exceptions`.
+
+```ruby
+rescue_from :grape_exceptions do |e|
+  error!(e, e.status)
+end
+```
+
 You can also rescue specific exceptions.
 
 ```ruby

data/grape.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
     'source_code_uri' => "https://github.com/ruby-grape/grape/tree/v#{s.version}"
   }
 
-  s.add_runtime_dependency 'activesupport'
+  s.add_runtime_dependency 'activesupport', '>= 5'
   s.add_runtime_dependency 'builder'
   s.add_runtime_dependency 'dry-types', '>= 1.1'
   s.add_runtime_dependency 'mustermann-grape', '~> 1.0.0'
-  s.add_runtime_dependency 'rack', '>= 1.3.0', '< 3'
+  s.add_runtime_dependency 'rack', '>= 1.3.0'
   s.add_runtime_dependency 'rack-accept'
 
   s.files         = %w[CHANGELOG.md CONTRIBUTING.md README.md grape.png UPGRADING.md LICENSE]

data/lib/grape/api.rb

@@ -8,7 +8,7 @@ module Grape
   # should subclass this class in order to build an API.
   class API
     # Class methods that we want to call on the API rather than on the API object
-    NON_OVERRIDABLE = (Class.new.methods + %i[call call! configuration compile! inherited]).freeze
+    NON_OVERRIDABLE = %i[call call! configuration compile! inherited].freeze
 
     class Boolean
       def self.build(val)
@@ -50,7 +50,7 @@ module Grape
 
       # Redefines all methods so that are forwarded to add_setup and be recorded
       def override_all_methods!
-        (base_instance.methods - NON_OVERRIDABLE).each do |method_override|
+        (base_instance.methods - Class.methods - NON_OVERRIDABLE).each do |method_override|
           define_singleton_method(method_override) do |*args, &block|
             add_setup(method_override, *args, &block)
           end

data/lib/grape/content_types.rb

@@ -17,17 +17,11 @@ module Grape
 
     class << self
       def content_types_for_settings(settings)
-        return if settings.blank?
-
-        settings.each_with_object({}) { |value, result| result.merge!(value) }
+        settings&.inject(:merge!)
       end
 
       def content_types_for(from_settings)
-        if from_settings.present?
-          from_settings
-        else
-          Grape::ContentTypes::CONTENT_TYPES.merge(default_elements)
-        end
+        from_settings.presence || Grape::ContentTypes::CONTENT_TYPES.merge(default_elements)
       end
     end
   end

data/lib/grape/dsl/desc.rb

@@ -68,7 +68,7 @@ module Grape
           end
 
           config_class.configure(&config_block)
-          warn '[DEPRECATION] Passing a options hash and a block to `desc` is deprecated. Move all hash options to block.' unless options.empty?
+          ActiveSupport::Deprecation.warn('Passing a options hash and a block to `desc` is deprecated. Move all hash options to block.') if options.any?
           options = config_class.settings
         else
           options = options.merge(description: description)

data/lib/grape/dsl/inside_route.rb

@@ -103,7 +103,7 @@ module Grape
 
           if type == 'Hash' && !has_children
             {}
-          elsif type == 'Array' || (type&.start_with?('[') && !type&.include?(','))
+          elsif type == 'Array' || (type&.start_with?('[') && type&.exclude?(','))
             []
           elsif type == 'Set' || type&.start_with?('#<Set')
             Set.new
@@ -280,13 +280,13 @@ module Grape
       # Deprecated method to send files to the client. Use `sendfile` or `stream`
       def file(value = nil)
         if value.is_a?(String)
-          warn '[DEPRECATION] Use sendfile or stream to send files.'
+          ActiveSupport::Deprecation.warn('Use sendfile or stream to send files.')
           sendfile(value)
         elsif !value.is_a?(NilClass)
-          warn '[DEPRECATION] Use stream to use a Stream object.'
+          ActiveSupport::Deprecation.warn('Use stream to use a Stream object.')
           stream(value)
         else
-          warn '[DEPRECATION] Use sendfile or stream to send files.'
+          ActiveSupport::Deprecation.warn('Use sendfile or stream to send files.')
           sendfile
         end
       end
@@ -433,7 +433,7 @@ module Grape
       #   the given entity_class.
       def entity_representation_for(entity_class, object, options)
         embeds = { env: env }
-        embeds[:version] = env[Grape::Env::API_VERSION] if env[Grape::Env::API_VERSION]
+        embeds[:version] = env[Grape::Env::API_VERSION] if env.key?(Grape::Env::API_VERSION)
         entity_class.represent(object, **embeds.merge(options))
       end
     end

data/lib/grape/dsl/request_response.rb

@@ -112,10 +112,11 @@ module Grape
 
           if args.include?(:all)
             namespace_inheritable(:rescue_all, true)
-            namespace_inheritable :all_rescue_handler, handler
+            namespace_inheritable(:all_rescue_handler, handler)
           elsif args.include?(:grape_exceptions)
             namespace_inheritable(:rescue_all, true)
             namespace_inheritable(:rescue_grape_exceptions, true)
+            namespace_inheritable(:grape_exceptions_rescue_handler, handler)
           else
             handler_type =
               case options[:rescue_subclasses]

data/lib/grape/dsl/settings.rb

@@ -109,13 +109,9 @@ module Grape
         settings = get_or_set :namespace_reverse_stackable, key, nil
         return if settings.blank?
 
-        result = {}
-        settings.each do |setting|
-          setting.each do |field, value|
-            result[field] ||= value
-          end
+        settings.each_with_object({}) do |setting, result|
+          result.merge!(setting) { |_k, s1, _s2| s1 }
         end
-        result
       end
 
       # (see #unset_global_setting)

data/lib/grape/endpoint.rb

@@ -171,10 +171,9 @@ module Grape
     end
 
     def prepare_routes_requirements
-      endpoint_requirements = options[:route_options][:requirements] || {}
-      all_requirements = (namespace_stackable(:namespace).map(&:requirements) << endpoint_requirements)
-      all_requirements.reduce({}) do |base_requirements, single_requirements|
-        base_requirements.merge!(single_requirements)
+      {}.merge!(*namespace_stackable(:namespace).map(&:requirements)).tap do |requirements|
+        endpoint_requirements = options.dig(:route_options, :requirements)
+        requirements.merge!(endpoint_requirements) if endpoint_requirements
       end
     end
 
@@ -293,7 +292,8 @@ module Grape
                 rescue_options: namespace_stackable_with_hash(:rescue_options) || {},
                 rescue_handlers: namespace_reverse_stackable_with_hash(:rescue_handlers) || {},
                 base_only_rescue_handlers: namespace_stackable_with_hash(:base_only_rescue_handlers) || {},
-                all_rescue_handler: namespace_inheritable(:all_rescue_handler)
+                all_rescue_handler: namespace_inheritable(:all_rescue_handler),
+                grape_exceptions_rescue_handler: namespace_inheritable(:grape_exceptions_rescue_handler)
 
       stack.concat namespace_stackable(:middleware)
 
@@ -318,8 +318,8 @@ module Grape
     end
 
     def build_helpers
-      helpers = namespace_stackable(:helpers) || []
-      Module.new { helpers.each { |mod_to_include| include mod_to_include } }
+      helpers = namespace_stackable(:helpers)
+      Module.new { helpers&.each { |mod_to_include| include mod_to_include } }
     end
 
     private :build_stack, :build_helpers
@@ -345,11 +345,9 @@ module Grape
       end
     end
 
-    def run_validators(validator_factories, request)
+    def run_validators(validators, request)
       validation_errors = []
 
-      validators = validator_factories.map { |options| Grape::Validations::ValidatorFactory.create_validator(**options) }
-
       ActiveSupport::Notifications.instrument('endpoint_run_validators.grape', endpoint: self, validators: validators, request: request) do
         validators.each do |validator|
           validator.validate(request)
@@ -367,34 +365,38 @@ module Grape
 
     def run_filters(filters, type = :other)
       ActiveSupport::Notifications.instrument('endpoint_run_filters.grape', endpoint: self, filters: filters, type: type) do
-        (filters || []).each { |filter| instance_eval(&filter) }
+        filters&.each { |filter| instance_eval(&filter) }
       end
       post_extension = DSL::InsideRoute.post_filter_methods(type)
       extend post_extension if post_extension
     end
 
     def befores
-      namespace_stackable(:befores) || []
+      namespace_stackable(:befores)
     end
 
     def before_validations
-      namespace_stackable(:before_validations) || []
+      namespace_stackable(:before_validations)
     end
 
     def after_validations
-      namespace_stackable(:after_validations) || []
+      namespace_stackable(:after_validations)
     end
 
     def afters
-      namespace_stackable(:afters) || []
+      namespace_stackable(:afters)
     end
 
     def finallies
-      namespace_stackable(:finallies) || []
+      namespace_stackable(:finallies)
     end
 
     def validations
-      route_setting(:saved_validations) || []
+      return enum_for(:validations) unless block_given?
+
+      route_setting(:saved_validations)&.each do |saved_validation|
+        yield Grape::Validations::ValidatorFactory.create_validator(**saved_validation)
+      end
     end
 
     def options?

data/lib/grape/error_formatter/base.rb

@@ -27,7 +27,7 @@ module Grape
 
         if presenter
           embeds = { env: env }
-          embeds[:version] = env[Grape::Env::API_VERSION] if env[Grape::Env::API_VERSION]
+          embeds[:version] = env[Grape::Env::API_VERSION] if env.key?(Grape::Env::API_VERSION)
           presented_message = presenter.represent(presented_message, embeds).serializable_hash
         end
 

data/lib/grape/exceptions/base.rb

@@ -73,11 +73,11 @@ module Grape
         options = options.dup
         options[:default] &&= options[:default].to_s
         message = ::I18n.translate(key, **options)
-        message.present? ? message : fallback_message(key, **options)
+        message.presence || fallback_message(key, **options)
       end
 
       def fallback_message(key, **options)
-        if ::I18n.enforce_available_locales && !::I18n.available_locales.include?(FALLBACK_LOCALE)
+        if ::I18n.enforce_available_locales && ::I18n.available_locales.exclude?(FALLBACK_LOCALE)
           key
         else
           ::I18n.translate(key, locale: FALLBACK_LOCALE, **options)

data/lib/grape/exceptions/missing_group_type.rb

@@ -10,9 +10,4 @@ module Grape
   end
 end
 
-Grape::Exceptions::MissingGroupTypeError = Class.new(Grape::Exceptions::MissingGroupType) do
-  def initialize(*)
-    super
-    warn '[DEPRECATION] `Grape::Exceptions::MissingGroupTypeError` is deprecated. Use `Grape::Exceptions::MissingGroupType` instead.'
-  end
-end
+Grape::Exceptions::MissingGroupTypeError = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Grape::Exceptions::MissingGroupTypeError', 'Grape::Exceptions::MissingGroupType')

data/lib/grape/exceptions/unsupported_group_type.rb

@@ -10,9 +10,4 @@ module Grape
   end
 end
 
-Grape::Exceptions::UnsupportedGroupTypeError = Class.new(Grape::Exceptions::UnsupportedGroupType) do
-  def initialize(*)
-    super
-    warn '[DEPRECATION] `Grape::Exceptions::UnsupportedGroupTypeError` is deprecated. Use `Grape::Exceptions::UnsupportedGroupType` instead.'
-  end
-end
+Grape::Exceptions::UnsupportedGroupTypeError = ActiveSupport::Deprecation::DeprecatedConstantProxy.new('Grape::Exceptions::UnsupportedGroupTypeError', 'Grape::Exceptions::UnsupportedGroupType')

data/lib/grape/exceptions/validation_errors.rb

@@ -13,12 +13,7 @@ module Grape
       attr_reader :errors
 
       def initialize(errors: [], headers: {}, **_options)
-        @errors = {}
-        errors.each do |validation_error|
-          @errors[validation_error.params] ||= []
-          @errors[validation_error.params] << validation_error
-        end
-
+        @errors = errors.group_by(&:params)
         super message: full_messages.join(', '), status: 400, headers: headers
       end
 

data/lib/grape/extensions/active_support/hash_with_indifferent_access.rb

@@ -16,9 +16,9 @@ module Grape
           end
 
           def build_params
-            params = ::ActiveSupport::HashWithIndifferentAccess.new(rack_params)
-            params.deep_merge!(grape_routing_args) if env[Grape::Env::GRAPE_ROUTING_ARGS]
-            params
+            ::ActiveSupport::HashWithIndifferentAccess.new(rack_params).tap do |params|
+              params.deep_merge!(grape_routing_args) if env.key?(Grape::Env::GRAPE_ROUTING_ARGS)
+            end
           end
         end
       end

data/lib/grape/extensions/hash.rb

@@ -11,13 +11,10 @@ module Grape
         end
 
         def build_params
-          params = Grape::Extensions::DeepMergeableHash[rack_params]
-          params.deep_merge!(grape_routing_args) if env[Grape::Env::GRAPE_ROUTING_ARGS]
-          post_process_params(params)
-        end
-
-        def post_process_params(params)
-          Grape::Extensions::DeepSymbolizeHash.deep_symbolize_keys_in(params)
+          rack_params.deep_dup.tap do |params|
+            params.deep_merge!(grape_routing_args) if env.key?(Grape::Env::GRAPE_ROUTING_ARGS)
+            params.deep_symbolize_keys!
+          end
         end
       end
     end

data/lib/grape/extensions/hashie/mash.rb

@@ -15,9 +15,9 @@ module Grape
           end
 
           def build_params
-            params = ::Hashie::Mash.new(rack_params)
-            params.deep_merge!(grape_routing_args) if env[Grape::Env::GRAPE_ROUTING_ARGS]
-            params
+            ::Hashie::Mash.new(rack_params).tap do |params|
+              params.deep_merge!(grape_routing_args) if env.key?(Grape::Env::GRAPE_ROUTING_ARGS)
+            end
           end
         end
       end

data/lib/grape/formatter/serializable_hash.rb

@@ -15,24 +15,24 @@ module Grape
         private
 
         def serializable?(object)
-          object.respond_to?(:serializable_hash) || (object.is_a?(Array) && object.all? { |o| o.respond_to? :serializable_hash }) || object.is_a?(Hash)
+          object.respond_to?(:serializable_hash) || array_serializable?(object) || object.is_a?(Hash)
         end
 
         def serialize(object)
           if object.respond_to? :serializable_hash
             object.serializable_hash
-          elsif object.is_a?(Array) && object.all? { |o| o.respond_to? :serializable_hash }
+          elsif array_serializable?(object)
             object.map(&:serializable_hash)
           elsif object.is_a?(Hash)
-            h = {}
-            object.each_pair do |k, v|
-              h[k] = serialize(v)
-            end
-            h
+            object.transform_values { |v| serialize(v) }
           else
             object
           end
         end
+
+        def array_serializable?(object)
+          object.is_a?(Array) && object.all? { |o| o.respond_to? :serializable_hash }
+        end
       end
     end
   end

data/lib/grape/middleware/auth/base.rb

@@ -28,7 +28,7 @@ module Grape
 
             strategy_info = Grape::Middleware::Auth::Strategies[options[:type]]
 
-            throw(:error, status: 401, message: 'API Authorization Failed.') unless strategy_info.present?
+            throw(:error, status: 401, message: 'API Authorization Failed.') if strategy_info.blank?
 
             strategy = strategy_info.create(@app, options) do |*args|
               auth_proc_context.instance_exec(*args, &auth_proc)

data/lib/grape/middleware/error.rb

@@ -109,7 +109,7 @@ module Grape
         return :error_response if klass == Grape::Exceptions::InvalidVersionHeader
         return unless options[:rescue_grape_exceptions] || !options[:rescue_all]
 
-        :error_response
+        options[:grape_exceptions_rescue_handler] || :error_response
       end
 
       def rescue_handler_for_any_class(klass)

data/lib/grape/middleware/formatter.rb

@@ -103,7 +103,7 @@ module Grape
           begin
             body = (env[Grape::Env::API_REQUEST_BODY] = parser.call(body, env))
             if body.is_a?(Hash)
-              env[Grape::Env::RACK_REQUEST_FORM_HASH] = if env[Grape::Env::RACK_REQUEST_FORM_HASH]
+              env[Grape::Env::RACK_REQUEST_FORM_HASH] = if env.key?(Grape::Env::RACK_REQUEST_FORM_HASH)
                                                           env[Grape::Env::RACK_REQUEST_FORM_HASH].merge(body)
                                                         else
                                                           body

data/lib/grape/middleware/versioner/header.rb

@@ -57,8 +57,7 @@ module Grape
         end
 
         def strict_version_vendor_accept_header_presence_check
-          return unless versions.present?
-          return if an_accept_header_with_version_and_vendor_is_present?
+          return if versions.blank? || an_accept_header_with_version_and_vendor_is_present?
 
           fail_with_invalid_accept_header!('API vendor or version not found.')
         end
@@ -101,25 +100,18 @@ module Grape
         end
 
         def available_media_types
-          available_media_types = []
-
-          content_types.each_key do |extension|
-            versions.reverse_each do |version|
-              available_media_types += [
-                "application/vnd.#{vendor}-#{version}+#{extension}",
-                "application/vnd.#{vendor}-#{version}"
-              ]
+          [].tap do |available_media_types|
+            content_types.each_key do |extension|
+              versions.reverse_each do |version|
+                available_media_types << "application/vnd.#{vendor}-#{version}+#{extension}"
+                available_media_types << "application/vnd.#{vendor}-#{version}"
+              end
+              available_media_types << "application/vnd.#{vendor}+#{extension}"
             end
-            available_media_types << "application/vnd.#{vendor}+#{extension}"
-          end
-
-          available_media_types << "application/vnd.#{vendor}"
 
-          content_types.each_value do |media_type|
-            available_media_types << media_type
+            available_media_types << "application/vnd.#{vendor}"
+            available_media_types.concat(content_types.values.flatten)
           end
-
-          available_media_types.flatten
         end
 
         def headers_contain_wrong_vendor?
@@ -130,7 +122,7 @@ module Grape
 
         def headers_contain_wrong_version?
           header.values.all? do |header_value|
-            version?(header_value) && !versions.include?(request_version(header_value))
+            version?(header_value) && versions.exclude?(request_version(header_value))
           end
         end
 

data/lib/grape/router/route.rb

@@ -84,9 +84,7 @@ module Grape
         path, line = *location.scan(SOURCE_LOCATION_REGEXP).first
         path = File.realpath(path) if Pathname.new(path).relative?
         expected ||= name
-        warn <<~WARNING
-          #{path}:#{line}: The route_xxx methods such as route_#{name} have been deprecated, please use #{expected}.
-        WARNING
+        ActiveSupport::Deprecation.warn("#{path}:#{line}: The route_xxx methods such as route_#{name} have been deprecated, please use #{expected}.")
       end
     end
   end

data/lib/grape/util/lazy_value.rb

@@ -70,29 +70,21 @@ module Grape
       end
 
       def evaluate
-        evaluated = []
-        @value_hash.each_with_index do |value, index|
-          evaluated[index] = value.evaluate
-        end
-        evaluated
+        @value_hash.map(&:evaluate)
       end
     end
 
     class LazyValueHash < LazyValueEnumerable
       def initialize(hash)
         super
-        @value_hash = {}.with_indifferent_access
+        @value_hash = ActiveSupport::HashWithIndifferentAccess.new
         hash.each do |key, value|
           self[key] = value
         end
       end
 
       def evaluate
-        evaluated = {}.with_indifferent_access
-        @value_hash.each do |key, value|
-          evaluated[key] =  value.evaluate
-        end
-        evaluated
+        @value_hash.transform_values(&:evaluate)
       end
     end
   end

data/lib/grape/util/strict_hash_configuration.rb

@@ -66,11 +66,10 @@ module Grape
           end
 
           define_method :to_hash do
-            merge_hash = {}
-            setting_name.each_key { |k| merge_hash[k] = send("#{k}_context").to_hash }
-
             @settings.to_hash.merge(
-              merge_hash
+              setting_name.each_key.with_object({}) do |k, merge_hash|
+                merge_hash[k] = send("#{k}_context").to_hash
+              end
             )
           end
         end

data/lib/grape/validations/multiple_attributes_iterator.rb

@@ -6,7 +6,7 @@ module Grape
       private
 
       def yield_attributes(resource_params, _attrs)
-        yield resource_params, skip?(resource_params)
+        yield resource_params unless skip?(resource_params)
       end
     end
   end