rubocop-rails 2.11.1 → 2.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb9c60dfc813cddff8b72b3f19b337ec3a6570f6210398841ed3852d9dcfad1
-  data.tar.gz: 4d026033a03b8f08ccf51e9503cd83c0266132e677478732b64b4fdbe664b02a
+  metadata.gz: 8fb49b448d769c9ff936129480584da1cfb68abc6f9697a845c94c7d345c7077
+  data.tar.gz: 9309aca423686c3df184c22a25320f90f9eae5b0c2c033447fff1dbbc7458518
 SHA512:
-  metadata.gz: 1fbc8870d37ee91a53e15f1d067517f8430cd9a0bb383bf27c80c4f84db32ded964c3f345caa6d026aaba187f3e7c78d6a838824433b16d3e9cac9ed7ecd337c
-  data.tar.gz: 0cf8c155c3b987a10f581d4983240696fa444d7157e54e4bb2d2ac616721e80a4dacd264e32d15a0165e66d7d1511d97b9c8a07d4e94e1e41accfc71b7803228
+  metadata.gz: 4d209b60d9c4cb2a1d1e0786936cb2ecac1d0debfc7fc83fc91e959a07a42a8f7ad8d5eba05c015b4c27cd79c342ce4e2f057399cbbd12af01218ff79f13d5b5
+  data.tar.gz: a18599aa1218bedcd1854db939fad42265d1de222b0d5fc633f30844dc3f4bc65b97fc943511dc902c5bd8588fcbb20c3424d4db3b6d9ad4e534691a2d4cfe89

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'irb'
+require 'rubocop'
+require 'rubocop-rails'
+
+ARGV.clear
+
+IRB.start(__FILE__)

data/config/default.yml

@@ -181,12 +181,14 @@ Rails/BulkChangeTable:
     - db/migrate/*.rb
 
 Rails/ContentTag:
-  Description: 'Use `tag` instead of `content_tag`.'
+  Description: 'Use `tag.something` instead of `tag(:something)`.'
   Reference:
+    - 'https://github.com/rubocop/rubocop-rails/issues/260'
     - 'https://github.com/rails/rails/issues/25195'
     - 'https://api.rubyonrails.org/classes/ActionView/Helpers/TagHelper.html#method-i-content_tag'
   Enabled: true
   VersionAdded: '2.6'
+  VersionChanged: '2.12'
 
 Rails/CreateTableWithTimestamps:
   Description: >-
@@ -499,6 +501,7 @@ Rails/OrderById:
 Rails/Output:
   Description: 'Checks for calls to puts, print, etc.'
   Enabled: true
+  SafeAutoCorrect: false
   VersionAdded: '0.15'
   VersionChanged: '0.19'
   Include:
@@ -607,6 +610,14 @@ Rails/RedundantReceiverInWithOptions:
   Enabled: true
   VersionAdded: '0.52'
 
+Rails/RedundantTravelBack:
+  Description: This cop checks for redundant `travel_back` calls.
+  Enabled: pending
+  VersionAdded: '2.12'
+  Include:
+    - spec/**/*.rb
+    - test/**/*.rb
+
 Rails/ReflectionClassName:
   Description: 'Use a string for `class_name` option value in the definition of a reflection.'
   Enabled: true
@@ -713,6 +724,7 @@ Rails/ScopeArgs:
   Description: 'Checks the arguments of ActiveRecord scopes.'
   Enabled: true
   VersionAdded: '0.19'
+  VersionChanged: '2.12'
   Include:
     - app/models/**/*.rb
 

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

@@ -57,12 +57,13 @@ module RuboCop
       # Resolve relation into column name.
       # It just returns column_name if the column exists.
       # Or it tries to resolve column_name as a relation.
+      # Returns an array of column names if the relation is polymorphic.
       # It returns `nil` if it can't resolve.
       #
       # @param name [String]
       # @param class_node [RuboCop::AST::Node]
       # @param table [RuboCop::Rails::SchemaLoader::Table]
-      # @return [String, nil]
+      # @return [Array, String, nil]
       def resolve_relation_into_column(name:, class_node:, table:)
         return unless table
         return name if table.with_column?(name: name)
@@ -71,7 +72,9 @@ module RuboCop
           next unless belongs_to.first_argument.value.to_s == name
 
           fk = foreign_key_of(belongs_to) || "#{name}_id"
-          return fk if table.with_column?(name: fk)
+          next unless table.with_column?(name: fk)
+
+          return polymorphic?(belongs_to) ? [fk, "#{name}_type"] : fk
         end
         nil
       end
@@ -88,6 +91,15 @@ module RuboCop
         end
       end
 
+      def polymorphic?(belongs_to)
+        options = belongs_to.last_argument
+        return false unless options.hash_type?
+
+        options.each_pair.any? do |pair|
+          pair.key.sym_type? && pair.key.value == :polymorphic && pair.value.true_type?
+        end
+      end
+
       def in_where?(node)
         send_node = node.each_ancestor(:send).first
         send_node && WHERE_METHODS.include?(send_node.method_name)

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

@@ -71,7 +71,7 @@ module RuboCop
 
         # Autocorrect by swapping between two nodes autocorrecting them
         def autocorrect(corrector, node)
-          previous = left_siblings_of(node).reverse_each.find do |sibling|
+          previous = node.left_siblings.reverse_each.find do |sibling|
             callback?(sibling)
           end
 
@@ -96,14 +96,6 @@ module RuboCop
           node.send_type? && CALLBACKS_ORDER_MAP.key?(node.method_name)
         end
 
-        def left_siblings_of(node)
-          siblings_of(node)[0, node.sibling_index]
-        end
-
-        def siblings_of(node)
-          node.parent.children
-        end
-
         def source_range_with_comment(node)
           begin_pos = begin_pos_with_comment(node)
           end_pos = end_position_for(node)

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

@@ -194,7 +194,11 @@ module RuboCop
         def database_yaml
           return nil unless File.exist?('config/database.yml')
 
-          yaml = YAML.load_file('config/database.yml')
+          yaml = if YAML.respond_to?(:unsafe_load_file)
+                   YAML.unsafe_load_file('config/database.yml')
+                 else
+                   YAML.load_file('config/database.yml')
+                 end
           return nil unless yaml.is_a? Hash
 
           config = yaml['development']

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

@@ -3,21 +3,21 @@
 module RuboCop
   module Cop
     module Rails
-      # This cop checks that `tag` is used instead of `content_tag`
-      # because `content_tag` is legacy syntax.
+      # This cop checks legacy syntax usage of `tag`
       #
-      # NOTE: Allow `content_tag` when the first argument is a variable because
-      #      `content_tag(name)` is simpler rather than `tag.public_send(name)`.
+      # NOTE: Allow `tag` when the first argument is a variable because
+      #       `tag(name)` is simpler rather than `tag.public_send(name)`.
+      #       And this cop will be renamed to something like `LegacyTag` in the future. (e.g. RuboCop Rails 2.0)
       #
       # @example
       #  # bad
-      #  content_tag(:p, 'Hello world!')
-      #  content_tag(:br)
+      #  tag(:p)
+      #  tag(:br, class: 'classname')
       #
       #  # good
-      #  tag.p('Hello world!')
-      #  tag.br
-      #  content_tag(name, 'Hello world!')
+      #  tag.p
+      #  tag.br(class: 'classname')
+      #  tag(name, class: 'classname')
       class ContentTag < Base
         include RangeHelp
         extend AutoCorrector
@@ -25,8 +25,8 @@ module RuboCop
 
         minimum_target_rails_version 5.1
 
-        MSG = 'Use `tag` instead of `content_tag`.'
-        RESTRICT_ON_SEND = %i[content_tag].freeze
+        MSG = 'Use `tag.%<preferred_method>s` instead of `tag(%<current_argument>s)`.'
+        RESTRICT_ON_SEND = %i[tag].freeze
 
         def on_new_investigation
           @corrected_nodes = nil
@@ -38,8 +38,11 @@ module RuboCop
                     allowed_argument?(first_argument) ||
                     corrected_ancestor?(node)
 
-          add_offense(node) do |corrector|
-            autocorrect(corrector, node)
+          preferred_method = node.first_argument.value.to_s.underscore
+          message = format(MSG, preferred_method: preferred_method, current_argument: first_argument.source)
+
+          add_offense(node, message: message) do |corrector|
+            autocorrect(corrector, node, preferred_method)
 
             @corrected_nodes ||= Set.new.compare_by_identity
             @corrected_nodes.add(node)
@@ -53,26 +56,26 @@ module RuboCop
         end
 
         def allowed_argument?(argument)
-          argument.variable? || argument.send_type? || argument.const_type? || argument.splat_type?
+          argument.variable? ||
+            argument.send_type? ||
+            argument.const_type? ||
+            argument.splat_type? ||
+            allowed_name?(argument)
         end
 
-        def autocorrect(corrector, node)
-          if method_name?(node.first_argument)
-            range = correction_range(node)
+        def autocorrect(corrector, node, preferred_method)
+          range = correction_range(node)
 
-            rest_args = node.arguments.drop(1)
-            replacement = "tag.#{node.first_argument.value.to_s.underscore}(#{rest_args.map(&:source).join(', ')})"
+          rest_args = node.arguments.drop(1)
+          replacement = "tag.#{preferred_method}(#{rest_args.map(&:source).join(', ')})"
 
-            corrector.replace(range, replacement)
-          else
-            corrector.replace(node.loc.selector, 'tag')
-          end
+          corrector.replace(range, replacement)
         end
 
-        def method_name?(node)
-          return false unless node.str_type? || node.sym_type?
+        def allowed_name?(argument)
+          return false unless argument.str_type? || argument.sym_type?
 
-          /^[a-zA-Z_][a-zA-Z_\-0-9]*$/.match?(node.value)
+          !/^[a-zA-Z\-][a-zA-Z\-0-9]*$/.match?(argument.value)
         end
 
         def correction_range(node)

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

@@ -100,7 +100,7 @@ module RuboCop
 
         def method_name_matches?(method_name, body)
           method_name == body.method_name ||
-            include_prefix_case? && method_name == prefixed_method_name(body)
+            (include_prefix_case? && method_name == prefixed_method_name(body))
         end
 
         def include_prefix_case?

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

@@ -40,7 +40,7 @@ module RuboCop
         IGNORED_ARGUMENT_TYPES = %i[hash splat].freeze
 
         def on_send(node)
-          return if node.receiver.nil? && !inherit_active_record_base?(node) || allowed_invocation?(node)
+          return if (node.receiver.nil? && !inherit_active_record_base?(node)) || allowed_invocation?(node)
 
           method_name = node.method_name
           static_name = static_method_name(method_name)

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

@@ -32,10 +32,10 @@ module RuboCop
         RESTRICT_ON_SEND = %i[first take].freeze
 
         def on_send(node)
-          return unless where_method?(node.receiver)
+          return unless node.arguments.empty? && where_method?(node.receiver)
           return if ignore_where_first? && node.method?(:first)
 
-          range = range_between(node.receiver.loc.selector.begin_pos, node.loc.selector.end_pos)
+          range = offense_range(node)
 
           add_offense(range, message: format(MSG, method: node.method_name)) do |corrector|
             autocorrect(corrector, node)
@@ -51,6 +51,10 @@ module RuboCop
           receiver.respond_to?(:method?) && receiver.method?(:where)
         end
 
+        def offense_range(node)
+          range_between(node.receiver.loc.selector.begin_pos, node.loc.selector.end_pos)
+        end
+
         def autocorrect(corrector, node)
           return if node.method?(:first)
 

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

@@ -100,8 +100,8 @@ module RuboCop
         end
 
         def contain_valid_options_in_with_options_block?(node)
-          if with_options_block(node)
-            return true if valid_options?(with_options_block(node))
+          if (options = with_options_block(node))
+            return true if valid_options?(options)
 
             return false unless node.parent
 
@@ -114,6 +114,10 @@ module RuboCop
         end
 
         def valid_options?(options)
+          return false if options.nil?
+
+          options = options.first.children.first.pairs if options.first.kwsplat_type?
+
           return true unless options
           return true if options.any? do |o|
             dependent_option?(o) || present_option?(o)

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

@@ -27,6 +27,7 @@ module RuboCop
         KEYWORD_ARGS = %i[
           method params session body flash xhr as headers env to
         ].freeze
+        ROUTING_METHODS = %i[draw routes].freeze
         RESTRICT_ON_SEND = %i[get post put patch delete head].freeze
 
         minimum_target_rails_version 5.0
@@ -40,6 +41,8 @@ module RuboCop
         PATTERN
 
         def on_send(node)
+          return if in_routing_block?(node)
+
           http_request?(node) do |data|
             return unless needs_conversion?(data)
 
@@ -63,13 +66,17 @@ module RuboCop
 
         private
 
+        def in_routing_block?(node)
+          !!node.each_ancestor(:block).detect { |block| ROUTING_METHODS.include?(block.send_node.method_name) }
+        end
+
         def needs_conversion?(data)
           return true unless data.hash_type?
           return false if kwsplat_hash?(data)
 
           data.each_pair.none? do |pair|
             special_keyword_arg?(pair.key) ||
-              format_arg?(pair.key) && data.pairs.one?
+              (format_arg?(pair.key) && data.pairs.one?)
           end
         end
 

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

@@ -124,9 +124,10 @@ module RuboCop
           block = parent.each_child_node(:begin).first
           return unless block
 
-          defined_methods = block.each_child_node(:def).map(&:method_name)
+          defined_action_methods = defined_action_methods(block)
+
           methods = array_values(methods_node).reject do |method|
-            defined_methods.include?(method)
+            defined_action_methods.include?(method)
           end
 
           message = message(methods, parent)
@@ -135,6 +136,26 @@ module RuboCop
 
         private
 
+        def defined_action_methods(block)
+          defined_methods = block.each_child_node(:def).map(&:method_name)
+
+          defined_methods + aliased_action_methods(block, defined_methods)
+        end
+
+        def aliased_action_methods(node, defined_methods)
+          alias_methods = node.each_child_node(:send).select { |send_node| send_node.method?(:alias_method) }
+
+          hash_of_alias_methods = alias_methods.each_with_object({}) do |alias_method, result|
+            result[alias_method.last_argument.value] = alias_method.first_argument.value
+          end
+
+          defined_methods.each_with_object([]) do |defined_method, aliased_method|
+            if (new_method_name = hash_of_alias_methods[defined_method])
+              aliased_method << new_method_name
+            end
+          end
+        end
+
         # @param node [RuboCop::AST::Node]
         # @return [Array<Symbol>]
         def array_values(node) # rubocop:disable Metrics/MethodLength

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

@@ -75,8 +75,8 @@ module RuboCop
           corrector.replace(str_range, "#{existing_rel} noopener")
         end
 
-        def add_rel(send_node, offence_node, corrector)
-          opening_quote = offence_node.children.last.source[0]
+        def add_rel(send_node, offense_node, corrector)
+          opening_quote = offense_node.children.last.source[0]
           closing_quote = opening_quote == ':' ? '' : opening_quote
           new_rel_exp = ", rel: #{opening_quote}noopener#{closing_quote}"
           range = if (last_argument = send_node.last_argument).hash_type?

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

@@ -14,6 +14,9 @@ module RuboCop
       #   # good
       #   Rails.logger.debug 'A debug message'
       class Output < Base
+        include RangeHelp
+        extend AutoCorrector
+
         MSG = 'Do not write to stdout. ' \
               "Use Rails's logger if you want to log."
         RESTRICT_ON_SEND = %i[
@@ -35,10 +38,13 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          return unless (output?(node) || io_output?(node)) &&
-                        node.arguments?
+          return unless (output?(node) || io_output?(node)) && node.arguments?
+
+          range = offense_range(node)
 
-          add_offense(node.loc.selector)
+          add_offense(range) do |corrector|
+            corrector.replace(range, 'Rails.logger.debug')
+          end
         end
 
         private
@@ -46,6 +52,14 @@ module RuboCop
         def match_gvar?(sym)
           %i[$stdout $stderr].include?(sym)
         end
+
+        def offense_range(node)
+          if node.receiver
+            range_between(node.loc.expression.begin_pos, node.loc.selector.end_pos)
+          else
+            node.loc.selector
+          end
+        end
       end
     end
   end

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

@@ -61,8 +61,8 @@ module RuboCop
         def offense?(node)
           number, = *node.receiver
 
-          singular_receiver?(number) && plural_method?(node.method_name) ||
-            plural_receiver?(number) && singular_method?(node.method_name)
+          (singular_receiver?(number) && plural_method?(node.method_name)) ||
+            (plural_receiver?(number) && singular_method?(node.method_name))
         end
 
         def plural_method?(method_name)

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

@@ -56,8 +56,8 @@ module RuboCop
 
         def register_offense(allow_nil, message)
           add_offense(allow_nil, message: message) do |corrector|
-            prv_sib = previous_sibling(allow_nil)
-            nxt_sib = next_sibling(allow_nil)
+            prv_sib = allow_nil.left_sibling
+            nxt_sib = allow_nil.right_sibling
 
             if nxt_sib
               corrector.remove(range_between(node_beg(allow_nil), node_beg(nxt_sib)))
@@ -88,14 +88,6 @@ module RuboCop
           nil
         end
 
-        def previous_sibling(node)
-          node.parent.children[node.sibling_index - 1]
-        end
-
-        def next_sibling(node)
-          node.parent.children[node.sibling_index + 1]
-        end
-
         def node_beg(node)
           node.loc.expression.begin_pos
         end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Rails
+      # This cop checks for redundant `travel_back` calls.
+      # Since Rails 5.2, `travel_back` is automatically called at the end of the test.
+      #
+      # @example
+      #
+      #   # bad
+      #   def teardown
+      #     do_something
+      #     travel_back
+      #   end
+      #
+      #   # good
+      #   def teardown
+      #     do_something
+      #   end
+      #
+      #   # bad
+      #   after do
+      #     do_something
+      #     travel_back
+      #   end
+      #
+      #   # good
+      #   after do
+      #     do_something
+      #   end
+      #
+      class RedundantTravelBack < Base
+        include RangeHelp
+        extend AutoCorrector
+        extend TargetRailsVersion
+
+        minimum_target_rails_version 5.2
+
+        MSG = 'Redundant `travel_back` detected.'
+        RESTRICT_ON_SEND = %i[travel_back].freeze
+
+        def on_send(node)
+          return unless node.each_ancestor(:def, :block).any? do |ancestor|
+            method_name = ancestor.def_type? ? :teardown : :after
+
+            ancestor.method?(method_name)
+          end
+
+          add_offense(node) do |corrector|
+            corrector.remove(range_by_whole_lines(node.source_range, include_final_newline: true))
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -343,8 +343,8 @@ module RuboCop
 
         def within_reversible_or_up_only_block?(node)
           node.each_ancestor(:block).any? do |ancestor|
-            ancestor.block_type? &&
-              ancestor.send_node.method?(:reversible) ||
+            (ancestor.block_type? &&
+              ancestor.send_node.method?(:reversible)) ||
               ancestor.send_node.method?(:up_only)
           end
         end

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

@@ -14,6 +14,8 @@ module RuboCop
       #   # good
       #   scope :something, -> { where(something: true) }
       class ScopeArgs < Base
+        extend AutoCorrector
+
         MSG = 'Use `lambda`/`proc` instead of a plain method call.'
         RESTRICT_ON_SEND = %i[scope].freeze
 
@@ -21,7 +23,9 @@ module RuboCop
 
         def on_send(node)
           scope?(node) do |second_arg|
-            add_offense(second_arg)
+            add_offense(second_arg) do |corrector|
+              corrector.replace(second_arg, "-> { #{second_arg.source} }")
+            end
           end
         end
       end

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

@@ -81,7 +81,7 @@ module RuboCop
           names_from_scope = column_names_from_scope(node)
           ret.concat(names_from_scope) if names_from_scope
 
-          ret.map! do |name|
+          ret = ret.flat_map do |name|
             klass = class_node(node)
             resolve_relation_into_column(
               name: name.to_s,

data/lib/rubocop/cop/rails_cops.rb

@@ -72,6 +72,7 @@ require_relative 'rails/read_write_attribute'
 require_relative 'rails/redundant_allow_nil'
 require_relative 'rails/redundant_foreign_key'
 require_relative 'rails/redundant_receiver_in_with_options'
+require_relative 'rails/redundant_travel_back'
 require_relative 'rails/reflection_class_name'
 require_relative 'rails/refute_methods'
 require_relative 'rails/relative_date_constant'

data/lib/rubocop/rails/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Rails
     # This module holds the RuboCop Rails version information.
     module Version
-      STRING = '2.11.1'
+      STRING = '2.12.1'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.12.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,6 +72,7 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
+- bin/console
 - bin/setup
 - config/default.yml
 - config/obsoletion.yml
@@ -147,6 +148,7 @@ files:
 - lib/rubocop/cop/rails/redundant_allow_nil.rb
 - lib/rubocop/cop/rails/redundant_foreign_key.rb
 - lib/rubocop/cop/rails/redundant_receiver_in_with_options.rb
+- lib/rubocop/cop/rails/redundant_travel_back.rb
 - lib/rubocop/cop/rails/reflection_class_name.rb
 - lib/rubocop/cop/rails/refute_methods.rb
 - lib/rubocop/cop/rails/relative_date_constant.rb
@@ -186,7 +188,7 @@ metadata:
   homepage_uri: https://docs.rubocop.org/rubocop-rails/
   changelog_uri: https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/rubocop/rubocop-rails/
-  documentation_uri: https://docs.rubocop.org/rubocop-rails/2.11/
+  documentation_uri: https://docs.rubocop.org/rubocop-rails/2.12/
   bug_tracker_uri: https://github.com/rubocop/rubocop-rails/issues
 post_install_message:
 rdoc_options: []