rubocop-rails 2.33.0 → 2.33.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a61be89f227c5abed6543c4fb84957391ac66fdbadc7f7891a1876b7be0c193
-  data.tar.gz: f2e30c0c3e5a5cac32bae9ec0900a0e1fc382dda89f764f8a844b085ad2abffb
+  metadata.gz: bf236bb6f7b10ea743c3afd8b4c92f2563d5cd989f3c8820b8fb270c9bb72c59
+  data.tar.gz: 356c8e006d8e4d1b4893cb263b9a67e0ecc3245556868678c5681800cc75cf36
 SHA512:
-  metadata.gz: 8610629e8893c71c21d591cc68897f993699f20edab9cda08a18ce65d9bf67ac153830dffa144e18b2d9e4e204027684c18cbb02e822d01c9c40e35312709083
-  data.tar.gz: f7dc418f1cb2f4a38968b9a79ae17028368e10f2d529cba2de15954a2edc5c3f8ebf7bb35617b670cf7e8dab758ccb138c0387a0fd6caa31051ee5e803925c35
+  metadata.gz: 8fbcfbc453e83a19e6b9c1b173347c9dbef375650c4202ac7949fcec04ae8bc65307246d0630a106455cb44a66e3736d287894e4709b12692fd6e589ed574235
+  data.tar.gz: 245d221771ce84010ff4195efbb6c231e28e0daac18288d52c201b347951475ef29168098d518fe7d75f7a33524b5a90f81b604720ab130629651d598e23cec5

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

@@ -20,11 +20,9 @@ module RuboCop
       #
       #   # good
       #   def current_user
-      #     if instance_variable_defined?(:@current_user)
-      #       @current_user
-      #     else
-      #       @current_user = User.find_by(id: session[:user_id])
-      #     end
+      #     return @current_user if defined?(@current_user)
+      #
+      #     @current_user = User.find_by(id: session[:user_id])
       #   end
       class FindByOrAssignmentMemoization < Base
         extend AutoCorrector
@@ -49,11 +47,9 @@ module RuboCop
               corrector.replace(
                 assignment_node,
                 <<~RUBY.rstrip
-                  if instance_variable_defined?(:#{varible_name})
-                    #{varible_name}
-                  else
-                    #{varible_name} = #{find_by.source}
-                  end
+                  return #{varible_name} if defined?(#{varible_name})
+
+                  #{varible_name} = #{find_by.source}
                 RUBY
               )
             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.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.33.0
+  version: 2.33.2
 platform: ruby
 authors:
 - Bozhidar Batsov