rubocop-rails 2.11.2 → 2.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f7044795da60c3d19962181ad6e9bc1914c1ae9c46f5072f4c2bc9c6115add
-  data.tar.gz: d1130053b86d468d25b114694dca3d56eea533aafdbff9ff8dc33f3fdc306fbb
+  metadata.gz: afc20a9d5f0799fab1f02a5a05c3b297a47b1713f6b948a25511da46b2e5a332
+  data.tar.gz: d71033e04f2cd0b1f7801d1ab80d99859af6e3d1bfba9551dec1d18a0e7b40dc
 SHA512:
-  metadata.gz: 49d18f985b54c2a8beefe8f00ad758b2cabed80d463315e10c994eeb348af4f1e6db1f53ac7a73434105d210db831b98ddb8f5ae44e849346888ff427c4eabcc
-  data.tar.gz: 291ad9f2cafe1c8ce146bf9e311e5bf84c667e087596050076d9fa560ef0612c41a425beb8d314386f98e4f2eeb4f31bdb50f134eebad52b44efca82ea4299ba
+  metadata.gz: eab328cf38c0f4957b79c3722175edd1a259af69f6c7c4a4501bc72a245b70ef3d4290b4daf4ef6925bf643dcffb1370a50ccfc5e7e870e138c3df675598df54
+  data.tar.gz: 7fb02325ab085ed0d716718dc02da92b39da5710b117b49a722f8f0d4de4d2e47648278a39aff455b81d2186b4914eed7f797fbdfd86d2ff4ee570dc20543309

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

@@ -57,12 +57,13 @@ module RuboCop
       # Resolve relation into column name.
       # It just returns column_name if the column exists.
       # Or it tries to resolve column_name as a relation.
+      # Returns an array of column names if the relation is polymorphic.
       # It returns `nil` if it can't resolve.
       #
       # @param name [String]
       # @param class_node [RuboCop::AST::Node]
       # @param table [RuboCop::Rails::SchemaLoader::Table]
-      # @return [String, nil]
+      # @return [Array, String, nil]
       def resolve_relation_into_column(name:, class_node:, table:)
         return unless table
         return name if table.with_column?(name: name)
@@ -71,7 +72,9 @@ module RuboCop
           next unless belongs_to.first_argument.value.to_s == name
 
           fk = foreign_key_of(belongs_to) || "#{name}_id"
-          return fk if table.with_column?(name: fk)
+          next unless table.with_column?(name: fk)
+
+          return polymorphic?(belongs_to) ? [fk, "#{name}_type"] : fk
         end
         nil
       end
@@ -88,6 +91,15 @@ module RuboCop
         end
       end
 
+      def polymorphic?(belongs_to)
+        options = belongs_to.last_argument
+        return false unless options.hash_type?
+
+        options.each_pair.any? do |pair|
+          pair.key.sym_type? && pair.key.value == :polymorphic && pair.value.true_type?
+        end
+      end
+
       def in_where?(node)
         send_node = node.each_ancestor(:send).first
         send_node && WHERE_METHODS.include?(send_node.method_name)

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

@@ -71,7 +71,7 @@ module RuboCop
 
         # Autocorrect by swapping between two nodes autocorrecting them
         def autocorrect(corrector, node)
-          previous = left_siblings_of(node).reverse_each.find do |sibling|
+          previous = node.left_siblings.reverse_each.find do |sibling|
             callback?(sibling)
           end
 
@@ -96,14 +96,6 @@ module RuboCop
           node.send_type? && CALLBACKS_ORDER_MAP.key?(node.method_name)
         end
 
-        def left_siblings_of(node)
-          siblings_of(node)[0, node.sibling_index]
-        end
-
-        def siblings_of(node)
-          node.parent.children
-        end
-
         def source_range_with_comment(node)
           begin_pos = begin_pos_with_comment(node)
           end_pos = end_position_for(node)

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

@@ -56,8 +56,8 @@ module RuboCop
 
         def register_offense(allow_nil, message)
           add_offense(allow_nil, message: message) do |corrector|
-            prv_sib = previous_sibling(allow_nil)
-            nxt_sib = next_sibling(allow_nil)
+            prv_sib = allow_nil.left_sibling
+            nxt_sib = allow_nil.right_sibling
 
             if nxt_sib
               corrector.remove(range_between(node_beg(allow_nil), node_beg(nxt_sib)))
@@ -88,14 +88,6 @@ module RuboCop
           nil
         end
 
-        def previous_sibling(node)
-          node.parent.children[node.sibling_index - 1]
-        end
-
-        def next_sibling(node)
-          node.parent.children[node.sibling_index + 1]
-        end
-
         def node_beg(node)
           node.loc.expression.begin_pos
         end

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

@@ -81,7 +81,7 @@ module RuboCop
           names_from_scope = column_names_from_scope(node)
           ret.concat(names_from_scope) if names_from_scope
 
-          ret.map! do |name|
+          ret = ret.flat_map do |name|
             klass = class_node(node)
             resolve_relation_into_column(
               name: name.to_s,

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.11.2'
+      STRING = '2.11.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.11.2
+  version: 2.11.3
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport