rubocop-rails 2.17.3 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1cd420a9b6ec0e14a26063533cf9db61a81a43e44bec26a8b98e577cf761e49
-  data.tar.gz: 73918575c04e0f9ee8390d3efc0a4eb49b1cb4093695ecbafddbf995c406869d
+  metadata.gz: 8f1cbc229165ee81ea84fc26d1c6482f917d8e8177827b139cf36974acff0176
+  data.tar.gz: 23cefe2f0434e5ef4c86856221f1336bfc55ffbacfd09f2dc9a24552b633d355
 SHA512:
-  metadata.gz: 93fffc6d3f6cbb781692725c13eb6f049e3106f2fb7ccb43a48fdf7c0d85a189914740d2ef743b0642eaa94ae0fc584ec1a32be53095a12167b3c02db2b035d4
-  data.tar.gz: 05ac2a5767f2c65437629fa623b3b4506547227c5b608a7ebc4e29a91b831e794ac6ee7c62a55b1573f3b228d40b6aaaedbda1fb7b81481c51f9c0df6884f389
+  metadata.gz: 59f9af07f060ff82a64bbf9db4af4d8ebb56dfada8310073bca25fde87736ef8fa0891e6f3ba997e8b847eef6218d93f25739b8022a8cb68e9aae970e8b2c674
+  data.tar.gz: a4415117082d7ccaeb8349f1ee31c9dba95bb6ea54bed77b176bcdd59b03cf4e2702f99c05414ff1e9028c48f96dce2f729eb2a2b98f91183cba3cb143e08894

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-22 Bozhidar Batsov
+Copyright (c) 2012-23 Bozhidar Batsov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/config/default.yml

@@ -46,23 +46,6 @@ Lint/NumberConversion:
     - fortnights
     - in_milliseconds
   AllowedPatterns: []
-  # Deprecated.
-  IgnoredMethods:
-    - ago
-    - from_now
-    - second
-    - seconds
-    - minute
-    - minutes
-    - hour
-    - hours
-    - day
-    - days
-    - week
-    - weeks
-    - fortnight
-    - fortnights
-    - in_milliseconds
 
 Rails:
   Enabled: true
@@ -135,7 +118,9 @@ Rails/ActiveRecordOverride:
                   Check for overriding Active Record methods instead of using
                   callbacks.
   Enabled: true
+  Severity: warning
   VersionAdded: '0.67'
+  VersionChanged: '2.18'
   Include:
     - app/models/**/*.rb
 
@@ -226,6 +211,9 @@ Rails/BelongsTo:
   Description: >-
                   Use `optional: true` instead of `required: false` for
                   `belongs_to` relations.
+  Reference:
+    - https://guides.rubyonrails.org/5_0_release_notes.html
+    - https://github.com/rails/rails/pull/18937
   Enabled: true
   VersionAdded: '0.62'
 
@@ -244,6 +232,9 @@ Rails/Blank:
 
 Rails/BulkChangeTable:
   Description: 'Check whether alter queries are combinable.'
+  Reference:
+    - https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html#method-i-change_table
+    - https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/Table.html
   Enabled: true
   VersionAdded: '0.57'
   Database: null
@@ -330,9 +321,10 @@ Rails/DelegateAllowBlank:
 Rails/DeprecatedActiveModelErrorsMethods:
   Description: 'Avoid manipulating ActiveModel errors hash directly.'
   Enabled: pending
+  Severity: warning
   Safe: false
   VersionAdded: '2.14'
-  VersionChanged: '2.15'
+  VersionChanged: '2.18'
 
 Rails/DotSeparatedKeys:
   Description: 'Enforces the use of dot-separated keys instead of `:scope` options in `I18n` translation methods.'
@@ -343,12 +335,16 @@ Rails/DotSeparatedKeys:
 Rails/DuplicateAssociation:
   Description: "Don't repeat associations in a model."
   Enabled: pending
+  Severity: warning
   VersionAdded: '2.14'
+  VersionChanged: '2.18'
 
 Rails/DuplicateScope:
   Description: 'Multiple scopes share this same where clause.'
   Enabled: pending
+  Severity: warning
   VersionAdded: '2.14'
+  VersionChanged: '2.18'
 
 Rails/DurationArithmetic:
   Description: 'Do not use duration as arithmetic operand with `Time.current`.'
@@ -463,7 +459,7 @@ Rails/FindById:
   VersionAdded: '2.7'
 
 Rails/FindEach:
-  Description: 'Prefer all.find_each over all.find.'
+  Description: 'Prefer all.find_each over all.each.'
   StyleGuide: 'https://rails.rubystyle.guide#find-each'
   Enabled: true
   VersionAdded: '0.30'
@@ -477,13 +473,6 @@ Rails/FindEach:
     - select
     - lock
   AllowedPatterns: []
-  # Deprecated.
-  IgnoredMethods:
-    # Methods that don't work well with `find_each`.
-    - order
-    - limit
-    - select
-    - lock
 
 Rails/FreezeTime:
   Description: 'Prefer `freeze_time` over `travel_to` with an argument of the current time.'
@@ -592,6 +581,9 @@ Rails/Inquiry:
 
 Rails/InverseOf:
   Description: 'Checks for associations where the inverse cannot be determined automatically.'
+  Reference:
+    - https://guides.rubyonrails.org/association_basics.html#bi-directional-associations
+    - https://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#module-ActiveRecord::Associations::ClassMethods-label-Setting+Inverses
   Enabled: true
   VersionAdded: '0.52'
   IgnoreScopes: false
@@ -695,7 +687,9 @@ Rails/Pluck:
   Description: 'Prefer `pluck` over `map { ... }`.'
   StyleGuide: 'https://rails.rubystyle.guide#pluck'
   Enabled: 'pending'
+  Safe: false
   VersionAdded: '2.7'
+  VersionChanged: '2.18'
 
 Rails/PluckId:
   Description: 'Use `ids` instead of `pluck(:id)` or `pluck(primary_key)`.'
@@ -847,6 +841,17 @@ Rails/RequireDependency:
   Enabled: false
   VersionAdded: '2.10'
 
+Rails/ResponseParsedBody:
+  Description: Prefer `response.parsed_body` to `JSON.parse(response.body)`.
+  Enabled: pending
+  SafeAutoCorrect: false
+  VersionAdded: '2.18'
+  Include:
+    - spec/controllers/**/*.rb
+    - spec/requests/**/*.rb
+    - test/controllers/**/*.rb
+    - test/integration/**/*.rb
+
 Rails/ReversibleMigration:
   Description: 'Checks whether the change method of the migration file is reversible.'
   StyleGuide: 'https://rails.rubystyle.guide#reversible-migration'
@@ -1038,10 +1043,14 @@ Rails/TopLevelHashWithIndifferentAccess:
   Description: 'Identifies top-level `HashWithIndifferentAccess`.'
   Reference: 'https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#top-level-hashwithindifferentaccess-is-soft-deprecated'
   Enabled: pending
+  Severity: warning
   VersionAdded: '2.16'
+  VersionChanged: '2.18'
 
 Rails/TransactionExitStatement:
   Description: 'Avoid the usage of `return`, `break` and `throw` in transaction blocks.'
+  Reference:
+    - https://github.com/rails/rails/commit/15aa4200e083
   Enabled: pending
   VersionAdded: '2.14'
 
@@ -1066,7 +1075,9 @@ Rails/UniqueValidationWithoutIndex:
 Rails/UnknownEnv:
   Description: 'Use correct environment name.'
   Enabled: true
+  Severity: warning
   VersionAdded: '0.51'
+  VersionChanged: '2.18'
   Environments:
     - development
     - test
@@ -1121,12 +1132,27 @@ Rails/WhereNot:
 Rails/WhereNotWithMultipleConditions:
   Description: 'Do not use `where.not(...)` with multiple conditions.'
   Enabled: 'pending'
+  Severity: warning
   VersionAdded: '2.17'
+  VersionChanged: '2.18'
 
 # Accept `redirect_to(...) and return` and similar cases.
 Style/AndOr:
   EnforcedStyle: conditionals
 
+Style/FormatStringToken:
+  AllowedMethods:
+    - redirect
+
+Style/InverseMethods:
+  # `InverseMethods` are methods that can be inverted by a not (`not` or `!`)
+  # The relationship of inverse methods only needs to be defined in one direction.
+  # Keys and values both need to be defined as symbols.
+  InverseMethods:
+    :present?: :blank?
+    :include?: :exclude?
+    :valid?: :invalid?
+
 Style/SymbolProc:
   AllowedMethods:
     - define_method

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

@@ -67,17 +67,19 @@ module RuboCop
         private
 
         def followed_by_render?(flash_node)
-          flash_assigment_node = find_ancestor(flash_node, type: :send)
-          context = flash_assigment_node
-          if (if_node = context.each_ancestor(:if).first)
-            context = if_node
+          flash_assignment_node = find_ancestor(flash_node, type: :send)
+          context = flash_assignment_node
+          if (node = context.each_ancestor(:if, :rescue).first)
+            return false if use_redirect_to?(context)
+
+            context = node
           elsif context.right_siblings.empty?
             return true
           end
           context = context.right_siblings
 
-          context.compact.any? do |node|
-            render?(node)
+          context.compact.any? do |render_candidate|
+            render?(render_candidate)
           end
         end
 
@@ -95,6 +97,12 @@ module RuboCop
           def_node || block_node
         end
 
+        def use_redirect_to?(context)
+          context.right_siblings.compact.any? do |sibling|
+            sibling.send_type? && sibling.method?(:redirect_to)
+          end
+        end
+
         def find_ancestor(node, type:)
           node.each_ancestor(type).first
         end

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

@@ -30,7 +30,7 @@ module RuboCop
 
         def_node_matcher :action_controller_test_case?, <<~PATTERN
           (class
-            (const {nil? cbase} _)
+            (const _ _)
             (const (const {nil? cbase} :ActionController) :TestCase) _)
         PATTERN
 

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

@@ -26,6 +26,8 @@ module RuboCop
         RESTRICT_ON_SEND = ALIASES.keys.freeze
 
         def on_send(node)
+          return if node.arguments.empty?
+
           method_name = node.method_name
           alias_method = ALIASES[method_name]
 

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

@@ -47,9 +47,6 @@ module RuboCop
       #   class Post < ApplicationRecord
       #     belongs_to :blog, optional: false
       #   end
-      #
-      # @see https://guides.rubyonrails.org/5_0_release_notes.html
-      # @see https://github.com/rails/rails/pull/18937
       class BelongsTo < Base
         extend AutoCorrector
         extend TargetRailsVersion

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

@@ -8,7 +8,7 @@ module RuboCop
       #
       # Interaction with `Style/UnlessElse`:
       # The configuration of `NotPresent` will not produce an offense in the
-      # context of `unless else` if `Style/UnlessElse` is inabled. This is
+      # context of `unless else` if `Style/UnlessElse` is enabled. This is
       # to prevent interference between the autocorrection of the two cops.
       #
       # @safety

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

@@ -62,9 +62,6 @@ module RuboCop
       #       t.string :nickname
       #     end
       #   end
-      #
-      # @see https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html#method-i-change_table
-      # @see https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/Table.html
       class BulkChangeTable < Base
         MSG_FOR_CHANGE_TABLE = <<~MSG.chomp
           You can combine alter queries using `bulk: true` options.
@@ -216,7 +213,7 @@ module RuboCop
             true
           when POSTGRESQL
             # Add bulk alter support for PostgreSQL in 5.2.0
-            # @see https://github.com/rails/rails/pull/31331
+            # See: https://github.com/rails/rails/pull/31331
             target_rails_version >= 5.2
           else
             false

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

@@ -160,7 +160,7 @@ module RuboCop
         end
 
         def model_file?
-          processed_source.buffer.name.include?('/models/')
+          processed_source.file_path.include?('/models/')
         end
       end
     end

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

@@ -26,6 +26,9 @@ module RuboCop
       #
       class FreezeTime < Base
         extend AutoCorrector
+        extend TargetRailsVersion
+
+        minimum_target_rails_version 5.2
 
         MSG = 'Use `freeze_time` instead of `travel_to`.'
         NOW_METHODS = %i[now new current].freeze

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

@@ -41,11 +41,11 @@ module RuboCop
         PATTERN
 
         def_node_matcher :association_without_options?, <<~PATTERN
-          (send nil? {:has_many :has_one} _)
+          (send _ {:has_many :has_one} _)
         PATTERN
 
         def_node_matcher :association_with_options?, <<~PATTERN
-          (send nil? {:has_many :has_one} ... (hash $...))
+          (send _ {:has_many :has_one} ... (hash $...))
         PATTERN
 
         def_node_matcher :dependent_option?, <<~PATTERN

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

@@ -69,7 +69,7 @@ module RuboCop
       class I18nLocaleTexts < Base
         MSG = 'Move locale texts to the locale files in the `config/locales` directory.'
 
-        RESTRICT_ON_SEND = %i[validates redirect_to []= mail].freeze
+        RESTRICT_ON_SEND = %i[validates redirect_to redirect_back []= mail].freeze
 
         def_node_search :validation_message, <<~PATTERN
           (pair (sym :message) $str)
@@ -94,7 +94,7 @@ module RuboCop
               add_offense(text_node)
             end
             return
-          when :redirect_to
+          when :redirect_to, :redirect_back
             text_node = redirect_to_flash(node).to_a.last
           when :[]=
             text_node = flash_assignment?(node)

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

@@ -35,8 +35,6 @@ module RuboCop
       #     skip_before_action :login_required,
       #       if: -> { trusted_origin? && action_name != "admin" }
       #   end
-      #
-      # @see https://api.rubyonrails.org/classes/AbstractController/Callbacks/ClassMethods.html#method-i-_normalize_callback_options
       class IgnoredSkipActionFilterOption < Base
         MSG = <<~MSG.chomp.freeze
           `%<ignore>s` option will be ignored when `%<prefer>s` and `%<ignore>s` are used together.

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

@@ -137,9 +137,6 @@ module RuboCop
       #   class Blog < ApplicationRecord
       #     has_many :posts, -> { order(published_at: :desc) }
       #   end
-      #
-      # @see https://guides.rubyonrails.org/association_basics.html#bi-directional-associations
-      # @see https://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#module-ActiveRecord::Associations::ClassMethods-label-Setting+Inverses
       class InverseOf < Base
         SPECIFY_MSG = 'Specify an `:inverse_of` option.'
         NIL_MSG = 'You specified `inverse_of: nil`, you probably meant to use `inverse_of: false`.'

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

@@ -144,19 +144,29 @@ module RuboCop
         end
 
         def aliased_action_methods(node, defined_methods)
-          alias_methods = node.each_child_node(:send).select { |send_node| send_node.method?(:alias_method) }
-
-          hash_of_alias_methods = alias_methods.each_with_object({}) do |alias_method, result|
-            result[alias_method.last_argument.value] = alias_method.first_argument.value
-          end
-
+          alias_methods = alias_methods(node)
           defined_methods.each_with_object([]) do |defined_method, aliased_method|
-            if (new_method_name = hash_of_alias_methods[defined_method])
+            if (new_method_name = alias_methods[defined_method])
               aliased_method << new_method_name
             end
           end
         end
 
+        def alias_methods(node)
+          result = {}
+          node.each_child_node(:send, :alias) do |child_node|
+            case child_node.type
+            when :send
+              if child_node.method?(:alias_method)
+                result[child_node.last_argument.value] = child_node.first_argument.value
+              end
+            when :alias
+              result[child_node.old_identifier.value] = child_node.new_identifier.value
+            end
+          end
+          result
+        end
+
         # @param node [RuboCop::AST::Node]
         # @return [Array<Symbol>]
         def array_values(node) # rubocop:disable Metrics/MethodLength

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

@@ -26,7 +26,7 @@ module RuboCop
         RESTRICT_ON_SEND = %i[!].freeze
 
         def_node_matcher :negate_include_call?, <<~PATTERN
-          (send (send $_ :include? $_) :!)
+          (send (send $!nil? :include? $_) :!)
         PATTERN
 
         def on_send(node)

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

@@ -21,7 +21,7 @@ module RuboCop
         RESTRICT_ON_SEND = %i[add_column add_reference].freeze
 
         def_node_matcher :add_not_null_column?, <<~PATTERN
-          (send nil? :add_column _ _ _ (hash $...))
+          (send nil? :add_column _ _ $_ (hash $...))
         PATTERN
 
         def_node_matcher :add_not_null_reference?, <<~PATTERN
@@ -44,17 +44,20 @@ module RuboCop
         private
 
         def check_add_column(node)
-          pairs = add_not_null_column?(node)
-          check_pairs(pairs)
+          add_not_null_column?(node) do |type, pairs|
+            return if type.value == :virtual || type.value == 'virtual'
+
+            check_pairs(pairs)
+          end
         end
 
         def check_add_reference(node)
-          pairs = add_not_null_reference?(node)
-          check_pairs(pairs)
+          add_not_null_reference?(node) do |pairs|
+            check_pairs(pairs)
+          end
         end
 
         def check_pairs(pairs)
-          return unless pairs
           return if pairs.any? { |pair| default_option?(pair) }
 
           null_false = pairs.find { |pair| null_false?(pair) }

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

@@ -9,6 +9,18 @@ module RuboCop
       # element in an enumerable. When called on an Active Record relation, it
       # results in a more efficient query that only selects the necessary key.
       #
+      # @safety
+      #   This cop is unsafe because model can use column aliases.
+      #
+      #   [source,ruby]
+      #   ----
+      #   # Original code
+      #   User.select('name AS nickname').map { |user| user[:nickname] } # => array of nicknames
+      #
+      #   # After autocorrection
+      #   User.select('name AS nickname').pluck(:nickname) # => raises ActiveRecord::StatementInvalid
+      #   ----
+      #
       # @example
       #   # bad
       #   Post.published.map { |post| post[:title] }

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

@@ -112,10 +112,10 @@ module RuboCop
         end
 
         def current(node)
-          if node.source.include?("\n")
+          if !node.ternary? && node.source.include?("\n")
             "#{node.loc.keyword.with(end_pos: node.condition.loc.selector.end_pos).source} ... end"
           else
-            node.source
+            node.source.gsub(/\n\s*/, ' ')
           end
         end
 

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

@@ -8,7 +8,7 @@ module RuboCop
       #
       # Interaction with `Style/UnlessElse`:
       # The configuration of `NotBlank` will not produce an offense in the
-      # context of `unless else` if `Style/UnlessElse` is inabled. This is
+      # context of `unless else` if `Style/UnlessElse` is enabled. This is
       # to prevent interference between the autocorrection of the two cops.
       #
       # @example NotNilAndNotEmpty: true (default)

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Rails
+      # Prefer `response.parsed_body` to `JSON.parse(response.body)`.
+      #
+      # @safety
+      #   This cop's autocorrection is unsafe because Content-Type may not be `application/json`. For example, the
+      #   proprietary Content-Type provided by corporate entities such as `application/vnd.github+json` is not
+      #   supported at `response.parsed_body` by default, so you still have to use `JSON.parse(response.body)` there.
+      #
+      # @example
+      #   # bad
+      #   JSON.parse(response.body)
+      #
+      #   # good
+      #   response.parsed_body
+      class ResponseParsedBody < Base
+        extend AutoCorrector
+        extend TargetRailsVersion
+
+        MSG = 'Prefer `response.parsed_body` to `JSON.parse(response.body)`.'
+
+        RESTRICT_ON_SEND = %i[parse].freeze
+
+        minimum_target_rails_version 5.0
+
+        # @!method json_parse_response_body?(node)
+        def_node_matcher :json_parse_response_body?, <<~PATTERN
+          (send
+            (const {nil? cbase} :JSON)
+            :parse
+            (send
+              (send nil? :response)
+              :body
+            )
+          )
+        PATTERN
+
+        def on_send(node)
+          return unless json_parse_response_body?(node)
+
+          add_offense(node) do |corrector|
+            autocorrect(corrector, node)
+          end
+        end
+
+        private
+
+        def autocorrect(corrector, node)
+          corrector.replace(node, 'response.parsed_body')
+        end
+      end
+    end
+  end
+end

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

@@ -16,23 +16,15 @@ module RuboCop
       #
       #   # good
       #   def change
-      #     create_table :users do |t|
-      #       t.string :name
+      #     change_table :users do |t|
+      #       t.remove :name, :string
       #     end
       #   end
       #
       #   # good
       #   def change
-      #     reversible do |dir|
-      #       change_table :users do |t|
-      #         dir.up do
-      #           t.column :name, :string
-      #         end
-      #
-      #         dir.down do
-      #           t.remove :name
-      #         end
-      #       end
+      #     create_table :users do |t|
+      #       t.string :name
       #     end
       #   end
       #
@@ -114,21 +106,6 @@ module RuboCop
       #     end
       #   end
       #
-      #   # good
-      #   def change
-      #     reversible do |dir|
-      #       change_table :users do |t|
-      #         dir.up do
-      #           t.change :price, :string
-      #         end
-      #
-      #         dir.down do
-      #           t.change :price, :integer
-      #         end
-      #       end
-      #     end
-      #   end
-      #
       # @example
       #   # remove_columns
       #
@@ -173,8 +150,6 @@ module RuboCop
       #   def change
       #     remove_index :users, column: :email
       #   end
-      #
-      # @see https://api.rubyonrails.org/classes/ActiveRecord/Migration/CommandRecorder.html
       class ReversibleMigration < Base
         include MigrationsHelper
 

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

@@ -186,11 +186,7 @@ module RuboCop
         def build_path_glob_replacement(path, method)
           receiver = range_between(path.loc.expression.begin_pos, path.children.first.loc.selector.end_pos).source
 
-          argument = if path.arguments.one?
-                       path.first_argument.source
-                     else
-                       join_arguments(path.arguments)
-                     end
+          argument = path.arguments.one? ? path.first_argument.source : join_arguments(path.arguments)
 
           "#{receiver}.#{method}(#{argument})"
         end
@@ -214,11 +210,28 @@ module RuboCop
         end
 
         def join_arguments(arguments)
-          quote = include_interpolation?(arguments) ? '"' : "'"
-          joined_arguments = arguments.map(&:value).join('/')
+          use_interpolation = false
+
+          joined_arguments = arguments.map do |arg|
+            if arg.respond_to?(:value)
+              arg.value
+            else
+              use_interpolation = true
+              "\#{#{arg.source}}"
+            end
+          end.join('/')
+          quote = enforce_double_quotes? || include_interpolation?(arguments) || use_interpolation ? '"' : "'"
 
           "#{quote}#{joined_arguments}#{quote}"
         end
+
+        def enforce_double_quotes?
+          string_literals_config['EnforcedStyle'] == 'double_quotes'
+        end
+
+        def string_literals_config
+          config.for_cop('Style/StringLiterals')
+        end
       end
     end
   end

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

@@ -48,6 +48,7 @@ module RuboCop
         SQL = 'SQL'
         SQUISH = '.squish'
         MSG = 'Use `%<expect>s` instead of `%<current>s`.'
+        SQL_IDENTIFIER_MARKERS = /(".+?")|('.+?')|(\[.+?\])/.freeze
 
         def on_heredoc(node)
           return unless offense_detected?(node)
@@ -60,7 +61,7 @@ module RuboCop
         private
 
         def offense_detected?(node)
-          sql_heredoc?(node) && !using_squish?(node)
+          sql_heredoc?(node) && !using_squish?(node) && !singleline_comments_present?(node)
         end
 
         def sql_heredoc?(node)
@@ -71,6 +72,12 @@ module RuboCop
           node.parent&.send_type? && node.parent&.method?(:squish)
         end
 
+        def singleline_comments_present?(node)
+          sql = node.children.map { |c| c.is_a?(String) ? c : c.source }.join('\n')
+
+          sql.gsub(SQL_IDENTIFIER_MARKERS, '').include?('--')
+        end
+
         def message(node)
           format(MSG, expect: "#{node.source}#{SQUISH}", current: node.source)
         end

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

@@ -228,12 +228,25 @@ module RuboCop
           acceptable
         end
 
-        # Time.new can be called with a time zone offset
+        # Time.new, Time.at, and Time.now can be called with a time zone offset
         # When it is, that should be considered safe
         # Example:
         # Time.new(1988, 3, 15, 3, 0, 0, "-05:00")
         def offset_provided?(node)
-          node.arguments.size >= 7
+          case node.method_name
+          when :new
+            node.arguments.size == 7 || offset_option_provided?(node)
+          when :at, :now
+            offset_option_provided?(node)
+          end
+        end
+
+        def offset_option_provided?(node)
+          options = node.last_argument
+          options&.hash_type? &&
+            options.each_pair.any? do |pair|
+              pair.key.sym_type? && pair.key.value == :in && !pair.value.nil_type?
+            end
         end
       end
     end

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

@@ -45,8 +45,6 @@ module RuboCop
       #     # Commit
       #     next if user.active?
       #   end
-      #
-      # @see https://github.com/rails/rails/commit/15aa4200e083
       class TransactionExitStatement < Base
         MSG = <<~MSG.chomp
           Exit statement `%<statement>s` is not allowed. Use `raise` (rollback) or `next` (commit).

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

@@ -139,11 +139,20 @@ module RuboCop
           pairs = node.arguments.last
           return unless pairs.hash_type?
 
+          return true if condition_hash_part?(pairs, keys: %i[if unless])
+
+          uniqueness_node = uniqueness_part(node)
+          return unless uniqueness_node&.hash_type?
+
+          condition_hash_part?(uniqueness_node, keys: %i[if unless conditions])
+        end
+
+        def condition_hash_part?(pairs, keys:)
           pairs.each_pair.any? do |pair|
             key = pair.key
             next unless key.sym_type?
 
-            key.value == :if || key.value == :unless
+            keys.include?(key.value)
           end
         end
 

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

@@ -28,12 +28,16 @@ module RuboCop
           (send self :ignored_columns= $array)
         PATTERN
 
+        def_node_matcher :appended_ignored_columns, <<~PATTERN
+          (op-asgn (send self :ignored_columns) :+ $array)
+        PATTERN
+
         def_node_matcher :column_name, <<~PATTERN
           ({str sym} $_)
         PATTERN
 
         def on_send(node)
-          return unless (columns = ignored_columns(node))
+          return unless (columns = ignored_columns(node) || appended_ignored_columns(node))
           return unless schema
 
           table = table(node)
@@ -43,6 +47,7 @@ module RuboCop
             check_column_existence(column_node, table)
           end
         end
+        alias on_op_asgn on_send
 
         private
 

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

@@ -38,7 +38,9 @@ module RuboCop
         def on_send(node)
           return unless node.first_argument.sym_type?
 
-          where_node_and_argument(root_receiver(node)) do |where_node, where_argument|
+          root_receiver = root_receiver(node)
+          where_node_and_argument(root_receiver) do |where_node, where_argument|
+            next unless root_receiver == root_receiver(where_node)
             next unless same_relationship?(where_argument, node.first_argument)
 
             range = range_between(node.loc.selector.begin_pos, node.loc.expression.end_pos)
@@ -50,7 +52,12 @@ module RuboCop
         private
 
         def root_receiver(node)
-          node&.parent&.send_type? ? root_receiver(node.parent) : node
+          parent = node.parent
+          if !parent&.send_type? || parent.method?(:or) || parent.method?(:and)
+            node
+          else
+            root_receiver(parent)
+          end
         end
 
         def same_relationship?(where, left_joins)

data/lib/rubocop/cop/rails_cops.rb

@@ -99,6 +99,7 @@ require_relative 'rails/render_inline'
 require_relative 'rails/render_plain_text'
 require_relative 'rails/request_referer'
 require_relative 'rails/require_dependency'
+require_relative 'rails/response_parsed_body'
 require_relative 'rails/reversible_migration'
 require_relative 'rails/reversible_migration_method_definition'
 require_relative 'rails/root_join_chain'

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

data/lib/rubocop/rails.rb

@@ -5,7 +5,7 @@ module RuboCop
   module Rails
     PROJECT_ROOT   = Pathname.new(__dir__).parent.parent.expand_path.freeze
     CONFIG_DEFAULT = PROJECT_ROOT.join('config', 'default.yml').freeze
-    CONFIG         = YAML.safe_load(CONFIG_DEFAULT.read).freeze
+    CONFIG         = YAML.safe_load(CONFIG_DEFAULT.read, permitted_classes: [Regexp, Symbol]).freeze
 
     private_constant(:CONFIG_DEFAULT, :PROJECT_ROOT)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails
 version: !ruby/object:Gem::Version
-  version: 2.17.3
+  version: 2.18.0
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-20 00:00:00.000000000 Z
+date: 2023-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -173,6 +173,7 @@ files:
 - lib/rubocop/cop/rails/render_plain_text.rb
 - lib/rubocop/cop/rails/request_referer.rb
 - lib/rubocop/cop/rails/require_dependency.rb
+- lib/rubocop/cop/rails/response_parsed_body.rb
 - lib/rubocop/cop/rails/reversible_migration.rb
 - lib/rubocop/cop/rails/reversible_migration_method_definition.rb
 - lib/rubocop/cop/rails/root_join_chain.rb
@@ -217,7 +218,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.17/
+  documentation_uri: https://docs.rubocop.org/rubocop-rails/2.18/
   bug_tracker_uri: https://github.com/rubocop/rubocop-rails/issues
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Automatic Rails code style checking tool.