rubocop-migration 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18f0c1b4fa8be61ca159b11acf5593b9343c4696156171acb9ba5774c422dfab
-  data.tar.gz: 7fd0e0b48fc9d98d1ba4a307a1bb41fbd8068240710954c0bf69e3aedb0c5d9c
+  metadata.gz: 74f6229f8d3cbb9c31aee226d95ed698edec1fb5cde69090bb8efd57179d8cfe
+  data.tar.gz: 85ea516f3e408ae2bfabd0d7bcd7162bbad88281b5e6513d6da71b0c14c3b2a6
 SHA512:
-  metadata.gz: '090d29334bcef597b4b9a13f63b9b79494ef0190f458814ea01abeb8d0d48a374b58a60619f06b85737d258ebda0065647f91e96cb98601e0dd53a4847e494ea'
-  data.tar.gz: f7992c9b8468c881508f5aaa091187c75f432368ba0f2e7c4db014fe81f233524c1536b184c067efdab12933ad0a3e0278f5ff3425120d29dc713d8b1478e6ad
+  metadata.gz: 7af4ce63e220e72a147c272df33ec7d5096868742edb42377871d73eaecd7c0f0ec50505274310b27b5385f1e6bef57e85ec7528df76b88351b3bdde8997a544
+  data.tar.gz: 28cdf473b50695099a1d847a482fd5de54cdbeacd8778dbf54389027095478d460b3c70532115b4c2e2dbeba1137f5191946f66a6c2b20eb302310734906f64c

data/.rubocop.yml

@@ -48,11 +48,11 @@ Sevencop/MethodDefinitionKeywordArgumentOrdered:
 Sevencop/MethodDefinitionOrdered:
   Enabled: true
 
-Sevencop/RequireOrdered:
-  Enabled: true
-
 Style/Documentation:
   Enabled: false
 
 Style/MultilineBlockChain:
   Enabled: false
+
+Style/RequireOrder:
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-migration (0.4.2)
+    rubocop-migration (0.5.0)
       activesupport
       rubocop (>= 1.34)
       rubocop-rails
@@ -9,68 +9,92 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.6)
+    activesupport (7.1.3)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    concurrent-ruby (1.2.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    minitest (5.18.1)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    minitest (5.21.2)
+    mutex_m (0.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
     rack (3.0.8)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.0)
-    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
+    rexml (3.2.6)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.36.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    rubocop (1.60.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.20.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.13.2)
-      rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
-    sevencop (0.21.0)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    sevencop (0.35.1)
+      activesupport
       rubocop
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   x86_64-linux

data/lib/rubocop/cop/migration/add_column_with_default_value.rb

@@ -209,7 +209,7 @@ module RuboCop
           corrector.remove(
             range_with_surrounding_comma(
               range_with_surrounding_space(
-                node.location.expression,
+                node.source_range,
                 side: :left
               ),
               :left

data/lib/rubocop/cop/migration/add_foreign_key.rb

@@ -144,7 +144,7 @@ module RuboCop
             corrector.remove(
               range_with_surrounding_comma(
                 range_with_surrounding_space(
-                  option_foreign_key_true_node_from_add_reference(node).location.expression,
+                  option_foreign_key_true_node_from_add_reference(node).source_range,
                   side: :left
                 ),
                 :left

data/lib/rubocop/cop/migration/add_index_duplicate.rb

@@ -108,7 +108,7 @@ module RuboCop
           indexed_columns_node = indexed_columns_node_from(node)
           case indexed_columns_node&.type
           when :array
-            indexed_columns_node.children.map(&:value).map(&:to_s)
+            indexed_columns_node.children.map { |child| child.value.to_s }
           when :str, :sym
             [indexed_columns_node.value.to_s]
           end
@@ -121,7 +121,7 @@ module RuboCop
           when :add_index
             node.arguments[1]
           when :index
-            node.arguments[0]
+            node.first_argument
           end
         end
 

data/lib/rubocop/cop/migration/batch_in_batches.rb

@@ -26,7 +26,16 @@ module RuboCop
       #     disable_ddl_transaction!
       #
       #     def up
-      #       User.within_in_batches do |relation|
+      #       User.in_batches.update_all(some_column: 'some value')
+      #     end
+      #   end
+      #
+      #   # good
+      #   class BackfillSomeColumnToUsers < ActiveRecord::Migration[7.0]
+      #     disable_ddl_transaction!
+      #
+      #     def up
+      #       User.in_batches do |relation|
       #         relation.update_all(some_column: 'some value')
       #       end
       #     end
@@ -62,32 +71,34 @@ module RuboCop
           corrector,
           node
         )
-          range = node.location.selector.with(
-            end_pos: node.location.expression.end_pos
-          )
-          corrector.replace(
-            range,
-            <<~TEXT.chomp
-              in_batches do |relation|
-                relation.#{range.source}
-              end
-            TEXT
-          )
+          corrector.insert_before(node.location.selector, 'in_batches.')
         end
 
-        # @param node [RuboCop::AST::Node]
+        # @param node [RuboCop::AST::SendNode]
         # @return [Boolean]
-        def within_in_batches?(node)
+        def in_batches?(node)
+          in_block_batches?(node) || in_inline_batches?(node)
+        end
+
+        # @param node [RuboCop::AST::SendNode]
+        # @return [Boolean]
+        def in_block_batches?(node)
           node.each_ancestor(:block).any? do |ancestor|
             ancestor.method?(:in_batches)
           end
         end
 
+        # @param node [RuboCop::AST::SendNode]
+        # @return [Boolean]
+        def in_inline_batches?(node)
+          node.receiver.is_a?(::RuboCop::AST::SendNode) &&
+            node.receiver.method?(:in_batches)
+        end
+
         # @param node [RuboCop::AST::SendNode]
         # @return [Boolean]
         def wrong?(node)
-          batch_processing?(node) &&
-            !within_in_batches?(node)
+          batch_processing?(node) && !in_batches?(node)
         end
       end
     end

data/lib/rubocop/cop/migration/change_column_null.rb

@@ -102,7 +102,7 @@ module RuboCop
         )
           corrector.replace(
             node.location.selector.with(
-              end_pos: node.location.expression.end_pos
+              end_pos: node.source_range.end_pos
             ),
             format_check_constraint(
               column_name: find_column_name_from_change_null(node),
@@ -141,19 +141,19 @@ module RuboCop
         # @param node [RuboCop::AST::SendNode]
         # @return [String]
         def find_column_name_from_change_null(node)
-          node.arguments[0].value.to_s
+          node.first_argument.value.to_s
         end
 
         # @parm node [RuboCop::AST::SendNode]
         # @return [String]
         def find_table_name_from_change_column_null(node)
-          node.arguments[0].value.to_s
+          node.first_argument.value.to_s
         end
 
         # @param node [RuboCop::AST::SendNode]
         # @return [String]
         def find_table_name_from_change_null(node)
-          find_ancestor_change_table(node).send_node.arguments[0].value.to_s
+          find_ancestor_change_table(node).send_node.first_argument.value.to_s
         end
 
         # @param column_name [String]

data/lib/rubocop/cop/migration/create_table_force.rb

@@ -76,7 +76,7 @@ module RuboCop
           corrector.remove(
             range_with_surrounding_comma(
               range_with_surrounding_space(
-                node.location.expression,
+                node.source_range,
                 side: :left
               ),
               :left

data/lib/rubocop/cop/migration/jsonb.rb

@@ -111,8 +111,8 @@ module RuboCop
           when :send
             node.location.selector
           when :sym
-            node.location.expression.with(
-              begin_pos: node.location.expression.begin_pos + 1
+            node.source_range.with(
+              begin_pos: node.source_range.begin_pos + 1
             )
           end
         end

data/lib/rubocop/cop/migration/remove_column.rb

@@ -135,7 +135,7 @@ module RuboCop
         # @param node [RuboCop::AST::SendNode]
         # @return [String, nil]
         def find_table_name_from(node)
-          table_name_node = node.arguments[0]
+          table_name_node = node.first_argument
           table_name_node.value&.to_s if table_name_node.respond_to?(:value)
         end
 

data/lib/rubocop/cop/migration/reserved_word_mysql.rb

@@ -165,7 +165,7 @@ module RuboCop
           when :rename_column
             [node.arguments[2]]
           when *COLUMN_TYPE_METHOD_NAMES
-            [node.arguments[0]]
+            [node.first_argument]
           else
             []
           end
@@ -203,7 +203,7 @@ module RuboCop
           when :create_join_table
             [table_name_option_from(node)].compact
           when :create_table
-            [node.arguments[0]]
+            [node.first_argument]
           when :rename_table
             [node.arguments[1]]
           else

data/lib/rubocop/migration/rubocop_extension.rb

@@ -7,7 +7,7 @@ require_relative 'config_loader'
 RuboCop::ConfigLoader.instance_variable_set(
   :@default_configuration,
   RuboCop::Migration::ConfigLoader.call(
-    path: ::File.expand_path(
+    path: File.expand_path(
       '../../../config/default.yml',
       __dir__
     )

data/lib/rubocop/migration/version.rb

@@ -2,6 +2,6 @@
 
 module Rubocop
   module Migration
-    VERSION = '0.4.2'
+    VERSION = '0.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-migration
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-07-14 00:00:00.000000000 Z
+date: 2024-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport