Merge pull request #170 from mvz/make-bulk-change-table-handle-blocks

Don't register BulkChangeTable offense if block intervenes

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### Bug fixes
 
+* [#170](https://github.com/rubocop-hq/rubocop-rails/pull/170): Make `Rails/BulkChangeTable` not suggest combining methods with an intervening block. ([@mvz][])
 * [#159](https://github.com/rubocop-hq/rubocop-rails/issues/159): Fix autocorrect for `Rails/EnumHash` when using % arrays notations. ([@ngouy][])
 
 ## 2.4.0 (2019-11-27)
@@ -113,3 +114,4 @@
 [@gyfis]: https:/github.com/gyfis
 [@DNA]: https://github.com/DNA
 [@ngouy]: https://github.com/ngouy
+[@mvz]: https://github.com/mvz

lib/rubocop/cop/rails/bulk_change_table.rb

@@ -138,9 +138,9 @@ def on_def(node)
 
           recorder = AlterMethodsRecorder.new
 
-          node.body.each_child_node(:send) do |send_node|
-            if combinable_alter_methods.include?(send_node.method_name)
-              recorder.process(send_node)
+          node.body.child_nodes.each do |child_node|
+            if call_to_combinable_alter_method? child_node
+              recorder.process(child_node)
             else
               recorder.flush
             end
@@ -218,6 +218,11 @@ def support_bulk_alter?
           end
         end
 
+        def call_to_combinable_alter_method?(child_node)
+          child_node.send_type? &&
+            combinable_alter_methods.include?(child_node.method_name)
+        end
+
         def combinable_alter_methods
           case database
           when MYSQL

spec/rubocop/cop/rails/bulk_change_table_spec.rb

@@ -306,6 +306,18 @@ def change
       RUBY
     end
 
+    it 'does not register an offense when including a block between' do
+      expect_no_offenses(<<~RUBY)
+        def change
+          add_column :users, :name, :string, null: false
+          User.find_each do |user|
+            user.update(name: user.nickname)
+          end
+          remove_column :users, :nickname
+        end
+      RUBY
+    end
+
     it 'does not register an offense' \
        'when including a combinable alter method' do
       expect_no_offenses(<<~RUBY)