rubocop-rails 2.17.3 → 2.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1cd420a9b6ec0e14a26063533cf9db61a81a43e44bec26a8b98e577cf761e49
-  data.tar.gz: 73918575c04e0f9ee8390d3efc0a4eb49b1cb4093695ecbafddbf995c406869d
+  metadata.gz: 8a9beeaefa16cbe4afb5d598878444a835536ccda5d9b46c3e44e111513f1d8e
+  data.tar.gz: 669a9681ce5ab1fca038229a831f7e5acae6bbdcc3a58ecfc88d65fd54ef7190
 SHA512:
-  metadata.gz: 93fffc6d3f6cbb781692725c13eb6f049e3106f2fb7ccb43a48fdf7c0d85a189914740d2ef743b0642eaa94ae0fc584ec1a32be53095a12167b3c02db2b035d4
-  data.tar.gz: 05ac2a5767f2c65437629fa623b3b4506547227c5b608a7ebc4e29a91b831e794ac6ee7c62a55b1573f3b228d40b6aaaedbda1fb7b81481c51f9c0df6884f389
+  metadata.gz: 72ca38ec9a9136bfa5bd635db9290314a4d1a4c8e3942f15aa62a823885ff1a1783f884598dce6f52765db75daccf8e4054d3faecdf973da6f2c53b10dc2c153
+  data.tar.gz: 536c7d8f5dfec22444d2d0fc4b297eac18f7b87cc6c871ce250bec58a2a6d380e814749534e5aedc47c0a66c7ae80ac8c61ffec330093c575cd1cc8dd76e4de9

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

@@ -69,15 +69,15 @@ module RuboCop
         def followed_by_render?(flash_node)
           flash_assigment_node = find_ancestor(flash_node, type: :send)
           context = flash_assigment_node
-          if (if_node = context.each_ancestor(:if).first)
-            context = if_node
+          if (node = context.each_ancestor(:if, :rescue).first)
+            context = node
           elsif context.right_siblings.empty?
             return true
           end
           context = context.right_siblings
 
-          context.compact.any? do |node|
-            render?(node)
+          context.compact.any? do |render_candidate|
+            render?(render_candidate)
           end
         end
 

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

@@ -69,7 +69,7 @@ module RuboCop
       class I18nLocaleTexts < Base
         MSG = 'Move locale texts to the locale files in the `config/locales` directory.'
 
-        RESTRICT_ON_SEND = %i[validates redirect_to []= mail].freeze
+        RESTRICT_ON_SEND = %i[validates redirect_to redirect_back []= mail].freeze
 
         def_node_search :validation_message, <<~PATTERN
           (pair (sym :message) $str)
@@ -94,7 +94,7 @@ module RuboCop
               add_offense(text_node)
             end
             return
-          when :redirect_to
+          when :redirect_to, :redirect_back
             text_node = redirect_to_flash(node).to_a.last
           when :[]=
             text_node = flash_assignment?(node)

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

@@ -186,11 +186,7 @@ module RuboCop
         def build_path_glob_replacement(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
+          argument = path.arguments.one? ? path.first_argument.source : join_arguments(path.arguments)
 
           "#{receiver}.#{method}(#{argument})"
         end
@@ -214,11 +210,28 @@ module RuboCop
         end
 
         def join_arguments(arguments)
-          quote = include_interpolation?(arguments) ? '"' : "'"
-          joined_arguments = arguments.map(&:value).join('/')
+          use_interpolation = false
+
+          joined_arguments = arguments.map do |arg|
+            if arg.respond_to?(:value)
+              arg.value
+            else
+              use_interpolation = true
+              "\#{#{arg.source}}"
+            end
+          end.join('/')
+          quote = enforce_double_quotes? || include_interpolation?(arguments) || use_interpolation ? '"' : "'"
 
           "#{quote}#{joined_arguments}#{quote}"
         end
+
+        def enforce_double_quotes?
+          string_literals_config['EnforcedStyle'] == 'double_quotes'
+        end
+
+        def string_literals_config
+          config.for_cop('Style/StringLiterals')
+        end
       end
     end
   end

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

@@ -228,12 +228,25 @@ module RuboCop
           acceptable
         end
 
-        # Time.new can be called with a time zone offset
+        # Time.new, Time.at, and Time.now can be called with a time zone offset
         # When it is, that should be considered safe
         # Example:
         # Time.new(1988, 3, 15, 3, 0, 0, "-05:00")
         def offset_provided?(node)
-          node.arguments.size >= 7
+          case node.method_name
+          when :new
+            node.arguments.size == 7 || offset_option_provided?(node)
+          when :at, :now
+            offset_option_provided?(node)
+          end
+        end
+
+        def offset_option_provided?(node)
+          options = node.last_argument
+          options&.hash_type? &&
+            options.each_pair.any? do |pair|
+              pair.key.sym_type? && pair.key.value == :in && !pair.value.nil_type?
+            end
         end
       end
     end

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

@@ -139,11 +139,20 @@ module RuboCop
           pairs = node.arguments.last
           return unless pairs.hash_type?
 
+          return true if condition_hash_part?(pairs, keys: %i[if unless])
+
+          uniqueness_node = uniqueness_part(node)
+          return unless uniqueness_node&.hash_type?
+
+          condition_hash_part?(uniqueness_node, keys: %i[if unless conditions])
+        end
+
+        def condition_hash_part?(pairs, keys:)
           pairs.each_pair.any? do |pair|
             key = pair.key
             next unless key.sym_type?
 
-            key.value == :if || key.value == :unless
+            keys.include?(key.value)
           end
         end
 

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

@@ -38,7 +38,9 @@ module RuboCop
         def on_send(node)
           return unless node.first_argument.sym_type?
 
-          where_node_and_argument(root_receiver(node)) do |where_node, where_argument|
+          root_receiver = root_receiver(node)
+          where_node_and_argument(root_receiver) do |where_node, where_argument|
+            next unless root_receiver == root_receiver(where_node)
             next unless same_relationship?(where_argument, node.first_argument)
 
             range = range_between(node.loc.selector.begin_pos, node.loc.expression.end_pos)
@@ -50,7 +52,12 @@ module RuboCop
         private
 
         def root_receiver(node)
-          node&.parent&.send_type? ? root_receiver(node.parent) : node
+          parent = node.parent
+          if !parent&.send_type? || parent.method?(:or) || parent.method?(:and)
+            node
+          else
+            root_receiver(parent)
+          end
         end
 
         def same_relationship?(where, left_joins)

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.17.3'
+      STRING = '2.17.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.17.3
+  version: 2.17.4
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-20 00:00:00.000000000 Z
+date: 2022-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Automatic Rails code style checking tool.