acts_as_list 0.9.19 → 1.0.0

data/gemfiles/rails_5_2.gemfile

@@ -2,10 +2,9 @@
 
 source "http://rubygems.org"
 
-gem "rack", "~> 1", platforms: [:ruby_19, :ruby_20, :ruby_21]
 gem "rake"
 gem "appraisal"
-gem "activerecord", "~> 5.2.1"
+gem "activerecord", "~> 5.2.0"
 
 group :development do
   gem "github_changelog_generator", "1.9.0"
@@ -13,21 +12,20 @@ end
 
 group :test do
   gem "minitest", "~> 5.0"
-  gem "test_after_commit", "~> 0.4.2"
   gem "timecop"
   gem "mocha"
 end
 
 group :sqlite do
-  gem "sqlite3", "~> 1.3.13", platforms: [:ruby]
+  gem "sqlite3", "~> 1.3.13"
 end
 
 group :postgresql do
-  gem "pg", "~> 0.18.0", platforms: [:ruby]
+  gem "pg", "~> 1.1.4"
 end
 
 group :mysql do
-  gem "mysql2", "~> 0.4.10", platforms: [:ruby]
+  gem "mysql2", "~> 0.5.0"
 end
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rake"
+gem "appraisal"
+gem "activerecord", "~> 6.0.0"
+
+group :development do
+  gem "github_changelog_generator", "1.9.0"
+end
+
+group :test do
+  gem "minitest", "~> 5.0"
+  gem "timecop"
+  gem "mocha"
+end
+
+group :sqlite do
+  gem "sqlite3", "~> 1.4"
+end
+
+group :postgresql do
+  gem "pg", "~> 1.1.4"
+end
+
+group :mysql do
+  gem "mysql2", "~> 0.5.0"
+end
+
+gemspec path: "../"

data/lib/acts_as_list/active_record/acts/list.rb

@@ -65,6 +65,12 @@ module ActiveRecord
       end
 
       module InstanceMethods
+        # Get the current position of the item in the list
+        def current_position
+          position = send(position_column)
+          position ? position.to_i : nil
+        end
+
         # Insert the item at the given position (defaults to the top position of 1).
         def insert_at(position = acts_as_list_top)
           insert_at_position(position)
@@ -79,8 +85,8 @@ module ActiveRecord
           return unless lower_item
 
           acts_as_list_class.transaction do
-            if lower_item.send(position_column) != self.send(position_column)
-              swap_positions(lower_item, self)
+            if lower_item.current_position != current_position
+              swap_positions_with(lower_item)
             else
               lower_item.decrement_position
               increment_position
@@ -93,8 +99,8 @@ module ActiveRecord
           return unless higher_item
 
           acts_as_list_class.transaction do
-            if higher_item.send(position_column) != self.send(position_column)
-              swap_positions(higher_item, self)
+            if higher_item.current_position != current_position
+              swap_positions_with(higher_item)
             else
               higher_item.increment_position
               decrement_position
@@ -134,13 +140,13 @@ module ActiveRecord
         # Increase the position of this item without adjusting the rest of the list.
         def increment_position
           return unless in_list?
-          set_list_position(self.send(position_column).to_i + 1)
+          set_list_position(current_position + 1)
         end
 
         # Decrease the position of this item without adjusting the rest of the list.
         def decrement_position
           return unless in_list?
-          set_list_position(self.send(position_column).to_i - 1)
+          set_list_position(current_position - 1)
         end
 
         def first?
@@ -163,9 +169,8 @@ module ActiveRecord
         # selects all higher items by default
         def higher_items(limit=nil)
           limit ||= acts_as_list_list.count
-          position_value = send(position_column)
           acts_as_list_list.
-            where("#{quoted_position_column_with_table_name} <= ?", position_value).
+            where("#{quoted_position_column_with_table_name} <= ?", current_position).
             where("#{quoted_table_name}.#{self.class.primary_key} != ?", self.send(self.class.primary_key)).
             reorder(acts_as_list_order_argument(:desc)).
             limit(limit)
@@ -181,9 +186,8 @@ module ActiveRecord
         # selects all lower items by default
         def lower_items(limit=nil)
           limit ||= acts_as_list_list.count
-          position_value = send(position_column)
           acts_as_list_list.
-            where("#{quoted_position_column_with_table_name} >= ?", position_value).
+            where("#{quoted_position_column_with_table_name} >= ?", current_position).
             where("#{quoted_table_name}.#{self.class.primary_key} != ?", self.send(self.class.primary_key)).
             reorder(acts_as_list_order_argument(:asc)).
             limit(limit)
@@ -195,40 +199,34 @@ module ActiveRecord
         end
 
         def not_in_list?
-          send(position_column).nil?
+          current_position.nil?
         end
 
         def default_position
-          acts_as_list_class.columns_hash[position_column.to_s].default
+          acts_as_list_class.column_defaults[position_column.to_s]
         end
 
         def default_position?
-          default_position && default_position.to_i == send(position_column)
+          default_position && default_position == current_position
         end
 
         # Sets the new position and saves it
         def set_list_position(new_position, raise_exception_if_save_fails=false)
-          write_attribute position_column, new_position
+          self[position_column] = new_position
           raise_exception_if_save_fails ? save! : save
         end
 
         private
 
-        def swap_positions(item1, item2)
-          item1_position = item1.send(position_column)
+        def swap_positions_with(item)
+          item_position = item.current_position
 
-          item1.set_list_position(item2.send(position_column))
-          item2.set_list_position(item1_position)
+          item.set_list_position(current_position)
+          set_list_position(item_position)
         end
 
         def acts_as_list_list
-          if ActiveRecord::VERSION::MAJOR < 4
-            acts_as_list_class.unscoped do
-              acts_as_list_class.where(scope_condition)
-            end
-          else
-            acts_as_list_class.unscope(:select, :where).where(scope_condition)
-          end
+          acts_as_list_class.unscope(:select, :where).where(scope_condition)
         end
 
         # Poorly named methods. They will insert the item at the desired position if the position
@@ -276,7 +274,7 @@ module ActiveRecord
         #   bottom_position_in_list    # => 2
         def bottom_position_in_list(except = nil)
           item = bottom_item(except)
-          item ? item.send(position_column) : acts_as_list_top - 1
+          item ? item.current_position : acts_as_list_top - 1
         end
 
         # Returns the bottom item
@@ -303,7 +301,7 @@ module ActiveRecord
         # 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_with_table_name} < ?", send(position_column).to_i).increment_all
+          acts_as_list_list.where("#{quoted_position_column_with_table_name} < ?", current_position).increment_all
         end
 
         # This has the effect of moving all the lower items down one.
@@ -323,9 +321,8 @@ module ActiveRecord
         end
 
         # This has the effect of moving all the lower items up one.
-        def decrement_positions_on_lower_items(position=nil)
+        def decrement_positions_on_lower_items(position=current_position)
           return unless in_list?
-          position ||= send(position_column).to_i
 
           if sequential_updates?
             acts_as_list_list.where("#{quoted_position_column_with_table_name} > ?", position).reorder(acts_as_list_order_argument(:asc)).decrement_sequentially
@@ -392,7 +389,7 @@ module ActiveRecord
           return set_list_position(position, raise_exception_if_save_fails) if new_record?
           with_lock do
             if in_list?
-              old_position = send(position_column).to_i
+              old_position = current_position
               return if position == old_position
               # temporary move after bottom with gap, avoiding duplicate values
               # gap is required to leave room for position increments
@@ -411,31 +408,27 @@ module ActiveRecord
           return unless position_before_save_changed?
 
           old_position = position_before_save || bottom_position_in_list + 1
-          new_position = send(position_column).to_i
 
-          return unless acts_as_list_list.where(
-            "#{quoted_position_column_with_table_name} = #{new_position}"
+          return unless current_position && acts_as_list_list.where(
+            "#{quoted_position_column_with_table_name} = #{current_position}"
           ).count > 1
-          shuffle_positions_on_intermediate_items old_position, new_position, id
+
+          shuffle_positions_on_intermediate_items old_position, current_position, id
         end
 
         def position_before_save_changed?
-          if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1 ||
-              ActiveRecord::VERSION::MAJOR > 5
-
+          if active_record_version_is?('>= 5.1')
             saved_change_to_attribute? position_column
           else
-            send "#{position_column}_changed?"
+            attribute_changed? position_column
           end
         end
 
         def position_before_save
-          if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1 ||
-              ActiveRecord::VERSION::MAJOR > 5
-
+          if active_record_version_is?('>= 5.1')
             attribute_before_last_save position_column
           else
-            send "#{position_column}_was"
+            attribute_was position_column
           end
         end
 
@@ -464,7 +457,7 @@ module ActiveRecord
         # This check is skipped if the position is currently the default position from the table
         # as modifying the default position on creation is handled elsewhere
         def check_top_position
-          if send(position_column) && !default_position? && send(position_column) < acts_as_list_top
+          if current_position && !default_position? && current_position < acts_as_list_top
             self[position_column] = acts_as_list_top
           end
         end
@@ -484,11 +477,13 @@ module ActiveRecord
         end
 
         def acts_as_list_order_argument(direction = :asc)
-          if ActiveRecord::VERSION::MAJOR >= 4
-            { position_column => direction }
-          else
-            "#{quoted_position_column_with_table_name} #{direction.to_s.upcase}"
-          end
+          { position_column => direction }
+        end
+
+        def active_record_version_is?(version_requirement)
+          requirement = Gem::Requirement.new(version_requirement)
+          version = Gem.loaded_specs['activerecord'].version
+          requirement.satisfied_by?(version)
         end
       end
 

data/lib/acts_as_list/active_record/acts/position_column_method_definer.rb

@@ -64,7 +64,7 @@ module ActiveRecord::Acts::List::PositionColumnMethodDefiner #:nodoc:
       end
 
       define_method :"#{position_column}=" do |position|
-        write_attribute(position_column, position)
+        self[position_column] = position
         @position_changed = true
       end
 

data/lib/acts_as_list/active_record/acts/scope_method_definer.rb

@@ -21,7 +21,6 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
         end
 
         define_method :destroyed_via_scope? do
-          return false if ActiveRecord::VERSION::MAJOR < 4
           scope == (destroyed_by_association && destroyed_by_association.foreign_key.to_sym)
         end
       elsif scope.is_a?(Array)
@@ -45,7 +44,6 @@ module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
         end
 
         define_method :destroyed_via_scope? do
-          return false if ActiveRecord::VERSION::MAJOR < 4
           scope_condition.keys.include? (destroyed_by_association && destroyed_by_association.foreign_key.to_sym)
         end
       else

data/lib/acts_as_list/active_record/acts/sequential_updates_method_definer.rb

@@ -7,7 +7,7 @@ module ActiveRecord::Acts::List::SequentialUpdatesMethodDefiner #:nodoc:
         if !defined?(@sequential_updates)
           if sequential_updates_option.nil?
             table_exists =
-              if ActiveRecord::VERSION::MAJOR >= 5
+              if active_record_version_is?('>= 5')
                 caller_class.connection.data_source_exists?(caller_class.table_name)
               else
                 caller_class.connection.table_exists?(caller_class.table_name)

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.19'
+      VERSION = '1.0.0'
     end
   end
 end

data/test/helper.rb

@@ -13,7 +13,7 @@ rescue Bundler::BundlerError => e
 end
 require "active_record"
 require "minitest/autorun"
-require "mocha/mini_test"
+require "mocha/minitest"
 require "#{File.dirname(__FILE__)}/../init"
 
 if defined?(ActiveRecord::VERSION) &&
@@ -27,15 +27,6 @@ db_config = YAML.load_file(File.expand_path("../database.yml", __FILE__)).fetch(
 ActiveRecord::Base.establish_connection(db_config)
 ActiveRecord::Schema.verbose = false
 
-# Returns true if ActiveRecord is rails 3, 4 version
-def rails_3
-  defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 3
-end
-
-def rails_4
-  defined?(ActiveRecord::VERSION) && ActiveRecord::VERSION::MAJOR >= 4
-end
-
 def teardown_db
   if ActiveRecord::VERSION::MAJOR >= 5
     tables = ActiveRecord::Base.connection.data_sources

data/test/shared_list.rb

@@ -10,6 +10,13 @@ module Shared
       end
     end
 
+    def test_current_position
+      first_item = ListMixin.where(parent_id: 5).first
+      assert_equal 1, first_item.current_position
+      first_item.remove_from_list
+      assert_nil first_item.current_position
+    end
+
     def test_reordering
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
 
@@ -230,12 +237,9 @@ module Shared
       # We need to trigger all the before_destroy callbacks without actually
       # destroying the record so we can see the affect the callbacks have on
       # the record.
-      # NOTE: Hotfix for rails3 ActiveRecord
       list = ListMixin.where(id: 2).first
       if list.respond_to?(:run_callbacks)
-        # Refactored to work according to Rails3 ActiveRSupport Callbacks <http://api.rubyonrails.org/classes/ActiveSupport/Callbacks.html>
-        list.run_callbacks(:destroy) if rails_3
-        list.run_callbacks(:before_destroy) if !rails_3
+        list.run_callbacks(:destroy)
       else
         list.send(:callback, :before_destroy)
       end

data/test/shared_list_sub.rb

@@ -47,7 +47,7 @@ module Shared
 
     def test_next_prev_not_regular_sequence
       ListMixin.all.each do |item|
-        item.update_attributes(pos: item.pos * 5)
+        item.update pos: item.pos * 5
       end
 
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5000).order('pos').map(&:id)

data/test/test_list.rb

@@ -49,11 +49,9 @@ def setup_db(position_options = {})
   ActiveRecord::Base.connection.add_index 'altid-table', :pos, unique: true
 
   mixins = [ Mixin, ListMixin, ListMixinSub1, ListMixinSub2, ListWithStringScopeMixin,
-    ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin,
+    ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin, EnumArrayScopeListMixin,
     DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin, QuotedList, TouchDisabledMixin ]
 
-  mixins << EnumArrayScopeListMixin if rails_4
-
   ActiveRecord::Base.connection.schema_cache.clear!
   mixins.each do |klass|
     klass.reset_column_information
@@ -80,19 +78,11 @@ class ListMixinSub1 < ListMixin
 end
 
 class ListMixinSub2 < ListMixin
-  if rails_3
-    validates :pos, presence: true
-  else
-    validates_presence_of :pos
-  end
+  validates :pos, presence: true
 end
 
 class ListMixinError < ListMixin
-  if rails_3
-    validates :state, presence: true
-  else
-    validates_presence_of :state
-  end
+  validates :state, presence: true
 end
 
 class ListWithStringScopeMixin < Mixin
@@ -107,13 +97,11 @@ class ArrayScopeListWithHashMixin < Mixin
   acts_as_list column: "pos", scope: [:parent_id, state: nil]
 end
 
-if rails_4
-  class EnumArrayScopeListMixin < Mixin
-    STATE_VALUES = %w(active archived)
-    enum state: STATE_VALUES
+class EnumArrayScopeListMixin < Mixin
+  STATE_VALUES = %w(active archived)
+  enum state: STATE_VALUES
 
-    acts_as_list column: "pos", scope: [:parent_id, :state]
-  end
+  acts_as_list column: "pos", scope: [:parent_id, :state]
 end
 
 class ZeroBasedMixin < Mixin
@@ -130,13 +118,7 @@ class DefaultScopedWhereMixin < Mixin
   default_scope { order('pos ASC').where(active: true) }
 
   def self.for_active_false_tests
-    if ActiveRecord::VERSION::MAJOR < 4
-      unscoped do
-        order('pos ASC').where(active: false)
-      end
-    else
-      unscope(:where).where(active: false)
-    end
+    unscope(:where).where(active: false)
   end
 end
 
@@ -170,7 +152,7 @@ end
 ##
 # The way we track changes to
 # scope and position can get tripped up
-# by someone using update_attributes within
+# by someone using update within
 # a callback because it causes multiple passes
 # through the callback chain
 module CallbackMixin
@@ -185,7 +167,7 @@ module CallbackMixin
       # doesn't matter what column changes, just
       # need to change something
 
-      self.update_attributes(active: !self.active)
+      self.update active: !self.active
     end
   end
 end
@@ -649,7 +631,7 @@ class MultipleListsTest < ActsAsListTestCase
   def test_check_scope_order
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 1).order('pos').map(&:id)
     assert_equal [5, 6, 7, 8], ListMixin.where(:parent_id => 2).order('pos').map(&:id)
-    ListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2)
+    ListMixin.find(4).update :parent_id => 2, :pos => 2
     assert_equal [1, 2, 3], ListMixin.where(:parent_id => 1).order('pos').map(&:id)
     assert_equal [5, 4, 6, 7, 8], ListMixin.where(:parent_id => 2).order('pos').map(&:id)
   end
@@ -657,34 +639,32 @@ class MultipleListsTest < ActsAsListTestCase
   def test_check_scope_position
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 1).map(&:pos)
     assert_equal [1, 2, 3, 4], ListMixin.where(:parent_id => 2).map(&:pos)
-    ListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2)
+    ListMixin.find(4).update :parent_id => 2, :pos => 2
     assert_equal [1, 2, 3], ListMixin.where(:parent_id => 1).order('pos').map(&:pos)
     assert_equal [1, 2, 3, 4, 5], ListMixin.where(:parent_id => 2).order('pos').map(&:pos)
   end
 end
 
-if rails_4
-  class EnumArrayScopeListMixinTest < ActsAsListTestCase
-    def setup
-      setup_db
-      EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['active']
-      EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']
-      EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["active"]
-      EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["archived"]
-    end
+class EnumArrayScopeListMixinTest < ActsAsListTestCase
+  def setup
+    setup_db
+    EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['active']
+    EnumArrayScopeListMixin.create! :parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']
+    EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["active"]
+    EnumArrayScopeListMixin.create! :parent_id => 2, :state => EnumArrayScopeListMixin.states["archived"]
+  end
 
-    def test_positions
-      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
-      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
-      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
-      assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
-    end
+  def test_positions
+    assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
+    assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 1, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
+    assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active']).map(&:pos)
+    assert_equal [1], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos)
+  end
 
-    def test_update_state
-      active_item = EnumArrayScopeListMixin.find_by(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active'])
-      active_item.update(state: EnumArrayScopeListMixin.states['archived'])
-      assert_equal [1, 2], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos).sort
-    end
+  def test_update_state
+    active_item = EnumArrayScopeListMixin.find_by(:parent_id => 2, :state => EnumArrayScopeListMixin.states['active'])
+    active_item.update(state: EnumArrayScopeListMixin.states['archived'])
+    assert_equal [1, 2], EnumArrayScopeListMixin.where(:parent_id => 2, :state => EnumArrayScopeListMixin.states['archived']).map(&:pos).sort
   end
 end
 
@@ -699,7 +679,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_order_after_all_scope_properties_are_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
     assert_equal [5, 6, 7, 8], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').order('pos').map(&:id)
-    ArrayScopeListMixin.find(2).update_attributes(:parent_id => 2, :pos => 2,:parent_type => 'something')
+    ArrayScopeListMixin.find(2).update :parent_id => 2, :pos => 2,:parent_type => 'something'
     assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
     assert_equal [5, 2, 6, 7, 8], ArrayScopeListMixin.where(:parent_id => 2,:parent_type => 'something').order('pos').map(&:id)
   end
@@ -707,7 +687,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_position_after_all_scope_properties_are_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').map(&:pos)
-    ArrayScopeListMixin.find(4).update_attributes(:parent_id => 2, :pos => 2, :parent_type => 'something')
+    ArrayScopeListMixin.find(4).update :parent_id => 2, :pos => 2, :parent_type => 'something'
     assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
     assert_equal [1, 2, 3, 4, 5], ArrayScopeListMixin.where(:parent_id => 2, :parent_type => 'something').order('pos').map(&:pos)
   end
@@ -715,7 +695,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_order_after_one_scope_property_is_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
     assert_equal [9, 10, 11, 12], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').order('pos').map(&:id)
-    ArrayScopeListMixin.find(2).update_attributes(:parent_id => 3, :pos => 2)
+    ArrayScopeListMixin.find(2).update :parent_id => 3, :pos => 2
     assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
     assert_equal [9, 2, 10, 11, 12], ArrayScopeListMixin.where(:parent_id => 3,:parent_type => 'anything').order('pos').map(&:id)
   end
@@ -723,7 +703,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_position_after_one_scope_property_is_changed
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').map(&:pos)
-    ArrayScopeListMixin.find(4).update_attributes(:parent_id => 3, :pos => 2)
+    ArrayScopeListMixin.find(4).update :parent_id => 3, :pos => 2
     assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
     assert_equal [1, 2, 3, 4, 5], ArrayScopeListMixin.where(:parent_id => 3, :parent_type => 'anything').order('pos').map(&:pos)
   end
@@ -731,7 +711,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_order_after_moving_to_empty_list
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:id)
     assert_equal [], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order('pos').map(&:id)
-    ArrayScopeListMixin.find(2).update_attributes(:parent_id => 4, :pos => 1)
+    ArrayScopeListMixin.find(2).update :parent_id => 4, :pos => 1
     assert_equal [1, 3, 4], ArrayScopeListMixin.where(:parent_id => 1,:parent_type => 'anything').order('pos').map(&:id)
     assert_equal [2], ArrayScopeListMixin.where(:parent_id => 4,:parent_type => 'anything').order('pos').map(&:id)
   end
@@ -739,7 +719,7 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   def test_position_after_moving_to_empty_list
     assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').map(&:pos)
     assert_equal [], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').map(&:pos)
-    ArrayScopeListMixin.find(2).update_attributes(:parent_id => 4, :pos => 1)
+    ArrayScopeListMixin.find(2).update :parent_id => 4, :pos => 1
     assert_equal [1, 2, 3], ArrayScopeListMixin.where(:parent_id => 1, :parent_type => 'anything').order('pos').map(&:pos)
     assert_equal [1], ArrayScopeListMixin.where(:parent_id => 4, :parent_type => 'anything').order('pos').map(&:pos)
   end