rubocop-rails 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18a288648626076787a00773149df97edce3b5330a5dc650cf662af46214bd5
-  data.tar.gz: f945d031d0a5bc98eb0af95a6cdf8e931cb5a469a1c1ced6ab11c1fb20f09bb5
+  metadata.gz: 26d2ede1a06dce0e42d2bcbfe3963745a159fc1ecdcc21ac55c3b9bf93e6acd4
+  data.tar.gz: 2c39a124756afd14f69febf84ab357f45fc720e68af45a16ba8e2668151a0664
 SHA512:
-  metadata.gz: 24f03fcf8cd683c5ed3e2afc9243f113afaa8641fc5cbd938d5d2ff916b7eeed95a994b69b48509b20618341c5b5c39286bde009f1dc5b369f94dc249a65b148
-  data.tar.gz: 57d3fff4181c71750d0eccdde094607ad63f79b7a6b273f698224dcc687a707879df82a264df063b4ac8f133fff3f4fe23dfcb820b4d2863cbae6792c6e38906
+  metadata.gz: 4b3d56057f612bf09a155255925aa8c85909866f4320629ce4bbf0657a81cfb4e39683e2daae6b87a37966a85882e549891271a73908ccf8ee66a0e40db09b14
+  data.tar.gz: 6bf0f0d6ae2d223368c44b80bb9a7c888603f06186e58d4fcacb085ac240d8877ce1717d9e694f8846c5ab06e3ffaeeea74b388f98f5ff3188184abceb3a029a

data/config/default.yml

@@ -1,6 +1,8 @@
 # Common configuration.
 
 AllCops:
+  Exclude:
+    - bin/bundle
   # What version of Rails is the inspected code using?  If a value is specified
   # for TargetRailsVersion then it is used.  Acceptable values are specificed
   # as a float (i.e. 5.1); the patch version of Rails should not be included.
@@ -9,9 +11,6 @@ AllCops:
   # application.  If neither of those files exist, RuboCop will use Rails 5.0
   # as the default.
   TargetRailsVersion: ~
-  # When specifying style guide URLs, any paths and/or fragments will be
-  # evaluated relative to the base URL.
-  StyleGuideBaseURL: https://rails.rubystyle.guide
 
 Rails/ActionFilter:
   Description: 'Enforces consistent use of action filter methods.'
@@ -140,7 +139,7 @@ Rails/DelegateAllowBlank:
 
 Rails/DynamicFindBy:
   Description: 'Use `find_by` instead of dynamic `find_by_*`.'
-  StyleGuide: '#find_by'
+  StyleGuide: 'https://rails.rubystyle.guide#find_by'
   Enabled: true
   VersionAdded: '0.44'
   Whitelist:
@@ -148,7 +147,7 @@ Rails/DynamicFindBy:
 
 Rails/EnumHash:
   Description: 'Prefer hash syntax over array syntax when defining enums.'
-  StyleGuide: '#enums'
+  StyleGuide: 'https://rails.rubystyle.guide#enums'
   Enabled: true
   VersionAdded: '2.3'
   Include:
@@ -192,7 +191,7 @@ Rails/FilePath:
 
 Rails/FindBy:
   Description: 'Prefer find_by over where.first.'
-  StyleGuide: '#find_by'
+  StyleGuide: 'https://rails.rubystyle.guide#find_by'
   Enabled: true
   VersionAdded: '0.30'
   Include:
@@ -200,7 +199,7 @@ Rails/FindBy:
 
 Rails/FindEach:
   Description: 'Prefer all.find_each over all.find.'
-  StyleGuide: '#find-each'
+  StyleGuide: 'https://rails.rubystyle.guide#find-each'
   Enabled: true
   VersionAdded: '0.30'
   Include:
@@ -208,7 +207,7 @@ Rails/FindEach:
 
 Rails/HasAndBelongsToMany:
   Description: 'Prefer has_many :through to has_and_belongs_to_many.'
-  StyleGuide: '#has-many-through'
+  StyleGuide: 'https://rails.rubystyle.guide#has-many-through'
   Enabled: true
   VersionAdded: '0.12'
   Include:
@@ -216,7 +215,7 @@ Rails/HasAndBelongsToMany:
 
 Rails/HasManyOrHasOneDependent:
   Description: 'Define the dependent option to the has_many and has_one associations.'
-  StyleGuide: '#has_many-has_one-dependent-option'
+  StyleGuide: 'https://rails.rubystyle.guide#has_many-has_one-dependent-option'
   Enabled: true
   VersionAdded: '0.50'
   Include:
@@ -263,7 +262,7 @@ Rails/InverseOf:
 
 Rails/LexicallyScopedActionFilter:
   Description: "Checks that methods specified in the filter's `only` or `except` options are explicitly defined in the controller."
-  StyleGuide: '#lexically-scoped-action-filter'
+  StyleGuide: 'https://rails.rubystyle.guide#lexically-scoped-action-filter'
   Enabled: true
   Safe: false
   VersionAdded: '0.52'
@@ -328,7 +327,7 @@ Rails/ReadWriteAttribute:
   Description: >-
                  Checks for read_attribute(:attr) and
                  write_attribute(:attr, val).
-  StyleGuide: '#read-attribute'
+  StyleGuide: 'https://rails.rubystyle.guide#read-attribute'
   Enabled: true
   VersionAdded: '0.20'
   VersionChanged: '0.29'
@@ -379,7 +378,7 @@ Rails/RequestReferer:
 
 Rails/ReversibleMigration:
   Description: 'Checks whether the change method of the migration file is reversible.'
-  StyleGuide: '#reversible-migration'
+  StyleGuide: 'https://rails.rubystyle.guide#reversible-migration'
   Reference: 'https://api.rubyonrails.org/classes/ActiveRecord/Migration/CommandRecorder.html'
   Enabled: true
   VersionAdded: '0.47'
@@ -398,7 +397,7 @@ Rails/SafeNavigation:
 
 Rails/SaveBang:
   Description: 'Identifies possible cases where Active Record save! or related should be used.'
-  StyleGuide: '#save-bang'
+  StyleGuide: 'https://rails.rubystyle.guide#save-bang'
   Enabled: false
   VersionAdded: '0.42'
   VersionChanged: '0.59'
@@ -437,7 +436,7 @@ Rails/SkipsModelValidations:
 
 Rails/TimeZone:
   Description: 'Checks the correct usage of time zone aware methods.'
-  StyleGuide: '#time'
+  StyleGuide: 'https://rails.rubystyle.guide#time'
   Reference: 'http://danilenko.org/2012/7/6/rails_timezones'
   Enabled: true
   Safe: false

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

@@ -38,6 +38,8 @@ module RuboCop
       #   # good
       #   a.presence || b
       class Presence < Cop
+        include RangeHelp
+
         MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
 
         def_node_matcher :redundant_receiver_and_other, <<-PATTERN
@@ -115,9 +117,31 @@ module RuboCop
         end
 
         def replacement(receiver, other)
-          or_source = other.nil? || other.nil_type? ? '' : " || #{other.source}"
+          or_source = if other&.send_type?
+                        build_source_for_or_method(other)
+                      elsif other.nil? || other.nil_type?
+                        ''
+                      else
+                        " || #{other.source}"
+                      end
+
           "#{receiver.source}.presence" + or_source
         end
+
+        def build_source_for_or_method(other)
+          if other.parenthesized? || !other.arguments?
+            " || #{other.source}"
+          else
+            method = range_between(
+              other.source_range.begin_pos,
+              other.first_argument.source_range.begin_pos - 1
+            ).source
+
+            arguments = other.arguments.map(&:source).join(', ')
+
+            " || #{method}(#{arguments})"
+          end
+        end
       end
     end
   end

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.0'
+      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.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Automatic Rails code style checking tool.