rubocop 0.48.0 → 0.48.1

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

@@ -44,10 +44,10 @@ module RuboCop
         CREATE_CONDITIONAL_MSG = '`%s` returns a model which is always truthy.'
                                  .freeze
 
-        CREATE_PERSIST_METHODS = %i(create
-                                    first_or_create find_or_create_by).freeze
-        MODIFY_PERSIST_METHODS = %i(save
-                                    update update_attributes destroy).freeze
+        CREATE_PERSIST_METHODS = %i[create
+                                    first_or_create find_or_create_by].freeze
+        MODIFY_PERSIST_METHODS = %i[save
+                                    update update_attributes destroy].freeze
         PERSIST_METHODS = (CREATE_PERSIST_METHODS +
                            MODIFY_PERSIST_METHODS).freeze
 

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

@@ -25,7 +25,7 @@ module RuboCop
       class SkipsModelValidations < Cop
         MSG = 'Avoid using `%s` because it skips validations.'.freeze
 
-        METHODS_WITH_ARGUMENTS = %w(decrement!
+        METHODS_WITH_ARGUMENTS = %w[decrement!
                                     decrement_counter
                                     increment!
                                     increment_counter
@@ -34,7 +34,7 @@ module RuboCop
                                     update_attribute
                                     update_column
                                     update_columns
-                                    update_counters).freeze
+                                    update_counters].freeze
 
         def on_send(node)
           return unless blacklist.include?(node.method_name.to_s)

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

@@ -40,16 +40,16 @@ module RuboCop
 
         MSG_CURRENT = 'Do not use `%s`. Use `Time.zone.now` instead.'.freeze
 
-        TIMECLASS = %i(Time DateTime).freeze
+        TIMECLASS = %i[Time DateTime].freeze
 
-        GOOD_METHODS = %i(zone zone_default find_zone find_zone!).freeze
+        GOOD_METHODS = %i[zone zone_default find_zone find_zone!].freeze
 
-        DANGEROUS_METHODS = %i(now local new strftime
-                               parse at current).freeze
+        DANGEROUS_METHODS = %i[now local new strftime
+                               parse at current].freeze
 
-        ACCEPTED_METHODS = %i(in_time_zone utc getlocal
+        ACCEPTED_METHODS = %i[in_time_zone utc getlocal
                               iso8601 jisx0301 rfc3339
-                              to_i to_f).freeze
+                              to_i to_f].freeze
 
         def on_const(node)
           mod, klass = *node

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

@@ -7,7 +7,7 @@ module RuboCop
       class Validation < Cop
         MSG = 'Prefer the new style validations `%s` over `%s`.'.freeze
 
-        TYPES = %w(
+        TYPES = %w[
           acceptance
           confirmation
           exclusion
@@ -18,7 +18,7 @@ module RuboCop
           presence
           size
           uniqueness
-        ).freeze
+        ].freeze
 
         BLACKLIST = TYPES.map { |p| "validates_#{p}_of".to_sym }.freeze
         WHITELIST = TYPES.map { |p| "validates :column, #{p}: value" }.freeze

data/lib/rubocop/cop/severity.rb

@@ -7,7 +7,7 @@ module RuboCop
       include Comparable
 
       # @api private
-      NAMES = %i(refactor convention warning error fatal).freeze
+      NAMES = %i[refactor convention warning error fatal].freeze
 
       # @api private
       CODE_TABLE = { R: :refactor, C: :convention,

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

@@ -5,6 +5,40 @@ module RuboCop
     module Style
       # This cop checks for braces around the last parameter in a method call
       # if the last parameter is a hash.
+      # It supports 3 styles:
+      #
+      # * The `braces` style enforces braces around all method
+      # parameters that are hashes.
+      #
+      # @example
+      #   # bad
+      #   some_method(x, y, a: 1, b: 2)
+      #
+      #   # good
+      #   some_method(x, y, {a: 1, b: 2})
+      #
+      # * The `no_braces` style checks that the last parameter doesn't
+      # have braces around it.
+      #
+      # @example
+      #   # bad
+      #   some_method(x, y, {a: 1, b: 2})
+      #
+      #   # good
+      #   some_method(x, y, a: 1, b: 2)
+      #
+      # * The `context_dependent` style checks that the last parameter
+      # doesn't have braces around it, but requires braces if the
+      # second to last parameter is also a hash literal.
+      #
+      # @example
+      #   # bad
+      #   some_method(x, y, {a: 1, b: 2})
+      #   some_method(x, y, {a: 1, b: 2}, a: 1, b: 2)
+      #
+      #   # good
+      #   some_method(x, y, a: 1, b: 2)
+      #   some_method(x, y, {a: 1, b: 2}, {a: 1, b: 2})
       class BracesAroundHashParameters < Cop
         include ConfigurableEnforcedStyle
 

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

@@ -57,7 +57,7 @@ module RuboCop
         end
 
         def one_child?(body)
-          body && %i(module class).include?(body.type)
+          body && %i[module class].include?(body.type)
         end
 
         def compact_node_name?(node)

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

@@ -105,7 +105,7 @@ module RuboCop
           replacement = if backtick_literal?(node)
                           ['%x', ''].zip(preferred_delimiters).map(&:join)
                         else
-                          %w(` `)
+                          %w[` `]
                         end
 
           lambda do |corrector|

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

@@ -90,7 +90,7 @@ module RuboCop
 
         def setter_method?(method_name)
           method_name.to_s.end_with?(EQUAL) &&
-            !%i(!= == === >= <=).include?(method_name)
+            !%i[!= == === >= <=].include?(method_name)
         end
 
         def assignment_rhs_exist?(node)
@@ -205,9 +205,9 @@ module RuboCop
         ASSIGN_TO_CONDITION_MSG =
           'Assign variables inside of conditionals'.freeze
         VARIABLE_ASSIGNMENT_TYPES =
-          %i(casgn cvasgn gvasgn ivasgn lvasgn).freeze
+          %i[casgn cvasgn gvasgn ivasgn lvasgn].freeze
         ASSIGNMENT_TYPES = VARIABLE_ASSIGNMENT_TYPES +
-                           %i(and_asgn or_asgn op_asgn masgn).freeze
+                           %i[and_asgn or_asgn op_asgn masgn].freeze
         LINE_LENGTH = 'Metrics/LineLength'.freeze
         INDENTATION_WIDTH = 'Style/IndentationWidth'.freeze
         ENABLED = 'Enabled'.freeze

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

@@ -19,7 +19,7 @@ module RuboCop
           # NewClass = something_that_returns_a_class
           # It's also ok to assign a class constant another class constant
           # SomeClass = SomeOtherClass
-          return if value && %i(send block const).include?(value.type)
+          return if value && %i[send block const].include?(value.type)
 
           add_offense(node, :name) if const_name !~ SNAKE_CASE
         end

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

@@ -18,7 +18,7 @@ module RuboCop
       #   [1, 2].each_with_object({}) { |e, a| a[e] = e }
       class EachWithObject < Cop
         MSG = 'Use `each_with_object` instead of `%s`.'.freeze
-        METHODS = %i(inject reduce).freeze
+        METHODS = %i[inject reduce].freeze
 
         def_node_matcher :each_with_object_candidate?, <<-PATTERN
           (block $(send _ {:inject :reduce} _) $_ $_)

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

@@ -21,7 +21,7 @@ module RuboCop
       #     # Some code
       #   end
       class EmptyLineAfterMagicComment < Cop
-        MSG = 'Add a space after magic comments.'.freeze
+        MSG = 'Add an empty line after magic comments.'.freeze
         BLANK_LINE = /\A\s*\z/
 
         def investigate(source)

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

@@ -91,7 +91,7 @@ module RuboCop
           return nil if node.nil?
           name = namespace.pop
 
-          on_node(%i(class module casgn), node) do |child|
+          on_node(%i[class module casgn], node) do |child|
             next unless (const = child.defined_module)
 
             const_namespace, const_name = *const
@@ -152,7 +152,7 @@ module RuboCop
           # But RC can be run from any working directory, and can check any path
           # We can't assume that the working directory, or any other, is the
           # "starting point" to build a namespace
-          start = %w(lib spec test src)
+          start = %w[lib spec test src]
           start_index = nil
 
           # To find the closest namespace root take the path components, and

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

@@ -14,7 +14,7 @@ module RuboCop
 
         # predefined global variables their English aliases
         # http://www.zenspider.com/Languages/Ruby/QuickRef.html
-        BUILT_IN_VARS = %w(
+        BUILT_IN_VARS = %w[
           $: $LOAD_PATH
           $" $LOADED_FEATURES
           $0 $PROGRAM_NAME
@@ -41,7 +41,7 @@ module RuboCop
           $DEBUG $FILENAME $VERBOSE $SAFE
           $-0 $-a $-d $-F $-i $-I $-l $-p $-v $-w
           $CLASSPATH $JRUBY_VERSION $JRUBY_REVISION $ENV_JAVA
-        ).map(&:to_sym)
+        ].map(&:to_sym)
 
         def user_vars
           cop_config['AllowedVariables'].map(&:to_sym)

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

@@ -13,8 +13,8 @@ module RuboCop
               'Another good alternative is the usage of control flow ' \
               '`&&`/`||`.'.freeze
 
-        ASSIGNMENT_TYPES = %i(lvasgn casgn cvasgn
-                              gvasgn ivasgn masgn).freeze
+        ASSIGNMENT_TYPES = %i[lvasgn casgn cvasgn
+                              gvasgn ivasgn masgn].freeze
 
         def on_if(node)
           return unless eligible_node?(node)

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

@@ -53,7 +53,7 @@ module RuboCop
         include AccessModifierNode
         include IgnoredPattern
 
-        SPECIAL_MODIFIERS = %w(private protected).freeze
+        SPECIAL_MODIFIERS = %w[private protected].freeze
 
         def on_rescue(node)
           _begin_node, *_rescue_nodes, else_node = *node
@@ -259,7 +259,7 @@ module RuboCop
         def indentation_to_check?(base_loc, body_node)
           return false if skip_check?(base_loc, body_node)
 
-          if %i(rescue ensure).include?(body_node.type)
+          if %i[rescue ensure].include?(body_node.type)
             block_body, = *body_node
             return unless block_body
           end

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

@@ -28,7 +28,7 @@ module RuboCop
       #   foo == bar
       class InverseMethods < Cop
         MSG = 'Use `%{inverse}` instead of inverting `%{method}`.'.freeze
-        EQUALITY_METHODS = %i(== != =~ !~ <= >= < >).freeze
+        EQUALITY_METHODS = %i[== != =~ !~ <= >= < >].freeze
 
         def_node_matcher :inverse_candidate?, <<-PATTERN
           {

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

@@ -22,12 +22,12 @@ module RuboCop
       class LineEndConcatenation < Cop
         MSG = 'Use `\\` instead of `+` or `<<` to concatenate ' \
               'those strings.'.freeze
-        CONCAT_TOKEN_TYPES = %i(tPLUS tLSHFT).freeze
+        CONCAT_TOKEN_TYPES = %i[tPLUS tLSHFT].freeze
         SIMPLE_STRING_TOKEN_TYPE = :tSTRING
-        COMPLEX_STRING_EDGE_TOKEN_TYPES = %i(tSTRING_BEG tSTRING_END).freeze
-        HIGH_PRECEDENCE_OP_TOKEN_TYPES = %i(tSTAR2 tPERCENT tDOT
-                                            tLBRACK2).freeze
-        QUOTE_DELIMITERS = %w(' ").freeze
+        COMPLEX_STRING_EDGE_TOKEN_TYPES = %i[tSTRING_BEG tSTRING_END].freeze
+        HIGH_PRECEDENCE_OP_TOKEN_TYPES = %i[tSTAR2 tPERCENT tDOT
+                                            tLBRACK2].freeze
+        QUOTE_DELIMITERS = %w[' "].freeze
 
         def investigate(processed_source)
           processed_source.tokens.each_index do |index|

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

@@ -15,6 +15,14 @@ module RuboCop
       #   # good
       #   array.delete(e)
       #
+      #   # good
+      #   # Operators don't need parens
+      #   foo == bar
+      #
+      #   # good
+      #   # Setter methods don't need parens
+      #   foo.bar = baz
+      #
       #   # okay with `puts` listed in `IgnoredMethods`
       #   puts 'test'
       #
@@ -35,10 +43,8 @@ module RuboCop
         MSG = 'Use parentheses for method calls with arguments.'.freeze
 
         def on_send(node)
-          return if ignored_list.include?(node.method_name)
+          return if ignored_method?(node)
           return unless node.arguments? && !node.parenthesized?
-          return if operator_call?(node)
-          return if ignore_macros? && node.macro?
 
           add_offense(node, :selector)
         end
@@ -67,6 +73,12 @@ module RuboCop
 
         private
 
+        def ignored_method?(node)
+          node.operator_method? || node.setter_method? ||
+            ignore_macros? && node.macro? ||
+            ignored_list.include?(node.method_name)
+        end
+
         def ignored_list
           cop_config['IgnoredMethods'].map(&:to_sym)
         end
@@ -79,10 +91,6 @@ module RuboCop
           node.loc.begin
         end
 
-        def operator_call?(node)
-          node.operator_method?
-        end
-
         def args_begin(node)
           loc = node.loc
           selector = node.super_type? ? loc.keyword : loc.selector

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

@@ -15,7 +15,7 @@ module RuboCop
         MSG = 'Do not use parentheses for method calls with ' \
               'no arguments.'.freeze
 
-        ASGN_NODES = %i(lvasgn masgn) + SHORTHAND_ASGN_NODES
+        ASGN_NODES = %i[lvasgn masgn] + SHORTHAND_ASGN_NODES
 
         def on_send(node)
           return if node.camel_case_method?

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

@@ -37,11 +37,11 @@ module RuboCop
       class MixinGrouping < Cop
         include ConfigurableEnforcedStyle
 
-        MIXIN_METHODS = %i(extend include prepend).freeze
+        MIXIN_METHODS = %i[extend include prepend].freeze
         MSG = 'Put `%s` mixins in %s.'.freeze
 
         def on_send(node)
-          return unless MIXIN_METHODS.include?(node.method_name)
+          return unless node.macro? && MIXIN_METHODS.include?(node.method_name)
 
           check(node)
         end

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

@@ -14,9 +14,9 @@ module RuboCop
       #   method1(method2 arg, method3, arg)
       class NestedParenthesizedCalls < Cop
         MSG = 'Add parentheses to nested method call `%s`.'.freeze
-        RSPEC_MATCHERS = %i(be eq eql equal be_kind_of be_instance_of
+        RSPEC_MATCHERS = %i[be eq eql equal be_kind_of be_instance_of
                             respond_to be_between match be_within
-                            start_with end_with include raise_error).freeze
+                            start_with end_with include raise_error].freeze
 
         def on_send(node)
           return unless node.parenthesized?

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

@@ -23,12 +23,12 @@ module RuboCop
         include MinBodyLength
 
         MSG = 'Use `next` to skip iteration.'.freeze
-        EXIT_TYPES = %i(break return).freeze
+        EXIT_TYPES = %i[break return].freeze
         EACH_ = 'each_'.freeze
-        ENUMERATORS = %i(collect collect_concat detect downto each
+        ENUMERATORS = %i[collect collect_concat detect downto each
                          find find_all find_index inject loop map!
                          map reduce reject reject! reverse_each select
-                         select! times upto).freeze
+                         select! times upto].freeze
 
         def investigate(_processed_source)
           # When correcting nested offenses, we need to keep track of how much

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

@@ -108,7 +108,7 @@ module RuboCop
         end
 
         def replacement_supported?(operator)
-          if %i(> <).include?(operator)
+          if %i[> <].include?(operator)
             target_ruby_version >= 2.3
           else
             true

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

@@ -26,7 +26,7 @@ module RuboCop
         def replacement(node)
           return to_ternary(node) unless node.parent
 
-          if %i(and or).include?(node.parent.type)
+          if %i[and or].include?(node.parent.type)
             return "(#{to_ternary(node)})"
           end
 
@@ -48,7 +48,7 @@ module RuboCop
         end
 
         def requires_parentheses?(node)
-          return true if %i(and or if).include?(node.type)
+          return true if %i[and or if].include?(node.type)
           return true if node.assignment?
           return true if method_call_with_changed_precedence?(node)
 

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

@@ -17,8 +17,8 @@ module RuboCop
         MSG = 'When defining the `%s` operator, ' \
               'name its argument `other`.'.freeze
 
-        OP_LIKE_METHODS = %i(eql? equal?).freeze
-        BLACKLISTED = %i(+@ -@ [] []= << `).freeze
+        OP_LIKE_METHODS = %i[eql? equal?].freeze
+        BLACKLISTED = %i[+@ -@ [] []= << `].freeze
 
         def_node_matcher :op_method_candidate?, <<-PATTERN
           (def $_ (args $(arg [!:other !:_other])) _)

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

@@ -171,7 +171,7 @@ module RuboCop
 
         def modifier_while?(node)
           node.loc.respond_to?(:keyword) &&
-            %w(while until).include?(node.loc.keyword.source) &&
+            %w[while until].include?(node.loc.keyword.source) &&
             node.modifier_form?
         end