extract private #increment_all_with_touch and #decrement_all_with_tou…

…ch methods.

lib/acts_as_list/active_record/acts/list.rb

@@ -344,50 +344,36 @@ def assume_top_position
 
           # This has the effect of moving all the higher items up one.
           def decrement_positions_on_higher_items(position)
-            acts_as_list_list.where(
-              "#{quoted_position_column} <= #{position}"
-            ).tap { |scope| touch_all scope }.update_all(
-              "#{quoted_position_column} = (#{quoted_position_column} - 1)"
-            )
+            scope = acts_as_list_list.where("#{quoted_position_column} <= #{position}")
+            decrement_all_with_touch scope
           end
 
           # This has the effect of moving all the lower items up one.
           def decrement_positions_on_lower_items(position=nil)
             return unless in_list?
             position ||= send(position_column).to_i
-            acts_as_list_list.where(
-              "#{quoted_position_column} > #{position}"
-            ).tap { |scope| touch_all scope }.update_all(
-              "#{quoted_position_column} = (#{quoted_position_column} - 1)"
-            )
+            scope = acts_as_list_list.where("#{quoted_position_column} > #{position}")
+            decrement_all_with_touch scope
           end
 
           # This has the effect of moving all the higher items down one.
           def increment_positions_on_higher_items
             return unless in_list?
-            acts_as_list_list.where(
-              "#{quoted_position_column} < #{send(position_column).to_i}"
-            ).tap { |scope| touch_all scope }.update_all(
-              "#{quoted_position_column} = (#{quoted_position_column} + 1)"
-            )
+            scope = acts_as_list_list.where("#{quoted_position_column} < #{send(position_column).to_i}")
+            increment_all_with_touch scope
           end
 
           # This has the effect of moving all the lower items down one.
           def increment_positions_on_lower_items(position, avoid_id = nil)
             avoid_id_condition = avoid_id ? " AND #{self.class.primary_key} != #{self.class.connection.quote(avoid_id)}" : ''
 
-            acts_as_list_list.where(
-              "#{quoted_position_column} >= #{position}#{avoid_id_condition}"
-            ).tap { |scope| touch_all scope }.update_all(
-              "#{quoted_position_column} = (#{quoted_position_column} + 1)"
-            )
+            scope = acts_as_list_list.where("#{quoted_position_column} >= #{position}#{avoid_id_condition}")
+            increment_all_with_touch scope
           end
 
           # Increments position (<tt>position_column</tt>) of all items in the list.
           def increment_positions_on_all_items
-            acts_as_list_list.tap { |scope| touch_all scope }.update_all(
-              "#{quoted_position_column} = (#{quoted_position_column} + 1)"
-            )
+            increment_all_with_touch acts_as_list_list
           end
 
           # Reorders intermediate items to support moving an item from old_position to new_position.
@@ -400,25 +386,23 @@ def shuffle_positions_on_intermediate_items(old_position, new_position, avoid_id
               #
               # e.g., if moving an item from 2 to 5,
               # move [3, 4, 5] to [2, 3, 4]
-              acts_as_list_list.where(
+              scope = acts_as_list_list.where(
                 "#{quoted_position_column} > #{old_position}"
               ).where(
                 "#{quoted_position_column} <= #{new_position}#{avoid_id_condition}"
-              ).tap { |scope| touch_all scope }.update_all(
-                "#{quoted_position_column} = (#{quoted_position_column} - 1)"
               )
+              decrement_all_with_touch scope
             else
               # Increment position of intermediate items
               #
               # e.g., if moving an item from 5 to 2,
               # move [2, 3, 4] to [3, 4, 5]
-              acts_as_list_list.where(
+              scope = acts_as_list_list.where(
                 "#{quoted_position_column} >= #{new_position}"
               ).where(
                 "#{quoted_position_column} < #{old_position}#{avoid_id_condition}"
-              ).tap { |scope| touch_all scope }.update_all(
-                "#{quoted_position_column} = (#{quoted_position_column} + 1)"
               )
+              increment_all_with_touch scope
             end
           end
 
@@ -495,6 +479,16 @@ def quoted_table_name
             @_quoted_table_name ||= acts_as_list_class.quoted_table_name
           end
 
+          def decrement_all_with_touch(scope)
+            touch_all scope
+            scope.update_all "#{quoted_position_column} = (#{quoted_position_column} - 1)"
+          end
+
+          def increment_all_with_touch(scope)
+            touch_all scope
+            scope.update_all "#{quoted_position_column} = (#{quoted_position_column} + 1)"
+          end
+
           def touch_all(scope)
             attrs = timestamp_attributes_for_update_in_model
             return if attrs.empty?