rubocop-rails 2.14.1 → 2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8ac7c4db62e8518ff9316e0a3ac8919ac440eaf9ba84eacf883cf902fffca7a
-  data.tar.gz: 8a4b1e0c90e4ea2b8ba06352bc7525b56c4d95af49e618fb77a6bfd4bc5dafdb
+  metadata.gz: babf21479a37aa37cba8b6b8401b23ddb6532e14afd679095d456f749aca3ca0
+  data.tar.gz: 11a94f8219a5b9d241d68af1c3ecd69afb0a47ccf988db59d00f48caaf73dfbf
 SHA512:
-  metadata.gz: fb91cd3a6e867309efc10717843f0994a743bf1a4eb65b058863340d48904624377e88bb1b38cc0e091b9c2d5c676901987c1a31c3f6f50e5923863feb11f900
-  data.tar.gz: fe8208f3d1962a6c5400c74ab174b7b5b8c88641a564616f155cf90d91915ea85b6de031dc99a9737eb93fe3c39d878507f52d7f0aed85480142f630d0a082f5
+  metadata.gz: 02b2646080a54c50c8708cd6feeed501b5aafd7ae77d04e42ed0bf5b8779f43fa778bc3f46daec2c06474ac76f40ae144bf0afed35e5acf996c4b2213df53f89
+  data.tar.gz: 4b29b44608474ead97651327e5c896bfb403eadcc1deffd10730853f303e75682e3ebebed80f8b3b05c1f9f0862441845bea89135d694ecf70ee3d6c776f2a97

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

@@ -22,30 +22,30 @@ module RuboCop
         extend AutoCorrector
         include MigrationsHelper
 
-        MSG = 'Replace with `%<corrected_class_name>s` that matches the file name.'
+        MSG = 'Replace with `%<camelized_basename>s` that matches the file name.'
 
         def on_class(node)
-          return if in_migration?(node)
+          return unless migration_class?(node)
 
-          snake_class_name = to_snakecase(node.identifier.source)
+          basename = basename_without_timestamp_and_suffix(processed_source.file_path)
 
-          basename = basename_without_timestamp_and_suffix
-          return if snake_class_name == basename
+          class_identifier = node.identifier
+          camelized_basename = camelize(basename)
+          return if class_identifier.source.casecmp(camelized_basename).zero?
 
-          corrected_class_name = to_camelcase(basename)
-          message = format(MSG, corrected_class_name: corrected_class_name)
+          message = format(MSG, camelized_basename: camelized_basename)
 
-          add_offense(node.identifier, message: message) do |corrector|
-            corrector.replace(node.identifier, corrected_class_name)
+          add_offense(class_identifier, message: message) do |corrector|
+            corrector.replace(class_identifier, camelized_basename)
           end
         end
 
         private
 
-        def basename_without_timestamp_and_suffix
-          filepath = processed_source.file_path
+        def basename_without_timestamp_and_suffix(filepath)
           basename = File.basename(filepath, '.rb')
           basename = remove_gem_suffix(basename)
+
           basename.sub(/\A\d+_/, '')
         end
 
@@ -54,17 +54,9 @@ module RuboCop
           file_name.sub(/\..+\z/, '')
         end
 
-        def to_camelcase(word)
+        def camelize(word)
           word.split('_').map(&:capitalize).join
         end
-
-        def to_snakecase(word)
-          word
-            .gsub(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
-            .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-            .tr('-', '_')
-            .downcase
-        end
       end
     end
   end

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

@@ -54,23 +54,40 @@ module RuboCop
         PATTERN
 
         def on_send(node)
-          parent = node.parent
-
-          return unless parent&.block_type?
+          return unless (parent = node.parent)
+          return unless parent.block_type? && parent.body
 
           exit_statements(parent.body).each do |statement_node|
-            statement = if statement_node.return_type?
-                          'return'
-                        elsif statement_node.break_type?
-                          'break'
-                        else
-                          statement_node.method_name
-                        end
+            next if in_rescue?(statement_node) || nested_block?(statement_node)
+
+            statement = statement(statement_node)
             message = format(MSG, statement: statement)
 
             add_offense(statement_node, message: message)
           end
         end
+
+        private
+
+        def statement(statement_node)
+          if statement_node.return_type?
+            'return'
+          elsif statement_node.break_type?
+            'break'
+          else
+            statement_node.method_name
+          end
+        end
+
+        def in_rescue?(statement_node)
+          statement_node.ancestors.find(&:rescue_type?)
+        end
+
+        def nested_block?(statement_node)
+          return false unless statement_node.break_type?
+
+          !statement_node.ancestors.find(&:block_type?).method?(:transaction)
+        end
       end
     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.14.1'
+      STRING = '2.14.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.14.1
+  version: 2.14.2
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport