rubocop-rails 2.12.0 → 2.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547615c004c88ace5079ff3c4c0da33bbc3a6187b963baaf82ba34ee9a068224
-  data.tar.gz: b7b09ff7ab96257ea329a393158c656f2d92fa3e3528916dc4bd3664f2341f90
+  metadata.gz: 7c247cc795386a013c8f1a9dd7a76a08ef8fbd3c729ebe69e2f99bcb28a7baf6
+  data.tar.gz: f85139a9ef4a5f1666672431285e6d34ca9a8c0a367bf6c1e2b8ed2d3d0acf63
 SHA512:
-  metadata.gz: 97f42ef251a1f3bcb91d0e08e3b89fb480a6555aa8f13266c57d0bf6b8319e35b4d200b8c4d2f407c303b8b8bbf72dc354a259688e27f032e625516683f1aafc
-  data.tar.gz: c9b8d93ad9c39f1903c2424c0e0e284281e7effe0373fbcfe8e3138b2dd659122fb69cb658b9560f4af8a94cd332ad80066b3617339a21ae24de47cf2987f2c6
+  metadata.gz: cd4893d903809e187a9094f84a14209aecfc931e4773df64e1c5a05c94fce22305ca0b0c899881545e697ceae8c6facb3400d0dc41415fed57a3b07244b7fdff
+  data.tar.gz: 91832638f61072047b0cf11b300d7be679a8fc7f708dc47cb5769eb1cd7852c8caf70452d6297cca122af4a53fd0599605d7221a8fc647e96352934fb0828684

data/config/default.yml

@@ -9,7 +9,7 @@ AllCops:
     - bin/*
     - db/schema.rb
   # What version of Rails is the inspected code using?  If a value is specified
-  # for TargetRailsVersion then it is used.  Acceptable values are specificed
+  # for TargetRailsVersion then it is used.  Acceptable values are specified
   # as a float (i.e. 5.1); the patch version of Rails should not be included.
   # If TargetRailsVersion is not set, RuboCop will parse the Gemfile.lock or
   # gems.locked file to find the version of Rails that has been bound to the
@@ -189,6 +189,9 @@ Rails/ContentTag:
   Enabled: true
   VersionAdded: '2.6'
   VersionChanged: '2.12'
+  # This `Exclude` config prevents false positives for `tag` calls to `has_one: tag`. No helpers are used in normal models.
+  Exclude:
+    - app/models/**/*.rb
 
 Rails/CreateTableWithTimestamps:
   Description: >-
@@ -198,6 +201,10 @@ Rails/CreateTableWithTimestamps:
   VersionAdded: '0.52'
   Include:
     - db/migrate/*.rb
+  Exclude:
+    # Respect the `active_storage_variant_records` table of `*_create_active_storage_tables.active_storage.rb`
+    # auto-generated by `bin/rails active_storage:install` even if `created_at` is not specified.
+    - db/migrate/*_create_active_storage_tables.active_storage.rb
 
 Rails/Date:
   Description: >-
@@ -816,7 +823,7 @@ Rails/UniqBeforePluck:
   AutoCorrect: false
 
 Rails/UniqueValidationWithoutIndex:
-  Description: 'Uniqueness validation should be with a unique index.'
+  Description: 'Uniqueness validation should have a unique index on the database column.'
   Enabled: true
   VersionAdded: '2.5'
   Include:

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

@@ -8,10 +8,10 @@ module RuboCop
       #
       # @example
       #   #bad
-      #   Book.update_attributes!(author: 'Alice')
+      #   book.update_attributes!(author: 'Alice')
       #
       #   #good
-      #   Book.update!(author: 'Alice')
+      #   book.update!(author: 'Alice')
       class ActiveRecordAliases < Base
         extend AutoCorrector
 

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

@@ -33,6 +33,9 @@ module RuboCop
         end
 
         def on_send(node)
+          return unless node.receiver.nil?
+          return if node.arguments.count >= 3
+
           first_argument = node.first_argument
           return if !first_argument ||
                     allowed_argument?(first_argument) ||
@@ -41,12 +44,7 @@ module RuboCop
           preferred_method = node.first_argument.value.to_s.underscore
           message = format(MSG, preferred_method: preferred_method, current_argument: first_argument.source)
 
-          add_offense(node, message: message) do |corrector|
-            autocorrect(corrector, node, preferred_method)
-
-            @corrected_nodes ||= Set.new.compare_by_identity
-            @corrected_nodes.add(node)
-          end
+          register_offense(node, message, preferred_method)
         end
 
         private
@@ -63,6 +61,15 @@ module RuboCop
             allowed_name?(argument)
         end
 
+        def register_offense(node, message, preferred_method)
+          add_offense(node, message: message) do |corrector|
+            autocorrect(corrector, node, preferred_method)
+
+            @corrected_nodes ||= Set.new.compare_by_identity
+            @corrected_nodes.add(node)
+          end
+        end
+
         def autocorrect(corrector, node, preferred_method)
           range = correction_range(node)
 

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

@@ -43,9 +43,22 @@ module RuboCop
         private
 
         def ignored?(node)
+          return true if active_model_error_where?(node.receiver)
+
           method_chain = node.each_node(:send).map(&:method_name)
+
           (cop_config['IgnoredMethods'].map(&:to_sym) & method_chain).any?
         end
+
+        def active_model_error_where?(node)
+          node.method?(:where) && active_model_error?(node.receiver)
+        end
+
+        def active_model_error?(node)
+          return false if node.nil?
+
+          node.send_type? && node.method?(:errors)
+        end
       end
     end
   end

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

@@ -45,7 +45,7 @@ module RuboCop
         PATTERN
 
         def_node_matcher :association_with_options?, <<~PATTERN
-          (send nil? {:has_many :has_one} _ (hash $...))
+          (send nil? {:has_many :has_one} ... (hash $...))
         PATTERN
 
         def_node_matcher :dependent_option?, <<~PATTERN
@@ -100,8 +100,8 @@ module RuboCop
         end
 
         def contain_valid_options_in_with_options_block?(node)
-          if with_options_block(node)
-            return true if valid_options?(with_options_block(node))
+          if (options = with_options_block(node))
+            return true if valid_options?(options)
 
             return false unless node.parent
 
@@ -114,6 +114,8 @@ module RuboCop
         end
 
         def valid_options?(options)
+          return false if options.nil?
+
           options = options.first.children.first.pairs if options.first.kwsplat_type?
 
           return true unless options

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

@@ -90,7 +90,7 @@ module RuboCop
         end
 
         def nested_relative_date(node, &callback)
-          return if node.block_type?
+          return if node.nil? || node.block_type?
 
           node.each_child_node do |child|
             nested_relative_date(child, &callback)

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

@@ -317,16 +317,24 @@ module RuboCop
           return if receiver != node.receiver &&
                     reversible_change_table_call?(node)
 
+          action = if method_name == :remove
+                     target_rails_version >= 6.1 ? 't.remove (without type)' : 't.remove'
+                   else
+                     "change_table(with #{method_name})"
+                   end
+
           add_offense(
             node,
-            message: format(MSG, action: "change_table(with #{method_name})")
+            message: format(MSG, action: action)
           )
         end
 
         def reversible_change_table_call?(node)
           case node.method_name
-          when :change, :remove
+          when :change
             false
+          when :remove
+            target_rails_version >= 6.1 && all_hash_key?(node.arguments.last, :type)
           when :change_default, :change_column_default, :change_table_comment,
                :change_column_comment
             all_hash_key?(node.arguments.last, :from, :to)

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

@@ -27,7 +27,7 @@ module RuboCop
       class UniqueValidationWithoutIndex < Base
         include ActiveRecordHelper
 
-        MSG = 'Uniqueness validation should be with a unique index.'
+        MSG = 'Uniqueness validation should have a unique index on the database column.'
         RESTRICT_ON_SEND = %i[validates].freeze
 
         def on_send(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.12.0'
+      STRING = '2.12.4'
 
       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.12.0
+  version: 2.12.4
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2021-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Automatic Rails code style checking tool.