rubocop-rails 2.32.0 → 2.34.3

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

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Rails
+      # Checks for uses of `redirect_back(fallback_location: ...)` and
+      # suggests using `redirect_back_or_to(...)` instead.
+      #
+      # `redirect_back(fallback_location: ...)` was soft deprecated in Rails 7.0 and
+      # `redirect_back_or_to` was introduced as a replacement.
+      #
+      # @example
+      #   # bad
+      #   redirect_back(fallback_location: root_path)
+      #
+      #   # good
+      #   redirect_back_or_to(root_path)
+      #
+      #   # bad
+      #   redirect_back(fallback_location: root_path, allow_other_host: false)
+      #
+      #   # good
+      #   redirect_back_or_to(root_path, allow_other_host: false)
+      #
+      class RedirectBackOrTo < Base
+        extend AutoCorrector
+        extend TargetRailsVersion
+
+        minimum_target_rails_version 7.0
+
+        MSG = 'Use `redirect_back_or_to` instead of `redirect_back` with `:fallback_location` keyword argument.'
+        RESTRICT_ON_SEND = %i[redirect_back].freeze
+
+        def_node_matcher :redirect_back_with_fallback_location, <<~PATTERN
+          (send nil? :redirect_back
+            (hash <$(pair (sym :fallback_location) $_) $...>)
+          )
+        PATTERN
+
+        def on_send(node)
+          redirect_back_with_fallback_location(node) do |fallback_pair, fallback_value, options|
+            add_offense(node.loc.selector) do |corrector|
+              correct_redirect_back(corrector, node, fallback_pair, fallback_value, options)
+            end
+          end
+        end
+
+        private
+
+        # rubocop:disable Metrics/AbcSize
+        def correct_redirect_back(corrector, node, fallback_pair, fallback_value, options)
+          corrector.replace(node.loc.selector, 'redirect_back_or_to')
+
+          hash_arg = node.first_argument
+
+          if hash_arg.pairs.one?
+            arguments = [fallback_value.source] + options.map(&:source)
+            corrector.replace(hash_arg, arguments.join(', '))
+          else
+            remove_fallback_location_pair(corrector, hash_arg, fallback_pair)
+            first_pair = hash_arg.pairs.find { |pair| pair != fallback_pair }
+            corrector.insert_before(first_pair, "#{fallback_value.source}, ")
+          end
+
+          wrap_with_parentheses(node, corrector) unless node.parenthesized?
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        def remove_fallback_location_pair(corrector, hash_node, fallback_pair)
+          pairs = hash_node.pairs
+          index = pairs.index(fallback_pair)
+
+          if pairs.one?
+            corrector.remove(fallback_pair)
+          elsif index.zero?
+            remove_first_pair(corrector, fallback_pair, pairs[1])
+          else
+            remove_non_first_pair(corrector, fallback_pair, pairs[index - 1])
+          end
+        end
+
+        def wrap_with_parentheses(node, corrector)
+          corrector.replace(node.loc.selector.end.join(node.first_argument.source_range.begin), '(')
+          corrector.insert_after(node, ')')
+        end
+
+        def remove_first_pair(corrector, fallback_pair, next_pair)
+          range = fallback_pair.source_range.join(next_pair.source_range.begin)
+          corrector.remove(range)
+        end
+
+        def remove_non_first_pair(corrector, fallback_pair, prev_pair)
+          range = prev_pair.source_range.end.join(fallback_pair.source_range.end)
+          corrector.remove(range)
+        end
+      end
+    end
+  end
+end

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

@@ -74,7 +74,7 @@ module RuboCop
             $[
               (hash <$(pair (sym :presence) true) ...>)         # presence: true
               !(hash <$(pair (sym :strict) {true const}) ...>)  # strict: true
-              !(hash <$(pair (sym {:if :unless}) _) ...>)       # if: some_condition or unless: some_condition
+              !(hash <$(pair (sym {:if}) _) ...>)               # if: some_condition or unless: some_condition
             ]
           )
         PATTERN
@@ -211,12 +211,12 @@ module RuboCop
 
         def non_optional_belongs_to(node, keys)
           keys.select do |key|
-            belongs_to = belongs_to_for(node, key)
+            belongs_to = belongs_to_for?(node, key)
             belongs_to && !optional?(belongs_to)
           end
         end
 
-        def belongs_to_for(model_class_node, key)
+        def belongs_to_for?(model_class_node, key)
           if key.to_s.end_with?('_id')
             normalized_key = key.to_s.delete_suffix('_id').to_sym
             belongs_to?(model_class_node, key: normalized_key, fk: key)

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

@@ -71,7 +71,7 @@ module RuboCop
         def on_block(node)
           return unless node.method?(:with_options)
           return unless (body = node.body)
-          return unless all_block_nodes_in(body).count.zero?
+          return unless all_block_nodes_in(body).none?
 
           send_nodes = all_send_nodes_in(body)
           return unless redundant_receiver?(send_nodes, node)

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

@@ -156,7 +156,7 @@ module RuboCop
           return unless persist_method?(node)
           return if return_value_assigned?(node)
           return if implicit_return?(node)
-          return if check_used_in_condition_or_compound_boolean(node)
+          return if check_used_in_condition_or_compound_boolean?(node)
           return if argument?(node)
           return if explicit_return?(node)
           return if checked_immediately?(node)
@@ -227,7 +227,7 @@ module RuboCop
           array
         end
 
-        def check_used_in_condition_or_compound_boolean(node)
+        def check_used_in_condition_or_compound_boolean?(node)
           return false unless in_condition_or_compound_boolean?(node)
 
           register_offense(node, CREATE_CONDITIONAL_MSG) unless MODIFY_PERSIST_METHODS.include?(node.method_name)

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

@@ -45,18 +45,26 @@ module RuboCop
         private
 
         def find_select_node(node, column_name)
-          node.descendants.detect do |select_candidate|
+          select_method_nodes = node.descendants.select do |select_candidate|
             next if !select_candidate.call_type? || !select_candidate.method?(:select)
 
             match_column_name?(select_candidate, column_name)
           end
+
+          return unless select_method_nodes.one?
+
+          select_method_nodes.first
         end
 
         # rubocop:disable Metrics/AbcSize
         def autocorrect(corrector, select_node, node, preferred_method)
-          corrector.remove(select_node.parent.loc.dot)
-          corrector.remove(select_node.loc.selector.begin.join(select_node.source_range.end))
-          corrector.replace(node.loc.selector.begin.join(node.source_range.end), preferred_method)
+          if (parent = select_node.parent).loc?(:dot)
+            corrector.remove(parent.loc.dot)
+            corrector.remove(select_node.loc.selector.begin.join(select_node.source_range.end))
+            corrector.replace(node.loc.selector.begin.join(node.source_range.end), preferred_method)
+          else
+            corrector.replace(node, "#{select_node.receiver.source}.#{preferred_method}")
+          end
         end
         # rubocop:enable Metrics/AbcSize
 

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

@@ -98,8 +98,11 @@ module RuboCop
         def in_transaction_block?(node)
           return false unless transaction_method_name?(node.method_name)
           return false unless (parent = node.parent)
+          return false unless parent.any_block_type? && parent.body
 
-          parent.any_block_type? && parent.body
+          node.right_siblings.none? do |sibling|
+            sibling.respond_to?(:loop_keyword?) && sibling.loop_keyword?
+          end
         end
 
         def statement(statement_node)

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

@@ -58,12 +58,12 @@ module RuboCop
           (call (call _ :where $...) :exists?)
         PATTERN
 
-        def_node_matcher :exists_with_args?, <<~PATTERN
-          (call _ :exists? $...)
+        def_node_matcher :exists_with_arg?, <<~PATTERN
+          (call _ :exists? $!splat_type?)
         PATTERN
 
         def on_send(node)
-          find_offenses(node) do |args|
+          find_offenses?(node) do |args|
             return unless convertable_args?(args)
 
             range = correction_range(node)
@@ -87,11 +87,11 @@ module RuboCop
           style == :exists
         end
 
-        def find_offenses(node, &block)
+        def find_offenses?(node, &block)
           if exists_style?
             where_exists_call?(node, &block)
           elsif where_style?
-            exists_with_args?(node, &block)
+            exists_with_arg?(node) { |arg| yield([arg]) }
           end
         end
 

data/lib/rubocop/cop/rails_cops.rb

@@ -50,6 +50,7 @@ require_relative 'rails/eager_evaluation_log_message'
 require_relative 'rails/enum_hash'
 require_relative 'rails/enum_syntax'
 require_relative 'rails/enum_uniqueness'
+require_relative 'rails/env'
 require_relative 'rails/env_local'
 require_relative 'rails/environment_comparison'
 require_relative 'rails/environment_variable_access'
@@ -58,6 +59,7 @@ require_relative 'rails/expanded_date_range'
 require_relative 'rails/file_path'
 require_relative 'rails/find_by'
 require_relative 'rails/find_by_id'
+require_relative 'rails/find_by_or_assignment_memoization'
 require_relative 'rails/find_each'
 require_relative 'rails/freeze_time'
 require_relative 'rails/has_and_belongs_to_many'
@@ -65,6 +67,7 @@ require_relative 'rails/has_many_or_has_one_dependent'
 require_relative 'rails/helper_instance_variable'
 require_relative 'rails/http_positional_arguments'
 require_relative 'rails/http_status'
+require_relative 'rails/http_status_name_consistency'
 require_relative 'rails/i18n_lazy_lookup'
 require_relative 'rails/i18n_locale_assignment'
 require_relative 'rails/i18n_locale_texts'
@@ -82,6 +85,7 @@ require_relative 'rails/migration_class_name'
 require_relative 'rails/multiple_route_paths'
 require_relative 'rails/negate_include'
 require_relative 'rails/not_null_column'
+require_relative 'rails/order_arguments'
 require_relative 'rails/order_by_id'
 require_relative 'rails/output'
 require_relative 'rails/output_safety'
@@ -100,6 +104,7 @@ require_relative 'rails/redundant_foreign_key'
 require_relative 'rails/redundant_presence_validation_on_belongs_to'
 require_relative 'rails/redundant_receiver_in_with_options'
 require_relative 'rails/redundant_travel_back'
+require_relative 'rails/redirect_back_or_to'
 require_relative 'rails/reflection_class_name'
 require_relative 'rails/refute_methods'
 require_relative 'rails/relative_date_constant'

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.32.0'
+      STRING = '2.34.3'
 
       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.32.0
+  version: 2.34.3
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -9,7 +9,7 @@ authors:
 - Yuji Nakayama
 bindir: bin
 cert_chain: []
-date: 2025-05-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,6 +156,7 @@ files:
 - lib/rubocop/cop/rails/enum_hash.rb
 - lib/rubocop/cop/rails/enum_syntax.rb
 - lib/rubocop/cop/rails/enum_uniqueness.rb
+- lib/rubocop/cop/rails/env.rb
 - lib/rubocop/cop/rails/env_local.rb
 - lib/rubocop/cop/rails/environment_comparison.rb
 - lib/rubocop/cop/rails/environment_variable_access.rb
@@ -164,6 +165,7 @@ files:
 - lib/rubocop/cop/rails/file_path.rb
 - lib/rubocop/cop/rails/find_by.rb
 - lib/rubocop/cop/rails/find_by_id.rb
+- lib/rubocop/cop/rails/find_by_or_assignment_memoization.rb
 - lib/rubocop/cop/rails/find_each.rb
 - lib/rubocop/cop/rails/freeze_time.rb
 - lib/rubocop/cop/rails/has_and_belongs_to_many.rb
@@ -171,6 +173,7 @@ files:
 - lib/rubocop/cop/rails/helper_instance_variable.rb
 - lib/rubocop/cop/rails/http_positional_arguments.rb
 - lib/rubocop/cop/rails/http_status.rb
+- lib/rubocop/cop/rails/http_status_name_consistency.rb
 - lib/rubocop/cop/rails/i18n_lazy_lookup.rb
 - lib/rubocop/cop/rails/i18n_locale_assignment.rb
 - lib/rubocop/cop/rails/i18n_locale_texts.rb
@@ -188,6 +191,7 @@ files:
 - lib/rubocop/cop/rails/multiple_route_paths.rb
 - lib/rubocop/cop/rails/negate_include.rb
 - lib/rubocop/cop/rails/not_null_column.rb
+- lib/rubocop/cop/rails/order_arguments.rb
 - lib/rubocop/cop/rails/order_by_id.rb
 - lib/rubocop/cop/rails/output.rb
 - lib/rubocop/cop/rails/output_safety.rb
@@ -200,6 +204,7 @@ files:
 - lib/rubocop/cop/rails/present.rb
 - lib/rubocop/cop/rails/rake_environment.rb
 - lib/rubocop/cop/rails/read_write_attribute.rb
+- lib/rubocop/cop/rails/redirect_back_or_to.rb
 - lib/rubocop/cop/rails/redundant_active_record_all_method.rb
 - lib/rubocop/cop/rails/redundant_allow_nil.rb
 - lib/rubocop/cop/rails/redundant_foreign_key.rb
@@ -264,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.32/
+  documentation_uri: https://docs.rubocop.org/rubocop-rails/2.34/
   bug_tracker_uri: https://github.com/rubocop/rubocop-rails/issues
   rubygems_mfa_required: 'true'
   default_lint_roller_plugin: RuboCop::Rails::Plugin
@@ -282,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Automatic Rails code style checking tool.
 test_files: []