rubocop 0.68.1 → 0.69.0

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

@@ -8,7 +8,7 @@ module RuboCop
       extend NodePattern::Macros
 
       MSG = 'Favor `%<inverse>s` over `%<current>s` for ' \
-            'negative conditions.'.freeze
+            'negative conditions.'
 
       private
 

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

@@ -14,8 +14,8 @@ module RuboCop
       def invalid_percent_array_context?(node)
         parent = node.parent
 
-        parent && parent.send_type? && parent.arguments.include?(node) &&
-          !parent.parenthesized? && parent.block_literal?
+        parent&.send_type? && parent.arguments.include?(node) &&
+          !parent.parenthesized? && parent&.block_literal?
       end
 
       def allowed_bracket_array?(node)

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

@@ -110,7 +110,7 @@ module RuboCop
       def move_pos(src, pos, step, condition, regexp)
         offset = step == -1 ? -1 : 0
         pos += step while condition && src[pos + offset] =~ regexp
-        pos < 0 ? 0 : pos
+        pos.negative? ? 0 : pos
       end
     end
   end

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

@@ -14,8 +14,7 @@ module RuboCop
       private
 
       def rescue_modifier?(node)
-        node &&
-          node.resbody_type? &&
+        node&.resbody_type? &&
           @modifier_locations.include?(node.loc.keyword)
       end
     end

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

@@ -15,7 +15,7 @@ module RuboCop
       end
 
       def rails?
-        config['Rails'] && config['Rails'].fetch('Enabled')
+        config['Rails']&.fetch('Enabled')
       end
     end
   end

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

@@ -5,7 +5,7 @@ module RuboCop
     # Common functionality for cops checking for missing space after
     # punctuation.
     module SpaceAfterPunctuation
-      MSG = 'Space missing after %<token>s.'.freeze
+      MSG = 'Space missing after %<token>s.'
 
       def investigate(processed_source)
         each_missing_space(processed_source.tokens) do |token|

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

@@ -7,7 +7,7 @@ module RuboCop
     module SpaceBeforePunctuation
       include RangeHelp
 
-      MSG = 'Space found before %<token>s.'.freeze
+      MSG = 'Space found before %<token>s.'
 
       def investigate(processed_source)
         each_missing_space(processed_source.tokens) do |token, pos_before|

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

@@ -6,8 +6,8 @@ module RuboCop
     module SurroundingSpace
       include RangeHelp
 
-      NO_SPACE_COMMAND = 'Do not use'.freeze
-      SPACE_COMMAND = 'Use'.freeze
+      NO_SPACE_COMMAND = 'Do not use'
+      SPACE_COMMAND = 'Use'
 
       private
 
@@ -94,7 +94,7 @@ module RuboCop
       def reposition(src, pos, step)
         offset = step == -1 ? -1 : 0
         pos += step while src[pos + offset] =~ /[ \t]/
-        pos < 0 ? 0 : pos
+        pos.negative? ? 0 : pos
       end
 
       def space_offense(node, token, side, message, command)

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

@@ -7,7 +7,7 @@ module RuboCop
       include ConfigurableMax
       include CodeLength
 
-      MSG = '%<label>s has too many lines. [%<length>d/%<max>d]'.freeze
+      MSG = '%<label>s has too many lines. [%<length>d/%<max>d]'
 
       private
 
@@ -17,7 +17,7 @@ module RuboCop
 
       def code_length(node)
         body = extract_body(node)
-        lines = body && body.source.lines || []
+        lines = body&.source&.lines || []
 
         lines.count { |line| !irrelevant_line(line) }
       end

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

@@ -8,7 +8,7 @@ module RuboCop
       include ConfigurableEnforcedStyle
       include RangeHelp
 
-      MSG = '%<command>s comma after the last %<unit>s.'.freeze
+      MSG = '%<command>s comma after the last %<unit>s.'
 
       private
 

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

@@ -4,12 +4,12 @@ module RuboCop
   module Cop
     # Common functionality shared by Uncommunicative cops
     module UncommunicativeName
-      CASE_MSG = 'Only use lowercase characters for %<name_type>s.'.freeze
-      NUM_MSG = 'Do not end %<name_type>s with a number.'.freeze
+      CASE_MSG = 'Only use lowercase characters for %<name_type>s.'
+      NUM_MSG = 'Do not end %<name_type>s with a number.'
       LENGTH_MSG = '%<name_type>s must be at least %<min>s ' \
-                   'characters long.'.freeze
+                   'characters long.'
       FORBIDDEN_MSG = 'Do not use %<name>s as a name for a ' \
-                      '%<name_type>s.'.freeze
+                      '%<name_type>s.'
 
       def check(node, args)
         args.each do |arg|

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

@@ -22,8 +22,8 @@ module RuboCop
       #   def attribute
       #   end
       class AccessorMethodName < Cop
-        MSG_READER = 'Do not prefix reader method names with `get_`.'.freeze
-        MSG_WRITER = 'Do not prefix writer method names with `set_`.'.freeze
+        MSG_READER = 'Do not prefix reader method names with `get_`.'
+        MSG_WRITER = 'Do not prefix writer method names with `set_`.'
 
         def on_def(node)
           return unless bad_reader_name?(node) || bad_writer_name?(node)

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

@@ -39,7 +39,7 @@ module RuboCop
       class AsciiIdentifiers < Cop
         include RangeHelp
 
-        MSG = 'Use only ascii symbols in identifiers.'.freeze
+        MSG = 'Use only ascii symbols in identifiers.'
 
         def investigate(processed_source)
           processed_source.each_token do |token|

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

@@ -15,7 +15,7 @@ module RuboCop
       #   def +(other); end
       class BinaryOperatorParameterName < Cop
         MSG = 'When defining the `%<opr>s` operator, ' \
-              'name its argument `other`.'.freeze
+              'name its argument `other`.'
 
         OP_LIKE_METHODS = %i[eql? equal?].freeze
         BLACKLISTED = %i[+@ -@ [] []= << === `].freeze

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

@@ -19,7 +19,7 @@ module RuboCop
       #   module MyModule
       #   end
       class ClassAndModuleCamelCase < Cop
-        MSG = 'Use CamelCase for classes and modules.'.freeze
+        MSG = 'Use CamelCase for classes and modules.'
 
         def on_class(node)
           return unless node.loc.name.source =~ /_/

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

@@ -18,7 +18,7 @@ module RuboCop
       #   # good
       #   INCH_IN_CM = 2.54
       class ConstantName < Cop
-        MSG = 'Use SCREAMING_SNAKE_CASE for constants.'.freeze
+        MSG = 'Use SCREAMING_SNAKE_CASE for constants.'
         # Use POSIX character classes, so we allow accented characters rather
         # than just standard ASCII characters
         SNAKE_CASE = /^[[:digit:][:upper:]_]+$/.freeze
@@ -30,7 +30,7 @@ module RuboCop
         PATTERN
 
         def on_casgn(node)
-          if node.parent && node.parent.or_asgn_type?
+          if node.parent&.or_asgn_type?
             lhs, value = *node.parent
             _scope, const_name = *lhs
           else
@@ -59,7 +59,7 @@ module RuboCop
         end
 
         def allowed_method_call_on_rhs?(node)
-          node && node.send_type? &&
+          node&.send_type? &&
             (node.receiver.nil? || !literal_receiver?(node))
         end
 
@@ -69,7 +69,7 @@ module RuboCop
         PATTERN
 
         def allowed_conditional_expression_on_rhs?(node)
-          node && node.if_type? && contains_contant?(node)
+          node&.if_type? && contains_contant?(node)
         end
 
         def contains_contant?(node)

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

@@ -28,10 +28,10 @@ module RuboCop
         include RangeHelp
 
         MSG_SNAKE_CASE = 'The name of this source file (`%<basename>s`) ' \
-                         'should use snake_case.'.freeze
+                         'should use snake_case.'
         MSG_NO_DEFINITION = '%<basename>s should define a class or module ' \
-                            'called `%<namespace>s`.'.freeze
-        MSG_REGEX = '`%<basename>s` should match `%<regex>s`.'.freeze
+                            'called `%<namespace>s`.'
+        MSG_REGEX = '`%<basename>s` should match `%<regex>s`.'
 
         SNAKE_CASE = /^[\da-z_.?!]+$/.freeze
 

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

@@ -31,7 +31,7 @@ module RuboCop
         include Heredoc
         include ConfigurableEnforcedStyle
 
-        MSG = 'Use %<style>s heredoc delimiters.'.freeze
+        MSG = 'Use %<style>s heredoc delimiters.'
 
         def on_heredoc(node)
           return if correct_case_delimiters?(node)

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

@@ -26,7 +26,7 @@ module RuboCop
       class HeredocDelimiterNaming < Cop
         include Heredoc
 
-        MSG = 'Use meaningful heredoc delimiters.'.freeze
+        MSG = 'Use meaningful heredoc delimiters.'
 
         def on_heredoc(node)
           return if meaningful_delimiters?(node)

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

@@ -88,9 +88,9 @@ module RuboCop
         include ConfigurableEnforcedStyle
 
         MSG = 'Memoized variable `%<var>s` does not match ' \
-          'method name `%<method>s`. Use `@%<suggested_var>s` instead.'.freeze
+          'method name `%<method>s`. Use `@%<suggested_var>s` instead.'
         UNDERSCORE_REQUIRED = 'Memoized variable `%<var>s` does not start ' \
-          'with `_`. Use `@%<suggested_var>s` instead.'.freeze
+          'with `_`. Use `@%<suggested_var>s` instead.'
 
         def self.node_pattern
           memo_assign = '(or_asgn $(ivasgn _) _)'

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

@@ -22,7 +22,7 @@ module RuboCop
       class MethodName < Cop
         include ConfigurableNaming
 
-        MSG = 'Use %<style>s for method names.'.freeze
+        MSG = 'Use %<style>s for method names.'
 
         def on_def(node)
           return if node.operator_method?

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

@@ -54,7 +54,7 @@ module RuboCop
       #   end
       #
       class RescuedExceptionsVariableName < Cop
-        MSG = 'Use `%<preferred>s` instead of `%<bad>s`.'.freeze
+        MSG = 'Use `%<preferred>s` instead of `%<bad>s`.'
 
         def on_resbody(node)
           exception_type, @exception_name = *node

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

@@ -22,7 +22,7 @@ module RuboCop
       class VariableName < Cop
         include ConfigurableNaming
 
-        MSG = 'Use %<style>s for variable names.'.freeze
+        MSG = 'Use %<style>s for variable names.'
 
         def on_lvasgn(node)
           name, = *node

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

@@ -40,7 +40,7 @@ module RuboCop
       class VariableNumber < Cop
         include ConfigurableNumbering
 
-        MSG = 'Use %<style>s for variable numbers.'.freeze
+        MSG = 'Use %<style>s for variable numbers.'
 
         def on_arg(node)
           name, = *node

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

@@ -36,7 +36,7 @@ module RuboCop
         extend TargetRailsVersion
         include ConfigurableEnforcedStyle
 
-        MSG = 'Prefer `%<prefer>s` over `%<current>s`.'.freeze
+        MSG = 'Prefer `%<prefer>s` over `%<current>s`.'
 
         FILTER_METHODS = %i[
           after_filter

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

@@ -13,7 +13,7 @@ module RuboCop
       #   #good
       #   Book.update!(author: 'Alice')
       class ActiveRecordAliases < Cop
-        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
+        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
 
         ALIASES = {
           update_attributes: :update,

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

@@ -27,7 +27,7 @@ module RuboCop
       class ActiveRecordOverride < Cop
         MSG =
           'Use %<prefer>s callbacks instead of overriding the Active Record ' \
-          'method `%<bad>s`.'.freeze
+          'method `%<bad>s`.'
         BAD_METHODS = %i[create destroy save update].freeze
         ACTIVE_RECORD_CLASSES = %w[ApplicationRecord ActiveModel::Base
                                    ActiveRecord::Base].freeze

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

@@ -20,7 +20,7 @@ module RuboCop
       #   [1, 2, 'a'].prepend('b')
       #
       class ActiveSupportAliases < Cop
-        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
+        MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
 
         ALIASES = {
           starts_with?: {

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

@@ -21,9 +21,9 @@ module RuboCop
 
         minimum_target_rails_version 5.0
 
-        MSG = 'Jobs should subclass `ApplicationJob`.'.freeze
-        SUPERCLASS = 'ApplicationJob'.freeze
-        BASE_PATTERN = '(const (const nil? :ActiveJob) :Base)'.freeze
+        MSG = 'Jobs should subclass `ApplicationJob`.'
+        SUPERCLASS = 'ApplicationJob'
+        BASE_PATTERN = '(const (const nil? :ActiveJob) :Base)'
 
         # rubocop:disable Layout/ClassStructure
         include RuboCop::Cop::EnforceSuperclass

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

@@ -21,9 +21,9 @@ module RuboCop
 
         minimum_target_rails_version 5.0
 
-        MSG = 'Models should subclass `ApplicationRecord`.'.freeze
-        SUPERCLASS = 'ApplicationRecord'.freeze
-        BASE_PATTERN = '(const (const nil? :ActiveRecord) :Base)'.freeze
+        MSG = 'Models should subclass `ApplicationRecord`.'
+        SUPERCLASS = 'ApplicationRecord'
+        BASE_PATTERN = '(const (const nil? :ActiveRecord) :Base)'
 
         # rubocop:disable Layout/ClassStructure
         include RuboCop::Cop::EnforceSuperclass

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

@@ -14,7 +14,7 @@ module RuboCop
       #   assert_not x
       #
       class AssertNot < RuboCop::Cop::Cop
-        MSG = 'Prefer `assert_not` over `assert !`.'.freeze
+        MSG = 'Prefer `assert_not` over `assert !`.'
 
         def_node_matcher :offensive?, '(send nil? :assert (send ... :!) ...)'
 

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

@@ -57,13 +57,13 @@ module RuboCop
 
         SUPERFLOUS_REQUIRE_FALSE_MSG =
           'You specified `required: false`, in Rails > 5.0 the required ' \
-          'option is deprecated and you want to use `optional: true`.'.freeze
+          'option is deprecated and you want to use `optional: true`.'
 
         SUPERFLOUS_REQUIRE_TRUE_MSG =
           'You specified `required: true`, in Rails > 5.0 the required ' \
           'option is deprecated and you want to use `optional: false`. ' \
           'In most configurations, this is the default and you can omit ' \
-          'this option altogether'.freeze
+          'this option altogether'
 
         def_node_matcher :match_belongs_to_with_options, <<-PATTERN
           (send _ :belongs_to _

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

@@ -54,10 +54,10 @@ module RuboCop
       #     !present?
       #   end
       class Blank < Cop
-        MSG_NIL_OR_EMPTY = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
-        MSG_NOT_PRESENT = 'Use `%<prefer>s` instead of `%<current>s`.'.freeze
+        MSG_NIL_OR_EMPTY = 'Use `%<prefer>s` instead of `%<current>s`.'
+        MSG_NOT_PRESENT = 'Use `%<prefer>s` instead of `%<current>s`.'
         MSG_UNLESS_PRESENT = 'Use `if %<prefer>s` instead of ' \
-                             '`%<current>s`.'.freeze
+                             '`%<current>s`.'
 
         # `(send nil $_)` is not actually a valid match for an offense. Nodes
         # that have a single method call on the left hand side

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

@@ -66,15 +66,15 @@ module RuboCop
       # @see https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/SchemaStatements.html#method-i-change_table
       # @see https://api.rubyonrails.org/classes/ActiveRecord/ConnectionAdapters/Table.html
       class BulkChangeTable < Cop
-        MSG_FOR_CHANGE_TABLE = <<-MSG.strip_indent.chomp
+        MSG_FOR_CHANGE_TABLE = <<~MSG.chomp
           You can combine alter queries using `bulk: true` options.
         MSG
-        MSG_FOR_ALTER_METHODS = <<-MSG.strip_indent.chomp
+        MSG_FOR_ALTER_METHODS = <<~MSG.chomp
           You can use `change_table :%<table>s, bulk: true` to combine alter queries.
         MSG
 
-        MYSQL = 'mysql'.freeze
-        POSTGRESQL = 'postgresql'.freeze
+        MYSQL = 'mysql'
+        POSTGRESQL = 'postgresql'
 
         MIGRATION_METHODS = %i[change up down].freeze
 

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

@@ -41,7 +41,7 @@ module RuboCop
       #     t.datetime :updated_at, default: -> { 'CURRENT_TIMESTAMP' }
       #   end
       class CreateTableWithTimestamps < Cop
-        MSG = 'Add timestamps when creating a new table.'.freeze
+        MSG = 'Add timestamps when creating a new table.'
 
         def_node_matcher :create_table_with_block?, <<-PATTERN
           (block

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

@@ -46,11 +46,11 @@ module RuboCop
       class Date < Cop
         include ConfigurableEnforcedStyle
 
-        MSG = 'Do not use `Date.%<day>s` without zone. Use ' \
-              '`Time.zone.%<day>s` instead.'.freeze
+        MSG = 'Do not use `Date.%<method_called>s` without zone. Use ' \
+              '`Time.zone.%<day>s` instead.'
 
         MSG_SEND = 'Do not use `%<method>s` on Date objects, because they ' \
-                   'know nothing about the time zone in use.'.freeze
+                   'know nothing about the time zone in use.'
 
         BAD_DAYS = %i[today current yesterday tomorrow].freeze
 
@@ -59,7 +59,7 @@ module RuboCop
         ].freeze
 
         DEPRECATED_MSG = '`%<deprecated>s` is deprecated. ' \
-                         'Use `%<relevant>s` instead.'.freeze
+                         'Use `%<relevant>s` instead.'
 
         def on_const(node)
           mod, klass = *node.children
@@ -101,8 +101,13 @@ module RuboCop
 
           method_name = (chain & bad_days).join('.')
 
+          day = method_name
+          day = 'today' if method_name == 'current'
+
           add_offense(node, location: :selector,
-                            message: format(MSG, day: method_name.to_s))
+                            message: format(MSG,
+                                            method_called: method_name,
+                                            day: day))
         end
 
         def extract_method_chain(node)
@@ -112,7 +117,7 @@ module RuboCop
         # 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