rubocop-rails 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 147c7b2462cbfbefa559fc9e6d23b3bad655397784ab1296d2865aede5d41aff
-  data.tar.gz: 1fe87be1d5319fa8687f82e4ece29feedcad65ef1568be8d3f849666f4ba0a5b
+  metadata.gz: 26d2ede1a06dce0e42d2bcbfe3963745a159fc1ecdcc21ac55c3b9bf93e6acd4
+  data.tar.gz: 2c39a124756afd14f69febf84ab357f45fc720e68af45a16ba8e2668151a0664
 SHA512:
-  metadata.gz: 191ef083e5a22f0b8deb9b4918b70cd10556f9db0ff98fdfddc944a40b176050dacdb3a5fbb819abe7a9aaee38c7f4cc06329bd59b82738a98de6c9ffebca7a2
-  data.tar.gz: 4b7b0d972bde8df9df3f8b7b956077d4b895ffcc7f5e0aab1c3885b1f6027244b4b918b0d1f619afb079388a7d2756a70a45fee85ffeca1bae25062370299d41
+  metadata.gz: 4b3d56057f612bf09a155255925aa8c85909866f4320629ce4bbf0657a81cfb4e39683e2daae6b87a37966a85882e549891271a73908ccf8ee66a0e40db09b14
+  data.tar.gz: 6bf0f0d6ae2d223368c44b80bb9a7c888603f06186e58d4fcacb085ac240d8877ce1717d9e694f8846c5ab06e3ffaeeea74b388f98f5ff3188184abceb3a029a

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

@@ -119,8 +119,10 @@ module RuboCop
         def replacement(receiver, other)
           or_source = if other&.send_type?
                         build_source_for_or_method(other)
-                      else
+                      elsif other.nil? || other.nil_type?
                         ''
+                      else
+                        " || #{other.source}"
                       end
 
           "#{receiver.source}.presence" + or_source

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

@@ -61,7 +61,8 @@ module RuboCop
 
         def autocorrect(node)
           last_argument = node.arguments.last
-          return if !last_argument.literal? && !last_argument.splat_type?
+          return if !last_argument.literal? && !last_argument.splat_type? &&
+                    !frozen_array_argument?(last_argument)
 
           lambda do |corrector|
             corrector.replace(node.loc.selector, 'validates')
@@ -81,19 +82,56 @@ module RuboCop
         end
 
         def correct_validate_type(corrector, node)
-          last_argument = node.arguments.last
-          validate_type = node.method_name.to_s.split('_')[1]
+          last_argument = node.last_argument
 
           if last_argument.hash_type?
-            corrector.replace(
-              last_argument.loc.expression,
-              "#{validate_type}: #{braced_options(last_argument)}"
-            )
+            correct_validate_type_for_hash(corrector, node, last_argument)
+          elsif last_argument.array_type?
+            loc = last_argument.loc
+
+            correct_validate_type_for_array(corrector, node, last_argument, loc)
+          elsif frozen_array_argument?(last_argument)
+            arguments = node.last_argument.receiver
+            loc = arguments.parent.loc
+
+            correct_validate_type_for_array(corrector, node, arguments, loc)
           else
             range = last_argument.source_range
 
-            corrector.insert_after(range, ", #{validate_type}: true")
+            corrector.insert_after(range, ", #{validate_type(node)}: true")
+          end
+        end
+
+        def correct_validate_type_for_hash(corrector, node, arguments)
+          corrector.replace(
+            arguments.loc.expression,
+            "#{validate_type(node)}: #{braced_options(arguments)}"
+          )
+        end
+
+        def correct_validate_type_for_array(corrector, node, arguments, loc)
+          attributes = []
+
+          arguments.each_child_node do |child_node|
+            attributes << if arguments.percent_literal?
+                            ":#{child_node.source}"
+                          else
+                            child_node.source
+                          end
           end
+
+          corrector.replace(
+            loc.expression,
+            "#{attributes.join(', ')}, #{validate_type(node)}: true"
+          )
+        end
+
+        def validate_type(node)
+          node.method_name.to_s.split('_')[1]
+        end
+
+        def frozen_array_argument?(argument)
+          argument.send_type? && argument.method?(:freeze)
         end
 
         def braced_options(options)

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.3.1'
+      STRING = '2.3.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack