rubocop 0.43.0 → 0.44.0

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

data/lib/rubocop/cop/offense.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,6 +1,6 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
+require 'pry'
 module RuboCop
   module Cop
     module Performance
@@ -82,7 +82,7 @@ module RuboCop
           *conditions, _body = *node
 
           lambda do |corrector|
-            if needs_reorder?(conditions)
+            if needs_reorder?(node)
               reorder_condition(corrector, node, replacement(conditions))
             else
               inline_fix_branch(corrector, node, conditions,
@@ -94,8 +94,10 @@ module RuboCop
         private
 
         def replacement(conditions)
-          new_condition = conditions.map(&:source)
-          new_condition.join(', ')
+          ordered_conditions = conditions.partition { |cond| !cond.splat_type? }
+          ordered_conditions.flatten!
+          ordered_conditions.map!(&:source)
+          ordered_conditions.join(', ')
         end
 
         def inline_fix_branch(corrector, _node, conditions, new_condition)
@@ -107,6 +109,8 @@ module RuboCop
         def reorder_condition(corrector, node, new_condition)
           *_conditions, body = *node
           _case_branch, *when_branches, _else_branch = *node.parent
+          return if when_branches.size == 1 # Can't reorder one branch
+
           corrector.remove(when_branch_range(node, when_branches))
 
           correction = if same_line?(node, body)
@@ -159,10 +163,15 @@ module RuboCop
             !condition.splat_type?
         end
 
-        def needs_reorder?(conditions)
-          conditions.any? do |condition|
-            variable, = *condition
-            condition.splat_type? && !(variable && variable.array_type?)
+        def needs_reorder?(node)
+          _case_condition, *when_branches, _else_branch = *node.parent
+          current_index = when_branches.index { |branch| branch == node }
+          when_branches[(current_index + 1)..-1].any? do |branch|
+            *conditions, _ = *branch
+            conditions.none? do |condition|
+              variable, = *condition
+              condition.splat_type? && !(variable && variable.array_type?)
+            end
           end
         end
       end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

data/lib/rubocop/cop/performance/{hash_each.rb → hash_each_methods.rb}

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -45,6 +44,7 @@ module RuboCop
 
         def each_redundant_merge(node)
           redundant_merge(node) do |receiver, pairs|
+            next unless receiver
             next if node.value_used? &&
                     !EachWithObjectInspector.new(node, receiver).value_used?
             next if pairs.size > 1 && !receiver.pure?

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # frozen_string_literal: true
 
 module RuboCop
@@ -92,7 +91,7 @@ module RuboCop
           def range_size(range_node)
             vals = *range_node
             return :unknown unless vals.all?(&:int_type?)
-            low, high = *vals.map(&:to_a).map(&:first)
+            low, high = *vals.map { |val| val.to_a.first }
             return :unknown unless low.zero? && high >= 0
             case range_node.type
             when :erange then high - low

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,12 +1,11 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop
   module Cop
     module Rails
-      # This cop enforces the consistent use of action filters methods.
+      # This cop enforces the consistent use of action filter methods.
       #
-      # The cop is configurable and the enforce the use of older
+      # The cop is configurable and can enforce the use of the older
       # something_filter methods or the newer something_action methods.
       class ActionFilter < Cop
         include ConfigurableEnforcedStyle

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Rails
+      # This cop looks for delegations that pass :allow_blank as an option
+      # instead of :allow_nil. :allow_blank is not a valid option to pass
+      # to ActiveSupport#delegate.
+      #
+      # @example
+      #   # bad
+      #   delegate :foo, to: :bar, allow_blank: true
+      #
+      #   # good
+      #   delegate :foo, to: :bar, allow_nil: true
+      class DelegateAllowBlank < Cop
+        MSG = '`allow_blank` is not a valid option, use `allow_nil`.'.freeze
+
+        def_node_matcher :delegate, <<-PATTERN
+          (send _ :delegate _ $hash)
+        PATTERN
+
+        def_node_matcher :delegate_options, <<-PATTERN
+          (hash $...)
+        PATTERN
+
+        def_node_matcher :allow_blank?, <<-PATTERN
+          (pair $(sym :allow_blank) true)
+        PATTERN
+
+        def on_send(node)
+          offending_node = allow_blank_option(node)
+          return unless offending_node
+
+          allow_blank = offending_node.children.first
+          add_offense(node, allow_blank.source_range, MSG)
+        end
+
+        def autocorrect(node)
+          offending_node = allow_blank_option(node)
+          return unless offending_node
+
+          allow_blank = offending_node.children.first
+          lambda do |corrector|
+            corrector.replace(allow_blank.source_range, 'allow_nil')
+          end
+        end
+
+        private
+
+        def allow_blank_option(node)
+          options_hash = delegate(node)
+          return unless options_hash
+          options = delegate_options(options_hash)
+          return unless options
+
+          options.detect { |opt| allow_blank?(opt) }
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Rails
+      # This cop checks dynamic `find_by_*` methods.
+      # Use `find_by` instead of dynamic method.
+      # See. https://github.com/bbatsov/rails-style-guide#find_by
+      #
+      # @example
+      #   # bad
+      #   User.find_by_name(name)
+      #
+      #   # bad
+      #   User.find_by_name_and_email(name)
+      #
+      #   # bad
+      #   User.find_by_email!(name)
+      #
+      #   # good
+      #   User.find_by(name: name)
+      #
+      #   # good
+      #   User.find_by(name: name, email: email)
+      #
+      #   # good
+      #   User.find_by!(email: email)
+      class DynamicFindBy < Cop
+        MSG = 'Use `%s` instead of dynamic `%s`.'.freeze
+        METHOD_PATTERN = /^find_by_(.+?)(!)?$/
+
+        def on_send(node)
+          _receiver, method, _args = *node
+          method_name = method.to_s
+          return if whitelist.include?(method_name)
+          static_name = static_method_name(method_name)
+          return unless static_name
+
+          add_offense(node, :expression, format(MSG, static_name, method))
+        end
+
+        def autocorrect(node)
+          _receiver, method, *args = *node
+          static_name = static_method_name(method.to_s)
+          keywords = column_keywords(method)
+          return if keywords.size != args.size
+
+          lambda do |corrector|
+            corrector.replace(node.loc.selector, static_name)
+            keywords.each.with_index do |keyword, idx|
+              corrector.insert_before(args[idx].loc.expression, keyword)
+            end
+          end
+        end
+
+        private
+
+        def whitelist
+          cop_config['Whitelist']
+        end
+
+        def column_keywords(method)
+          keyword_string = method.to_s[METHOD_PATTERN, 1]
+          keyword_string.split('_and_').map { |keyword| "#{keyword}: " }
+        end
+
+        # Returns static method name.
+        # If code isn't wrong, returns nil
+        def static_method_name(method_name)
+          match = METHOD_PATTERN.match(method_name)
+          return nil unless match
+          match[2] ? 'find_by!' : 'find_by'
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 module RuboCop

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

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Rails
+      # This cop is used to identify usages of http methods
+      # like `get`, `post`, `put`, `path` without the usage of keyword arguments
+      # in your tests and change them to use keyword arguments.
+      #
+      # @example
+      #   # bad
+      #   get :new, { user_id: 1}
+      #
+      #   # good
+      #   get :new, params: { user_id: 1 }
+      class HttpPositionalArguments < Cop
+        MSG = 'Use keyword arguments instead of ' \
+              'positional arguments for http call: `%s`.'.freeze
+        KEYWORD_ARGS = [:headers, :env, :params, :body, :flash, :as].freeze
+        HTTP_METHODS = [:get, :post, :put, :patch, :delete, :head].freeze
+
+        def on_send(node)
+          receiver, http_method, http_path, data = *node
+          # if the first word on the line is not an http method, then skip
+          return unless HTTP_METHODS.include?(http_method)
+          # if the data is nil then we don't need to add keyword arguments
+          # because there is no data to put in params or headers, so skip
+          return if data.nil?
+          return unless needs_conversion?(data)
+          # ensures this is the first method on the line
+          # there is an edge case here where sometimes the http method is
+          # wrapped into another method, but its just safer to skip those
+          # cases and process manually
+          return unless receiver.nil?
+          # a http_method without a path?, must be something else
+          return if http_path.nil?
+          add_offense(node, node.loc.selector, format(MSG, node.method_name))
+        end
+
+        # @return [Boolean] true if the line needs to be converted
+        def needs_conversion?(data)
+          # if the line has already been converted to use keyword args
+          # then skip
+          # ie. get :new, params: { user_id: 1 }  (looking for keyword arg)
+          value = data.descendants.find do |d|
+            KEYWORD_ARGS.include?(d.children.first) if d.type == :sym
+          end
+          value.nil?
+        end
+
+        def convert_hash_data(data, type)
+          # empty hash or no hash return empty string
+          return '' if data.nil? || data.children.count < 1
+          hash_data = if data.type == :send
+                        # user supplies an object,
+                        # no need to surround with braces
+                        data.source
+                      else
+                        format('{ %s }', data.children.map(&:source).join(', '))
+                      end
+          format(', %s: %s', type, hash_data)
+        end
+
+        # given a pre Rails 5 method: get :new, user_id: @user.id, {}
+        #
+        # @return lambda of auto correct procedure
+        # the result should look like:
+        #     get :new, params: { user_id: @user.id }, headers: {}
+        # the http_method is the method use to call the controller
+        # the controller node can be a symbol, method, object or string
+        # that represents the path/action on the Rails controller
+        # the data is the http parameters and environment sent in
+        # the Rails 5 http call
+        def autocorrect(node)
+          _receiver, http_method, http_path, *data = *node
+          controller_action = http_path.source
+          params = convert_hash_data(data.first, 'params')
+          headers = convert_hash_data(data.last, 'headers') if data.count > 1
+          # the range of the text to replace, which is the whole line
+          code_to_replace = node.loc.expression
+          # what to replace with
+          new_code = format('%s %s%s%s', http_method, controller_action,
+                            params, headers)
+          ->(corrector) { corrector.replace(code_to_replace, new_code) }
+        end
+      end
+    end
+  end
+end