Merge pull request #2643 from ruby-grape/replace_try_by_respond_to

dblock · web-flow · commit 83913612170e · 2025-12-17T09:02:44.000-05:00
Replace all `try` to `respond_to`.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * [#2637](https://github.com/ruby-grape/grape/pull/2637): Refactor declared method - [@ericproulx](https://github.com/ericproulx).
 * [#2639](https://github.com/ruby-grape/grape/pull/2639): Refactor mime_types_for - [@ericproulx](https://github.com/ericproulx).
 * [#2638](https://github.com/ruby-grape/grape/pull/2638): Remove unnecessary path string duplication - [@ericproulx](https://github.com/ericproulx).
+* [#2643](https://github.com/ruby-grape/grape/pull/2638): Remove `try` method in codebase - [@ericproulx](https://github.com/ericproulx).
 * Your contribution here.
 
 #### Fixes
diff --git a/lib/grape.rb b/lib/grape.rb
@@ -19,7 +19,6 @@
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/deep_dup'
-require 'active_support/core_ext/object/try'
 require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/string/output_safety'
 require 'active_support/core_ext/string/exclude'
diff --git a/lib/grape/api.rb b/lib/grape/api.rb
@@ -140,12 +140,12 @@ def skip_immediate_run?(instance, args, kwargs)
       end
 
       def any_lazy?(args)
-        args.any? { |argument| argument.try(:lazy?) }
+        args.any? { |argument| argument_lazy?(argument) }
       end
 
       def evaluate_arguments(configuration, *args)
         args.map do |argument|
-          if argument.try(:lazy?)
+          if argument_lazy?(argument)
             argument.evaluate_from(configuration)
           elsif argument.is_a?(Hash)
             argument.transform_values { |value| evaluate_arguments(configuration, value).first }
@@ -157,12 +157,8 @@ def evaluate_arguments(configuration, *args)
         end
       end
 
-      def never_mounted?
-        mounted_instances.empty?
-      end
-
-      def mounted_instances
-        instances - [base_instance]
+      def argument_lazy?(argument)
+        argument.respond_to?(:lazy?) && argument.lazy?
       end
     end
   end
diff --git a/lib/grape/dsl/declared.rb b/lib/grape/dsl/declared.rb
@@ -75,7 +75,7 @@ def declared_hash_attr(passed_params, options, declared_param, params_nested_pat
         else
           # If it is not a Hash then it does not have children.
           # Find its value or set it to nil.
-          return unless options[:include_missing] || passed_params.try(:key?, declared_param)
+          return unless options[:include_missing] || (passed_params.respond_to?(:key?) && passed_params.key?(declared_param))
 
           rename_path = params_nested_path + [declared_param.to_s]
           renamed_param_name = renamed_params[rename_path]
@@ -103,7 +103,7 @@ def handle_passed_param(params_nested_path, has_passed_children: false, &_block)
 
         if type == 'Hash' && !has_children
           {}
-        elsif type == 'Array' || (type&.start_with?('[') && type.exclude?(','))
+        elsif type == 'Array' || (type&.start_with?('[') && !type.include?(','))
           []
         elsif type == 'Set' || type&.start_with?('#<Set')
           Set.new
diff --git a/lib/grape/dsl/routing.rb b/lib/grape/dsl/routing.rb
@@ -276,7 +276,7 @@ def nest(*blocks, &block)
       def evaluate_as_instance_with_configuration(block, lazy: false)
         lazy_block = Grape::Util::Lazy::Block.new do |configuration|
           value_for_configuration = configuration
-          self.configuration = value_for_configuration.evaluate if value_for_configuration.try(:lazy?)
+          self.configuration = value_for_configuration.evaluate if value_for_configuration.respond_to?(:lazy?) && value_for_configuration.lazy?
           response = instance_eval(&block)
           self.configuration = value_for_configuration
           response
diff --git a/lib/grape/endpoint.rb b/lib/grape/endpoint.rb
@@ -30,7 +30,7 @@ def before_each(new_setup = false, &block)
 
       def run_before_each(endpoint)
         superclass.run_before_each(endpoint) unless self == Endpoint
-        before_each.each { |blk| blk.try(:call, endpoint) }
+        before_each.each { |blk| blk.call(endpoint) }
       end
 
       def block_to_unbound_method(block)
@@ -139,7 +139,7 @@ def call!(env)
     # Return the collection of endpoints within this endpoint.
     # This is the case when an Grape::API mounts another Grape::API.
     def endpoints
-      @endpoints ||= options[:app].try(:endpoints)
+      @endpoints ||= options[:app].respond_to?(:endpoints) ? options[:app].endpoints : nil
     end
 
     def equals?(endpoint)
@@ -234,8 +234,10 @@ def run_validators(validators, request)
     end
 
     def run_filters(filters, type = :other)
+      return unless filters
+
       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
     end
 
diff --git a/lib/grape/middleware/base.rb b/lib/grape/middleware/base.rb
@@ -109,6 +109,10 @@ def merge_default_options(options)
           options
         end
       end
+
+      def try_scrub(obj)
+        (obj.respond_to?(:scrub) && obj.scrub) || obj
+      end
     end
   end
 end
diff --git a/lib/grape/middleware/error.rb b/lib/grape/middleware/error.rb
@@ -58,7 +58,7 @@ def error_response(error = {})
           h.merge!(error[:headers]) if error[:headers].is_a?(Hash)
         end
         backtrace = error[:backtrace] || error[:original_exception]&.backtrace || []
-        original_exception = error.is_a?(Exception) ? error : error[:original_exception] || nil
+        original_exception = error.is_a?(Exception) ? error : error[:original_exception]
         rack_response(status, headers, format_message(message, backtrace, original_exception))
       end
 
diff --git a/lib/grape/middleware/formatter.rb b/lib/grape/middleware/formatter.rb
@@ -69,12 +69,14 @@ def read_body_input
         return if input.nil?
         return unless read_body_input?
 
-        input.try(:rewind)
+        rewind = input.respond_to?(:rewind)
+
+        input.rewind if rewind
         body = env[Grape::Env::API_REQUEST_INPUT] = input.read
         begin
           read_rack_input(body)
         ensure
-          input.try(:rewind)
+          input.rewind if rewind
         end
       end
 
@@ -130,7 +132,7 @@ def negotiate_content_type
       end
 
       def format_from_extension
-        request_path = rack_request.path.try(:scrub)
+        request_path = try_scrub(rack_request.path)
         dot_pos = request_path.rindex('.')
         return unless dot_pos
 
@@ -139,7 +141,7 @@ def format_from_extension
       end
 
       def format_from_header
-        accept_header = env['HTTP_ACCEPT'].try(:scrub)
+        accept_header = try_scrub(env['HTTP_ACCEPT'])
         return if accept_header.blank? || accept_header == ALL_MEDIA_TYPES
 
         media_type = Rack::Utils.best_q_match(accept_header, mime_types.keys)
diff --git a/lib/grape/middleware/versioner/accept_version_header.rb b/lib/grape/middleware/versioner/accept_version_header.rb
@@ -18,7 +18,7 @@ module Versioner
       # route.
       class AcceptVersionHeader < Base
         def before
-          potential_version = env['HTTP_ACCEPT_VERSION'].try(:scrub)
+          potential_version = try_scrub(env['HTTP_ACCEPT_VERSION'])
           not_acceptable!('Accept-Version header must be set.') if strict && potential_version.blank?
 
           return if potential_version.blank?
diff --git a/lib/grape/router.rb b/lib/grape/router.rb
@@ -109,7 +109,7 @@ def transaction(input, method, env)
             return response unless cascade
 
             # we need to close the body if possible before dismissing
-            response[2].try(:close)
+            response[2].close if response[2].respond_to?(:close)
           end
         end
       end
diff --git a/lib/grape/validations/params_scope.rb b/lib/grape/validations/params_scope.rb
@@ -78,7 +78,7 @@ def initialize(opts, &block)
       end
 
       def configuration
-        @api.configuration.respond_to?(:evaluate) ? @api.configuration.evaluate : @api.configuration
+        (@api.configuration.respond_to?(:evaluate) && @api.configuration.evaluate) || @api.configuration
       end
 
       # @return [Boolean] whether or not this entire scope needs to be
@@ -120,8 +120,8 @@ def meets_hash_dependency?(params)
           if dependency.is_a?(Hash)
             dependency_key = dependency.keys[0]
             proc = dependency.values[0]
-            return false unless proc.call(params.try(:[], dependency_key))
-          elsif params.respond_to?(:key?) && params.try(:[], dependency).blank?
+            return false unless proc.call(params[dependency_key])
+          elsif params[dependency].blank?
             return false
           end
         end
diff --git a/lib/grape/validations/validators/base.rb b/lib/grape/validations/validators/base.rb
@@ -49,7 +49,7 @@ def validate!(params)
             next if !@scope.required? && empty_val
             next unless @scope.meets_dependency?(val, params)
 
-            validate_param!(attr_name, val) if @required || val.try(:key?, attr_name)
+            validate_param!(attr_name, val) if @required || (val.respond_to?(:key?) && val.key?(attr_name))
           rescue Grape::Exceptions::Validation => e
             array_errors << e
           end
@@ -69,7 +69,7 @@ def message(default_key = nil)
 
         def options_key?(key, options = nil)
           options = instance_variable_get(:@option) if options.nil?
-          options.try(:key?, key) && !options[key].nil?
+          options.respond_to?(:key?) && options.key?(key) && !options[key].nil?
         end
 
         def fail_fast?
diff --git a/lib/grape/validations/validators/except_values_validator.rb b/lib/grape/validations/validators/except_values_validator.rb
@@ -10,7 +10,7 @@ def initialize(attrs, options, required, scope, opts)
         end
 
         def validate_param!(attr_name, params)
-          return unless params.try(:key?, attr_name)
+          return unless params.respond_to?(:key?) && params.key?(attr_name)
 
           excepts = @except.is_a?(Proc) ? @except.call : @except
           return if excepts.nil?
diff --git a/lib/grape/validations/validators/presence_validator.rb b/lib/grape/validations/validators/presence_validator.rb
@@ -5,7 +5,7 @@ module Validations
     module Validators
       class PresenceValidator < Base
         def validate_param!(attr_name, params)
-          return if params.try(:key?, attr_name)
+          return if params.respond_to?(:key?) && params.key?(attr_name)
 
           raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:presence))
         end
diff --git a/lib/grape/validations/validators/regexp_validator.rb b/lib/grape/validations/validators/regexp_validator.rb
@@ -5,7 +5,7 @@ module Validations
     module Validators
       class RegexpValidator < Base
         def validate_param!(attr_name, params)
-          return unless params.try(:key?, attr_name)
+          return unless params.respond_to?(:key) && params.key?(attr_name)
           return if Array.wrap(params[attr_name]).all? { |param| param.nil? || param.to_s.scrub.match?((options_key?(:value) ? @option[:value] : @option)) }
 
           raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:regexp))
diff --git a/spec/support/chunked_response.rb b/spec/support/chunked_response.rb
@@ -29,7 +29,7 @@ def each(&block)
 
     # Close the response body if the response body supports it.
     def close
-      @body.try(:close)
+      @body.close if @body.respond_to?(:close)
     end
 
     private
