acts_as_list 1.0.4 → 1.2.0

data/test/test_list.rb

@@ -7,11 +7,13 @@ 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"
+  sqlite = ENV.fetch("DB") == "sqlite"
+  unique = position_options.delete(:unique)
+  positive = position_options.delete(:positive)
 
   # AR caches columns options like defaults etc. Clear them!
   ActiveRecord::Base.connection.create_table :mixins do |t|
-    t.column :pos, :integer, **position_options unless position_options[:positive] && sqlite
+    t.column :pos, :integer, **position_options unless positive && sqlite
     t.column :active, :boolean, default: true
     t.column :parent_id, :integer
     t.column :parent_type, :string
@@ -20,11 +22,11 @@ def setup_db(position_options = {})
     t.column :state, :integer
   end
 
-  if position_options[:unique] && !(sqlite && position_options[:positive])
+  if unique && !(sqlite && positive)
     ActiveRecord::Base.connection.add_index :mixins, :pos, unique: true
   end
 
-  if position_options[:positive]
+  if 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')
@@ -48,9 +50,21 @@ def setup_db(position_options = {})
 
   ActiveRecord::Base.connection.add_index 'altid-table', :pos, unique: true
 
+  # This table is used to test table names with a composite primary_key
+  ActiveRecord::Base.connection.create_table 'composite-primary-key-table', primary_key: [:first_id, :second_id] do |t|
+    t.integer :first_id, null: false
+    t.integer :second_id, null: false
+    t.column :parent_id, :integer
+    t.column :parent_type, :string
+    t.column :pos, :integer
+    t.column :created_at, :datetime
+    t.column :updated_at, :datetime
+    t.column :state, :integer
+  end
+
   mixins = [ Mixin, ListMixin, ListMixinSub1, ListMixinSub2, ListWithStringScopeMixin,
     ArrayScopeListMixin, ZeroBasedMixin, DefaultScopedMixin, EnumArrayScopeListMixin,
-    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin, QuotedList, TouchDisabledMixin ]
+    DefaultScopedWhereMixin, TopAdditionMixin, NoAdditionMixin, QuotedList, TouchDisabledMixin, CompositePrimaryKeyList, CompositePrimaryKeyListScoped ]
 
   ActiveRecord::Base.connection.schema_cache.clear!
   mixins.each do |klass|
@@ -194,6 +208,21 @@ class QuotedList < ActiveRecord::Base
   acts_as_list column: :order
 end
 
+class CompositePrimaryKeyList < ActiveRecord::Base
+  self.table_name = "composite-primary-key-table"
+  self.primary_key = [:first_id, :second_id] 
+
+  acts_as_list column: "pos"
+end
+
+class CompositePrimaryKeyListScoped < CompositePrimaryKeyList
+  acts_as_list column: "pos", scope: :parent_id
+end
+
+class CompositePrimaryKeyListScopedError < CompositePrimaryKeyListScoped
+  validates :state, presence: true
+end
+
 class ActsAsListTestCase < Minitest::Test
   # No default test required as this class is abstract.
   # Need for test/unit.
@@ -604,6 +633,42 @@ class MultiDestroyTest < ActsAsListTestCase
   end
 end
 
+class MultiUpdateTest < ActsAsListTestCase
+
+  def setup
+    setup_db
+  end
+
+  def test_multiple_updates_within_transaction
+    @page = ListMixin.create! id: 100, parent_id: nil, pos: 1
+    @row = ListMixin.create! parent_id: @page.id, pos: 1
+    @column1 = ListMixin.create! parent_id: @row.id, pos: 1
+    @column2 = ListMixin.create! parent_id: @row.id, pos: 2
+    @rich_text1 = ListMixin.create! parent_id: @column1.id, pos: 1
+    @rich_text2 = ListMixin.create! parent_id: @column2.id, pos: 1
+
+    ActiveRecord::Base.transaction do
+      @rich_text1.update!(parent_id: @column2.id, pos: 1)
+
+      assert_equal [@rich_text1.id, @rich_text2.id], ListMixin.where(parent_id: @column2.id).order('pos').map(&:id)
+      assert_equal [1, 2], ListMixin.where(parent_id: @column2.id).order('pos').map(&:pos)
+
+      @column1.destroy!
+      assert_equal [@column2.id], ListMixin.where(parent_id: @row.id).order('pos').map(&:id)
+      assert_equal [1], ListMixin.where(parent_id: @row.id).order('pos').map(&:pos)
+
+      @rich_text1.update!(parent_id: @page.id, pos: 1)
+      @rich_text2.update!(parent_id: @page.id, pos: 2)
+      @row.destroy!
+      @column2.destroy!
+    end
+
+    assert_equal(1, @page.reload.pos)
+    assert_equal [@rich_text1.id, @rich_text2.id], ListMixin.where(parent_id: @page.id).order('pos').map(&:id)
+    assert_equal [1, 2], ListMixin.where(parent_id: @page.id).order('pos').map(&:pos)
+  end
+end
+
 #class TopAdditionMixin < Mixin
 
 class TopAdditionTest < ActsAsListTestCase
@@ -1084,3 +1149,105 @@ class SequentialUpdatesMixinNotNullUniquePositiveConstraintsTest < ActsAsListTes
     end
   end
 end
+
+if ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR >= 1 || ActiveRecord::VERSION::MAJOR > 7
+  class CompositePrimaryKeyListTest < ActsAsListTestCase
+    def setup
+      setup_db
+      (1..4).each { |counter| CompositePrimaryKeyList.create!({first_id: counter, second_id: counter, pos: counter}) }
+    end
+
+    def test_insert_at
+      new = CompositePrimaryKeyList.create({first_id: 5, second_id: 5})
+      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
+
+    def test_move_lower
+      item = CompositePrimaryKeyList.order(:pos).first
+      item.move_lower
+      assert_equal 2, item.pos
+    end
+
+    def test_move_higher
+      item = CompositePrimaryKeyList.order(:pos).second
+      item.move_higher
+      assert_equal 1, item.pos
+    end
+
+    def test_move_to_bottom
+      item = CompositePrimaryKeyList.order(:pos).first
+      item.move_to_bottom
+      assert_equal 4, item.pos
+    end
+
+    def test_move_to_top
+      new_item = CompositePrimaryKeyList.create!({first_id: 5, second_id: 5})
+      assert_equal 5, new_item.pos
+
+      new_item.move_to_top
+      assert_equal 1, new_item.pos
+    end
+
+    def test_remove_from_list
+      assert_equal true, CompositePrimaryKeyList.find([1, 1]).in_list?
+      CompositePrimaryKeyList.find([1,1]).remove_from_list
+      assert_equal false, CompositePrimaryKeyList.find([1, 1]).in_list?
+    end
+
+    def test_increment_position
+      item = CompositePrimaryKeyList.order(:pos).first
+      item.increment_position
+      assert_equal 2, item.pos
+    end
+
+    def test_decrement_position
+      item = CompositePrimaryKeyList.order(:pos).second
+      item.decrement_position
+      assert_equal 1, item.pos
+    end
+
+    def test_set_list_position
+      item = CompositePrimaryKeyList.order(:pos).first
+      item.set_list_position(4)
+      assert_equal 4, item.pos
+    end
+
+    def test_create_at_top
+      new = CompositePrimaryKeyList.create({first_id: 5, second_id: 5, pos: 1})
+      assert_equal 1, new.pos
+    end
+
+    def test_destroy
+      new_item = CompositePrimaryKeyList.create({first_id: 5, second_id: 5})
+      assert_equal 5, new_item.pos
+      assert_equal true, new_item.last?
+
+      new_item.insert_at(1)
+      assert_equal 1, new_item.pos
+      assert_equal true, new_item.first?
+
+      new_item.destroy
+      assert_equal [1,2,3,4], CompositePrimaryKeyList.all.map(&:pos).sort
+    end
+  end
+
+  class CompositePrimaryKeyListScopedTest < ActsAsListTestCase
+    include Shared::List
+
+    def setup
+      setup_db
+
+      super(CompositePrimaryKeyListScoped, CompositePrimaryKeyListScopedError, :first_id)
+    end
+  end
+end
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Swanand Pagnis
 - Brendon Muir
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2024-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +17,112 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
+        version: '6.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: minitest-hooks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.8
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.6
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.5
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 description: This "acts_as" extension provides the capabilities for sorting and reordering
   a number of objects in a list. The class that has this specified needs to have a
   "position" column defined as an integer on the mapped database table.
@@ -51,21 +135,15 @@ extra_rdoc_files: []
 files:
 - ".gemtest"
 - ".github/FUNDING.yml"
+- ".github/dependabot.yml"
+- ".github/workflows/continuous_integration.yml"
 - ".gitignore"
-- ".travis.yml"
-- Appraisals
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - acts_as_list.gemspec
-- gemfiles/rails_4_2.gemfile
-- gemfiles/rails_5_0.gemfile
-- gemfiles/rails_5_1.gemfile
-- gemfiles/rails_5_2.gemfile
-- gemfiles/rails_6_0.gemfile
-- gemfiles/rails_6_1.gemfile
 - init.rb
 - lib/acts_as_list.rb
 - lib/acts_as_list/active_record/acts/active_record.rb
@@ -79,7 +157,6 @@ files:
 - 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
@@ -89,6 +166,8 @@ files:
 - test/shared_quoting.rb
 - test/shared_top_addition.rb
 - test/shared_zero_based.rb
+- test/support/ci_database.yml
+- test/support/database.yml
 - test/test_default_scope_with_select.rb
 - test/test_joined_list.rb
 - test/test_list.rb
@@ -96,14 +175,14 @@ files:
 - test/test_no_update_for_scope_destruction.rb
 - test/test_no_update_for_subclasses.rb
 - test/test_scope_with_user_defined_foreign_key.rb
-homepage: http://github.com/brendon/acts_as_list
+homepage: https://github.com/brendon/acts_as_list
 licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/brendon/acts_as_list
   bug_tracker_uri: https://github.com/brendon/acts_as_list/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -118,13 +197,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 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
@@ -134,6 +212,8 @@ test_files:
 - test/shared_quoting.rb
 - test/shared_top_addition.rb
 - test/shared_zero_based.rb
+- test/support/ci_database.yml
+- test/support/database.yml
 - test/test_default_scope_with_select.rb
 - test/test_joined_list.rb
 - test/test_list.rb

data/.travis.yml

@@ -1,55 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-before_script:
-  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-  - gem install bundler -v '< 2'
-  - mysql -e 'create database acts_as_list;'
-  - psql -c 'create database acts_as_list;' -U postgres
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-services:
-  - mysql
-  - postgresql
-env:
-  - DB=sqlite
-  - DB=mysql
-  - DB=postgresql
-gemfile:
-  - gemfiles/rails_4_2.gemfile
-  - gemfiles/rails_5_0.gemfile
-  - gemfiles/rails_5_1.gemfile
-  - gemfiles/rails_5_2.gemfile
-  - gemfiles/rails_6_0.gemfile
-  - gemfiles/rails_6_1.gemfile
-matrix:
-  exclude:
-    - rvm: 2.4
-      gemfile: gemfiles/rails_6_0.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_6_1.gemfile
-    # Ruby 2.7 uses a `bigdecimal` version that doesn't support BigDecimal.new
-    # that Rails 4.2 uses. See also:
-    # https://github.com/ruby/bigdecimal#which-version-should-you-select
-    - rvm: 2.7
-      gemfile: gemfiles/rails_4_2.gemfile
-    # Ruby 2.7 warning `sqlite3-1.3.13/lib/sqlite3/statement.rb:108: warning: rb_tainted_str_new is deprecated`
-    # and job wil exceed the maximum log length
-    # see also: https://github.com/sparklemotion/sqlite3-ruby/issues/276
-    - rvm: 2.7
-      gemfile: gemfiles/rails_5_0.gemfile
-      env: DB=sqlite
-    # Rails <6 does not support Ruby 3, see:
-    # https://github.com/rails/rails/issues/40938#issuecomment-751898275
-    - rvm: 3.0
-      gemfile: gemfiles/rails_4_2.gemfile
-    - rvm: 3.0
-      gemfile: gemfiles/rails_5_0.gemfile
-    - rvm: 3.0
-      gemfile: gemfiles/rails_5_1.gemfile
-    - rvm: 3.0
-      gemfile: gemfiles/rails_5_2.gemfile

data/Appraisals

@@ -1,40 +0,0 @@
-appraise "rails-4-2" do
-  group :mysql do
-    gem "mysql2", "~> 0.4.0"
-  end
-  group :postgresql do
-    gem "pg", "~> 0.18.4"
-  end
-  group :test do
-    gem "test_after_commit", "~> 0.4.2"
-  end
-  group :sqlite do
-    gem "sqlite3", "~> 1.3.13"
-  end
-
-  gem "activerecord", "~> 4.2.0"
-end
-
-appraise "rails-5-0" do
-  group :sqlite do
-    gem "sqlite3", "~> 1.3.13"
-  end
-
-  gem "activerecord", "~> 5.0.0"
-end
-
-appraise "rails-5-1" do
-  gem "activerecord", "~> 5.1.0"
-end
-
-appraise "rails-5-2" do
-  gem "activerecord", "~> 5.2.0"
-end
-
-appraise "rails-6-0" do
-  gem "activerecord", "~> 6.0.0"
-end
-
-appraise "rails-6-1" do
-  gem "activerecord", "6.1.0.rc1"
-end

data/gemfiles/rails_4_2.gemfile

@@ -1,32 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "activerecord", "~> 4.2.0"
-
-group :development do
-  gem "github_changelog_generator", "1.9.0"
-end
-
-group :test do
-  gem "minitest", "~> 5.0"
-  gem "timecop"
-  gem "mocha"
-  gem "test_after_commit", "~> 0.4.2"
-end
-
-group :sqlite do
-  gem "sqlite3", "~> 1.3.13"
-end
-
-group :postgresql do
-  gem "pg", "~> 0.18.4"
-end
-
-group :mysql do
-  gem "mysql2", "~> 0.4.0"
-end
-
-gemspec path: "../"

data/gemfiles/rails_5_0.gemfile

@@ -1,31 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "activerecord", "~> 5.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.3.13"
-end
-
-group :postgresql do
-  gem "pg", "~> 1.2.0"
-end
-
-group :mysql do
-  gem "mysql2", "~> 0.5.0"
-end
-
-gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -1,31 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "activerecord", "~> 5.1.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.2.0"
-end
-
-group :mysql do
-  gem "mysql2", "~> 0.5.0"
-end
-
-gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -1,31 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rake"
-gem "appraisal"
-gem "activerecord", "~> 5.2.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.2.0"
-end
-
-group :mysql do
-  gem "mysql2", "~> 0.5.0"
-end
-
-gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -1,31 +0,0 @@
-# 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.2.0"
-end
-
-group :mysql do
-  gem "mysql2", "~> 0.5.0"
-end
-
-gemspec path: "../"