rubocop-rails 2.35.5 → 2.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5620166bbbdcac74d58be7dec4ea307fc841d7cd31ffd9684f422009d00b8754
-  data.tar.gz: 7c156916d1a363419097086b305baf6010361473443602ea477ff03894c5e350
+  metadata.gz: 5fcf30164d8e9727b16702ab937a902890c342d02c1865e4588295a355380f7a
+  data.tar.gz: 8c88a959e8b7b07e6751c6a385302deabc39f8bf328278b979d62c46becaccc7
 SHA512:
-  metadata.gz: fccc029e306ebaf72e1809005110005d18416b9d314c347b24b2381bdd84fa70c9e2d175633501618881c883e205ae0e79ed9aef3dcee4d4b16f6b02fce51818
-  data.tar.gz: 704f46a2a6c8b53eeeb8ac8ac60bfb25c39aa096e3b99516b132405f604729f48a877066b0531697e6ab8f1f65a9638435013c6610c5be5767e0b955d7d17300
+  metadata.gz: bc070f9148d8b3b8d87c06cf95ae2b604eb81758548cfab082a38300760ac714ac0d1741e19c8c7d604563868be6b03b4c1b1bdc87af6d7999a4386aa37701d4
+  data.tar.gz: 14e8a2fa9886a93625e49678688e7b00e2075bfcfa00a04adc23c3de5d3b8e9fd3c5be88b19e532d4cd30b1dc746320b273f0a2c7f7b984625e1a6874f16d649

data/lib/rubocop/cop/rails/eager_evaluation_log_message.rb

@@ -42,7 +42,7 @@ module RuboCop
         end
 
         def on_send(node)
-          return if node.parent&.block_type?
+          return if node.block_literal?
 
           interpolated_string_passed_to_debug(node) do |arguments|
             range = replacement_range(node)

data/lib/rubocop/cop/rails/reversible_migration.rb

@@ -294,6 +294,8 @@ module RuboCop
             false
           when :remove
             target_rails_version >= 6.1 && all_hash_key?(node.last_argument, :type)
+          when :remove_index
+            reversible_remove_index?(node)
           when :change_default, :change_column_default, :change_table_comment,
                :change_column_comment
             all_hash_key?(node.last_argument, :from, :to)
@@ -302,6 +304,12 @@ module RuboCop
           end
         end
 
+        def reversible_remove_index?(node)
+          return true if node.arguments.any? { |arg| !arg.hash_type? }
+
+          all_hash_key?(node.last_argument, :column)
+        end
+
         def within_change_method?(node)
           node.each_ancestor(:def).any? do |ancestor|
             ancestor.method?(:change)

data/lib/rubocop/cop/rails/safe_navigation.rb

@@ -12,8 +12,10 @@ module RuboCop
       #   foo.try!(:bar)
       #   foo.try!(:bar, baz)
       #   foo.try!(:bar) { |e| e.baz }
+      #   foo.try!(&:bar)
       #
       #   foo.try!(:[], 0)
+      #   foo.try!(:==, baz)
       #
       #   # good
       #   foo.try(:bar)
@@ -23,20 +25,28 @@ module RuboCop
       #   foo&.bar
       #   foo&.bar(baz)
       #   foo&.bar { |e| e.baz }
+      #   foo&.[](0)
+      #   foo&.==(baz)
       #
       # @example ConvertTry: true
       #   # bad
       #   foo.try!(:bar)
       #   foo.try!(:bar, baz)
       #   foo.try!(:bar) { |e| e.baz }
+      #   foo.try!(&:bar)
       #   foo.try(:bar)
       #   foo.try(:bar, baz)
       #   foo.try(:bar) { |e| e.baz }
+      #   foo.try(&:bar)
+      #   foo.try(:[], 0)
+      #   foo.try(:==, baz)
       #
       #   # good
       #   foo&.bar
       #   foo&.bar(baz)
       #   foo&.bar { |e| e.baz }
+      #   foo&.[](0)
+      #   foo&.==(baz)
       class SafeNavigation < Base
         include RangeHelp
         extend AutoCorrector
@@ -51,6 +61,11 @@ module RuboCop
           (send _ ${:try :try!} $_ ...)
         PATTERN
 
+        # Extracts the method name from a symbol-to-proc block argument, e.g. `:foo` from `try(&:foo)`.
+        def_node_matcher :symbol_proc_method, <<~PATTERN
+          (block_pass (sym $_))
+        PATTERN
+
         def self.autocorrect_incompatible_with
           [Style::RedundantSelf]
         end
@@ -58,11 +73,16 @@ module RuboCop
         def on_send(node)
           try_call(node) do |try_method, dispatch|
             return if try_method == :try && !cop_config['ConvertTry']
-            return unless dispatch.sym_type? && dispatch.value.match?(/\w+[=!?]?/)
+            return unless dispatch.sym_type? || symbol_proc_method(dispatch)
+            # When a `try` is nested in another `try`'s argument, correcting both at once
+            # produces overlapping replacements. Correct the outer one first and defer the
+            # inner one to a subsequent pass.
+            return if part_of_ignored_node?(node)
 
             add_offense(node, message: format(MSG, try: try_method)) do |corrector|
               autocorrect(corrector, node)
             end
+            ignore_node(node)
           end
         end
 
@@ -70,7 +90,6 @@ module RuboCop
 
         def autocorrect(corrector, node)
           method_node, *params = *node.arguments
-          method = method_node.source[1..]
 
           range = if node.receiver
                     range_between(node.loc.dot.begin_pos, node.source_range.end_pos)
@@ -79,13 +98,16 @@ module RuboCop
                     node
                   end
 
-          corrector.replace(range, replacement(method, params))
+          corrector.replace(range, replacement(method_node, params))
         end
 
-        def replacement(method, params)
+        def replacement(method_node, params)
+          return "&.#{symbol_proc_method(method_node)}" if method_node.block_pass_type?
+
+          method = method_node.source[1..]
           new_params = params.map(&:source).join(', ')
 
-          if method.end_with?('=')
+          if setter_method?(method)
             "&.#{method[0...-1]} = #{new_params}"
           elsif params.empty?
             "&.#{method}"
@@ -93,6 +115,12 @@ module RuboCop
             "&.#{method}(#{new_params})"
           end
         end
+
+        # Operator methods such as `==` and `[]=` also end with `=`, but they are not setters
+        # and must keep the explicit call form (e.g. `&.==(bar)`, `&.[]=(key, value)`).
+        def setter_method?(method)
+          method.match?(/\A\w+=\z/)
+        end
       end
     end
   end

data/lib/rubocop/rails/migration_file_skippable.rb

@@ -29,10 +29,6 @@ module RuboCop
         super if method(__method__).super_method
       end
 
-      def self.apply_to_cops!
-        RuboCop::Cop::Registry.all.each { |cop| cop.prepend(MigrationFileSkippable) }
-      end
-
       private
 
       def already_migrated_file?

data/lib/rubocop/rails/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Rails
     # This module holds the RuboCop Rails version information.
     module Version
-      STRING = '2.35.5'
+      STRING = '2.36.0'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

data/lib/rubocop-rails.rb

@@ -12,7 +12,8 @@ require_relative 'rubocop/rails/plugin'
 require_relative 'rubocop/cop/rails_cops'
 
 require_relative 'rubocop/rails/migration_file_skippable'
-RuboCop::Rails::MigrationFileSkippable.apply_to_cops!
+
+RuboCop::Cop::Base.prepend(RuboCop::Rails::MigrationFileSkippable)
 
 RuboCop::Cop::Style::HashExcept.minimum_target_ruby_version(2.0)
 
@@ -39,3 +40,11 @@ RuboCop::Cop::Style::RedundantSelf.singleton_class.prepend(
     end
   end
 )
+
+RuboCop::Cop::Style::TrailingCommaInArguments.singleton_class.prepend(
+  Module.new do
+    def autocorrect_incompatible_with
+      super.push(RuboCop::Cop::Rails::LinkToBlank)
+    end
+  end
+)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails
 version: !ruby/object:Gem::Version
-  version: 2.35.5
+  version: 2.36.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -269,7 +269,7 @@ metadata:
   homepage_uri: https://docs.rubocop.org/rubocop-rails/
   changelog_uri: https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop-rails/
-  documentation_uri: https://docs.rubocop.org/rubocop-rails/2.35/
+  documentation_uri: https://docs.rubocop.org/rubocop-rails/2.36/
   bug_tracker_uri: https://github.com/rubocop/rubocop-rails/issues
   rubygems_mfa_required: 'true'
   default_lint_roller_plugin: RuboCop::Rails::Plugin