rubocop-rails 2.33.0 → 2.33.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a61be89f227c5abed6543c4fb84957391ac66fdbadc7f7891a1876b7be0c193
-  data.tar.gz: f2e30c0c3e5a5cac32bae9ec0900a0e1fc382dda89f764f8a844b085ad2abffb
+  metadata.gz: ddb8c79abf97afc451393bd9a309ac575a99057e1143d4e4632fa84568173e8b
+  data.tar.gz: b6cf48b796104788e4d2302f379328071dc5b5042f3cd6923eb625a3ec19128d
 SHA512:
-  metadata.gz: 8610629e8893c71c21d591cc68897f993699f20edab9cda08a18ce65d9bf67ac153830dffa144e18b2d9e4e204027684c18cbb02e822d01c9c40e35312709083
-  data.tar.gz: f7dc418f1cb2f4a38968b9a79ae17028368e10f2d529cba2de15954a2edc5c3f8ebf7bb35617b670cf7e8dab758ccb138c0387a0fd6caa31051ee5e803925c35
+  metadata.gz: 2618f426daf94c51e8fceb989eca50055dae465b334a5ef83d5dc940959a123e1f3a2337246db86defd3f189970a1848a207b5b6b8afcf9917149877bd3fee3e
+  data.tar.gz: 164f84eeab842a88a39131e8c8949584487ac22893604de862ecc28cd984d6df2e5e244ab82e57295dbe9abba0c71830c018412325eccaa3a6ff376f3517ecfc

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

@@ -73,7 +73,7 @@ module RuboCop
             return false if use_redirect_to?(context)
 
             context = node
-          elsif context.right_siblings.empty?
+          elsif context.right_siblings.empty? && !use_redirect_to?(context.parent)
             return true
           end
           context = context.right_siblings

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

@@ -46,7 +46,7 @@ module RuboCop
         private
 
         def where_method?(receiver)
-          return false unless receiver
+          return false if !receiver || receiver.any_block_type?
 
           receiver.respond_to?(:method?) && receiver.method?(:where)
         end

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

@@ -13,18 +13,32 @@ module RuboCop
       #   or the code may have a different purpose than memoization.
       #
       # @example
-      #   # bad
+      #   # bad - exclusively doing memoization
       #   def current_user
       #     @current_user ||= User.find_by(id: session[:user_id])
       #   end
       #
       #   # good
       #   def current_user
-      #     if instance_variable_defined?(:@current_user)
+      #     return @current_user if defined?(@current_user)
+      #
+      #     @current_user = User.find_by(id: session[:user_id])
+      #   end
+      #
+      #   # bad - method contains other code
+      #   def current_user
+      #     @current_user ||= User.find_by(id: session[:user_id])
+      #     @current_user.do_something
+      #   end
+      #
+      #   # good
+      #   def current_user
+      #     if defined?(@current_user)
       #       @current_user
       #     else
       #       @current_user = User.find_by(id: session[:user_id])
       #     end
+      #     @current_user.do_something
       #   end
       class FindByOrAssignmentMemoization < Base
         extend AutoCorrector
@@ -40,6 +54,24 @@ module RuboCop
           )
         PATTERN
 
+        # When a method body contains only memoization, the correction can be more succinct.
+        def on_def(node)
+          find_by_or_assignment_memoization(node.body) do |varible_name, find_by|
+            add_offense(node.body) do |corrector|
+              corrector.replace(
+                node.body,
+                <<~RUBY.rstrip
+                  return #{varible_name} if defined?(#{varible_name})
+
+                  #{varible_name} = #{find_by.source}
+                RUBY
+              )
+
+              correct_to_regular_method_definition(corrector, node) if node.endless?
+            end
+          end
+        end
+
         def on_send(node)
           assignment_node = node.parent
           find_by_or_assignment_memoization(assignment_node) do |varible_name, find_by|
@@ -49,7 +81,7 @@ module RuboCop
               corrector.replace(
                 assignment_node,
                 <<~RUBY.rstrip
-                  if instance_variable_defined?(:#{varible_name})
+                  if defined?(#{varible_name})
                     #{varible_name}
                   else
                     #{varible_name} = #{find_by.source}
@@ -59,6 +91,15 @@ module RuboCop
             end
           end
         end
+
+        private
+
+        def correct_to_regular_method_definition(corrector, node)
+          range = node.loc.assignment.join(node.body.source_range.begin)
+
+          corrector.replace(range, "\n")
+          corrector.insert_after(node, "\nend")
+        end
       end
     end
   end

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

@@ -52,6 +52,7 @@ module RuboCop
           order_arguments.map! { |arg| extract_column_and_direction(arg.strip) }
 
           return if order_arguments.any?(&:nil?)
+          return if order_arguments.any? { |column_name, _| positional_column?(column_name) }
 
           convert_to_preferred_arguments(order_arguments).join(', ')
         end
@@ -68,6 +69,10 @@ module RuboCop
           end
         end
 
+        def positional_column?(column_name)
+          column_name.match?(/\A\d+\z/)
+        end
+
         def extract_column_and_direction(order_expression)
           return unless (column, direction = ORDER_EXPRESSION_REGEX.match(order_expression)&.captures)
 

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

@@ -66,7 +66,7 @@ module RuboCop
           return false unless enclosing_method
 
           shadowing_method_name = first_arg.value.to_s
-          shadowing_method_name << '=' if node.method?(:write_attribute)
+          shadowing_method_name += '=' if node.method?(:write_attribute)
           enclosing_method.method?(shadowing_method_name)
         end
 

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

@@ -97,7 +97,8 @@ module RuboCop
 
         def in_transaction_block?(node)
           return false unless transaction_method_name?(node.method_name)
-          return false unless node.parent&.body
+          return false unless (parent = node.parent)
+          return false unless parent.any_block_type? && parent.body
 
           node.right_siblings.none? do |sibling|
             sibling.respond_to?(:loop_keyword?) && sibling.loop_keyword?

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

@@ -58,8 +58,8 @@ module RuboCop
           (call (call _ :where $...) :exists?)
         PATTERN
 
-        def_node_matcher :exists_with_args?, <<~PATTERN
-          (call _ :exists? $...)
+        def_node_matcher :exists_with_arg?, <<~PATTERN
+          (call _ :exists? $!splat_type?)
         PATTERN
 
         def on_send(node)
@@ -91,7 +91,7 @@ module RuboCop
           if exists_style?
             where_exists_call?(node, &block)
           elsif where_style?
-            exists_with_args?(node, &block)
+            exists_with_arg?(node) { |arg| yield([arg]) }
           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.33.0'
+      STRING = '2.33.4'
 
       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.33.0
+  version: 2.33.4
 platform: ruby
 authors:
 - Bozhidar Batsov