rubocop 0.48.0 → 0.48.1

data/lib/rubocop/cop/metrics/block_nesting.rb

@@ -14,10 +14,10 @@ module RuboCop
       class BlockNesting < Cop
         include ConfigurableMax
 
-        NESTING_BLOCKS = %i(
+        NESTING_BLOCKS = %i[
           case if while while_post
           until until_post for resbody
-        ).freeze
+        ].freeze
 
         def investigate(processed_source)
           return unless processed_source.ast

data/lib/rubocop/cop/metrics/cyclomatic_complexity.rb

@@ -17,8 +17,8 @@ module RuboCop
         include MethodComplexity
 
         MSG = 'Cyclomatic complexity for %s is too high. [%d/%d]'.freeze
-        COUNTED_NODES = %i(if while until for
-                           rescue when and or).freeze
+        COUNTED_NODES = %i[if while until for
+                           rescue when and or].freeze
 
         private
 

data/lib/rubocop/cop/metrics/parameter_lists.rb

@@ -28,7 +28,7 @@ module RuboCop
           if count_keyword_args?
             node.children.size
           else
-            node.children.count { |a| !%i(kwoptarg kwarg).include?(a.type) }
+            node.children.count { |a| !%i[kwoptarg kwarg].include?(a.type) }
           end
         end
 

data/lib/rubocop/cop/metrics/perceived_complexity.rb

@@ -30,8 +30,8 @@ module RuboCop
         include MethodComplexity
 
         MSG = 'Perceived complexity for %s is too high. [%d/%d]'.freeze
-        COUNTED_NODES = %i(if case while until
-                           for rescue and or).freeze
+        COUNTED_NODES = %i[if case while until
+                           for rescue and or].freeze
 
         private
 

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

@@ -32,7 +32,7 @@ module RuboCop
           if ancestor.block_type?
             return true if ancestor.class_constructor?
           elsif !ancestor.begin_type?
-            return %i(casgn sclass class module).include?(ancestor.type)
+            return %i[casgn sclass class module].include?(ancestor.type)
           end
         end
       end

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

@@ -6,7 +6,7 @@ module RuboCop
     module DefNode
       extend NodePattern::Macros
 
-      NON_PUBLIC_MODIFIERS = %w(private protected).freeze
+      NON_PUBLIC_MODIFIERS = %w[private protected].freeze
 
       def non_public?(node)
         non_public_modifier?(node.parent) ||

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

@@ -8,7 +8,7 @@ module RuboCop
 
       FROZEN_STRING_LITERAL = '# frozen_string_literal:'.freeze
       FROZEN_STRING_LITERAL_ENABLED = '# frozen_string_literal: true'.freeze
-      FROZEN_STRING_LITERAL_TYPES = %i(str dstr).freeze
+      FROZEN_STRING_LITERAL_TYPES = %i[str dstr].freeze
 
       def frozen_string_literal_comment_exists?
         leading_comment_lines.any? do |line|

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

@@ -37,7 +37,7 @@ module RuboCop
         !send_node.receiver &&
           send_node.method_name != :def &&
           send_node.arguments.one? &&
-          %i(def defs).include?(send_node.first_argument.type)
+          %i[def defs].include?(send_node.first_argument.type)
       end
     end
   end

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

@@ -4,6 +4,8 @@ module RuboCop
   module Cop
     # Common functionality for handling percent literals.
     module PercentLiteral
+      PERCENT_LITERAL_TYPES = %w[% %i %I %q %Q %r %s %w %W %x].freeze
+
       private
 
       def percent_literal?(node)
@@ -35,14 +37,18 @@ module RuboCop
         words = node.children
         escape = words.any? { |w| needs_escaping?(w.children[0]) }
         char = char.upcase if escape
-        contents = autocorrect_words(words, escape, node.loc.line)
+        delimiters = preferred_delimiters_for("%#{char}")
+        contents = autocorrect_words(words, escape, node.loc.line, delimiters)
 
         lambda do |corrector|
-          corrector.replace(node.source_range, "%#{char}(#{contents})")
+          corrector.replace(
+            node.source_range,
+            "%#{char}#{delimiters[0]}#{contents}#{delimiters[1]}"
+          )
         end
       end
 
-      def autocorrect_words(word_nodes, escape, base_line_number)
+      def autocorrect_words(word_nodes, escape, base_line_number, delimiters)
         previous_node_line_number = base_line_number
         word_nodes.map do |node|
           number_of_line_breaks = node.loc.line - previous_node_line_number
@@ -50,10 +56,45 @@ module RuboCop
           previous_node_line_number = node.loc.line
           content = node.children.first.to_s
           content = escape ? escape_string(content) : content
-          content.gsub!(/\)/, '\\)')
+          delimiters.each do |delimiter|
+            content.gsub!(delimiter, "\\#{delimiter}")
+          end
           line_breaks + content
         end.join(' ')
       end
+
+      def ensure_valid_preferred_delimiters
+        invalid = preferred_delimiters_config.keys -
+                  (PERCENT_LITERAL_TYPES + %w[default])
+        return if invalid.empty?
+
+        raise ArgumentError,
+              "Invalid preferred delimiter config key: #{invalid.join(', ')}"
+      end
+
+      def preferred_delimiters
+        @preferred_delimiters ||=
+          begin
+            ensure_valid_preferred_delimiters
+
+            if preferred_delimiters_config.key?('default')
+              Hash[PERCENT_LITERAL_TYPES.map do |type|
+                [type, preferred_delimiters_config[type] ||
+                  preferred_delimiters_config['default']]
+              end]
+            else
+              preferred_delimiters_config
+            end
+          end
+      end
+
+      def preferred_delimiters_config
+        @config.for_cop('Style/PercentLiteralDelimiters')['PreferredDelimiters']
+      end
+
+      def preferred_delimiters_for(type)
+        preferred_delimiters[type].split(//)
+      end
     end
   end
 end

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

@@ -33,7 +33,7 @@ module RuboCop
       end
 
       def allowed_type?(token)
-        %i(tRPAREN tRBRACK tPIPE).include?(token.type)
+        %i[tRPAREN tRBRACK tPIPE].include?(token.type)
       end
 
       def space_forbidden_before_rcurly?

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

@@ -24,7 +24,7 @@ module RuboCop
         end
 
         def autocorrect(node)
-          return if %i(kwarg kwoptarg).include?(node.type)
+          return if %i[kwarg kwoptarg].include?(node.type)
 
           if node.blockarg_type?
             lambda do |corrector|

data/lib/rubocop/cop/offense.rb

@@ -7,8 +7,8 @@ module RuboCop
       include Comparable
 
       # @api private
-      COMPARISON_ATTRIBUTES = %i(line column cop_name
-                                 message severity).freeze
+      COMPARISON_ATTRIBUTES = %i[line column cop_name
+                                 message severity].freeze
 
       # @api public
       #

data/lib/rubocop/cop/performance/casecmp.rb

@@ -19,7 +19,7 @@ module RuboCop
       #   'abc'.casecmp(str).zero?
       class Casecmp < Cop
         MSG = 'Use `casecmp` instead of `%s %s`.'.freeze
-        CASE_METHODS = %i(downcase upcase).freeze
+        CASE_METHODS = %i[downcase upcase].freeze
 
         def_node_matcher :downcase_eq, <<-END
           (send

data/lib/rubocop/cop/performance/end_with.rb

@@ -12,8 +12,7 @@ module RuboCop
       #   'abc'.match(/bc\Z/)
       #
       #   @good
-      #   'abc' =~ /ab/
-      #   'abc' =~ /\w*\Z/
+      #   'abc'.end_with?('bc')
       class EndWith < Cop
         MSG = 'Use `String#end_with?` instead of a regex match anchored to ' \
               'the end of the string.'.freeze

data/lib/rubocop/cop/performance/redundant_match.rb

@@ -3,7 +3,7 @@
 module RuboCop
   module Cop
     module Performance
-      # This cop identifies use of `Regexp#match` or `String#match in a context
+      # This cop identifies use of `Regexp#match` or `String#match` in a context
       # where the integral return value of `=~` would do just as well.
       #
       # @example

data/lib/rubocop/cop/performance/regexp_match.rb

@@ -191,14 +191,14 @@ module RuboCop
         end
 
         def match_gvar?(sym)
-          %i(
+          %i[
             $~
             $MATCH
             $PREMATCH
             $POSTMATCH
             $LAST_PAREN_MATCH
             $LAST_MATCH_INFO
-          ).include?(sym)
+          ].include?(sym)
         end
 
         def correct_operator(corrector, recv, arg)

data/lib/rubocop/cop/performance/start_with.rb

@@ -12,8 +12,7 @@ module RuboCop
       #   'abc'.match(/\Aab/)
       #
       #   @good
-      #   'abc' =~ /ab/
-      #   'abc' =~ /\A\w*/
+      #   'abc'.start_with?('ab')
       class StartWith < Cop
         MSG = 'Use `String#start_with?` instead of a regex match anchored to ' \
               'the beginning of the string.'.freeze

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

@@ -16,7 +16,7 @@ module RuboCop
 
         MSG = 'Prefer `%s` over `%s`.'.freeze
 
-        FILTER_METHODS = %i(
+        FILTER_METHODS = %i[
           after_filter
           append_after_filter
           append_around_filter
@@ -30,9 +30,9 @@ module RuboCop
           skip_around_filter
           skip_before_filter
           skip_filter
-        ).freeze
+        ].freeze
 
-        ACTION_METHODS = %i(
+        ACTION_METHODS = %i[
           after_action
           append_after_action
           append_around_action
@@ -46,7 +46,7 @@ module RuboCop
           skip_around_action
           skip_before_action
           skip_action_callback
-        ).freeze
+        ].freeze
 
         minimum_target_rails_version 4.0
 

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

@@ -75,6 +75,7 @@ module RuboCop
 
         def on_or(node)
           return unless cop_config['NilOrEmpty']
+          return unless node.lhs.receiver && node.rhs.receiver
 
           nil_or_empty?(node) do |variable1, variable2|
             return unless variable1 == variable2

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

@@ -43,7 +43,7 @@ module RuboCop
         MSG_SEND = 'Do not use `%s` on Date objects, because they ' \
                    'know nothing about the time zone in use.'.freeze
 
-        BAD_DAYS = %i(today current yesterday tomorrow).freeze
+        BAD_DAYS = %i[today current yesterday tomorrow].freeze
 
         def on_const(node)
           mod, klass = *node.children
@@ -107,7 +107,7 @@ module RuboCop
         end
 
         def good_days
-          style == :strict ? [] : %i(current yesterday tomorrow)
+          style == :strict ? [] : %i[current yesterday tomorrow]
         end
 
         def bad_days
@@ -115,7 +115,7 @@ module RuboCop
         end
 
         def bad_methods
-          style == :strict ? %i(to_time to_time_in_current_zone) : [:to_time]
+          style == :strict ? %i[to_time to_time_in_current_zone] : [:to_time]
         end
 
         def good_methods

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

@@ -94,7 +94,7 @@ module RuboCop
         end
 
         def private_or_protected_before(line)
-          (processed_source[0..line].map(&:strip) & %w(private protected)).any?
+          (processed_source[0..line].map(&:strip) & %w[private protected]).any?
         end
 
         def private_or_protected_inline(line)

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

@@ -20,8 +20,8 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         MSG = 'Do not use `exit` in Rails applications.'.freeze
-        TARGET_METHODS = %i(exit exit!).freeze
-        EXPLICIT_RECEIVERS = %i(Kernel Process).freeze
+        TARGET_METHODS = %i[exit exit!].freeze
+        EXPLICIT_RECEIVERS = %i[Kernel Process].freeze
 
         def on_send(node)
           add_offense(node, :selector) if offending_node?(node)

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

@@ -51,11 +51,15 @@ module RuboCop
         def check_for_rails_root_join_with_slash_separated_path(node)
           return unless rails_root_nodes?(node)
           return unless rails_root_join_nodes?(node)
-          return unless node.method_args.any? { |arg| arg.source =~ %r{/} }
+          return unless node.method_args.any? { |arg| string_with_slash?(arg) }
 
           register_offense(node)
         end
 
+        def string_with_slash?(node)
+          node.type == :str && node.source =~ %r{/}
+        end
+
         def register_offense(node)
           line_range = node.loc.column...node.loc.last_column
 

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

@@ -15,7 +15,7 @@ module RuboCop
       #   User.find_by(name: 'Bruce')
       class FindBy < Cop
         MSG = 'Use `find_by` instead of `where.%s`.'.freeze
-        TARGET_SELECTORS = %i(first take).freeze
+        TARGET_SELECTORS = %i[first take].freeze
 
         def_node_matcher :where_first?, <<-PATTERN
           (send (send _ :where ...) {:first :take})

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

@@ -15,8 +15,8 @@ module RuboCop
       class FindEach < Cop
         MSG = 'Use `find_each` instead of `each`.'.freeze
 
-        SCOPE_METHODS = %i(all where not).freeze
-        IGNORED_METHODS = %i(order limit select).freeze
+        SCOPE_METHODS = %i[all where not].freeze
+        IGNORED_METHODS = %i[order limit select].freeze
 
         def on_send(node)
           return unless node.receiver && node.method?(:each)

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

@@ -21,10 +21,10 @@ module RuboCop
 
         MSG = 'Use keyword arguments instead of ' \
               'positional arguments for http call: `%s`.'.freeze
-        KEYWORD_ARGS = %i(
+        KEYWORD_ARGS = %i[
           headers env params body flash as xhr session method
-        ).freeze
-        HTTP_METHODS = %i(get post put patch delete head).freeze
+        ].freeze
+        HTTP_METHODS = %i[get post put patch delete head].freeze
 
         minimum_target_rails_version 5.0
 

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

@@ -22,10 +22,14 @@ module RuboCop
         MSG = 'Do not assign %s to constants as it will be evaluated only ' \
               'once.'.freeze
 
-        RELATIVE_DATE_METHODS = %i(ago from_now since until).freeze
+        RELATIVE_DATE_METHODS = %i[ago from_now since until].freeze
 
         def on_casgn(node)
-          bad_node = node.descendants.find { |n| bad_method?(n) }
+          _scope, _constant, rhs = *node
+
+          return if rhs.lambda_or_proc?
+
+          bad_node = node.descendants.find { |n| relative_date_method?(n) }
           return unless bad_node
 
           add_offense(node, :expression, format(MSG, bad_node.method_name))
@@ -33,7 +37,7 @@ module RuboCop
 
         private
 
-        def bad_method?(node)
+        def relative_date_method?(node)
           node.send_type? &&
             RELATIVE_DATE_METHODS.include?(node.method_name) &&
             node.method_args.empty?

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

@@ -3,8 +3,23 @@
 module RuboCop
   module Cop
     module Rails
-      # This cop checks for consistent uses of request.referrer or
-      # request.referrer, depending on configuration.
+      # This cop checks for consistent uses of `request.referer` or
+      # `request.referrer`, depending on the cop's configuration.
+      #
+      # @example
+      #   # EnforcedStyle: referer
+      #   # bad
+      #   request.referrer
+      #
+      #   # good
+      #   request.referer
+      #
+      #   # EnforcedStyle: referrer
+      #   # bad
+      #   request.referer
+      #
+      #   # good
+      #   request.referrer
       class RequestReferer < Cop
         include ConfigurableEnforcedStyle