rubocop-rails 2.16.0 → 2.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a928896af6bef8228bfc2530b829a683154c23b22ea547557d40ea1e4d08ae7f
-  data.tar.gz: 40303c4d80e1e6eaef12ceb0170b64b65b151fc2056957d6c6b6bac1d645d445
+  metadata.gz: 531a7f7b4bc04b877c25047dc10ee38e10804ad233b5b2abd425b613d508f0b5
+  data.tar.gz: 135eaa3b4ab1c2393f8ab72cd961470c713552d2d6300bd2ea0f981831ea5cba
 SHA512:
-  metadata.gz: a87b9c167cf43287207bae3ec38e385cb6213c26ff0f7e10aa3bf392ab28b724794820a459dc6af6d464e48ea70629c443e74acc4539dca6f0c0a57fee65d87c
-  data.tar.gz: fbb0b7333c6d485e50facadd7170bb2d59e425119134d01f42ac3d24eecc01ad52d588f55de184c9373061ba207cf6845d3e8201fe43ce48e3a8d3b22e992dff
+  metadata.gz: ab99c18ad7f0684d03945b48393cadecd20f465ade8f27a9876b874210e2b930300ce5b08d7e6b8d654595bca67ae321b6afef88c05843ddd79ff47cf1b80708
+  data.tar.gz: 879fd14dfff79cd8afe60e9f6678d66f61eefe8b91cdbe36c92cbb31541f6735b59d5dc33a8c21f8330dac60f359c4e46ad59f43b259d81ea25c366d3f26ca50

data/config/default.yml

@@ -845,6 +845,7 @@ Rails/RootJoinChain:
 Rails/RootPathnameMethods:
   Description: 'Use `Rails.root` IO methods instead of passing it to `File`.'
   Enabled: pending
+  SafeAutocorrect: false
   VersionAdded: '2.16'
 
 Rails/RootPublicPath:

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

@@ -43,10 +43,15 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          child_node, method_name = *node.first_argument.children
+          child_node, method_name, time_argument = *node.first_argument.children
+          return if time_argument || !child_node
           return unless current_time?(child_node, method_name) || current_time_with_convert?(child_node, method_name)
 
-          add_offense(node) { |corrector| corrector.replace(node, 'freeze_time') }
+          add_offense(node) do |corrector|
+            last_argument = node.last_argument
+            freeze_time_method = last_argument.block_pass_type? ? "freeze_time(#{last_argument.source})" : 'freeze_time'
+            corrector.replace(node, freeze_time_method)
+          end
         end
 
         private

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

@@ -11,6 +11,10 @@ module RuboCop
       # This cop works best when used together with
       # `Style/FileRead`, `Style/FileWrite` and `Rails/RootJoinChain`.
       #
+      # @safety
+      #   This cop is unsafe for autocorrection because `Dir`'s `children`, `each_child`, `entries`, and `glob`
+      #   methods return string element, but these methods of `Pathname` return `Pathname` element.
+      #
       # @example
       #   # bad
       #   File.open(Rails.root.join('db', 'schema.rb'))
@@ -30,6 +34,7 @@ module RuboCop
       #
       class RootPathnameMethods < Base
         extend AutoCorrector
+        include RangeHelp
 
         MSG = '`%<rails_root>s` is a `Pathname` so you can just append `#%<method>s`.'
 
@@ -138,6 +143,11 @@ module RuboCop
           }
         PATTERN
 
+        def_node_matcher :dir_glob?, <<~PATTERN
+          (send
+            (const {cbase nil?} :Dir) :glob ...)
+        PATTERN
+
         def_node_matcher :rails_root_pathname?, <<~PATTERN
           {
             $#rails_root?
@@ -153,8 +163,12 @@ module RuboCop
         def on_send(node)
           evidence(node) do |method, path, args, rails_root|
             add_offense(node, message: format(MSG, method: method, rails_root: rails_root.source)) do |corrector|
-              replacement = "#{path.source}.#{method}"
-              replacement += "(#{args.map(&:source).join(', ')})" unless args.empty?
+              if dir_glob?(node)
+                replacement = build_path_glob(path, method)
+              else
+                replacement = "#{path.source}.#{method}"
+                replacement += "(#{args.map(&:source).join(', ')})" unless args.empty?
+              end
 
               corrector.replace(node, replacement)
             end
@@ -169,6 +183,31 @@ module RuboCop
 
           yield(method, path, args, rails_root)
         end
+
+        def build_path_glob(path, method)
+          receiver = range_between(path.loc.expression.begin_pos, path.children.first.loc.selector.end_pos).source
+
+          argument = if path.arguments.one?
+                       path.first_argument.source
+                     else
+                       join_arguments(path.arguments)
+                     end
+
+          "#{receiver}.#{method}(#{argument})"
+        end
+
+        def include_interpolation?(arguments)
+          arguments.any? do |argument|
+            argument.children.any? { |child| child.respond_to?(:begin_type?) && child.begin_type? }
+          end
+        end
+
+        def join_arguments(arguments)
+          quote = include_interpolation?(arguments) ? '"' : "'"
+          joined_arguments = arguments.map(&:value).join('/')
+
+          "#{quote}#{joined_arguments}#{quote}"
+        end
       end
     end
   end

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

@@ -31,6 +31,7 @@ module RuboCop
         # @param [RuboCop::AST::ConstNode] node
         def on_const(node)
           return unless top_level_hash_with_indifferent_access?(node)
+          return if node.parent&.class_type? && node.parent.ancestors.any?(&:module_type?)
 
           add_offense(node) do |corrector|
             autocorrect(corrector, node)

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.16.0'
+      STRING = '2.16.1'
 
       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.16.0
+  version: 2.16.1
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport