rubocop-rails 2.15.0 → 2.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e850e3f6c08903dd860f5865cb24cab1037189bbd7418c0db047d36094808d8
-  data.tar.gz: a91a77471ae5e9a4c7a188d5fb958402844ba04c3641f14a6bf82161ea43ebf7
+  metadata.gz: 169ed04b1f5378e9e08fbffdca151afaf4b84fd54b1867a173740aadaede60b3
+  data.tar.gz: 1a2ac75c313cfcdeec1814d7e3aff4777c5013527d2cf4a2aa4f95aeb45446bf
 SHA512:
-  metadata.gz: 753768200576274520f9f6a8d8ab959436e0b87c44a7b51a6eb20803fee0ec842fb1d0debb4c4fef997e8b51f7caee4198692bb8de3e1603ce16fdadf386692f
-  data.tar.gz: eeabca82a842cea89cb8f3b5fbb54abe83c4d6405112a6493e30aeaa9ebb4df39b67c71a6e43342e77d80b2ca901978d48b77e7a52952254f20545ab9eaaf74a
+  metadata.gz: 51d495edd3e825db49ece8f51bfc118c73887681f414b86d31cd47d85dc5a1a22a385a2a17ed4ebf7d1c6332989795e2cde999a364d911c60f452993dc926c4b
+  data.tar.gz: 4546785b39af93e6c7fe5a6a3b637fa5c21d4b358c38ea8ad3ebd5c272d1d0a504e8206e8201cfe3771af9199c336649d033e32b324f16b06fc7d150054dc488

data/config/default.yml

@@ -160,7 +160,7 @@ Rails/AttributeDefaultBlockValue:
   Enabled: pending
   VersionAdded: '2.9'
   Include:
-    - 'models/**/*'
+    - 'app/models/**/*'
 
 Rails/BelongsTo:
   Description: >-
@@ -367,6 +367,7 @@ Rails/Exit:
 
 Rails/ExpandedDateRange:
   Description: 'Checks for expanded date range.'
+  StyleGuide: 'https://rails.rubystyle.guide/#date-time-range'
   Enabled: pending
   VersionAdded: '2.11'
 

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

@@ -54,6 +54,7 @@ module RuboCop
       #   delegate :bar, to: :foo, prefix: true
       class Delegate < Base
         extend AutoCorrector
+        include VisibilityHelp
 
         MSG = 'Use `delegate` to define delegations.'
 
@@ -112,17 +113,11 @@ module RuboCop
         end
 
         def private_or_protected_delegation(node)
-          line = node.first_line
-          private_or_protected_before(line) ||
-            private_or_protected_inline(line)
+          private_or_protected_inline(node) || node_visibility(node) != :public
         end
 
-        def private_or_protected_before(line)
-          (processed_source[0..line].map(&:strip) & %w[private protected]).any?
-        end
-
-        def private_or_protected_inline(line)
-          processed_source[line - 1].strip.match?(/\A(private )|(protected )/)
+        def private_or_protected_inline(node)
+          processed_source[node.first_line - 1].strip.match?(/\A(private )|(protected )/)
         end
       end
     end

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

@@ -106,6 +106,8 @@ module RuboCop
 
         def on_send(node)
           any_manipulation?(node) do
+            next if node.method?(:keys) && target_rails_version <= 6.0
+
             add_offense(node) do |corrector|
               next unless AUTOCORECTABLE_METHODS.include?(node.method_name)
 
@@ -119,7 +121,7 @@ module RuboCop
         def autocorrect(corrector, node)
           receiver = node.receiver
 
-          if receiver.receiver.method?(:messages)
+          if receiver.receiver.send_type? && receiver.receiver.method?(:messages)
             corrector.remove(receiver.receiver.loc.dot)
             corrector.remove(receiver.receiver.loc.selector)
           end

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

@@ -53,7 +53,7 @@ module RuboCop
         end
 
         def new_key(key_node, scope_node)
-          "'#{scopes(scope_node).map(&:value).join('.')}.#{key_node.value}'"
+          "'#{scopes(scope_node).map(&:value).join('.')}.#{key_node.value}'".squeeze('.')
         end
 
         def scopes(scope_node)

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

@@ -20,8 +20,7 @@ module RuboCop
       class EnumHash < Base
         extend AutoCorrector
 
-        MSG = 'Enum defined as an array found in `%<enum>s` enum declaration. '\
-              'Use hash syntax instead.'
+        MSG = 'Enum defined as an array found in `%<enum>s` enum declaration. Use hash syntax instead.'
         RESTRICT_ON_SEND = %i[enum].freeze
 
         def_node_matcher :enum?, <<~PATTERN

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

@@ -29,14 +29,6 @@ module RuboCop
 
         minimum_target_rails_version 5.1
 
-        def_node_matcher :expanded_date_range, <<~PATTERN
-          (irange
-            (send
-              $_ {:beginning_of_day :beginning_of_week :beginning_of_month :beginning_of_quarter :beginning_of_year})
-            (send
-              $_ {:end_of_day :end_of_week :end_of_month :end_of_quarter :end_of_year}))
-        PATTERN
-
         PREFERRED_METHODS = {
           beginning_of_day: 'all_day',
           beginning_of_week: 'all_week',
@@ -54,31 +46,55 @@ module RuboCop
         }.freeze
 
         def on_irange(node)
-          return unless expanded_date_range(node)
-
           begin_node = node.begin
           end_node = node.end
-          return unless same_receiver?(begin_node, end_node)
-
-          beginning_method = begin_node.method_name
-          end_method = end_node.method_name
-          return unless use_mapped_methods?(beginning_method, end_method)
+          return if allow?(begin_node, end_node)
 
-          preferred_method = "#{begin_node.receiver.source}.#{PREFERRED_METHODS[beginning_method]}"
+          preferred_method = preferred_method(begin_node)
+          if begin_node.method?(:beginning_of_week) && begin_node.arguments.one?
+            return unless same_argument?(begin_node, end_node)
 
-          add_offense(node, message: format(MSG, preferred_method: preferred_method)) do |corrector|
-            corrector.replace(node, preferred_method)
+            preferred_method << "(#{begin_node.first_argument.source})"
+          elsif any_arguments?(begin_node, end_node)
+            return
           end
+
+          register_offense(node, preferred_method)
         end
 
         private
 
-        def same_receiver?(begin_node, end_node)
-          begin_node.receiver.source == end_node.receiver.source
+        def allow?(begin_node, end_node)
+          return true unless (begin_source = receiver_source(begin_node))
+          return true unless (end_source = receiver_source(end_node))
+
+          begin_source != end_source || MAPPED_DATE_RANGE_METHODS[begin_node.method_name] != end_node.method_name
+        end
+
+        def receiver_source(node)
+          return if !node&.send_type? || node.receiver.nil?
+
+          node.receiver.source
         end
 
-        def use_mapped_methods?(beginning_method, end_method)
-          MAPPED_DATE_RANGE_METHODS[beginning_method] == end_method
+        def same_argument?(begin_node, end_node)
+          begin_node.first_argument.source == end_node.first_argument.source
+        end
+
+        def preferred_method(begin_node)
+          +"#{begin_node.receiver.source}.#{PREFERRED_METHODS[begin_node.method_name]}"
+        end
+
+        def any_arguments?(begin_node, end_node)
+          begin_node.arguments.any? || end_node.arguments.any?
+        end
+
+        def register_offense(node, preferred_method)
+          message = format(MSG, preferred_method: preferred_method)
+
+          add_offense(node, message: message) do |corrector|
+            corrector.replace(node, preferred_method)
+          end
         end
       end
     end

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

@@ -23,8 +23,7 @@ module RuboCop
       class OrderById < Base
         include RangeHelp
 
-        MSG = 'Do not use the `id` column for ordering. '\
-              'Use a timestamp column to order chronologically.'
+        MSG = 'Do not use the `id` column for ordering. Use a timestamp column to order chronologically.'
         RESTRICT_ON_SEND = %i[order].freeze
 
         def_node_matcher :order_by_id?, <<~PATTERN

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

@@ -43,7 +43,7 @@ module RuboCop
 
         def register_offense(node, heredoc)
           add_offense(node) do |corrector|
-            squiggly_heredoc = heredoc.source.sub(/\A<<-?/, '<<~')
+            squiggly_heredoc = heredoc.source.sub(/\A<<(-|~)?/, '<<~')
 
             corrector.replace(heredoc, squiggly_heredoc)
             corrector.remove(node.loc.dot)

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

@@ -22,12 +22,12 @@ module RuboCop
         MSG = 'Use `Time.use_zone` with block instead of `Time.zone=`.'
         RESTRICT_ON_SEND = %i[zone=].freeze
 
-        def_node_matcher :time_zone_assignement?, <<~PATTERN
+        def_node_matcher :time_zone_assignment?, <<~PATTERN
           (send (const nil? :Time) :zone= ...)
         PATTERN
 
         def on_send(node)
-          return unless time_zone_assignement?(node)
+          return unless time_zone_assignment?(node)
 
           add_offense(node)
         end

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

@@ -39,6 +39,7 @@ module RuboCop
             corrector.replace(node.loc.selector, style)
           end
         end
+        alias on_csend on_send
       end
     end
   end

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

@@ -6,7 +6,7 @@ module RuboCop
       # Checks for the use of exit statements (namely `return`,
       # `break` and `throw`) in transactions. This is due to the eventual
       # unexpected behavior when using ActiveRecord >= 7, where transactions
-      # exitted using these statements are being rollbacked rather than
+      # exited using these statements are being rollbacked rather than
       # committed (pre ActiveRecord 7 behavior).
       #
       # As alternatives, it would be more intuitive to explicitly raise an

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

@@ -56,9 +56,9 @@ module RuboCop
 
         def with_index?(klass, table, names)
           # Compatibility for Rails 4.2.
-          add_indicies = schema.add_indicies_by(table_name: table_name(klass))
+          add_indices = schema.add_indices_by(table_name: table_name(klass))
 
-          (table.indices + add_indicies).any? do |index|
+          (table.indices + add_indices).any? do |index|
             index.unique &&
               (index.columns.to_set == names ||
                include_column_names_in_expression_index?(index, names))

data/lib/rubocop/rails/schema_loader/schema.rb

@@ -5,11 +5,11 @@ module RuboCop
     module SchemaLoader
       # Represent db/schema.rb
       class Schema
-        attr_reader :tables, :add_indicies
+        attr_reader :tables, :add_indices
 
         def initialize(ast)
           @tables = []
-          @add_indicies = []
+          @add_indices = []
 
           build!(ast)
         end
@@ -20,8 +20,8 @@ module RuboCop
           end
         end
 
-        def add_indicies_by(table_name:)
-          add_indicies.select do |add_index|
+        def add_indices_by(table_name:)
+          add_indices.select do |add_index|
             add_index.table_name == table_name
           end
         end
@@ -39,7 +39,7 @@ module RuboCop
 
           # Compatibility for Rails 4.2.
           each_add_index(ast) do |add_index_def|
-            @add_indicies << AddIndex.new(add_index_def)
+            @add_indices << AddIndex.new(add_index_def)
           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.15.0'
+      STRING = '2.15.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.15.0
+  version: 2.15.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-14 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Automatic Rails code style checking tool.