rubocop-rails 2.17.4 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a9beeaefa16cbe4afb5d598878444a835536ccda5d9b46c3e44e111513f1d8e
-  data.tar.gz: 669a9681ce5ab1fca038229a831f7e5acae6bbdcc3a58ecfc88d65fd54ef7190
+  metadata.gz: 327dd4bed957b6be1d52e47a9087f43abf7f7361ddaf8b0c3b13dbb0bf7bbb52
+  data.tar.gz: cf2c5747f8abab6e65ff8ffc9d31693c42c0515e8751a1d5b0651c12c7ceb93a
 SHA512:
-  metadata.gz: 72ca38ec9a9136bfa5bd635db9290314a4d1a4c8e3942f15aa62a823885ff1a1783f884598dce6f52765db75daccf8e4054d3faecdf973da6f2c53b10dc2c153
-  data.tar.gz: 536c7d8f5dfec22444d2d0fc4b297eac18f7b87cc6c871ce250bec58a2a6d380e814749534e5aedc47c0a66c7ae80ac8c61ffec330093c575cd1cc8dd76e4de9
+  metadata.gz: 4114a576ae595944cd0ec1b673e8f706fa975a643fb9d56e25b5498b7964f5141e2724aeb2dc24c6b63f6d501c7e1a85469a32333be69862e054fdb10874f09c
+  data.tar.gz: c87e88b3de8ea166a68a0be6a08e70e387790b3d705648145a8d769978f1c92e03ea18fe510b1ce5543c6f1fefe59be1f0fd583ba392dd2274b1dde58a21ca61

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/README.md

@@ -12,7 +12,7 @@ Note: This repository manages rubocop-rails gem (>= 2.0.0). rubocop-rails gem (<
 Just install the `rubocop-rails` gem
 
 ```sh
-gem install rubocop-rails
+$ gem install rubocop-rails
 ```
 
 or if you use bundler put this in your `Gemfile`
@@ -48,7 +48,7 @@ cops together with the standard cops.
 ### Command line
 
 ```sh
-rubocop --require rubocop-rails
+$ rubocop --require rubocop-rails
 ```
 
 Note: `--rails` option is required while `rubocop` command supports `--rails` option.
@@ -61,6 +61,26 @@ RuboCop::RakeTask.new do |task|
 end
 ```
 
+## Rails configuration tip
+
+If you are using Rails 6.1 or newer, add the following `config.generators.after_generate` setting to
+your config/application.rb to apply RuboCop autocorrection to code generated by `bin/rails g`.
+
+```ruby
+# config/application.rb
+module YourCoolApp
+  class Application < Rails::Application
+    config.generators.after_generate do |files|
+      system("bundle exec rubocop -A --fail-level=E #{files.shelljoin}", exception: true)
+    end
+  end
+end
+```
+
+It uses `rubocop -A` to apply `Style/FrozenStringLiteralComment` and other unsafe autocorretion cops.
+`rubocop -A` is unsafe autocorrection, but code generated by default is simple and less likely to
+be incompatible with `rubocop -A`. If you have problems you can replace it with `rubocop -a` instead.
+
 ## The Cops
 
 All cops are located under

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
@@ -70,8 +53,6 @@ Rails:
 
 Rails/ActionControllerFlashBeforeRender:
   Description: 'Use `flash.now` instead of `flash` before `render`.'
-  StyleGuide: 'https://rails.rubystyle.guide/#flash-before-render'
-  Reference: 'https://api.rubyonrails.org/classes/ActionController/FlashBeforeRender.html'
   Enabled: 'pending'
   SafeAutoCorrect: false
   VersionAdded: '2.16'
@@ -135,7 +116,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 +209,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 +230,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 +319,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 +333,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,11 +457,12 @@ 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
+  Safe: false
   VersionAdded: '0.30'
-  VersionChanged: '2.9'
+  VersionChanged: '2.19'
   Include:
     - app/models/**/*.rb
   AllowedMethods:
@@ -477,13 +472,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 +580,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 +686,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 +840,18 @@ Rails/RequireDependency:
   Enabled: false
   VersionAdded: '2.10'
 
+Rails/ResponseParsedBody:
+  Description: Prefer `response.parsed_body` to `JSON.parse(response.body)`.
+  Enabled: pending
+  Safe: false
+  VersionAdded: '2.18'
+  VersionChanged: '2.19'
+  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'
@@ -992,6 +997,14 @@ Rails/TableNameAssignment:
   Include:
     - app/models/**/*.rb
 
+Rails/ThreeStateBooleanColumn:
+  Description: 'Add a default value and a `NOT NULL` constraint to boolean columns.'
+  StyleGuide: 'https://rails.rubystyle.guide/#three-state-boolean'
+  Enabled: pending
+  VersionAdded: '2.19'
+  Include:
+    - db/**/*.rb
+
 Rails/TimeZone:
   Description: 'Checks the correct usage of time zone aware methods.'
   StyleGuide: 'https://rails.rubystyle.guide#time'
@@ -1038,10 +1051,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 +1083,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 +1140,18 @@ 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/SymbolProc:
   AllowedMethods:
     - define_method

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

@@ -32,7 +32,7 @@ module RuboCop
 
       def register_offense(offense_node)
         add_offense(offense_node) do |corrector|
-          corrector.replace(offense_node.source_range, self.class::SUPERCLASS)
+          corrector.replace(offense_node, self.class::SUPERCLASS)
         end
       end
     end

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

@@ -138,7 +138,7 @@ module RuboCop
         end
 
         def strip_prefix_and_suffix(node, corrector)
-          expression = node.loc.expression
+          expression = node.source_range
           corrector.remove_leading(expression, leading)
           corrector.remove_trailing(expression, trailing)
         end
@@ -153,11 +153,11 @@ module RuboCop
         end
 
         def set_new_arg_name(transformed_argname, corrector)
-          corrector.replace(block_node.arguments.loc.expression, "|#{transformed_argname}|")
+          corrector.replace(block_node.arguments, "|#{transformed_argname}|")
         end
 
         def set_new_body_expression(transforming_body_expr, corrector)
-          corrector.replace(block_node.body.loc.expression, transforming_body_expr.loc.expression.source)
+          corrector.replace(block_node.body, transforming_body_expr.source)
         end
       end
     end

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

@@ -67,9 +67,11 @@ module RuboCop
         private
 
         def followed_by_render?(flash_node)
-          flash_assigment_node = find_ancestor(flash_node, type: :send)
-          context = flash_assigment_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
@@ -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/action_order.rb

@@ -92,12 +92,11 @@ module RuboCop
         end
 
         def range_with_comments(node)
-          ranges = [
-            node,
-            *processed_source.ast_with_comments[node]
-          ].map do |element|
-            element.location.expression
-          end
+          # rubocop:todo InternalAffairs/LocationExpression
+          # Using `RuboCop::Ext::Comment#source_range` requires RuboCop > 1.46,
+          # which introduces https://github.com/rubocop/rubocop/pull/11630.
+          ranges = [node, *processed_source.ast_with_comments[node]].map { |comment| comment.loc.expression }
+          # rubocop:enable InternalAffairs/LocationExpression
           ranges.reduce do |result, range|
             add_range(result, range)
           end

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/active_record_callbacks_order.rb

@@ -104,7 +104,7 @@ module RuboCop
         end
 
         def end_position_for(node)
-          end_line = buffer.line_for_position(node.loc.expression.end_pos)
+          end_line = buffer.line_for_position(node.source_range.end_pos)
           buffer.line_range(end_line).end_pos
         end
 
@@ -112,8 +112,7 @@ module RuboCop
           annotation_line = node.first_line - 1
           first_comment = nil
 
-          processed_source.comments_before_line(annotation_line)
-                          .reverse_each do |comment|
+          processed_source.each_comment_in_lines(0..annotation_line).reverse_each do |comment|
             if comment.location.line == annotation_line && !inline_comment?(comment)
               first_comment = comment
               annotation_line -= 1
@@ -124,7 +123,11 @@ module RuboCop
         end
 
         def inline_comment?(comment)
+          # rubocop:todo InternalAffairs/LocationExpression
+          # Using `RuboCop::Ext::Comment#source_range` requires RuboCop > 1.46,
+          # which introduces https://github.com/rubocop/rubocop/pull/11630.
           !comment_line?(comment.loc.expression.source_line)
+          # rubocop:enable InternalAffairs/LocationExpression
         end
 
         def start_line_position(node)

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

@@ -42,7 +42,7 @@ module RuboCop
             add_index_opts = ''
 
             if value.hash_type?
-              hash = value.loc.expression.adjust(begin_pos: 1, end_pos: -1).source.strip
+              hash = value.source_range.adjust(begin_pos: 1, end_pos: -1).source.strip
               add_index_opts = ", #{hash}"
             end
 
@@ -53,7 +53,7 @@ module RuboCop
         private
 
         def index_range(pair_node)
-          range_with_surrounding_comma(range_with_surrounding_space(pair_node.loc.expression, side: :left), :left)
+          range_with_surrounding_comma(range_with_surrounding_space(pair_node.source_range, side: :left), :left)
         end
       end
     end

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

@@ -36,7 +36,7 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.source_range, self.class::SUPERCLASS)
+            corrector.replace(node, self.class::SUPERCLASS)
           end
         end
       end

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

@@ -38,7 +38,7 @@ module RuboCop
           return unless (star = star_bracket?(node))
 
           add_offense(star) do |corrector|
-            corrector.replace(star.loc.expression, 'Arel.star')
+            corrector.replace(star, 'Arel.star')
           end
         end
       end

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

@@ -25,7 +25,7 @@ module RuboCop
           return unless offensive?(node)
 
           add_offense(node) do |corrector|
-            expression = node.loc.expression
+            expression = node.source_range
 
             corrector.replace(expression, corrected_source(expression.source))
           end

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
@@ -83,7 +80,7 @@ module RuboCop
               end
 
             add_offense(node.loc.selector, message: message) do |corrector|
-              corrector.replace(option_node.loc.expression, replacement)
+              corrector.replace(option_node, replacement)
             end
           end
         end

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
@@ -142,10 +142,10 @@ module RuboCop
 
           if method_call
             corrector.replace(node.loc.keyword, 'if')
-            range = method_call.loc.expression
+            range = method_call.source_range
           else
             variable1, _variable2 = nil_or_empty?(node) || not_present?(node)
-            range = node.loc.expression
+            range = node.source_range
           end
 
           corrector.replace(range, replacement(variable1))
@@ -153,9 +153,9 @@ module RuboCop
 
         def unless_condition(node, method_call)
           if node.modifier_form?
-            node.loc.keyword.join(node.loc.expression.end)
+            node.loc.keyword.join(node.source_range.end)
           else
-            node.loc.expression.begin.join(method_call.loc.expression)
+            node.source_range.begin.join(method_call.source_range)
           end
         end
 

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/compact_blank.rb

@@ -94,9 +94,9 @@ module RuboCop
 
         def offense_range(node)
           end_pos = if node.parent&.block_type? && node.parent&.send_node == node
-                      node.parent.loc.expression.end_pos
+                      node.parent.source_range.end_pos
                     else
-                      node.loc.expression.end_pos
+                      node.source_range.end_pos
                     end
 
           range_between(node.loc.selector.begin_pos, end_pos)

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

@@ -85,7 +85,7 @@ module RuboCop
         end
 
         def correction_range(node)
-          range_between(node.loc.selector.begin_pos, node.loc.expression.end_pos)
+          range_between(node.loc.selector.begin_pos, node.source_range.end_pos)
         end
       end
     end

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

@@ -3,10 +3,12 @@
 module RuboCop
   module Cop
     module Rails
-      # Checks the migration for which timestamps are not included
-      # when creating a new table.
+      # Checks the migration for which timestamps are not included when creating a new table.
       # In many cases, timestamps are useful information and should be added.
       #
+      # NOTE: Allow `timestamps` not written when `id: false` because this emphasizes respecting
+      # user's editing intentions.
+      #
       # @example
       #   # bad
       #   create_table :users
@@ -40,12 +42,23 @@ module RuboCop
       #
       #     t.datetime :updated_at, default: -> { 'CURRENT_TIMESTAMP' }
       #   end
+      #
+      #   # good
+      #   create_table :users, articles, id: false do |t|
+      #     t.integer :user_id
+      #     t.integer :article_id
+      #   end
+      #
       class CreateTableWithTimestamps < Base
         include ActiveRecordMigrationsHelper
 
         MSG = 'Add timestamps when creating a new table.'
         RESTRICT_ON_SEND = %i[create_table].freeze
 
+        def_node_search :use_id_false_option?, <<~PATTERN
+          (pair (sym :id) (false))
+        PATTERN
+
         def_node_matcher :create_table_with_timestamps_proc?, <<~PATTERN
           (send nil? :create_table (sym _) ... (block-pass (sym :timestamps)))
         PATTERN
@@ -61,7 +74,7 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return unless node.command?(:create_table)
+          return if !node.command?(:create_table) || use_id_false_option?(node)
 
           parent = node.parent
 

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

@@ -24,6 +24,14 @@ module RuboCop
       #   # good
       #   delegate :bar, to: :foo
       #
+      #   # bad
+      #   def bar
+      #     self.bar
+      #   end
+      #
+      #   # good
+      #   delegate :bar, to: :self
+      #
       #   # good
       #   def bar
       #     foo&.bar
@@ -60,7 +68,7 @@ module RuboCop
 
         def_node_matcher :delegate?, <<~PATTERN
           (def _method_name _args
-            (send (send nil? _) _ ...))
+            (send {(send nil? _) (self)} _ ...))
         PATTERN
 
         def on_def(node)
@@ -74,10 +82,14 @@ module RuboCop
 
         def register_offense(node)
           add_offense(node.loc.keyword) do |corrector|
-            delegation = ["delegate :#{node.body.method_name}", "to: :#{node.body.receiver.method_name}"]
+            body = node.body
+
+            receiver = body.receiver.self_type? ? 'self' : ":#{body.receiver.method_name}"
+
+            delegation = ["delegate :#{body.method_name}", "to: #{receiver}"]
             delegation << ['prefix: true'] if node.method?(prefixed_method_name(node.body))
 
-            corrector.replace(node.source_range, delegation.join(', '))
+            corrector.replace(node, delegation.join(', '))
           end
         end
 
@@ -106,6 +118,8 @@ module RuboCop
         end
 
         def prefixed_method_name(body)
+          return '' if body.receiver.self_type?
+
           [body.receiver.method_name, body.method_name].join('_').to_sym
         end
 

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

@@ -27,7 +27,7 @@ module RuboCop
           return unless (offending_node = allow_blank_option(node))
 
           add_offense(offending_node) do |corrector|
-            corrector.replace(offending_node.key.source_range, 'allow_nil')
+            corrector.replace(offending_node.key, 'allow_nil')
           end
         end
       end

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