rubocop-rails 2.17.0 → 2.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a7a516c82d0953f3f1995b190ddc427aa251583287a9232229e82a218c93ba6
-  data.tar.gz: f224a35df6de69c04c7c6f6314f9cfa713cc5accfba1bbce9d5554c7fd50a121
+  metadata.gz: 97069bbada22491ece697f32f933ce8dc5274c18ad2782bb832cd83b168874a3
+  data.tar.gz: 4a691068f93c7be89e9cf695c3be16fe183cb23be4b187e822a9bf9d896c9af7
 SHA512:
-  metadata.gz: 5b3277765f3819855d3e29d3226c81ebc6231b1b1aaf583e1ae86db9e18b7b450bbc2b3f9bccaaa85623ca57e0ac139abde604c35bccc81c3081a80c4392f35d
-  data.tar.gz: a3d7b79f10c2090b04a05d1b30cc3c639645aa6b3c2ad33247fecfa7597907238d8f6e727a8e0dd088b92d69842c488489e9883f9acfd4551e08a9b8f3dd1f8c
+  metadata.gz: 213e3da3d5e23338c53ee9428d8d44a57123fa8a239c3974e5eb0181797555639da23ed7e09336e906e14ba3c99c46e33efba18db44646f0efe86913dc0b7847
+  data.tar.gz: ed27cd2b9106a650b01fc700e9c2511971853412f49aa93876589dfa67e77c7a246fa364dd4682747fc97ffe8121d286a4096e6ef0b257483668c36f99fec9e1

data/config/default.yml

@@ -73,7 +73,7 @@ Rails/ActionControllerFlashBeforeRender:
   StyleGuide: 'https://rails.rubystyle.guide/#flash-before-render'
   Reference: 'https://api.rubyonrails.org/classes/ActionController/FlashBeforeRender.html'
   Enabled: 'pending'
-  SafeAutocorrect: false
+  SafeAutoCorrect: false
   VersionAdded: '2.16'
 
 Rails/ActionControllerTestCase:
@@ -81,7 +81,7 @@ Rails/ActionControllerTestCase:
   StyleGuide: 'https://rails.rubystyle.guide/#integration-testing'
   Reference: 'https://api.rubyonrails.org/classes/ActionController/TestCase.html'
   Enabled: 'pending'
-  SafeAutocorrect: false
+  SafeAutoCorrect: false
   VersionAdded: '2.14'
   Include:
     - '**/test/**/*.rb'
@@ -873,7 +873,7 @@ Rails/RootJoinChain:
 Rails/RootPathnameMethods:
   Description: 'Use `Rails.root` IO methods instead of passing it to `File`.'
   Enabled: pending
-  SafeAutocorrect: false
+  SafeAutoCorrect: false
   VersionAdded: '2.16'
 
 Rails/RootPublicPath:

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

@@ -37,8 +37,8 @@ module RuboCop
           ^(send (send nil? :flash) :[]= ...)
         PATTERN
 
-        def_node_search :redirect_to?, <<~PATTERN
-          (send nil? :redirect_to ...)
+        def_node_search :render?, <<~PATTERN
+          (send nil? :render ...)
         PATTERN
 
         def_node_search :action_controller?, <<~PATTERN
@@ -53,7 +53,7 @@ module RuboCop
         def on_send(flash_node)
           return unless flash_assignment?(flash_node)
 
-          return if followed_by_redirect_to?(flash_node)
+          return unless followed_by_render?(flash_node)
 
           return unless instance_method_or_block?(flash_node)
 
@@ -66,13 +66,15 @@ module RuboCop
 
         private
 
-        def followed_by_redirect_to?(flash_node)
+        def followed_by_render?(flash_node)
           flash_assigment_node = find_ancestor(flash_node, type: :send)
-          context = flash_assigment_node.parent
+          context = flash_assigment_node
+          context = context.parent if context.parent.if_type?
+          context = context.right_siblings
+          return true if context.empty?
 
-          flash_index = context.children.index(flash_assigment_node)
-          context.each_child_node.with_index.any? do |node, index|
-            index > flash_index && redirect_to?(node)
+          context.compact.any? do |node|
+            render?(node)
           end
         end
 

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

@@ -12,7 +12,6 @@ module RuboCop
       #   render plain: 'foo/bar', status: 304
       #   redirect_to root_url, status: 301
       #   head 200
-      #   get '/foobar', to: redirect('/foobar/baz', status: 301)
       #
       #   # good
       #   render :foo, status: :ok
@@ -20,7 +19,6 @@ module RuboCop
       #   render plain: 'foo/bar', status: :not_modified
       #   redirect_to root_url, status: :moved_permanently
       #   head :ok
-      #   get '/foobar', to: redirect('/foobar/baz', status: :moved_permanently)
       #
       # @example EnforcedStyle: numeric
       #   # bad
@@ -29,7 +27,6 @@ module RuboCop
       #   render plain: 'foo/bar', status: :not_modified
       #   redirect_to root_url, status: :moved_permanently
       #   head :ok
-      #   get '/foobar', to: redirect('/foobar/baz', status: :moved_permanently)
       #
       #   # good
       #   render :foo, status: 200
@@ -37,20 +34,18 @@ module RuboCop
       #   render plain: 'foo/bar', status: 304
       #   redirect_to root_url, status: 301
       #   head 200
-      #   get '/foobar', to: redirect('/foobar/baz', status: 301)
       #
       class HttpStatus < Base
         include ConfigurableEnforcedStyle
         extend AutoCorrector
 
-        RESTRICT_ON_SEND = %i[render redirect_to head redirect].freeze
+        RESTRICT_ON_SEND = %i[render redirect_to head].freeze
 
         def_node_matcher :http_status, <<~PATTERN
           {
             (send nil? {:render :redirect_to} _ $hash)
             (send nil? {:render :redirect_to} $hash)
             (send nil? :head ${int sym} ...)
-            (send nil? :redirect _ $hash)
           }
         PATTERN
 

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

@@ -26,34 +26,53 @@ module RuboCop
         minimum_target_rails_version 5.0
 
         def_node_matcher :pluck_candidate?, <<~PATTERN
-          ({block numblock} (send _ {:map :collect}) $_argument (send (lvar $_element) :[] $_key))
+          ({block numblock} (send _ {:map :collect}) $_argument (send lvar :[] $_key))
         PATTERN
 
         def on_block(node)
-          pluck_candidate?(node) do |argument, element, key|
+          pluck_candidate?(node) do |argument, key|
+            next unless use_one_block_argument?(argument)
+
             match = if node.block_type?
-                      argument.children.first.source.to_sym == element
+                      block_argument = argument.children.first.source
+                      use_block_argument_in_key?(block_argument, key)
                     else # numblock
-                      argument == 1 && element == :_1
+                      argument == 1 && use_block_argument_in_key?('_1', key)
                     end
             next unless match
 
-            replacement = "pluck(#{key.source})"
-            message = message(replacement, node)
-
-            add_offense(offense_range(node), message: message) do |corrector|
-              corrector.replace(offense_range(node), replacement)
-            end
+            register_offense(node, key)
           end
         end
         alias on_numblock on_block
 
         private
 
+        def use_one_block_argument?(argument)
+          return true if argument == 1 # Checks for numbered argument `_1`.
+
+          argument.respond_to?(:one?) && argument.one?
+        end
+
+        def use_block_argument_in_key?(block_argument, key)
+          return false if block_argument == key.source
+
+          key.each_descendant(:lvar).none? { |lvar| block_argument == lvar.source }
+        end
+
         def offense_range(node)
           node.send_node.loc.selector.join(node.loc.end)
         end
 
+        def register_offense(node, key)
+          replacement = "pluck(#{key.source})"
+          message = message(replacement, node)
+
+          add_offense(offense_range(node), message: message) do |corrector|
+            corrector.replace(offense_range(node), replacement)
+          end
+        end
+
         def message(replacement, node)
           current = offense_range(node).source
 

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

@@ -45,7 +45,7 @@ module RuboCop
 
         def multiple_arguments_hash?(hash)
           return true if hash.pairs.size >= 2
-          return false unless hash.values[0].hash_type?
+          return false unless hash.values[0]&.hash_type?
 
           multiple_arguments_hash?(hash.values[0])
         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.17.0'
+      STRING = '2.17.2'
 
       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.17.0
+  version: 2.17.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport