acts_as_list 0.8.2 → 0.9.0

data/test/shared_zero_based.rb

@@ -15,6 +15,11 @@ module Shared
       assert !new.first?
       assert new.last?
 
+      new = ZeroBasedMixin.acts_as_list_no_update { ZeroBasedMixin.create(parent_id: 20) }
+      assert_equal_or_nil $default_position, new.pos
+      assert !new.first?
+      assert !new.last?
+
       new = ZeroBasedMixin.create(parent_id: 20)
       assert_equal 2, new.pos
       assert !new.first?
@@ -63,6 +68,9 @@ module Shared
       new = ZeroBasedMixin.create(parent_id: 20)
       assert_equal 2, new.pos
 
+      new_noup = ZeroBasedMixin.acts_as_list_no_update { ZeroBasedMixin.create(parent_id: 20) }
+      assert_equal_or_nil $default_position, new_noup.pos
+
       new4 = ZeroBasedMixin.create(parent_id: 20)
       assert_equal 3, new4.pos
 
@@ -86,6 +94,9 @@ module Shared
 
       new4.reload
       assert_equal 4, new4.pos
+
+      new_noup.reload
+      assert_equal_or_nil $default_position, new_noup.pos
     end
   end
 end

data/test/test_joined_list.rb

@@ -1,6 +1,7 @@
 require 'helper'
 
-ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
+db_config = YAML.load_file(File.expand_path("../database.yml", __FILE__)).fetch(ENV["DB"] || "sqlite")
+ActiveRecord::Base.establish_connection(db_config)
 ActiveRecord::Schema.verbose = false
 
 class Section < ActiveRecord::Base
@@ -36,7 +37,12 @@ class JoinedTestCase < Minitest::Test
   end
 
   def teardown
-    ActiveRecord::Base.connection.tables.each do |table|
+    if ActiveRecord::VERSION::MAJOR >= 5
+      tables = ActiveRecord::Base.connection.data_sources
+    else
+      tables = ActiveRecord::Base.connection.tables
+    end
+    tables.each do |table|
       ActiveRecord::Base.connection.drop_table(table)
     end
     super

data/test/test_list.rb

@@ -1,16 +1,19 @@
 # NOTE: following now done in helper.rb (better Readability)
 require 'helper'
 
-ActiveRecord::Base.establish_connection(
-  adapter: "sqlite3",
-  database: 'file:memdb1?mode=memory&cache=shared'
-)
+db_config = YAML.load_file(File.expand_path("../database.yml", __FILE__)).fetch(ENV["DB"] || "sqlite")
+ActiveRecord::Base.establish_connection(db_config)
 ActiveRecord::Schema.verbose = false
 
 def setup_db(position_options = {})
+  $default_position = position_options[:default]
+  
+  # sqlite cannot drop/rename/alter columns and add constraints after table creation
+  sqlite = ENV.fetch("DB", "sqlite") == "sqlite"
+
   # AR caches columns options like defaults etc. Clear them!
   ActiveRecord::Base.connection.create_table :mixins do |t|
-    t.column :pos, :integer, position_options
+    t.column :pos, :integer, position_options unless position_options[:positive] && sqlite
     t.column :active, :boolean, default: true
     t.column :parent_id, :integer
     t.column :parent_type, :string
@@ -19,6 +22,20 @@ def setup_db(position_options = {})
     t.column :state, :integer
   end
 
+  if position_options[:unique] && !(sqlite && position_options[:positive])
+    ActiveRecord::Base.connection.add_index :mixins, :pos, unique: true
+  end
+  
+  if position_options[:positive]
+    if sqlite
+      # SQLite cannot add constraint after table creation, also cannot add unique inside ADD COLUMN
+      ActiveRecord::Base.connection.execute('ALTER TABLE mixins ADD COLUMN pos integer8 NOT NULL CHECK (pos > 0) DEFAULT 1')
+      ActiveRecord::Base.connection.execute('CREATE UNIQUE INDEX index_mixins_on_pos ON mixins(pos)')
+    else
+      ActiveRecord::Base.connection.execute('ALTER TABLE mixins ADD CONSTRAINT pos_check CHECK (pos > 0)')
+    end
+  end
+
   # This table is used to test table names and column names quoting
   ActiveRecord::Base.connection.create_table 'table-name' do |t|
     t.column :order, :integer
@@ -115,6 +132,14 @@ class DefaultScopedWhereMixin < Mixin
   end
 end
 
+class SequentialUpdatesDefault < Mixin
+  acts_as_list column: "pos"
+end
+
+class SequentialUpdatesFalseMixin < Mixin
+  acts_as_list column: "pos", sequential_updates: false
+end
+
 class TopAdditionMixin < Mixin
   acts_as_list column: "pos", add_new_at: :top, scope: :parent_id
 end
@@ -163,13 +188,6 @@ end
 class TheBaseSubclass < TheBaseClass
 end
 
-class DBConfigTest < Minitest::Test
-  def test_db_config
-    # make sure sqlite3 accepts multi threaded access
-    assert_equal "file:memdb1?mode=memory&cache=shared", ActiveRecord::Base.connection.pool.spec.config[:database]
-  end
-end
-
 class QuotedList < ActiveRecord::Base
   self.table_name = 'table-name'
   acts_as_list column: :order
@@ -239,7 +257,7 @@ class ListTest < ActsAsListTestCase
     wait_for_it = false
     threads.each(&:join)
 
-    assert_equal (1..n).to_a, ListMixin.where(parent_id: 1).order('pos').map(&:pos)
+    assert_equal((1..n).to_a, ListMixin.where(parent_id: 1).order('pos').map(&:pos))
   end
 end
 
@@ -326,6 +344,11 @@ class DefaultScopedTest < ActsAsListTestCase
     assert !new.first?
     assert new.last?
 
+    new = DefaultScopedMixin.acts_as_list_no_update { DefaultScopedMixin.create }
+    assert_equal_or_nil $default_position, new.pos
+    assert_equal $default_position.is_a?(Fixnum), new.first?
+    assert !new.last?
+
     new = DefaultScopedMixin.create
     assert_equal 7, new.pos
     assert !new.first?
@@ -361,6 +384,9 @@ class DefaultScopedTest < ActsAsListTestCase
     new = DefaultScopedMixin.create
     assert_equal 6, new.pos
 
+    new_noup = DefaultScopedMixin.acts_as_list_no_update { DefaultScopedMixin.create }
+    assert_equal_or_nil $default_position, new_noup.pos
+
     new = DefaultScopedMixin.create
     assert_equal 7, new.pos
 
@@ -387,6 +413,9 @@ class DefaultScopedTest < ActsAsListTestCase
 
     new4.reload
     assert_equal 4, new4.pos
+
+    new_noup.reload
+    assert_equal_or_nil $default_position, new_noup.pos
   end
 
   def test_update_position
@@ -419,6 +448,11 @@ class DefaultScopedWhereTest < ActsAsListTestCase
     assert !new.first?
     assert new.last?
 
+    new = DefaultScopedWhereMixin.acts_as_list_no_update { DefaultScopedWhereMixin.create }
+    assert_equal_or_nil $default_position, new.pos
+    assert_equal $default_position.is_a?(Fixnum), new.first?
+    assert !new.last?
+
     new = DefaultScopedWhereMixin.create
     assert_equal 7, new.pos
     assert !new.first?
@@ -457,6 +491,9 @@ class DefaultScopedWhereTest < ActsAsListTestCase
     new = DefaultScopedWhereMixin.create
     assert_equal 7, new.pos
 
+    new_noup = DefaultScopedWhereMixin.acts_as_list_no_update { DefaultScopedWhereMixin.create }
+    assert_equal_or_nil $default_position, new_noup.pos
+
     new4 = DefaultScopedWhereMixin.create
     assert_equal 8, new4.pos
 
@@ -480,6 +517,9 @@ class DefaultScopedWhereTest < ActsAsListTestCase
 
     new4.reload
     assert_equal 4, new4.pos
+
+    new_noup.reload
+    assert_equal_or_nil $default_position, new_noup.pos
   end
 
   def test_update_position
@@ -534,10 +574,20 @@ class MultiDestroyTest < ActsAsListTestCase
     new3 = DefaultScopedMixin.create
     assert_equal 3, new3.pos
 
+    new4 = DefaultScopedMixin.create
+    assert_equal 4, new4.pos
+
     new1.destroy
     new2.destroy
     new3.reload
+    new4.reload
     assert_equal 1, new3.pos
+    assert_equal 2, new4.pos
+
+    DefaultScopedMixin.acts_as_list_no_update { new3.destroy }
+
+    new4.reload
+    assert_equal 2, new4.pos
   end
 end
 
@@ -670,65 +720,79 @@ class MultipleListsArrayScopeTest < ActsAsListTestCase
   end
 end
 
+require 'timecop'
+
 class TouchTest < ActsAsListTestCase
   def setup
     setup_db
-    4.times { ListMixin.create! updated_at: yesterday }
+    Timecop.freeze(yesterday) do
+      4.times { ListMixin.create! }
+    end
   end
 
   def now
-    Time.now.utc
+    @now ||= Time.current
   end
 
   def yesterday
-    1.day.ago
+    @yesterday ||= 1.day.ago
   end
 
   def updated_ats
-    ListMixin.pluck(:updated_at)
+    ListMixin.order(:id).pluck(:updated_at)
   end
 
   def test_moving_item_lower_touches_self_and_lower_item
-    ListMixin.first.move_lower
-    updated_ats[0..1].each do |updated_at|
-      assert_in_delta updated_at, now, 1.second
-    end
-    updated_ats[2..3].each do |updated_at|
-      assert_in_delta updated_at, yesterday, 1.second
+    Timecop.freeze(now) do
+      ListMixin.first.move_lower
+      updated_ats[0..1].each do |updated_at|
+        assert_equal updated_at.to_i, now.to_i
+      end
+      updated_ats[2..3].each do |updated_at|
+        assert_equal updated_at.to_i, yesterday.to_i
+      end
     end
   end
 
   def test_moving_item_higher_touches_self_and_higher_item
-    ListMixin.all.second.move_higher
-    updated_ats[0..1].each do |updated_at|
-      assert_in_delta updated_at, now, 1.second
-    end
-    updated_ats[2..3].each do |updated_at|
-      assert_in_delta updated_at, yesterday, 1.second
+    Timecop.freeze(now) do
+      ListMixin.all.second.move_higher
+      updated_ats[0..1].each do |updated_at|
+        assert_equal updated_at.to_i, now.to_i
+      end
+      updated_ats[2..3].each do |updated_at|
+        assert_equal updated_at.to_i, yesterday.to_i
+      end
     end
   end
 
   def test_moving_item_to_bottom_touches_all_other_items
-    ListMixin.first.move_to_bottom
-    updated_ats.each do |updated_at|
-      assert_in_delta updated_at, now, 1.second
+    Timecop.freeze(now) do
+      ListMixin.first.move_to_bottom
+      updated_ats.each do |updated_at|
+        assert_equal updated_at.to_i, now.to_i
+      end
     end
   end
 
   def test_moving_item_to_top_touches_all_other_items
-    ListMixin.last.move_to_top
-    updated_ats.each do |updated_at|
-      assert_in_delta updated_at, now, 1.second
+    Timecop.freeze(now) do
+      ListMixin.last.move_to_top
+      updated_ats.each do |updated_at|
+        assert_equal updated_at.to_i, now.to_i
+      end
     end
   end
 
   def test_removing_item_touches_all_lower_items
-    ListMixin.all.third.remove_from_list
-    updated_ats[0..1].each do |updated_at|
-      assert_in_delta updated_at, yesterday, 1.second
-    end
-    updated_ats[2..2].each do |updated_at|
-      assert_in_delta updated_at, now, 1.second
+    Timecop.freeze(now) do
+      ListMixin.all.third.remove_from_list
+      updated_ats[0..1].each do |updated_at|
+        assert_equal updated_at.to_i, yesterday.to_i
+      end
+      updated_ats[2..2].each do |updated_at|
+        assert_equal updated_at.to_i, now.to_i
+      end
     end
   end
 end
@@ -768,8 +832,9 @@ class NilPositionTest < ActsAsListTestCase
     new3.reload.pos = 1
     new3.save
 
-    assert_equal [nil, 1, 2], DefaultScopedMixin.all.map(&:pos)
-    assert_equal [2, 3, 1], DefaultScopedMixin.all.map(&:id)
+    assert_equal [1, 2], DefaultScopedMixin.where("pos IS NOT NULL").map(&:pos)
+    assert_equal [3, 1], DefaultScopedMixin.where("pos IS NOT NULL").map(&:id)
+    assert_nil new2.reload.pos
 
     new2.reload.pos = 1
     new2.save
@@ -777,4 +842,43 @@ class NilPositionTest < ActsAsListTestCase
     assert_equal [1, 2, 3], DefaultScopedMixin.all.map(&:pos)
     assert_equal [2, 3, 1], DefaultScopedMixin.all.map(&:id)
   end
-end
+end
+
+class SequentialUpdatesOptionDefaultTest < ActsAsListTestCase
+  def setup
+    setup_db
+  end
+
+  def test_sequential_updates_default_to_false_without_unique_index
+    assert_equal false, SequentialUpdatesDefault.new.send(:sequential_updates?)
+  end
+end
+
+class SequentialUpdatesMixinNotNullUniquePositiveConstraintsTest < ActsAsListTestCase
+  def setup
+    setup_db null: false, unique: true, positive: true
+    (1..4).each { |counter| SequentialUpdatesDefault.create!({pos: counter}) }
+  end
+
+  def test_sequential_updates_default_to_true_with_unique_index
+    assert_equal true, SequentialUpdatesDefault.new.send(:sequential_updates?)
+  end
+
+  def test_sequential_updates_option_override_with_false
+    assert_equal false, SequentialUpdatesFalseMixin.new.send(:sequential_updates?)
+  end
+
+  def test_insert_at
+    new = SequentialUpdatesDefault.create
+    assert_equal 5, new.pos
+
+    new.insert_at(1)
+    assert_equal 1, new.pos
+
+    new.insert_at(5)
+    assert_equal 5, new.pos
+
+    new.insert_at(3)
+    assert_equal 3, new.pos
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -65,8 +65,17 @@ files:
 - gemfiles/rails_5_0.gemfile
 - init.rb
 - lib/acts_as_list.rb
+- lib/acts_as_list/active_record/acts/add_new_at_method_definer.rb
+- lib/acts_as_list/active_record/acts/aux_method_definer.rb
+- lib/acts_as_list/active_record/acts/callback_definer.rb
+- lib/acts_as_list/active_record/acts/column_method_definer.rb
 - lib/acts_as_list/active_record/acts/list.rb
+- lib/acts_as_list/active_record/acts/no_update.rb
+- lib/acts_as_list/active_record/acts/scope_method_definer.rb
+- lib/acts_as_list/active_record/acts/sequential_updates_method_definer.rb
+- lib/acts_as_list/active_record/acts/top_of_list_method_definer.rb
 - lib/acts_as_list/version.rb
+- test/database.yml
 - test/helper.rb
 - test/shared.rb
 - test/shared_array_scope_list.rb
@@ -104,6 +113,7 @@ specification_version: 4
 summary: A gem adding sorting, reordering capabilities to an active_record model,
   allowing it to act as a list
 test_files:
+- test/database.yml
 - test/helper.rb
 - test/shared.rb
 - test/shared_array_scope_list.rb