rubocop-rails 2.33.2 → 2.33.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf236bb6f7b10ea743c3afd8b4c92f2563d5cd989f3c8820b8fb270c9bb72c59
-  data.tar.gz: 356c8e006d8e4d1b4893cb263b9a67e0ecc3245556868678c5681800cc75cf36
+  metadata.gz: ddb8c79abf97afc451393bd9a309ac575a99057e1143d4e4632fa84568173e8b
+  data.tar.gz: b6cf48b796104788e4d2302f379328071dc5b5042f3cd6923eb625a3ec19128d
 SHA512:
-  metadata.gz: 8fbcfbc453e83a19e6b9c1b173347c9dbef375650c4202ac7949fcec04ae8bc65307246d0630a106455cb44a66e3736d287894e4709b12692fd6e589ed574235
-  data.tar.gz: 245d221771ce84010ff4195efbb6c231e28e0daac18288d52c201b347951475ef29168098d518fe7d75f7a33524b5a90f81b604720ab130629651d598e23cec5
+  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,7 +13,7 @@ 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
@@ -24,6 +24,22 @@ module RuboCop
       #
       #     @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
 
@@ -38,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|
@@ -47,14 +81,25 @@ module RuboCop
               corrector.replace(
                 assignment_node,
                 <<~RUBY.rstrip
-                  return #{varible_name} if defined?(#{varible_name})
-
-                  #{varible_name} = #{find_by.source}
+                  if defined?(#{varible_name})
+                    #{varible_name}
+                  else
+                    #{varible_name} = #{find_by.source}
+                  end
                 RUBY
               )
             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/rails/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Rails
     # This module holds the RuboCop Rails version information.
     module Version
-      STRING = '2.33.2'
+      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.2
+  version: 2.33.4
 platform: ruby
 authors:
 - Bozhidar Batsov