rubocop-rails 2.33.2 → 2.33.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf236bb6f7b10ea743c3afd8b4c92f2563d5cd989f3c8820b8fb270c9bb72c59
-  data.tar.gz: 356c8e006d8e4d1b4893cb263b9a67e0ecc3245556868678c5681800cc75cf36
+  metadata.gz: 1dd62ec2504a075e89e8933ab9a8ecc63061d04c75f604d661d21a87b264cdee
+  data.tar.gz: a47a5b0e0d1e2f94b4f5a2976875ce86eb19c2c9fed53a1767ce5c59666d819e
 SHA512:
-  metadata.gz: 8fbcfbc453e83a19e6b9c1b173347c9dbef375650c4202ac7949fcec04ae8bc65307246d0630a106455cb44a66e3736d287894e4709b12692fd6e589ed574235
-  data.tar.gz: 245d221771ce84010ff4195efbb6c231e28e0daac18288d52c201b347951475ef29168098d518fe7d75f7a33524b5a90f81b604720ab130629651d598e23cec5
+  metadata.gz: 5c48f2805329e13493881423a0de8549a7e3d3cfacc99be40b5a9dbd36b4a6c3d376845c5b0bcf3b492023835e8b3f5062d291c8ebe87165d82f96a77dbbc102
+  data.tar.gz: b30b183e23a29af49d9a6709d27318d79d4ff24246ba1b21ac8ae14260acbb64fd46ec54661f3d18867ffb331f71d794a33e5b760545b0743645ce902cac1daf

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,22 @@ 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
+              )
+            end
+          end
+        end
+
         def on_send(node)
           assignment_node = node.parent
           find_by_or_assignment_memoization(assignment_node) do |varible_name, find_by|
@@ -47,9 +79,11 @@ 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

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.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.33.2
+  version: 2.33.3
 platform: ruby
 authors:
 - Bozhidar Batsov