rubocop-rails 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd5bcec81363b7952d67bc476f82e25fbe0e0a8e4eb62e490712ddb5cfb58807
-  data.tar.gz: 0eeec3b789aed712f41d0f842620ec0fd871dc884fe791819256b5777a0edb9d
+  metadata.gz: 2ad01eddf8f7245cdbba5eef8c2c7f73656707bde4dd3e1dc08e6604284e2c5b
+  data.tar.gz: b4542ee0b28af39310b2fbf6e5b7e276249144050edf90208036b8b9dafe64da
 SHA512:
-  metadata.gz: 4fb1e35ca0fab64ed16959e29d2144b5cb9aafaf5064d04c67f1bee3cba9eaa4cc2c7c87b71dc240d10c1d11a8361ccacb3cb7002b9e14ef0a3908bfe271f79d
-  data.tar.gz: 108de4501d9f50c50d7d3e23c93574a1a2eee389d5abef80b7e9982d3d7dba524dc263cf76986ae3caa1ab202fc4c7b20ce8106ac82dab5c43e7a578f4fe04ef
+  metadata.gz: d3c643803fcbeb378b60bf8c811bda542445d03ded462975d2c89f3a49e3f36b0c4f46468adbbbc768923a4f01545e5b03159ee2a675687bd49906b81dd28912
+  data.tar.gz: a471837a24adbb346243c23a2e88d0daceb2214632e7b92fc075b4936897fec91b06cb56d6131e65ea9716a643f3a635317357053364f29f6a7663ccefd62f32

data/config/default.yml

@@ -57,22 +57,30 @@ Rails/ActiveSupportAliases:
 Rails/ApplicationController:
   Description: 'Check that controllers subclass ApplicationController.'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '2.4'
+  VersionChanged: '2.5'
 
 Rails/ApplicationJob:
   Description: 'Check that jobs subclass ApplicationJob.'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '0.49'
+  VersionChanged: '2.5'
 
 Rails/ApplicationMailer:
   Description: 'Check that mailers subclass ApplicationMailer.'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '2.4'
+  VersionChanged: '2.5'
 
 Rails/ApplicationRecord:
   Description: 'Check that models subclass ApplicationRecord.'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '0.49'
+  VersionChanged: '2.5'
 
 Rails/AssertNot:
   Description: 'Use `assert_not` instead of `assert !`.'

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

@@ -32,6 +32,7 @@ module RuboCop
         def on_send(node)
           return unless node.method?(:validates)
           return unless uniqueness_part(node)
+          return if condition_part?(node)
           return unless schema
           return if with_index?(node)
 
@@ -50,8 +51,21 @@ module RuboCop
           names = column_names(node)
           return true unless names
 
-          table.indices.any? do |index|
-            index.unique && index.columns.to_set == names
+          # Compatibility for Rails 4.2.
+          add_indicies = schema.add_indicies_by(table_name: table_name(klass))
+
+          (table.indices + add_indicies).any? do |index|
+            index.unique &&
+              (index.columns.to_set == names ||
+               include_column_names_in_expression_index?(index, names))
+          end
+        end
+
+        def include_column_names_in_expression_index?(index, column_names)
+          return false unless (expression_index = index.expression)
+
+          column_names.all? do |column_name|
+            expression_index.include?(column_name)
           end
         end
 
@@ -113,6 +127,18 @@ module RuboCop
           end
         end
 
+        def condition_part?(node)
+          pairs = node.arguments.last
+          return unless pairs.hash_type?
+
+          pairs.each_pair.any? do |pair|
+            key = pair.key
+            next unless key.sym_type?
+
+            key.value == :if || key.value == :unless
+          end
+        end
+
         def array_node_to_array(node)
           node.values.map do |elm|
             case elm.type

data/lib/rubocop/rails/schema_loader/schema.rb

@@ -5,10 +5,12 @@ module RuboCop
     module SchemaLoader
       # Represent db/schema.rb
       class Schema
-        attr_reader :tables
+        attr_reader :tables, :add_indicies
 
         def initialize(ast)
           @tables = []
+          @add_indicies = []
+
           build!(ast)
         end
 
@@ -18,6 +20,12 @@ module RuboCop
           end
         end
 
+        def add_indicies_by(table_name:)
+          add_indicies.select do |add_index|
+            add_index.table_name == table_name
+          end
+        end
+
         private
 
         def build!(ast)
@@ -26,6 +34,11 @@ module RuboCop
           each_table(ast) do |table_def|
             @tables << Table.new(table_def)
           end
+
+          # Compatibility for Rails 4.2.
+          each_add_index(ast) do |add_index_def|
+            @add_indicies << AddIndex.new(add_index_def)
+          end
         end
 
         def each_table(ast)
@@ -40,9 +53,17 @@ module RuboCop
             yield ast.body
           end
         end
+
+        def each_add_index(ast)
+          ast.body.children.each do |node|
+            next if !node&.send_type? || !node.method?(:add_index)
+
+            yield(node)
+          end
+        end
       end
 
-      # Reprecent a table
+      # Represent a table
       class Table
         attr_reader :name, :columns, :indices
 
@@ -60,7 +81,7 @@ module RuboCop
 
         def build_columns(node)
           each_content(node).map do |child|
-            next unless child.send_type?
+            next unless child&.send_type?
             next if child.method?(:index)
 
             Column.new(child)
@@ -69,7 +90,7 @@ module RuboCop
 
         def build_indices(node)
           each_content(node).map do |child|
-            next unless child.send_type?
+            next unless child&.send_type?
             next unless child.method?(:index)
 
             Index.new(child)
@@ -79,7 +100,7 @@ module RuboCop
         def each_content(node)
           return enum_for(__method__, node) unless block_given?
 
-          case node.body.type
+          case node.body&.type
           when :begin
             node.body.children.each do |child|
               yield(child)
@@ -90,7 +111,7 @@ module RuboCop
         end
       end
 
-      # Reprecent a column
+      # Represent a column
       class Column
         attr_reader :name, :type, :not_null
 
@@ -116,13 +137,12 @@ module RuboCop
         end
       end
 
-      # Reprecent an index
+      # Represent an index
       class Index
         attr_reader :name, :columns, :expression, :unique
 
         def initialize(node)
-          node.first_argument
-          @columns, @expression = build_columns_or_expr(node)
+          @columns, @expression = build_columns_or_expr(node.first_argument)
           @unique = nil
 
           analyze_keywords!(node)
@@ -130,12 +150,11 @@ module RuboCop
 
         private
 
-        def build_columns_or_expr(node)
-          arg = node.first_argument
-          if arg.array_type?
-            [arg.values.map(&:value), nil]
+        def build_columns_or_expr(columns)
+          if columns.array_type?
+            [columns.values.map(&:value), nil]
           else
-            [[], arg.value]
+            [[], columns.value]
           end
         end
 
@@ -153,6 +172,19 @@ module RuboCop
           end
         end
       end
+
+      # Represent an `add_index`
+      class AddIndex < Index
+        attr_reader :table_name
+
+        def initialize(node)
+          @table_name = node.first_argument.value
+          @columns, @expression = build_columns_or_expr(node.arguments[1])
+          @unique = nil
+
+          analyze_keywords!(node)
+        end
+      end
     end
   end
 end

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.5.0'
+      STRING = '2.5.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport