rubocop-rails 2.17.1 → 2.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d21ae5d8d1539043fce111139db7f488f0fa4b5c8bc62d2e29ab73d209a4619
-  data.tar.gz: 48a66d61c7bbba386b076f04adba40076a020342c60e0e7665ee2d2c3c93be6d
+  metadata.gz: 97069bbada22491ece697f32f933ce8dc5274c18ad2782bb832cd83b168874a3
+  data.tar.gz: 4a691068f93c7be89e9cf695c3be16fe183cb23be4b187e822a9bf9d896c9af7
 SHA512:
-  metadata.gz: 945db96e9abac04c69f4d96f30626042424faedff229dc2784bcd0a56dfdcfe3a2bbbf65104346d85673ff6479c11dcc70d1ab533347a78fec6d058fa0c523c0
-  data.tar.gz: 11454cf0df5f0ea170d3a4e2ba911b7e8e559f775dedced95031bd426923e7ea7d6ef33578a6c16060dca4b6a4ed69fac4ae0047595cd7b7794ee1c8f30366c1
+  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/pluck.rb

@@ -31,6 +31,8 @@ module RuboCop
 
         def on_block(node)
           pluck_candidate?(node) do |argument, key|
+            next unless use_one_block_argument?(argument)
+
             match = if node.block_type?
                       block_argument = argument.children.first.source
                       use_block_argument_in_key?(block_argument, key)
@@ -39,19 +41,22 @@ module RuboCop
                     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
 
@@ -59,6 +64,15 @@ module RuboCop
           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.1'
+      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.1
+  version: 2.17.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport