rubocop-rails 2.37.0 → 2.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9258d56d31fc4adeef0526b551dbe652abe70dd4599debc25ee39be54b743330
-  data.tar.gz: ab2d60fe9b2a61ac47f8f15f8753fb60dd26e278d5452d23501f59a398fd7b0a
+  metadata.gz: 934845fbf3f9e2a700b98f36bcd02c55bf2ec0ed4955931830e36463f3dc2793
+  data.tar.gz: a4623739f29604fa7869bc431442feea890337223628839e500672f2f74f1783
 SHA512:
-  metadata.gz: 7ba4c487f87fdbd58130ba06fc0184c9c5b5dabe5ee3934aa03930c27467072a7f89ac77ba423fe89f69ad9739c2dfcbeac1bb947e64804757e6efbdb47b47a5
-  data.tar.gz: 223e0693edfd7de08b9d6a770fbdd7ced5c6422cab60d5074657ef65dd7b4ce538c8f61c37cc15156d63824e1d4060a654bca1fef7830d1b587e7ca84d516f62
+  metadata.gz: bf70f7da40827b323bf43d3ee9718177a11aeed5417f6a332d31a2a8edbd63733472819fd6bc658bcf1c47451b3f38125f2b84e1ac9de1aa6e8eb35593d52c32
+  data.tar.gz: 3db22831cd73b6c83abcba17c13fdf1b239fd94197644f311bc259433fdf78430f7e0051bdc9e27dbbb490e1e5c6887aa1e573a9d85512267fbfb78f09cfb871

data/lib/rubocop/cop/mixin/target_rails_version.rb

@@ -11,6 +11,29 @@ module RuboCop
       # See https://github.com/rubocop/rubocop/pull/11289
       TARGET_GEM_NAME = 'railties' # :nodoc:
 
+      # Used when the target Rails version cannot be detected from `AllCops: TargetRailsVersion`
+      # or from the `railties` version in the target's lockfile.
+      DEFAULT_RAILS_VERSION = 5.0
+
+      # Resolves the target Rails version as a `major.minor` Float, using only stable RuboCop core APIs.
+      # Precedence: `AllCops: TargetRailsVersion`, then the `railties` version from the target's lockfile,
+      # then `DEFAULT_RAILS_VERSION`.
+      def self.resolve(config)
+        target_rails_version = config.for_all_cops['TargetRailsVersion']
+        return target_rails_version.to_f if target_rails_version
+
+        gem_versions_in_target = config.gem_versions_in_target
+        railties_version = gem_versions_in_target && gem_versions_in_target[TARGET_GEM_NAME]
+        return DEFAULT_RAILS_VERSION unless railties_version
+
+        segments = railties_version.segments
+        Float("#{segments[0]}.#{segments[1]}")
+      end
+
+      def self.extended(base)
+        base.include(InstanceMethods)
+      end
+
       def minimum_target_rails_version(version)
         case version
         when Integer, Float then requires_gem(TARGET_GEM_NAME, ">= #{version}")
@@ -26,6 +49,35 @@ module RuboCop
 
         gem_requirement.satisfied_by?(Gem::Version.new(version))
       end
+
+      # Instance methods for cops that use the resolved target Rails version at runtime,
+      # included automatically when a cop extends `TargetRailsVersion`.
+      # On RuboCop < 2.0, `#target_rails_version` shadows `RuboCop::Cop::Base#target_rails_version`,
+      # so the resolution is owned by rubocop-rails on all supported RuboCop versions.
+      module InstanceMethods
+        def target_rails_version
+          @target_rails_version ||= TargetRailsVersion.resolve(config)
+        end
+
+        private
+
+        # Overrides `RuboCop::Cop::Base` so that `railties` requirements declared via
+        # `minimum_target_rails_version` are checked against the resolved target Rails version
+        # instead of the lockfile alone. This keeps `AllCops: TargetRailsVersion` effective for
+        # version-gated cops, including in projects without a lockfile.
+        def target_satisfies_all_gem_version_requirements?
+          self.class.gem_requirements.all? do |gem_name, version_requirement|
+            if gem_name == TARGET_GEM_NAME
+              version_requirement.satisfied_by?(Gem::Version.new(target_rails_version.to_s))
+            else
+              gem_versions_in_target = config.gem_versions_in_target
+              gem_version_in_target = gem_versions_in_target && gem_versions_in_target[gem_name]
+
+              gem_version_in_target && version_requirement.satisfied_by?(gem_version_in_target)
+            end
+          end
+        end
+      end
     end
   end
 end

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

@@ -19,6 +19,7 @@ module RuboCop
       #   ActiveSupport.on_load(:active_record) { include MyClass }
       class ActiveSupportOnLoad < Base
         extend AutoCorrector
+        extend TargetRailsVersion
 
         MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
         RESTRICT_ON_SEND = %i[prepend include extend].freeze

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

@@ -66,6 +66,7 @@ module RuboCop
       class BulkChangeTable < Base
         include DatabaseTypeResolvable
         include MigrationsHelper
+        extend TargetRailsVersion
 
         MSG_FOR_CHANGE_TABLE = <<~MSG.chomp
           You can combine alter queries using `bulk: true` options.

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

@@ -35,6 +35,7 @@ module RuboCop
       class DeprecatedActiveModelErrorsMethods < Base
         include RangeHelp
         extend AutoCorrector
+        extend TargetRailsVersion
 
         MSG = 'Avoid manipulating ActiveModel errors as hash directly.'
         AUTOCORRECTABLE_METHODS = %i[<< clear keys].freeze

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

@@ -25,6 +25,7 @@ module RuboCop
       #
       class EnumHash < Base
         extend AutoCorrector
+        extend TargetRailsVersion
 
         MSG = 'Enum defined as an array found in `%<enum>s` enum declaration. Use hash syntax instead.'
         RESTRICT_ON_SEND = %i[enum].freeze

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

@@ -138,6 +138,8 @@ module RuboCop
       #     has_many :posts, -> { order(published_at: :desc) }
       #   end
       class InverseOf < Base
+        extend TargetRailsVersion
+
         SPECIFY_MSG = 'Specify an `:inverse_of` option.'
         NIL_MSG = 'You specified `inverse_of: nil`, you probably meant to use `inverse_of: false`.'
         RESTRICT_ON_SEND = %i[has_many has_one belongs_to].freeze

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

@@ -45,22 +45,62 @@ module RuboCop
             return if with_dependencies?(task_method)
 
             add_offense(task_method) do |corrector|
-              if with_arguments?(task_method)
-                new_task_dependency = correct_task_arguments_dependency(task_method)
-                corrector.replace(task_arguments(task_method), new_task_dependency)
-              else
-                task_name = task_method.first_argument
-                new_task_dependency = correct_task_dependency(task_name)
-                corrector.replace(task_name, new_task_dependency)
-              end
+              autocorrect(corrector, task_method)
             end
           end
         end
 
         private
 
-        def correct_task_arguments_dependency(task_method)
-          "#{task_arguments(task_method).source} => :environment"
+        def autocorrect(corrector, task_method)
+          task_name, *task_arguments = task_method.arguments
+
+          if task_arguments.empty?
+            correct_task_name(corrector, task_name)
+          else
+            correct_task_arguments(corrector, task_arguments)
+          end
+        end
+
+        def correct_task_name(corrector, task_name)
+          if task_name.hash_type?
+            correct_empty_dependencies(corrector, task_name)
+          else
+            corrector.replace(task_name, correct_task_dependency(task_name))
+          end
+        end
+
+        def correct_task_arguments(corrector, task_arguments)
+          if task_arguments.one?
+            correct_single_task_argument(corrector, task_arguments.first)
+          elsif task_arguments.all? { |argument| argument.type?(:sym, :str) }
+            corrector.replace(task_arguments_range(task_arguments), task_arguments_dependency(task_arguments))
+          end
+        end
+
+        def correct_single_task_argument(corrector, argument)
+          if argument.hash_type?
+            correct_empty_dependencies(corrector, argument)
+          elsif argument.array_type?
+            corrector.replace(argument, "#{argument.source} => :environment")
+          elsif argument.type?(:sym, :str)
+            corrector.replace(argument, task_arguments_dependency([argument]))
+          end
+        end
+
+        def task_arguments_dependency(task_arguments)
+          "[#{task_arguments.map(&:source).join(', ')}] => :environment"
+        end
+
+        def correct_empty_dependencies(corrector, hash_node)
+          dependencies = hash_node.pairs.first&.value
+          return unless dependencies&.array_type? && dependencies.values.empty?
+
+          corrector.replace(dependencies, '[:environment]')
+        end
+
+        def task_arguments_range(task_arguments)
+          task_arguments.first.source_range.join(task_arguments.last.source_range)
         end
 
         def correct_task_dependency(task_name)
@@ -88,14 +128,6 @@ module RuboCop
           end
         end
 
-        def task_arguments(node)
-          node.arguments[1]
-        end
-
-        def with_arguments?(node)
-          node.arguments.size > 1 && node.arguments[1].array_type?
-        end
-
         def with_dependencies?(node)
           first_arg = node.first_argument
           return false unless first_arg

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

@@ -52,6 +52,8 @@ module RuboCop
           return if within_shadowing_method?(node)
 
           add_offense(node, message: build_message(node)) do |corrector|
+            next if nested_read_write_attribute?(node)
+
             corrector.replace(node, node_replacement(node))
           end
         end
@@ -106,6 +108,12 @@ module RuboCop
         def write_attribute_replacement(node)
           "self[#{node.first_argument.source}] = #{node.last_argument.source}"
         end
+
+        def nested_read_write_attribute?(node)
+          node.each_descendant(:send).any? do |descendant|
+            read_write_attribute?(descendant) && !within_shadowing_method?(descendant)
+          end
+        end
       end
     end
   end

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

@@ -152,6 +152,7 @@ module RuboCop
       #   end
       class ReversibleMigration < Base
         include MigrationsHelper
+        extend TargetRailsVersion
 
         MSG = '%<action>s is not reversible.'
 

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

@@ -64,6 +64,8 @@ module RuboCop
       #   end
       #
       class TransactionExitStatement < Base
+        extend TargetRailsVersion
+
         MSG = 'Exit statement `%<statement>s` is not allowed. Use `raise` (rollback) or `next` (commit).'
         BUILT_IN_TRANSACTION_METHODS = %i[transaction with_lock].freeze
 

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

@@ -34,6 +34,8 @@ module RuboCop
       #   end
       #
       class UnknownEnv < Base
+        extend TargetRailsVersion
+
         MSG = 'Unknown environment `%<name>s`.'
         MSG_SIMILAR = 'Unknown environment `%<name>s`. Did you mean `%<similar>s`?'
 

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.37.0'
+      STRING = '2.38.0'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails
 version: !ruby/object:Gem::Version
-  version: 2.37.0
+  version: 2.38.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -271,7 +271,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.37/
+  documentation_uri: https://docs.rubocop.org/rubocop-rails/2.38/
   bug_tracker_uri: https://github.com/rubocop/rubocop-rails/issues
   rubygems_mfa_required: 'true'
   default_lint_roller_plugin: RuboCop::Rails::Plugin