rubocop 0.68.1 → 0.69.0

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

@@ -14,7 +14,7 @@ module RuboCop
       #   # good
       #   scope :something, -> { where(something: true) }
       class ScopeArgs < Cop
-        MSG = 'Use `lambda`/`proc` instead of a plain method call.'.freeze
+        MSG = 'Use `lambda`/`proc` instead of a plain method call.'
 
         def_node_matcher :scope?, '(send nil? :scope _ $send)'
 

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

@@ -36,7 +36,7 @@ module RuboCop
       #   user.touch
       #
       class SkipsModelValidations < Cop
-        MSG = 'Avoid using `%<method>s` because it skips validations.'.freeze
+        MSG = 'Avoid using `%<method>s` because it skips validations.'
 
         METHODS_WITH_ARGUMENTS = %w[decrement!
                                     decrement_counter

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

@@ -6,7 +6,7 @@ module RuboCop
       # This cop checks for the use of Time methods without zone.
       #
       # Built on top of Ruby on Rails style guide (https://github.com/rubocop-hq/rails-style-guide#time)
-      # and the article http://danilenko.org/2012/7/6/rails_timezones/ .
+      # and the article http://danilenko.org/2012/7/6/rails_timezones/
       #
       # Two styles are supported for this cop. When EnforcedStyle is 'strict'
       # then only use of Time.zone is allowed.
@@ -47,52 +47,69 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         MSG = 'Do not use `%<current>s` without zone. Use `%<prefer>s` ' \
-              'instead.'.freeze
+              'instead.'
 
         MSG_ACCEPTABLE = 'Do not use `%<current>s` without zone. ' \
-                         'Use one of %<prefer>s instead.'.freeze
+                         'Use one of %<prefer>s instead.'
 
         MSG_LOCALTIME = 'Do not use `Time.localtime` without ' \
-                        'offset or zone.'.freeze
+                        'offset or zone.'
 
-        MSG_CURRENT = 'Do not use `%<current>s`. Use `Time.zone.now` ' \
-                      'instead.'.freeze
-
-        TIMECLASS = %i[Time DateTime].freeze
+        TIMECLASSES = %i[Time DateTime].freeze
 
         GOOD_METHODS = %i[zone zone_default find_zone find_zone!].freeze
 
-        DANGEROUS_METHODS = %i[now local new
-                               parse at current].freeze
+        DANGEROUS_METHODS = %i[now local new parse at current].freeze
 
-        ACCEPTED_METHODS = %i[in_time_zone utc getlocal
-                              xmlschema iso8601 jisx0301 rfc3339
-                              httpdate to_i to_f].freeze
+        ACCEPTED_METHODS = %i[in_time_zone utc getlocal xmlschema iso8601
+                              jisx0301 rfc3339 httpdate to_i to_f].freeze
 
         def on_const(node)
           mod, klass = *node
-          # we should only check core class
-          # (`DateTime`/`Time` or `::Date`/`::DateTime`)
+          # we should only check core classes
+          # (`DateTime`, `Time`, `::DateTime` or `::Time`)
           return unless (mod.nil? || mod.cbase_type?) && method_send?(node)
 
-          check_time_node(klass, node.parent) if TIMECLASS.include?(klass)
+          check_time_node(klass, node.parent) if TIMECLASSES.include?(klass)
         end
 
         def autocorrect(node)
           lambda do |corrector|
-            if acceptable?
-              corrector.insert_after(node.source_range, '.in_time_zone')
-            else
-              corrector.insert_after(node.children[0].source_range, '.zone')
+            # add `.zone`: `Time.at` => `Time.zone.at`
+            corrector.insert_after(node.children[0].source_range, '.zone')
+            # replace `Time.zone.current` => `Time.zone.now`
+            if node.method_name == :current
+              corrector.replace(node.loc.selector, 'now')
+            end
+            # prefer `Time` over `DateTime` class
+            if strict?
+              corrector.replace(node.children.first.source_range, 'Time')
             end
+            remove_redundant_in_time_zone(corrector, node)
           end
         end
 
         private
 
+        # remove redundant `.in_time_zone` from `Time.zone.now.in_time_zone`
+        def remove_redundant_in_time_zone(corrector, node)
+          time_methods_called = extract_method_chain(node)
+          return unless time_methods_called.include?(:in_time_zone) ||
+                        time_methods_called.include?(:zone)
+
+          while node&.send_type?
+            if node.children.last == :in_time_zone
+              in_time_zone_with_dot =
+                node.loc.selector.adjust(begin_pos: -1)
+              corrector.remove(in_time_zone_with_dot)
+            end
+            node = node.parent
+          end
+        end
+
         def check_time_node(klass, node)
           chain = extract_method_chain(node)
-          return if danger_chain?(chain)
+          return if not_danger_chain?(chain)
 
           return check_localtime(node) if need_check_localtime?(chain)
 
@@ -105,17 +122,13 @@ module RuboCop
           add_offense(node, location: :selector, message: message)
         end
 
-        # rubocop:disable Metrics/MethodLength
         def build_message(klass, method_name, node)
-          if acceptable?
+          if flexible?
             format(
               MSG_ACCEPTABLE,
               current: "#{klass}.#{method_name}",
               prefer: acceptable_methods(klass, method_name, node).join(', ')
             )
-          elsif method_name == 'current'
-            format(MSG_CURRENT,
-                   current: "#{klass}.#{method_name}")
           else
             safe_method_name = safe_method(method_name, node)
             format(MSG,
@@ -123,7 +136,6 @@ module RuboCop
                    prefer: "Time.zone.#{safe_method_name}")
           end
         end
-        # rubocop:enable Metrics/MethodLength
 
         def extract_method_chain(node)
           chain = []
@@ -141,32 +153,30 @@ module RuboCop
           if (receiver.is_a? RuboCop::AST::Node) && !receiver.cbase_type?
             method_from_time_class?(receiver)
           else
-            TIMECLASS.include? method_name
+            TIMECLASSES.include?(method_name)
           end
         end
 
         # checks that parent node of send_type
         # and receiver is the given node
         def method_send?(node)
-          return false unless node.parent && node.parent.send_type?
+          return false unless node.parent&.send_type?
 
           node.parent.receiver == node
         end
 
         def safe_method(method_name, node)
-          return method_name unless method_name == 'new'
-
-          if node.arguments?
-            'local'
+          if %w[new current].include?(method_name)
+            node.arguments? ? 'local' : 'now'
           else
-            'now'
+            method_name
           end
         end
 
         def check_localtime(node)
           selector_node = node
 
-          while node && node.send_type?
+          while node&.send_type?
             break if node.method_name == :localtime
 
             node = node.parent
@@ -178,20 +188,24 @@ module RuboCop
                       location: :selector, message: MSG_LOCALTIME)
         end
 
-        def danger_chain?(chain)
+        def not_danger_chain?(chain)
           (chain & DANGEROUS_METHODS).empty? || !(chain & good_methods).empty?
         end
 
         def need_check_localtime?(chain)
-          acceptable? && chain.include?(:localtime)
+          flexible? && chain.include?(:localtime)
         end
 
-        def acceptable?
+        def flexible?
           style == :flexible
         end
 
+        def strict?
+          style == :strict
+        end
+
         def good_methods
-          if style == :strict
+          if strict?
             GOOD_METHODS
           else
             GOOD_METHODS + [:current] + ACCEPTED_METHODS

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

@@ -46,10 +46,10 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = 'Use `%<method>s` before `pluck`.'.freeze
-        NEWLINE = "\n".freeze
+        MSG = 'Use `%<method>s` before `pluck`.'
+        NEWLINE = "\n"
         PATTERN = '[!^block (send (send %<type>s :pluck ...) ' \
-                  '${:uniq :distinct} ...)]'.freeze
+                  '${:uniq :distinct} ...)]'
 
         def_node_matcher :conservative_node_match,
                          format(PATTERN, type: 'const')

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

@@ -15,9 +15,9 @@ module RuboCop
       class UnknownEnv < Cop
         include NameSimilarity
 
-        MSG = 'Unknown environment `%<name>s`.'.freeze
+        MSG = 'Unknown environment `%<name>s`.'
         MSG_SIMILAR = 'Unknown environment `%<name>s`. ' \
-                      'Did you mean `%<similar>s`?'.freeze
+                      'Did you mean `%<similar>s`?'
 
         def_node_matcher :unknown_environment?, <<-PATTERN
           (send

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

@@ -34,7 +34,7 @@ module RuboCop
       #
       class Validation < Cop
         MSG = 'Prefer the new style validations `%<prefer>s` over ' \
-              '`%<current>s`.'.freeze
+              '`%<current>s`.'
 
         TYPES = %w[
           acceptance

data/lib/rubocop/cop/registry.rb

@@ -6,7 +6,7 @@ module RuboCop
     # refer to two or more cops under different departments
     class AmbiguousCopName < RuboCop::Error
       MSG = 'Ambiguous cop name `%<name>s` used in %<origin>s needs ' \
-            'department qualifier. Did you mean %<options>s?'.freeze
+            'department qualifier. Did you mean %<options>s?'
 
       def initialize(name, origin, badges)
         super(

data/lib/rubocop/cop/security/eval.rb

@@ -12,7 +12,7 @@ module RuboCop
       #   eval(something)
       #   binding.eval(something)
       class Eval < Cop
-        MSG = 'The use of `eval` is a serious security risk.'.freeze
+        MSG = 'The use of `eval` is a serious security risk.'
 
         def_node_matcher :eval?, <<-PATTERN
           (send {nil? (send nil? :binding)} :eval $!str ...)

data/lib/rubocop/cop/security/json_load.rb

@@ -23,7 +23,7 @@ module RuboCop
       #   JSON.parse("{}")
       #
       class JSONLoad < Cop
-        MSG = 'Prefer `JSON.parse` over `JSON.%<method>s`.'.freeze
+        MSG = 'Prefer `JSON.parse` over `JSON.%<method>s`.'
 
         def_node_matcher :json_load, <<-PATTERN
           (send (const {nil? cbase} :JSON) ${:load :restore} ...)

data/lib/rubocop/cop/security/marshal_load.rb

@@ -19,7 +19,7 @@ module RuboCop
       #   Marshal.load(Marshal.dump({}))
       #
       class MarshalLoad < Cop
-        MSG = 'Avoid using `Marshal.%<method>s`.'.freeze
+        MSG = 'Avoid using `Marshal.%<method>s`.'
 
         def_node_matcher :marshal_load, <<-PATTERN
           (send (const {nil? cbase} :Marshal) ${:load :restore}

data/lib/rubocop/cop/security/open.rb

@@ -20,7 +20,7 @@ module RuboCop
       #   IO.popen(something)
       #   URI.parse(something).open
       class Open < Cop
-        MSG = 'The use of `Kernel#open` is a serious security risk.'.freeze
+        MSG = 'The use of `Kernel#open` is a serious security risk.'
 
         def_node_matcher :open?, <<-PATTERN
           (send nil? :open $!str ...)

data/lib/rubocop/cop/security/yaml_load.rb

@@ -16,7 +16,7 @@ module RuboCop
       #   YAML.dump("foo")
       #
       class YAMLLoad < Cop
-        MSG = 'Prefer using `YAML.safe_load` over `YAML.load`.'.freeze
+        MSG = 'Prefer using `YAML.safe_load` over `YAML.load`.'
 
         def_node_matcher :yaml_load, <<-PATTERN
           (send (const {nil? cbase} :YAML) :load ...)

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

@@ -25,11 +25,11 @@ module RuboCop
       class Alias < Cop
         include ConfigurableEnforcedStyle
 
-        MSG_ALIAS = 'Use `alias_method` instead of `alias`.'.freeze
+        MSG_ALIAS = 'Use `alias_method` instead of `alias`.'
         MSG_ALIAS_METHOD = 'Use `alias` instead of `alias_method` ' \
-                           '%<current>s.'.freeze
+                           '%<current>s.'
         MSG_SYMBOL_ARGS  = 'Use `alias %<prefer>s` instead of ' \
-                           '`alias %<current>s`.'.freeze
+                           '`alias %<current>s`.'
 
         def on_send(node)
           return unless node.command?(:alias_method)

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

@@ -40,7 +40,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
+        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
 
         def on_and(node)
           process_logical_operator(node) if style == :always

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

@@ -18,7 +18,7 @@ module RuboCop
       #   %w(foo bar baz).join(",")
       #
       class ArrayJoin < Cop
-        MSG = 'Favor `Array#join` over `Array#*`.'.freeze
+        MSG = 'Favor `Array#join` over `Array#*`.'
 
         def_node_matcher :join_candidate?, '(send $array :* $str)'
 

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

@@ -18,7 +18,7 @@ module RuboCop
       class AsciiComments < Cop
         include RangeHelp
 
-        MSG = 'Use only ascii symbols in comments.'.freeze
+        MSG = 'Use only ascii symbols in comments.'
 
         def investigate(processed_source)
           processed_source.each_comment do |comment|

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

@@ -17,7 +17,7 @@ module RuboCop
       class Attr < Cop
         include RangeHelp
 
-        MSG = 'Do not use `attr`. Use `%<replacement>s` instead.'.freeze
+        MSG = 'Do not use `attr`. Use `%<replacement>s` instead.'
 
         def on_send(node)
           return unless node.command?(:attr) && node.arguments?

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

@@ -17,7 +17,7 @@ module RuboCop
       #     # ...
       #   end
       class AutoResourceCleanup < Cop
-        MSG = 'Use the block version of `%<class>s.%<method>s`.'.freeze
+        MSG = 'Use the block version of `%<class>s.%<method>s`.'
 
         TARGET_METHODS = {
           File: :open

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

@@ -26,7 +26,7 @@ module RuboCop
       class BarePercentLiterals < Cop
         include ConfigurableEnforcedStyle
 
-        MSG = 'Use `%%%<good>s` instead of `%%%<bad>s`.'.freeze
+        MSG = 'Use `%%%<good>s` instead of `%%%<bad>s`.'
 
         def on_dstr(node)
           check(node)

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

@@ -11,7 +11,7 @@ module RuboCop
       #   BEGIN { test }
       #
       class BeginBlock < Cop
-        MSG = 'Avoid the use of `BEGIN` blocks.'.freeze
+        MSG = 'Avoid the use of `BEGIN` blocks.'
 
         def on_preexe(node)
           add_offense(node, location: :keyword)

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

@@ -19,7 +19,7 @@ module RuboCop
       class BlockComments < Cop
         include RangeHelp
 
-        MSG = 'Do not use block comments.'.freeze
+        MSG = 'Do not use block comments.'
         BEGIN_LENGTH = "=begin\n".length
         END_LENGTH = "\n=end".length
 

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

@@ -111,7 +111,6 @@ module RuboCop
         include IgnoredMethods
 
         ALWAYS_BRACES_MESSAGE = 'Prefer `{...}` over `do...end` for blocks.'
-                                .freeze
 
         def on_send(node)
           return unless node.arguments?

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

@@ -43,7 +43,7 @@ module RuboCop
         include ConfigurableEnforcedStyle
         include RangeHelp
 
-        MSG = '%<type>s curly braces around a hash parameter.'.freeze
+        MSG = '%<type>s curly braces around a hash parameter.'
 
         def on_send(node)
           return if node.assignment_method? || node.operator_method?

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

@@ -17,7 +17,7 @@ module RuboCop
       #   some_string =~ /something/
       #
       class CaseEquality < Cop
-        MSG = 'Avoid the use of the case equality operator `===`.'.freeze
+        MSG = 'Avoid the use of the case equality operator `===`.'
 
         def_node_matcher :case_equality?, '(send _ :=== _)'
 

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

@@ -18,7 +18,7 @@ module RuboCop
         include StringHelp
 
         MSG = 'Do not use the character literal - ' \
-              'use string literal instead.'.freeze
+              'use string literal instead.'
 
         def offense?(node)
           # we don't register an offense for things like ?\C-\M-d

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

@@ -26,9 +26,9 @@ module RuboCop
         include RangeHelp
 
         NESTED_MSG = 'Use nested module/class definitions instead of ' \
-                     'compact style.'.freeze
+                     'compact style.'
         COMPACT_MSG = 'Use compact module/class definition instead of ' \
-                      'nested style.'.freeze
+                      'nested style.'
 
         def on_class(node)
           return if node.parent_class && style != :nested
@@ -68,20 +68,20 @@ module RuboCop
         end
 
         def replace_keyword_with_module(corrector, node)
-          corrector.replace(node.loc.keyword, 'module'.freeze)
+          corrector.replace(node.loc.keyword, 'module')
         end
 
         def split_on_double_colon(corrector, node, padding)
           children_definition = node.children.first
           range = range_between(children_definition.loc.double_colon.begin_pos,
                                 children_definition.loc.double_colon.end_pos)
-          replacement = "\n#{padding}#{node.loc.keyword.source} ".freeze
+          replacement = "\n#{padding}#{node.loc.keyword.source} "
 
           corrector.replace(range, replacement)
         end
 
         def add_trailing_end(corrector, node, padding)
-          replacement = "#{padding}end\n#{leading_spaces(node)}end".freeze
+          replacement = "#{padding}end\n#{leading_spaces(node)}end"
           corrector.replace(node.loc.end, replacement)
         end