rubocop-rails 2.30.1 → 2.30.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b27c710b734d026be33bd2bb2f777e58aa4b1bfbedbcfb487b9a900bcb3689d6
-  data.tar.gz: d817c2bdda07d206ef7521122ed915859f820fe45c059740c885f7478d75bbfa
+  metadata.gz: a45ebdeef3a184afbb85ff1e1685fa978198ee00cf3bbbc0f1cbfa04b56f9dc7
+  data.tar.gz: 2d06943201b3836891ed9f8c0bd9a5e2bebd90de7736351add71af9460e271b7
 SHA512:
-  metadata.gz: bf49fe022c9885721fe7d5b0466052fbfbff90c3e421cc23d0abdb1f8f45e964e12aed5978202e7a9894c50c82cc4df3ce686a74735df80255628db05136df26
-  data.tar.gz: 8117361c6ae1e240c8994c482810278e5d157316ed3b01416630b0c3ee868ebac02c74e2c073a8e9d3958bcd04d849d9ae1f8ea90c0cc8289d8a136f3ab5e97d
+  metadata.gz: ed82ce027a4bee9e6dfa16dd763fa856d7b19b96356b918d469ef1274ef0c5a4e8ea5e949c6aaed84ee6d0f290ca838e34e352929640294a6bd4d579c0145cdd
+  data.tar.gz: 7e11061742bc02b64742e4219ccfea80d5befb27572cb043d7ebc57c7a616f2fd2c8b829ac08dfad6b644f23d8a0f096c8b571cc5b8e9ecf34e7769f1f551fb4

data/README.md

@@ -5,7 +5,8 @@
 
 A [RuboCop](https://github.com/rubocop/rubocop) extension focused on enforcing Rails best practices and coding conventions.
 
-Note: This repository manages rubocop-rails gem (>= 2.0.0). rubocop-rails gem (<= 1.5.0) has been renamed to [rubocop-rails_config](https://rubygems.org/gems/rubocop-rails_config) gem.
+> [!IMPORTANT]
+> This repository manages rubocop-rails gem (>= 2.0.0). rubocop-rails gem (<= 1.5.0) has been renamed to [rubocop-rails_config](https://rubygems.org/gems/rubocop-rails_config) gem.
 
 ## Installation
 

data/config/default.yml

@@ -77,6 +77,20 @@ Lint/SafeNavigationChain:
     - try!
     - in?
 
+Lint/UselessAccessModifier:
+  # Add methods from `ActiveSupport::Concern` and `Module::Concerning`:
+  # https://api.rubyonrails.org/classes/ActiveSupport/Concern.html
+  # https://api.rubyonrails.org/classes/Module/Concerning
+  inherit_mode:
+    merge:
+      - ContextCreatingMethods
+  ContextCreatingMethods:
+    - class_methods
+    - included
+    - prepended
+    - concern
+    - concerning
+
 Rails:
   Enabled: true
   DocumentationBaseURL: https://docs.rubocop.org/rubocop-rails
@@ -353,11 +367,13 @@ Rails/Delegate:
   Description: 'Prefer delegate method for delegations.'
   Enabled: true
   VersionAdded: '0.21'
-  VersionChanged: '0.50'
+  VersionChanged: '2.30'
   # When set to true, using the target object as a prefix of the
   # method name without using the `delegate` method will be a
   # violation. When set to false, this case is legal.
   EnforceForPrefixed: true
+  Exclude:
+    - app/controllers/**/*.rb
 
 Rails/DelegateAllowBlank:
   Description: 'Do not use allow_blank as an option to delegate.'

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

@@ -103,7 +103,7 @@ module RuboCop
       end
 
       def in_where?(node)
-        send_node = node.each_ancestor(:send, :csend).first
+        send_node = node.each_ancestor(:call).first
         return false unless send_node
 
         return true if WHERE_METHODS.include?(send_node.method_name)

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

@@ -22,9 +22,9 @@ module RuboCop
       ].freeze
 
       def_node_matcher :create_table_with_block?, <<~PATTERN
-        (block
+        (any_block
           (send nil? :create_table ...)
-          (args (arg _var))
+          { _ | (args (arg _var)) }
           _)
       PATTERN
     end

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

@@ -123,7 +123,7 @@ module RuboCop
         def on_if(node)
           return unless cop_config['UnlessPresent']
           return unless node.unless?
-          return if node.else? && config.for_cop('Style/UnlessElse')['Enabled']
+          return if node.else? && config.cop_enabled?('Style/UnlessElse')
 
           unless_present?(node) do |method_call, receiver|
             range = unless_condition(node, method_call)

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

@@ -15,6 +15,9 @@ module RuboCop
       # without using the `delegate` method will be a violation.
       # When set to `false`, this case is legal.
       #
+      # It is disabled for controllers in order to keep controller actions
+      # explicitly defined.
+      #
       # @example
       #   # bad
       #   def bar
@@ -74,6 +77,7 @@ module RuboCop
         def on_def(node)
           return unless trivial_delegate?(node)
           return if private_or_protected_delegation(node)
+          return if module_function_declared?(node)
 
           register_offense(node)
         end
@@ -163,6 +167,12 @@ module RuboCop
           private_or_protected_inline(node) || node_visibility(node) != :public
         end
 
+        def module_function_declared?(node)
+          node.each_ancestor(:module, :begin).any? do |ancestor|
+            ancestor.children.any? { |child| child.send_type? && child.method?(:module_function) }
+          end
+        end
+
         def private_or_protected_inline(node)
           processed_source[node.first_line - 1].strip.match?(/\A(private )|(protected )/)
         end

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

@@ -115,6 +115,10 @@ module RuboCop
                 $_)))
         PATTERN
 
+        def_node_matcher :delegated_methods, <<~PATTERN
+          (send nil? :delegate (sym $_)+ (hash <(pair (sym :to) _) ...>))
+        PATTERN
+
         def on_send(node)
           methods_node = only_or_except_filter_methods(node)
           return unless methods_node
@@ -139,7 +143,13 @@ module RuboCop
           return [] unless block
 
           defined_methods = block.each_child_node(:def).map(&:method_name)
-          defined_methods + aliased_action_methods(block, defined_methods)
+          defined_methods + delegated_action_methods(block) + aliased_action_methods(block, defined_methods)
+        end
+
+        def delegated_action_methods(node)
+          node.each_child_node(:send).flat_map do |child_node|
+            delegated_methods(child_node) || []
+          end
         end
 
         def aliased_action_methods(node, defined_methods)

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

@@ -60,7 +60,7 @@ module RuboCop
         PATTERN
 
         def on_block(node)
-          return if node.each_ancestor(:block, :numblock).any?
+          return if node.each_ancestor(:any_block).any?
 
           pluck_candidate?(node) do |argument, key|
             next if key.regexp_type? || !use_one_block_argument?(argument)

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

@@ -110,7 +110,7 @@ module RuboCop
         def on_if(node)
           return unless cop_config['UnlessBlank']
           return unless node.unless?
-          return if node.else? && config.for_cop('Style/UnlessElse')['Enabled']
+          return if node.else? && config.cop_enabled?('Style/UnlessElse')
 
           unless_blank?(node) do |method_call, receiver|
             range = unless_condition(node, method_call)

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

@@ -40,7 +40,7 @@ module RuboCop
 
         def on_send(node)
           association_with_reflection(node) do |reflection_class_name|
-            return if reflection_class_name.value.send_type? && reflection_class_name.value.receiver.nil?
+            return if reflection_class_name.value.send_type? && !reflection_class_name.value.receiver&.const_type?
             return if reflection_class_name.value.lvar_type? && str_assigned?(reflection_class_name)
 
             add_offense(reflection_class_name) do |corrector|

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

@@ -90,7 +90,7 @@ module RuboCop
         end
 
         def nested_relative_date(node, &callback)
-          return if node.nil? || node.block_type?
+          return if node.nil? || node.any_block_type?
 
           node.each_child_node do |child|
             nested_relative_date(child, &callback)

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

@@ -218,7 +218,7 @@ module RuboCop
           return unless (last_argument = node.last_argument)
 
           drop_table_call(node) do
-            unless node.parent.block_type? || last_argument.block_pass_type?
+            unless node.parent.any_block_type? || last_argument.block_pass_type?
               add_offense(node, message: format(MSG, action: 'drop_table(without block)'))
             end
           end

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

@@ -182,7 +182,7 @@ module RuboCop
         def right_assignment_node(assignment)
           node = assignment.node.child_nodes.first
 
-          return node unless node&.block_type?
+          return node unless node&.any_block_type?
 
           node.send_node
         end
@@ -305,7 +305,7 @@ module RuboCop
 
           node = assignable_node(node)
           method, sibling_index = find_method_with_sibling_index(node.parent)
-          return false unless method&.type?(:def, :block)
+          return false unless method&.type?(:def, :any_block)
 
           method.children.size == node.sibling_index + sibling_index
         end

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

@@ -99,7 +99,7 @@ module RuboCop
           return false unless transaction_method_name?(node.method_name)
           return false unless (parent = node.parent)
 
-          parent.block_type? && parent.body
+          parent.any_block_type? && parent.body
         end
 
         def statement(statement_node)
@@ -113,7 +113,7 @@ module RuboCop
         end
 
         def nested_block?(statement_node)
-          name = statement_node.ancestors.find(&:block_type?).children.first.method_name
+          name = statement_node.ancestors.find(&:any_block_type?).children.first.method_name
           !transaction_method_name?(name)
         end
 

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

@@ -51,51 +51,28 @@ module RuboCop
 
         MSG = 'Use `distinct` before `pluck`.'
         RESTRICT_ON_SEND = %i[uniq].freeze
-        NEWLINE = "\n"
-        PATTERN = '[!^block (send (send %<type>s :pluck ...) :uniq ...)]'
 
-        def_node_matcher :conservative_node_match, format(PATTERN, type: 'const')
-
-        def_node_matcher :aggressive_node_match, format(PATTERN, type: '_')
+        def_node_matcher :uniq_before_pluck, '[!^any_block $(send $(send _ :pluck ...) :uniq ...)]'
 
         def on_send(node)
-          uniq = if style == :conservative
-                   conservative_node_match(node)
-                 else
-                   aggressive_node_match(node)
-                 end
-
-          return unless uniq
+          uniq_before_pluck(node) do |uniq_node, pluck_node|
+            next if style == :conservative && !pluck_node.receiver&.const_type?
 
-          add_offense(node.loc.selector) do |corrector|
-            autocorrect(corrector, node)
+            add_offense(uniq_node.loc.selector) do |corrector|
+              autocorrect(corrector, uniq_node, pluck_node)
+            end
           end
         end
 
         private
 
-        def autocorrect(corrector, node)
-          method = node.method_name
+        def autocorrect(corrector, uniq_node, pluck_node)
+          corrector.remove(range_between(pluck_node.loc.end.end_pos, uniq_node.loc.selector.end_pos))
 
-          corrector.remove(dot_method_with_whitespace(method, node))
-          if (dot = node.receiver.loc.dot)
+          if (dot = pluck_node.loc.dot)
             corrector.insert_before(dot.begin, '.distinct')
           else
-            corrector.insert_before(node.receiver, 'distinct.')
-          end
-        end
-
-        def dot_method_with_whitespace(method, node)
-          range_between(dot_method_begin_pos(method, node), node.loc.selector.end_pos)
-        end
-
-        def dot_method_begin_pos(method, node)
-          lines = node.source.split(NEWLINE)
-
-          if lines.last.strip == ".#{method}"
-            node.source.rindex(NEWLINE)
-          else
-            node.loc.dot.begin_pos
+            corrector.insert_before(pluck_node, 'distinct.')
           end
         end
       end

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.30.1'
+      STRING = '2.30.3'
 
       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.30.1
+  version: 2.30.3
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -9,7 +9,7 @@ authors:
 - Yuji Nakayama
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport