rubocop 0.68.0 → 0.68.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dba5f457f541be403c090a1e65bb79ecec9cb44d20caf6468f7dea47dc14074
-  data.tar.gz: f50ff42c73bd17159540297bc823e0979f1fdd26e8ccf0add7f371f99b6b3669
+  metadata.gz: ca0a417513e7e81c8c52ba5637cf8ab60ec57ee22b6c328bd6564a4cea90376f
+  data.tar.gz: b6a8bc46c9c4b1b43ad52cb8cfd301193246abc2fc0bbe156e3b9cd663d77c53
 SHA512:
-  metadata.gz: 6994e2accbbacb5dcd032aaff1fda0193165ed849ccb1483b52151066b3df1f9c4ce0c925caea2fd306b047a9d489da263ac3f9ff946a3c0298a2a276fde8f5f
-  data.tar.gz: b017c04fc55eeef70492a75495cf799a6a550bc8dd4f4e4802c68e16753d721f074b1d63439866d9c3535db2975f5763f2031d489fdf235aba4ee86f1428df8b
+  metadata.gz: 954a7c8b1155ec9359cf59675084554c0e3c17e2d8e87d621a73fb1ddbd7b8fe522dafe4ad816aa5162fb81a65305616299c4b248cb72554f69729ecb77c1fae
+  data.tar.gz: 9bbc404dc1c34e98033deae94361924489747ae5ff5b740884e26f08f6eb7ae15c73693af3b82bb505c1db89701599aa166916f06360a95208d9c903153fbbb8

data/README.md

@@ -53,7 +53,7 @@ haven't reached version 1.0 yet). To prevent an unwanted RuboCop update you
 might want to use a conservative version lock in your `Gemfile`:
 
 ```rb
-gem 'rubocop', '~> 0.68.0', require: false
+gem 'rubocop', '~> 0.68.1', require: false
 ```
 
 ## Quickstart

data/config/default.yml

@@ -743,7 +743,7 @@ Layout/IndentFirstParameter:
   Enabled: true
   VersionAdded: '0.49'
   VersionChanged: '0.68'
-  EnforcedStyle: special_for_inner_method_call_in_parentheses
+  EnforcedStyle: consistent
   SupportedStyles:
     - consistent
     - align_parentheses

data/lib/rubocop/ast/node/mixin/method_dispatch_node.rb

@@ -212,7 +212,7 @@ module RuboCop
 
       def_node_matcher :macro_scope?, <<-PATTERN
         {^{({sclass class module block} ...) class_constructor?}
-         ^^{({sclass class module block} ... (begin ...)) class_constructor?}
+         ^^{({sclass class module block} ... ({begin if} ...)) class_constructor?}
          ^#macro_kwbegin_wrapper?
          #root_node?}
       PATTERN

data/lib/rubocop/cop/internal_affairs/redundant_location_argument.rb

@@ -21,12 +21,10 @@ module RuboCop
 
         MSG = 'Redundant location argument to `#add_offense`.'.freeze
 
-        def_node_matcher :add_offense_kwargs, <<-PATTERN
-          (send nil? :add_offense _ $hash)
-        PATTERN
-
-        def_node_matcher :redundant_location_argument?, <<-PATTERN
-          (pair (sym :location) (sym :expression))
+        def_node_matcher :redundant_location_argument, <<-PATTERN
+          (send nil? :add_offense _
+            (hash <$(pair (sym :location) (sym :expression)) ...>)
+          )
         PATTERN
 
         def on_send(node)
@@ -39,17 +37,6 @@ module RuboCop
           ->(corrector) { corrector.remove(range) }
         end
 
-        private
-
-        def redundant_location_argument(node)
-          add_offense_kwargs(node) do |kwargs|
-            result =
-              kwargs.pairs.find { |arg| redundant_location_argument?(arg) }
-
-            yield result if result
-          end
-        end
-
         def offending_range(node)
           with_space = range_with_surrounding_space(range: node.loc.expression)
 

data/lib/rubocop/cop/naming/rescued_exceptions_variable_name.rb

@@ -69,7 +69,16 @@ module RuboCop
 
         def autocorrect(node)
           lambda do |corrector|
+            offending_name = node.exception_variable.children.first
             corrector.replace(offense_range(node), preferred_name)
+
+            return unless node.body
+
+            node.body.each_descendant(:lvar) do |var|
+              next unless var.children.first == offending_name
+
+              corrector.replace(var.loc.expression, preferred_name)
+            end
           end
         end
 

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

@@ -66,54 +66,36 @@ module RuboCop
           'this option altogether'.freeze
 
         def_node_matcher :match_belongs_to_with_options, <<-PATTERN
-          (send $_ :belongs_to _ (hash $...))
-        PATTERN
-
-        def_node_matcher :match_required_false?, <<-PATTERN
-          (pair (sym :required) false)
-        PATTERN
-
-        def_node_matcher :match_required_true?, <<-PATTERN
-          (pair (sym :required) true)
+          (send _ :belongs_to _
+            (hash <$(pair (sym :required) ${true false}) ...>)
+          )
         PATTERN
 
         def on_send(node)
-          opt = extract_required_option(node)
-          return unless opt
-          return unless match_required_true?(opt) || match_required_false?(opt)
-
-          message =
-            if match_required_true?(opt)
-              SUPERFLOUS_REQUIRE_TRUE_MSG
-            elsif match_required_false?(opt)
-              SUPERFLOUS_REQUIRE_FALSE_MSG
-            end
+          match_belongs_to_with_options(node) do |_option_node, option_value|
+            message =
+              if option_value.true_type?
+                SUPERFLOUS_REQUIRE_TRUE_MSG
+              elsif option_value.false_type?
+                SUPERFLOUS_REQUIRE_FALSE_MSG
+              end
 
-          add_offense(node, message: message, location: :selector)
+            add_offense(node, message: message, location: :selector)
+          end
         end
 
         def autocorrect(node)
-          opt = extract_required_option(node)
-          return unless opt
+          option_node, option_value = match_belongs_to_with_options(node)
+          return unless option_node
 
           lambda do |corrector|
-            if match_required_true?(opt)
-              corrector.replace(opt.loc.expression, 'optional: false')
-            elsif match_required_false?(opt)
-              corrector.replace(opt.loc.expression, 'optional: true')
+            if option_value.true_type?
+              corrector.replace(option_node.loc.expression, 'optional: false')
+            elsif option_value.false_type?
+              corrector.replace(option_node.loc.expression, 'optional: true')
             end
           end
         end
-
-        def extract_required_option(node)
-          _, opts = match_belongs_to_with_options(node)
-          return unless opts
-
-          opts.find do |opt|
-            match_required_true?(opt) ||
-              match_required_false?(opt)
-          end
-        end
       end
     end
   end

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

@@ -16,20 +16,14 @@ module RuboCop
       class DelegateAllowBlank < Cop
         MSG = '`allow_blank` is not a valid option, use `allow_nil`.'.freeze
 
-        def_node_matcher :delegate_options, <<-PATTERN
-          (send nil? :delegate _ $hash)
-        PATTERN
-
-        def_node_matcher :allow_blank_option?, <<-PATTERN
-          (pair (sym :allow_blank) true)
+        def_node_matcher :allow_blank_option, <<-PATTERN
+          (send nil? :delegate _ (hash <$(pair (sym :allow_blank) true) ...>))
         PATTERN
 
         def on_send(node)
-          offending_node = allow_blank_option(node)
-
-          return unless offending_node
-
-          add_offense(offending_node)
+          allow_blank_option(node) do |offending_node|
+            add_offense(offending_node)
+          end
         end
 
         def autocorrect(pair_node)
@@ -37,14 +31,6 @@ module RuboCop
             corrector.replace(pair_node.key.source_range, 'allow_nil')
           end
         end
-
-        private
-
-        def allow_blank_option(node)
-          delegate_options(node) do |hash|
-            hash.pairs.find { |opt| allow_blank_option?(opt) }
-          end
-        end
       end
     end
   end

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

@@ -48,8 +48,8 @@ module RuboCop
           }
         PATTERN
 
-        def_node_matcher :status_pair?, <<-PATTERN
-          (pair (sym :status) ${int sym})
+        def_node_matcher :status_code, <<-PATTERN
+          (hash <(pair (sym :status) ${int sym}) ...>)
         PATTERN
 
         def on_send(node)
@@ -77,13 +77,6 @@ module RuboCop
 
         private
 
-        def status_code(node)
-          node.each_pair.each do |pair|
-            status_pair?(pair) { |code| return code }
-          end
-          false
-        end
-
         def checker_class
           case style
           when :symbolic

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

@@ -16,21 +16,20 @@ module RuboCop
       class ReflectionClassName < Cop
         MSG = 'Use a string value for `class_name`.'.freeze
 
-        def_node_matcher :association_with_options?, <<-PATTERN
-          (send nil? {:has_many :has_one :belongs_to} _ (hash $...))
+        def_node_matcher :association_with_reflection, <<-PATTERN
+          (send nil? {:has_many :has_one :belongs_to} _
+            (hash <$#reflection_class_name ...>)
+          )
         PATTERN
 
-        def_node_search :reflection_class_name, <<-PATTERN
+        def_node_matcher :reflection_class_name, <<-PATTERN
           (pair (sym :class_name) [!dstr !str !sym])
         PATTERN
 
         def on_send(node)
-          return unless association_with_options?(node)
-
-          reflection_class_name = reflection_class_name(node).first
-          return unless reflection_class_name
-
-          add_offense(node, location: reflection_class_name.loc.expression)
+          association_with_reflection(node) do |reflection_class_name|
+            add_offense(node, location: reflection_class_name.loc.expression)
+          end
         end
       end
     end

data/lib/rubocop/cop/style/block_delimiters.rb

@@ -165,7 +165,7 @@ module RuboCop
 
         def braces_for_chaining_message(node)
           if node.multiline?
-            if return_value_chaining?(node)
+            if node.chained?
               'Prefer `{...}` over `do...end` for multi-line chained blocks.'
             else
               'Prefer `do...end` for multi-line blocks without chaining.'
@@ -267,7 +267,7 @@ module RuboCop
           block_begin = node.loc.begin.source
 
           block_begin == if node.multiline?
-                           (return_value_chaining?(node) ? '{' : 'do')
+                           (node.chained? ? '{' : 'do')
                          else
                            '{'
                          end
@@ -277,10 +277,6 @@ module RuboCop
           node.loc.begin.source == '{'
         end
 
-        def return_value_chaining?(node)
-          node.parent && node.parent.send_type? && node.parent.dot?
-        end
-
         def correction_would_break_code?(node)
           return unless node.keywords?
 

data/lib/rubocop/cop/style/inverse_methods.rb

@@ -30,6 +30,7 @@ module RuboCop
       #   !(foo.class < Numeric) # Checking class hierarchy is allowed
       class InverseMethods < Cop
         include IgnoredNode
+        include RangeHelp
 
         MSG = 'Use `%<inverse>s` instead of inverting `%<method>s`.'.freeze
         CLASS_COMPARISON_METHODS = %i[<= >= < >].freeze
@@ -121,6 +122,11 @@ module RuboCop
             selector[0] = '='
             corrector.replace(block.loc.selector, selector)
           else
+            if block.loc.dot
+              range = dot_range(block.loc)
+              corrector.remove(range)
+            end
+
             corrector.remove(block.loc.selector)
           end
         end
@@ -165,6 +171,10 @@ module RuboCop
         def camel_case_constant?(node)
           node.const_type? && node.source =~ CAMEL_CASE
         end
+
+        def dot_range(loc)
+          range_between(loc.dot.begin_pos, loc.expression.end_pos)
+        end
       end
     end
   end

data/lib/rubocop/cop/style/next.rb

@@ -54,6 +54,10 @@ module RuboCop
         MSG = 'Use `next` to skip iteration.'.freeze
         EXIT_TYPES = %i[break return].freeze
 
+        def self.autocorrect_incompatible_with
+          [Style::SafeNavigation]
+        end
+
         def investigate(_processed_source)
           # When correcting nested offenses, we need to keep track of how much
           # we have adjusted the indentation of each line

data/lib/rubocop/cop/style/redundant_freeze.rb

@@ -54,7 +54,7 @@ module RuboCop
         def_node_matcher :operation_produces_immutable_object?, <<-PATTERN
           {
             (begin (send {float int} {:+ :- :* :** :/ :% :<<} _))
-            (begin (send _ {:+ :- :* :** :/ :%} {float int}))
+            (begin (send !(str _) {:+ :- :* :** :/ :%} {float int}))
             (begin (send _ {:== :=== :!= :<= :>= :< :>} _))
             (send (const nil? :ENV) :[] _)
             (send _ {:count :length :size} ...)

data/lib/rubocop/cop/style/redundant_parentheses.rb

@@ -16,8 +16,6 @@ module RuboCop
       class RedundantParentheses < Cop
         include Parentheses
 
-        ALLOWED_LITERALS = %i[irange erange].freeze
-
         def_node_matcher :square_brackets?,
                          '(send {(send _recv _msg) str array hash} :[] ...)'
         def_node_matcher :range_end?, '^^{irange erange}'
@@ -28,6 +26,8 @@ module RuboCop
 
         def on_begin(node)
           return if !parentheses?(node) || parens_allowed?(node)
+          return if node.parent && (node.parent.while_post_type? ||
+                                    node.parent.until_post_type?)
 
           check(node)
         end
@@ -156,7 +156,7 @@ module RuboCop
 
         def disallowed_literal?(begin_node, node)
           node.literal? &&
-            !ALLOWED_LITERALS.include?(node.type) &&
+            !node.range_type? &&
             !raised_to_power_negative_numeric?(begin_node, node)
         end
 

data/lib/rubocop/cop/style/safe_navigation.rb

@@ -72,7 +72,7 @@ module RuboCop
 
         # if format: (if checked_variable body nil)
         # unless format: (if checked_variable nil body)
-        def_node_matcher :modifier_if_safe_navigation_candidate?, <<-PATTERN
+        def_node_matcher :modifier_if_safe_navigation_candidate, <<-PATTERN
           {
             (if {
                   (send $_ {:nil? :!})
@@ -147,11 +147,15 @@ module RuboCop
 
         def extract_parts_from_if(node)
           variable, receiver =
-            modifier_if_safe_navigation_candidate?(node)
+            modifier_if_safe_navigation_candidate(node)
 
           checked_variable, matching_receiver, method =
             extract_common_parts(receiver, variable)
-          matching_receiver = nil if LOGIC_JUMP_KEYWORDS.include?(receiver.type)
+
+          if receiver && LOGIC_JUMP_KEYWORDS.include?(receiver.type)
+            matching_receiver = nil
+          end
+
           [checked_variable, matching_receiver, receiver, method]
         end
 

data/lib/rubocop/cop/style/sample.rb

@@ -77,10 +77,9 @@ module RuboCop
         end
 
         def sample_size_for_one_arg(arg)
-          case arg.type
-          when :erange, :irange
+          if arg.range_type?
             range_size(arg)
-          when :int
+          elsif arg.int_type?
             [0, -1].include?(arg.to_a.first) ? nil : :unknown
           else
             :unknown

data/lib/rubocop/version.rb

@@ -3,7 +3,7 @@
 module RuboCop
   # This module holds the RuboCop version information.
   module Version
-    STRING = '0.68.0'.freeze
+    STRING = '0.68.1'.freeze
 
     MSG = '%<version>s (using Parser %<parser_version>s, running on ' \
           '%<ruby_engine>s %<ruby_version>s %<ruby_platform>s)'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop
 version: !ruby/object:Gem::Version
-  version: 0.68.0
+  version: 0.68.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jaro_winkler