rubocop-rails 2.30.3 → 2.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45ebdeef3a184afbb85ff1e1685fa978198ee00cf3bbbc0f1cbfa04b56f9dc7
-  data.tar.gz: 2d06943201b3836891ed9f8c0bd9a5e2bebd90de7736351add71af9460e271b7
+  metadata.gz: ba4876948bedd432dc186a3c060c26c3808f1c7126b8fe69072e056a5f160d94
+  data.tar.gz: 7f890ec180a125abe4a40ad146661e71c088596eb093eacf12d322135c7f6907
 SHA512:
-  metadata.gz: ed82ce027a4bee9e6dfa16dd763fa856d7b19b96356b918d469ef1274ef0c5a4e8ea5e949c6aaed84ee6d0f290ca838e34e352929640294a6bd4d579c0145cdd
-  data.tar.gz: 7e11061742bc02b64742e4219ccfea80d5befb27572cb043d7ebc57c7a616f2fd2c8b829ac08dfad6b644f23d8a0f096c8b571cc5b8e9ecf34e7769f1f551fb4
+  metadata.gz: 719fd043fd8ae7738eebb0c78abba01a23f2bc30c6d8c9825c89c7cbcc6cd48fd0077918e9bc84c9c471afecd62b69597d3f046c757606ecaec4af9daf8ef183
+  data.tar.gz: b7173eeaf159ee8673fe2f2c16a1c92bcbb55601d1202db18e5b48d09d1d1ef0207c17a182dcfb2b39c6e686d2b82871b191d5f90c4416a1af7d7b038a12c218

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

@@ -29,8 +29,8 @@ module RuboCop
       end
 
       def database_from_env
-        url = ENV['DATABASE_URL'].presence
-        return unless url
+        url = ENV.fetch('DATABASE_URL', '')
+        return if url.blank?
 
         case url
         when %r{\A(mysql2|trilogy)://}

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 module RuboCop
-  module Cop
+  module Cop # rubocop:disable Style/Documentation
+    # The EnforceSuperclass module is also defined in `rubocop` (for backwards
+    # compatibility), so here we remove it before (re)defining it, to avoid
+    # warnings about methods in the module being redefined.
+    remove_const(:EnforceSuperclass) if defined?(EnforceSuperclass)
+
     # Common functionality for enforcing a specific superclass.
     module EnforceSuperclass
       def self.included(base)

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

@@ -58,7 +58,7 @@ module RuboCop
         end
 
         def set_new_arg_name(transformed_argname, corrector)
-          return if block_node.numblock_type?
+          return unless block_node.block_type?
 
           corrector.replace(block_node.arguments, "|#{transformed_argname}|")
         end
@@ -84,6 +84,7 @@ module RuboCop
       end
 
       alias on_numblock on_block
+      alias on_itblock on_block
 
       def on_send(node)
         on_bad_map_to_h(node) do |*match|

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

@@ -5,14 +5,14 @@ module RuboCop
     module Rails
       # Prevents usage of `"*"` on an Arel::Table column reference.
       #
-      # Using `arel_table["*"]` causes the outputted string to be a literal
-      # quoted asterisk (e.g. <tt>`my_model`.`*`</tt>). This causes the
-      # database to look for a column named <tt>`*`</tt> (or `"*"`) as opposed
+      # Using `arel_table["\*"]` causes the outputted string to be a literal
+      # quoted asterisk (e.g. `my_model`.`*`). This causes the
+      # database to look for a column named `\*` (or `"*"`) as opposed
       # to expanding the column list as one would likely expect.
       #
       # @safety
-      #   This cop's autocorrection is unsafe because it turns a quoted `*` into
-      #   an SQL `*`, unquoted. `*` is a valid column name in certain databases
+      #   This cop's autocorrection is unsafe because it turns a quoted `\*` into
+      #   an SQL `*`, unquoted. `\*` is a valid column name in certain databases
       #   supported by Rails, and even though it is usually a mistake,
       #   it might denote legitimate access to a column named `*`.
       #

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

@@ -45,12 +45,10 @@ module RuboCop
           return if node.parent&.block_type?
 
           interpolated_string_passed_to_debug(node) do |arguments|
-            message = format(MSG)
-
             range = replacement_range(node)
             replacement = replacement_source(node, arguments)
 
-            add_offense(range, message: message) do |corrector|
+            add_offense(range) do |corrector|
               corrector.replace(range, replacement)
             end
           end

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

@@ -37,6 +37,9 @@ module RuboCop
             (numblock
               (call _ :to_h) $1
               (array $_ (lvar :_1)))
+            (itblock
+              (call _ :to_h) $:it
+              (array $_ (lvar :it)))
           }
         PATTERN
 
@@ -50,6 +53,9 @@ module RuboCop
               (numblock
                 (call _ {:map :collect}) $1
                 (array $_ (lvar :_1)))
+              (itblock
+                (call _ {:map :collect}) $:it
+                (array $_ (lvar :it)))
             }
             :to_h)
         PATTERN
@@ -66,6 +72,9 @@ module RuboCop
               (numblock
                 (call _ {:map :collect}) $1
                 (array $_ (lvar :_1)))
+              (itblock
+                (call _ {:map :collect}) $:it
+                (array $_ (lvar :it)))
             }
           )
         PATTERN

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

@@ -40,6 +40,9 @@ module RuboCop
             (numblock
               (call _ :to_h) $1
               (array (lvar :_1) $_))
+            (itblock
+              (call _ :to_h) $:it
+              (array (lvar :it) $_))
           }
         PATTERN
 
@@ -53,6 +56,9 @@ module RuboCop
               (numblock
                 (call _ {:map :collect}) $1
                 (array (lvar :_1) $_))
+              (itblock
+                (call _ {:map :collect}) $:it
+                (array (lvar :it) $_))
             }
             :to_h)
         PATTERN
@@ -69,6 +75,9 @@ module RuboCop
               (numblock
                 (call _ {:map :collect}) $1
                 (array (lvar :_1) $_))
+              (itblock
+                (call _ {:map :collect}) $:it
+                (array (lvar :it) $_))
             }
           )
         PATTERN

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

@@ -23,7 +23,6 @@ module RuboCop
 
         MSG = "Do not write to stdout. Use Rails's logger if you want to log."
         RESTRICT_ON_SEND = %i[ap p pp pretty_print print puts binwrite syswrite write write_nonblock].freeze
-        ALLOWED_TYPES = %i[send csend block numblock].freeze
 
         def_node_matcher :output?, <<~PATTERN
           (send nil? {:ap :p :pp :pretty_print :print :puts} ...)
@@ -40,7 +39,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return if ALLOWED_TYPES.include?(node.parent&.type)
+          return if node.parent&.call_type? || node.block_node
           return if !output?(node) && !io_output?(node)
 
           range = offense_range(node)

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

@@ -59,6 +59,7 @@ module RuboCop
           (any_block (call _ {:map :collect}) $_argument (send lvar :[] $_key))
         PATTERN
 
+        # rubocop:disable Metrics/AbcSize
         def on_block(node)
           return if node.each_ancestor(:any_block).any?
 
@@ -68,20 +69,25 @@ module RuboCop
             match = if node.block_type?
                       block_argument = argument.children.first.source
                       use_block_argument_in_key?(block_argument, key)
-                    else # numblock
-                      argument == 1 && use_block_argument_in_key?('_1', key)
+                    elsif node.numblock_type?
+                      use_block_argument_in_key?('_1', key)
+                    else # itblock
+                      use_block_argument_in_key?('it', key)
                     end
             next unless match
 
             register_offense(node, key)
           end
         end
+        # rubocop:enable Metrics/AbcSize
         alias on_numblock on_block
+        alias on_itblock on_block
 
         private
 
         def use_one_block_argument?(argument)
-          return true if argument == 1 # Checks for numbered argument `_1`.
+          # Checks for numbered argument `_1` or `it block parameter.
+          return true if [1, :it].include?(argument)
 
           argument.respond_to?(:one?) && argument.one?
         end

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

@@ -85,18 +85,22 @@ module RuboCop
         end
 
         alias on_numblock on_block
+        alias on_itblock on_block
 
         private
 
         def autocorrect(corrector, send_node, node)
           corrector.remove(send_node.receiver)
           corrector.remove(send_node.loc.dot)
-          corrector.remove(block_argument_range(send_node)) unless node.numblock_type?
+          corrector.remove(block_argument_range(send_node)) if node.block_type?
         end
 
+        # rubocop:disable Metrics/AbcSize
         def redundant_receiver?(send_nodes, node)
           proc = if node.numblock_type?
                    ->(n) { n.receiver.lvar_type? && n.receiver.source == '_1' }
+                 elsif node.itblock_type?
+                   ->(n) { n.receiver.lvar_type? && n.receiver.source == 'it' }
                  else
                    return false if node.arguments.empty?
 
@@ -106,6 +110,7 @@ module RuboCop
 
           send_nodes.all?(&proc)
         end
+        # rubocop:enable Metrics/AbcSize
 
         def block_argument_range(node)
           block_node = node.each_ancestor(:block).first

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

@@ -76,7 +76,7 @@ module RuboCop
         def autocorrect(corrector, class_config)
           class_value = class_config.value
           replacement = const_or_string(class_value)
-          return unless replacement.present?
+          return unless replacement
 
           corrector.replace(class_value, replacement.source.inspect)
         end

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

@@ -205,6 +205,7 @@ module RuboCop
         end
 
         alias on_numblock on_block
+        alias on_itblock on_block
 
         private
 

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

@@ -39,7 +39,7 @@ module RuboCop
 
         # @!method comment_present?(node)
         def_node_matcher :comment_present?, <<~PATTERN
-          (hash <(pair {(sym :comment) (str "comment")} (_ [present?])) ...>)
+          (hash <(pair {(sym :comment) (str "comment")} (_ !blank?)) ...>)
         PATTERN
 
         # @!method add_column?(node)

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

data/lib/rubocop-rails.rb

@@ -3,7 +3,6 @@
 require 'rubocop'
 require 'rack/utils'
 require 'active_support/inflector'
-require 'active_support/core_ext/object/blank'
 
 require_relative 'rubocop/rails'
 require_relative 'rubocop/rails/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails
 version: !ruby/object:Gem::Version
-  version: 2.30.3
+  version: 2.31.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -9,7 +9,7 @@ authors:
 - Yuji Nakayama
 bindir: bin
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: 1.75.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -69,7 +69,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.72.1
+        version: 1.75.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -264,7 +264,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.30/
+  documentation_uri: https://docs.rubocop.org/rubocop-rails/2.31/
   bug_tracker_uri: https://github.com/rubocop/rubocop-rails/issues
   rubygems_mfa_required: 'true'
   default_lint_roller_plugin: RuboCop::Rails::Plugin