rubocop-rails 2.34.0 → 2.34.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffddf417706a66433be596f397b807c824a2593bea0a5175907be9d9be318970
-  data.tar.gz: 40672bac8ab7a1961102c3f5306526fa98a360987c7095128313dd5bae7c5641
+  metadata.gz: 0ba3287dd87a87e513f027365ed1e2f726a812b513f92c70e63e1e1792d2ce45
+  data.tar.gz: 375105175c67eebfbf7f82469ca3a8b8540779199e2d9542990fc219c6c57412
 SHA512:
-  metadata.gz: 16ba2fc1926397b8b5c413c207a9f45e80a30b53e1e73b215e18abf38218e3aea3ecd2090cc4858adfe4a9d32ebb527b83db57acb38cff48510d4eaf18dcdd9c
-  data.tar.gz: 6541216ccafd3cd5287517989ea8a49dcb4b547ca98d0c363f58ac5a11ebbe6452329ea0964357e7f9777a5224d05d271b6bd21ee31f0d0bffcb37dfaa26dbd0
+  metadata.gz: bd06a6c9f0cc892c20473c640ae9bc27d2fd02b2e7ccb1c763c6d4ab0008cc9b3699f9ef8d32aadecc4f5d0eb89066a14495852e3b7fabedc4e0702dd3c2b132
+  data.tar.gz: 2353dca7cb758e658688f8fed9343a20f16355d5f3a3170d4e3e1472adb03b4466404067966124c55101e586b5e1009efc96ef4b95d0982ab3c9ed0f7fac2d3e

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

@@ -45,7 +45,7 @@ module RuboCop
           return unless node.receiver&.const_name == 'Rails'
 
           parent = node.parent
-          return unless parent&.predicate_method?
+          return unless parent.respond_to?(:predicate_method?) && parent.predicate_method?
 
           return if ALLOWED_LIST.include?(parent.method_name)
 

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

@@ -53,11 +53,22 @@ module RuboCop
       #
       #   # good
       #   a.presence&.foo
+      #
+      #   # good
+      #   a.present? ? a[1] : nil
+      #
+      #   # good
+      #   a[:key] = value if a.present?
+      #
+      #   # good
+      #   a.present? ? a > 1 : nil
+      #   a <= 0 if a.present?
       class Presence < Base
         include RangeHelp
         extend AutoCorrector
 
         MSG = 'Use `%<prefer>s` instead of `%<current>s`.'
+        INDEX_ACCESS_METHODS = %i[[] []=].freeze
 
         def_node_matcher :redundant_receiver_and_other, <<~PATTERN
           {
@@ -130,7 +141,7 @@ module RuboCop
         end
 
         def ignore_chain_node?(node)
-          node.method?('[]') || node.arithmetic_operation?
+          index_access_method?(node) || node.assignment? || node.arithmetic_operation? || node.comparison_method?
         end
 
         def message(node, replacement)
@@ -180,6 +191,10 @@ module RuboCop
           replaced += "(#{chain.arguments.map(&:source).join(', ')})" if chain.arguments?
           left_sibling ? "(#{replaced})" : replaced
         end
+
+        def index_access_method?(node)
+          INDEX_ACCESS_METHODS.include?(node.method_name)
+        end
       end
     end
   end

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

@@ -33,33 +33,38 @@ module RuboCop
 
         def_node_matcher :redirect_back_with_fallback_location, <<~PATTERN
           (send nil? :redirect_back
-            (hash <$(pair (sym :fallback_location) $_) ...>)
+            (hash <$(pair (sym :fallback_location) $_) $...>)
           )
         PATTERN
 
         def on_send(node)
-          redirect_back_with_fallback_location(node) do |fallback_pair, fallback_value|
+          redirect_back_with_fallback_location(node) do |fallback_pair, fallback_value, options|
             add_offense(node.loc.selector) do |corrector|
-              correct_redirect_back(corrector, node, fallback_pair, fallback_value)
+              correct_redirect_back(corrector, node, fallback_pair, fallback_value, options)
             end
           end
         end
 
         private
 
-        def correct_redirect_back(corrector, node, fallback_pair, fallback_value)
+        # rubocop:disable Metrics/AbcSize
+        def correct_redirect_back(corrector, node, fallback_pair, fallback_value, options)
           corrector.replace(node.loc.selector, 'redirect_back_or_to')
 
           hash_arg = node.first_argument
 
           if hash_arg.pairs.one?
-            corrector.replace(hash_arg, fallback_value.source)
+            arguments = [fallback_value.source] + options.map(&:source)
+            corrector.replace(hash_arg, arguments.join(', '))
           else
             remove_fallback_location_pair(corrector, hash_arg, fallback_pair)
             first_pair = hash_arg.pairs.find { |pair| pair != fallback_pair }
             corrector.insert_before(first_pair, "#{fallback_value.source}, ")
           end
+
+          wrap_with_parentheses(node, corrector) unless node.parenthesized?
         end
+        # rubocop:enable Metrics/AbcSize
 
         def remove_fallback_location_pair(corrector, hash_node, fallback_pair)
           pairs = hash_node.pairs
@@ -74,6 +79,11 @@ module RuboCop
           end
         end
 
+        def wrap_with_parentheses(node, corrector)
+          corrector.replace(node.loc.selector.end.join(node.first_argument.source_range.begin), '(')
+          corrector.insert_after(node, ')')
+        end
+
         def remove_first_pair(corrector, fallback_pair, next_pair)
           range = fallback_pair.source_range.join(next_pair.source_range.begin)
           corrector.remove(range)

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.34.0'
+      STRING = '2.34.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.34.0
+  version: 2.34.2
 platform: ruby
 authors:
 - Bozhidar Batsov