acts_as_list 0.8.2 → 0.9.0

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

@@ -0,0 +1,50 @@
+module ActiveRecord
+  module Acts
+    module List
+      module NoUpdate
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # Lets you selectively disable all act_as_list database updates
+          # for the duration of a block.
+          #
+          # ==== Examples
+          #   ActiveRecord::Acts::List.acts_as_list_no_update do
+          #     TodoList....
+          #   end
+          #
+          #   TodoList.acts_as_list_no_update do
+          #     TodoList....
+          #   end
+          #
+          def acts_as_list_no_update(&block)
+            NoUpdate.apply_to(self, &block)
+          end
+        end
+
+        class << self
+          def apply_to(klass)
+            klasses.push(klass)
+            yield
+          ensure
+            klasses.pop
+          end
+
+          def applied_to?(klass)
+            klasses.any? { |k| k >= klass }
+          end
+
+          private
+
+            def klasses
+              Thread.current[:act_as_list_no_update] ||= []
+            end
+        end
+
+        def act_as_list_no_update?
+          NoUpdate.applied_to?(self.class)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,49 @@
+module ActiveRecord::Acts::List::ScopeMethodDefiner #:nodoc:
+  extend ActiveSupport::Inflector
+
+  def self.call(caller_class, scope)
+    scope = idify(scope) if scope.is_a?(Symbol)
+
+    caller_class.class_eval do
+      define_method :scope_name do
+        scope
+      end
+
+      if scope.is_a?(Symbol)
+        define_method :scope_condition do
+          { scope => send(:"#{scope}") }
+        end
+
+        define_method :scope_changed? do
+          changed.include?(scope_name.to_s)
+        end
+      elsif scope.is_a?(Array)
+        define_method :scope_condition do
+          scope.inject({}) do |hash, column|
+            hash.merge!({ column.to_sym => read_attribute(column.to_sym) })
+          end
+        end
+
+        define_method :scope_changed? do
+          (scope_condition.keys & changed.map(&:to_sym)).any?
+        end
+      else
+        define_method :scope_condition do
+          eval "%{#{scope}}"
+        end
+
+        define_method :scope_changed? do
+          false
+        end
+      end
+
+      self.scope :in_list, lambda { where("#{quoted_position_column_with_table_name} IS NOT NULL") }
+    end
+  end
+
+  def self.idify(name)
+    return name if name.to_s =~ /_id$/
+
+    foreign_key(name).to_sym
+  end
+end

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

@@ -0,0 +1,21 @@
+module ActiveRecord::Acts::List::SequentialUpdatesMethodDefiner #:nodoc:
+  def self.call(caller_class, column, sequential_updates_option)
+    caller_class.class_eval do
+      define_method :sequential_updates? do
+        if !defined?(@sequential_updates)
+          if sequential_updates_option.nil?
+            table_exists = caller_class.connection.table_exists?(caller_class.table_name)
+            index_exists = caller_class.connection.index_exists?(caller_class.table_name, column, unique: true)
+            @sequential_updates = table_exists && index_exists
+          else
+            @sequential_updates = sequential_updates_option
+          end
+        else
+          @sequential_updates
+        end
+      end
+
+      private :sequential_updates?
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module ActiveRecord::Acts::List::TopOfListMethodDefiner #:nodoc:
+  def self.call(caller_class, top_of_list)
+    caller_class.class_eval do
+      define_singleton_method :acts_as_list_top do
+        top_of_list.to_i
+      end
+
+      define_method :acts_as_list_top do
+        top_of_list.to_i
+      end
+    end
+  end
+end

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.8.2'
+      VERSION = '0.9.0'
     end
   end
 end

data/test/database.yml

@@ -0,0 +1,16 @@
+sqlite:
+  adapter: sqlite3
+  database: "file:memdb1?mode=memory&cache=shared"
+
+mysql:
+  adapter: mysql2
+  username: root
+  password:
+  database: acts_as_list
+
+postgresql:
+  adapter: postgresql
+  username: postgres
+  password:
+  database: acts_as_list
+  min_messages: ERROR

data/test/helper.rb

@@ -1,3 +1,5 @@
+# $DEBUG = true
+
 require "rubygems"
 require "bundler/setup"
 begin
@@ -19,3 +21,13 @@ if defined?(ActiveRecord::VERSION) &&
 end
 
 require "shared"
+
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+def assert_equal_or_nil(a, b)
+  if a.nil?
+    assert_nil b
+  else
+    assert_equal a, b
+  end
+end

data/test/shared_array_scope_list.rb

@@ -25,7 +25,7 @@ module Shared
 
       ArrayScopeListMixin.where(id: 4).first.move_to_top
       assert_equal [4, 1, 3, 2], ArrayScopeListMixin.where(parent_id: 5, parent_type: 'ParentClass').order('pos').map(&:id)
-      
+
       ArrayScopeListMixin.where(id: 4).first.insert_at(4)
       assert_equal [1, 3, 2, 4], ArrayScopeListMixin.where(parent_id: 5, parent_type: 'ParentClass').order('pos').map(&:id)
       assert_equal [1, 2, 3, 4], ArrayScopeListMixin.where(parent_id: 5, parent_type: 'ParentClass').order('pos').map(&:pos)
@@ -60,6 +60,11 @@ module Shared
       assert !new.first?
       assert new.last?
 
+      new = ArrayScopeListMixin.acts_as_list_no_update { ArrayScopeListMixin.create(parent_id: 20, parent_type: 'ParentClass') }
+      assert_equal_or_nil $default_position,new.pos
+      assert_equal $default_position.is_a?(Fixnum), new.first?
+      assert !new.last?
+
       new = ArrayScopeListMixin.create(parent_id: 20, parent_type: 'ParentClass')
       assert_equal 3, new.pos
       assert !new.first?
@@ -81,6 +86,9 @@ module Shared
       new = ArrayScopeListMixin.create(parent_id: 20, parent_type: 'ParentClass')
       assert_equal 3, new.pos
 
+      new_noup = ArrayScopeListMixin.acts_as_list_no_update { ArrayScopeListMixin.create(parent_id: 20, parent_type: 'ParentClass') }
+      assert_equal_or_nil $default_position,new_noup.pos
+
       new4 = ArrayScopeListMixin.create(parent_id: 20, parent_type: 'ParentClass')
       assert_equal 4, new4.pos
 
@@ -104,6 +112,9 @@ module Shared
 
       new4.reload
       assert_equal 5, new4.pos
+
+      new_noup.reload
+      assert_equal_or_nil $default_position, new_noup.pos
     end
 
     def test_delete_middle
@@ -123,6 +134,12 @@ module Shared
 
       assert_equal 1, ArrayScopeListMixin.where(id: 3).first.pos
       assert_equal 2, ArrayScopeListMixin.where(id: 4).first.pos
+
+      ArrayScopeListMixin.acts_as_list_no_update { ArrayScopeListMixin.where(id: 3).first.destroy }
+
+      assert_equal [4], ArrayScopeListMixin.where(parent_id: 5, parent_type: 'ParentClass').order('pos').map(&:id)
+
+      assert_equal 2, ArrayScopeListMixin.where(id: 4).first.pos
     end
 
     def test_remove_from_list_should_then_fail_in_list?
@@ -136,10 +153,8 @@ module Shared
 
       ArrayScopeListMixin.where(id: 2).first.remove_from_list
 
-      assert_equal [2, 1, 3, 4], ArrayScopeListMixin.where(parent_id: 5, parent_type: 'ParentClass').order('pos').map(&:id)
-
       assert_equal 1,   ArrayScopeListMixin.where(id: 1).first.pos
-      assert_equal nil, ArrayScopeListMixin.where(id: 2).first.pos
+      assert_nil        ArrayScopeListMixin.where(id: 2).first.pos
       assert_equal 2,   ArrayScopeListMixin.where(id: 3).first.pos
       assert_equal 3,   ArrayScopeListMixin.where(id: 4).first.pos
     end

data/test/shared_list.rb

@@ -60,6 +60,11 @@ module Shared
       assert !new.first?
       assert new.last?
 
+      new = ListMixin.acts_as_list_no_update { ListMixin.create(parent_id: 20) }
+      assert_equal_or_nil $default_position, new.pos
+      assert_equal $default_position.is_a?(Fixnum), new.first?
+      assert !new.last?
+
       new = ListMixin.create(parent_id: 20)
       assert_equal 3, new.pos
       assert !new.first?
@@ -81,6 +86,9 @@ module Shared
       new = ListMixin.create(parent_id: 20)
       assert_equal 3, new.pos
 
+      new_noup = ListMixin.acts_as_list_no_update { ListMixin.create(parent_id: 20) }
+      assert_equal_or_nil $default_position, new_noup.pos
+
       new4 = ListMixin.create(parent_id: 20)
       assert_equal 4, new4.pos
 
@@ -105,18 +113,20 @@ module Shared
       new4.reload
       assert_equal 5, new4.pos
 
-      last1 = ListMixin.order('pos').last
-      last2 = ListMixin.order('pos').last
+      new_noup.reload
+      assert_equal_or_nil $default_position, new_noup.pos
+
+      last1 = ListMixin.where('pos IS NOT NULL').order('pos').last
+      last2 = ListMixin.where('pos IS NOT NULL').order('pos').last
       last1.insert_at(1)
       last2.insert_at(1)
-      assert_equal [1, 2, 3, 4, 5], ListMixin.where(parent_id: 20).order('pos').map(&:pos)
+      pos_list = ListMixin.where(parent_id: 20).order("pos ASC#{' NULLS FIRST' if ENV['DB'] == 'postgresql'}").map(&:pos)
+      assert_equal [$default_position, 1, 2, 3, 4, 5], pos_list
     end
 
     def test_delete_middle
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
 
-
-
       ListMixin.where(id: 2).first.destroy
 
       assert_equal [1, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
@@ -131,6 +141,12 @@ module Shared
 
       assert_equal 1, ListMixin.where(id: 3).first.pos
       assert_equal 2, ListMixin.where(id: 4).first.pos
+
+      ListMixin.acts_as_list_no_update { ListMixin.where(id: 3).first.destroy }
+
+      assert_equal [4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
+
+      assert_equal 2, ListMixin.where(id: 4).first.pos
     end
 
     def test_with_string_based_scope
@@ -175,10 +191,8 @@ module Shared
 
       ListMixin.where(id: 2).first.remove_from_list
 
-      assert_equal [2, 1, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
-
       assert_equal 1,   ListMixin.where(id: 1).first.pos
-      assert_equal nil, ListMixin.where(id: 2).first.pos
+      assert_nil        ListMixin.where(id: 2).first.pos
       assert_equal 2,   ListMixin.where(id: 3).first.pos
       assert_equal 3,   ListMixin.where(id: 4).first.pos
     end
@@ -243,14 +257,24 @@ module Shared
 
       assert_equal [5, 1, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
 
+      new6 = ListMixin.new(parent_id: 5)
+      new6.pos = 3
+      new6.save!
+      assert_equal 3, new6.pos
+      assert !new6.first?
+      assert !new6.last?
+
+      assert_equal [5, 1, 6, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
+
       new = ListMixin.new(parent_id: 5)
       new.pos = 3
-      new.save!
+      ListMixin.acts_as_list_no_update { new.save! }
       assert_equal 3, new.pos
+      assert_equal 3, new6.pos
       assert !new.first?
       assert !new.last?
 
-      assert_equal [5, 1, 6, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos').map(&:id)
+      assert_equal [5, 1, 6, 7, 2, 3, 4], ListMixin.where(parent_id: 5).order('pos, id').map(&:id)
     end
 
     def test_non_persisted_records_dont_get_lock_called

data/test/shared_list_sub.rb

@@ -49,12 +49,16 @@ module Shared
       end
 
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5000).order('pos').map(&:id)
+      assert_equal [5, 10, 15, 20], ListMixin.where(parent_id: 5000).order('id').map(&:pos)
 
       ListMixin.where(id: 2).first.move_lower
       assert_equal [1, 3, 2, 4], ListMixin.where(parent_id: 5000).order('pos').map(&:id)
+      assert_equal [5, 15, 10, 20], ListMixin.where(parent_id: 5000).order('id').map(&:pos)
+
 
       ListMixin.where(id: 2).first.move_higher
       assert_equal [1, 2, 3, 4], ListMixin.where(parent_id: 5000).order('pos').map(&:id)
+      assert_equal [5, 10, 15, 20], ListMixin.where(parent_id: 5000).order('id').map(&:pos)
 
       ListMixin.where(id: 1).first.move_to_bottom
       assert_equal [2, 3, 4, 1], ListMixin.where(parent_id: 5000).order('pos').map(&:id)
@@ -93,7 +97,7 @@ module Shared
 
       li3.update_column(:pos, 2) # Make the same position as li2
 
-      assert_equal [1, 2, 2, 4], ListMixin.pluck(:pos)
+      assert_equal [1, 2, 2, 4], ListMixin.order(:pos).pluck(:pos)
 
       assert_equal [li3, li4], li2.lower_items
       assert_equal [li2, li4], li3.lower_items
@@ -118,6 +122,9 @@ module Shared
       new = ListMixinSub1.create("parent_id" => 20)
       assert_equal 3, new.pos
 
+      new_noup = ListMixinSub1.acts_as_list_no_update { ListMixinSub1.create("parent_id" => 20) }
+      assert_equal_or_nil $default_position, new_noup.pos
+
       new4 = ListMixin.create("parent_id" => 20)
       assert_equal 4, new4.pos
 
@@ -141,6 +148,9 @@ module Shared
 
       new4.reload
       assert_equal 5, new4.pos
+
+      new_noup.reload
+      assert_equal_or_nil $default_position, new_noup.pos
     end
 
     def test_delete_middle
@@ -160,6 +170,12 @@ module Shared
 
       assert_equal 1, ListMixin.where(id: 3).first.pos
       assert_equal 2, ListMixin.where(id: 4).first.pos
+
+      ListMixin.acts_as_list_no_update { ListMixin.where(id: 3).first.destroy }
+
+      assert_equal [4], ListMixin.where(parent_id: 5000).order('pos').map(&:id)
+
+      assert_equal 2, ListMixin.where(id: 4).first.pos
     end
 
     def test_acts_as_list_class

data/test/shared_no_addition.rb

@@ -6,11 +6,11 @@ module Shared
 
     def test_insert
       new = NoAdditionMixin.create(parent_id: 20)
-      assert_equal nil, new.pos
+      assert_nil new.pos
       assert !new.in_list?
 
       new = NoAdditionMixin.create(parent_id: 20)
-      assert_equal nil, new.pos
+      assert_nil new.pos
     end
 
     def test_update_does_not_add_to_list

data/test/shared_top_addition.rb

@@ -46,9 +46,14 @@ module Shared
       assert new.first?
       assert !new.last?
 
+      new = TopAdditionMixin.acts_as_list_no_update { TopAdditionMixin.create(parent_id: 20) }
+      assert_equal_or_nil $default_position, new.pos
+      assert_equal $default_position.is_a?(Fixnum), new.first?
+      assert !new.last?
+
       new = TopAdditionMixin.create(parent_id: 20)
       assert_equal 1, new.pos
-      assert new.first?
+      assert_equal $default_position.nil?, new.first?
       assert !new.last?
 
       new = TopAdditionMixin.create(parent_id: 0)
@@ -67,6 +72,9 @@ module Shared
       new = TopAdditionMixin.create(parent_id: 20)
       assert_equal 1, new.pos
 
+      new = TopAdditionMixin.acts_as_list_no_update { TopAdditionMixin.create(parent_id: 20) }
+      assert_equal_or_nil $default_position, new.pos
+
       new4 = TopAdditionMixin.create(parent_id: 20)
       assert_equal 1, new4.pos
 
@@ -87,6 +95,13 @@ module Shared
       assert_equal 1, TopAdditionMixin.where(id: 1).first.pos
       assert_equal 2, TopAdditionMixin.where(id: 3).first.pos
       assert_equal 3, TopAdditionMixin.where(id: 4).first.pos
+
+      TopAdditionMixin.acts_as_list_no_update { TopAdditionMixin.where(id: 3).first.destroy }
+
+      assert_equal [1, 4], TopAdditionMixin.where(parent_id: 5).order('pos').map(&:id)
+
+      assert_equal 1, TopAdditionMixin.where(id: 1).first.pos
+      assert_equal 3, TopAdditionMixin.where(id: 4).first.pos
     end
 
   end