Handle composite foreign keys in positioning scope changes

lib/positioning.rb

@@ -35,7 +35,7 @@ def positioned(on: [], column: :position)
             reflection = reflections[scope_component]
 
             if reflection&.belongs_to?
-              positioning_columns[column][:scope_columns] << reflection.foreign_key
+              positioning_columns[column][:scope_columns].concat Array(reflection.foreign_key).map(&:to_s)
               positioning_columns[column][:scope_columns] << reflection.foreign_type if reflection.polymorphic?
               positioning_columns[column][:scope_associations] << reflection.name
             else

lib/positioning/mechanisms.rb

@@ -221,8 +221,12 @@ def positioning_scope_changed?
     end
 
     def destroyed_via_positioning_scope?
-      @positioned.destroyed_by_association && scope_columns.any? do |scope_column|
-        @positioned.destroyed_by_association.foreign_key == scope_column
+      return false unless @positioned.destroyed_by_association
+
+      foreign_keys = Array(@positioned.destroyed_by_association.foreign_key).map(&:to_s)
+
+      scope_columns.any? do |scope_column|
+        foreign_keys.include?(scope_column.to_s)
       end
     end
   end

test/test_positioning.rb

@@ -566,6 +566,32 @@ def test_destroyed_via_positioning_scope?
     list.destroy
     assert mechanisms.send(:destroyed_via_positioning_scope?)
   end
+
+  def test_destroyed_via_positioning_scope_with_composite_foreign_key
+    list = List.create name: "List"
+    item = list.items.create name: "Item"
+
+    mechanisms = Positioning::Mechanisms.new(item, :position)
+
+    mock_association = mock
+    mock_association.stubs(:foreign_key).returns(["list_id", "other_key"])
+    item.stubs(:destroyed_by_association).returns(mock_association)
+
+    assert mechanisms.send(:destroyed_via_positioning_scope?)
+  end
+
+  def test_destroyed_via_positioning_scope_with_composite_foreign_key_no_match
+    list = List.create name: "List"
+    item = list.items.create name: "Item"
+
+    mechanisms = Positioning::Mechanisms.new(item, :position)
+
+    mock_association = mock
+    mock_association.stubs(:foreign_key).returns(["other_key", "another_key"])
+    item.stubs(:destroyed_by_association).returns(mock_association)
+
+    refute mechanisms.send(:destroyed_via_positioning_scope?)
+  end
 end
 
 class TestPositioningScopes < Minitest::Test

vendor/bundle/ruby/3.2.0/bin/minitest

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby3.2
+#
+# This file was generated by RubyGems.
+#
+# The application 'minitest' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('minitest', 'minitest', version)
+else
+gem "minitest", version
+load Gem.bin_path("minitest", "minitest", version)
+end

vendor/bundle/ruby/3.2.0/bin/racc

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby3.2
+#
+# This file was generated by RubyGems.
+#
+# The application 'racc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('racc', 'racc', version)
+else
+gem "racc", version
+load Gem.bin_path("racc", "racc", version)
+end

vendor/bundle/ruby/3.2.0/bin/rake

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby3.2
+#
+# This file was generated by RubyGems.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('rake', 'rake', version)
+else
+gem "rake", version
+load Gem.bin_path("rake", "rake", version)
+end

vendor/bundle/ruby/3.2.0/bin/rubocop

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby3.2
+#
+# This file was generated by RubyGems.
+#
+# The application 'rubocop' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('rubocop', 'rubocop', version)
+else
+gem "rubocop", version
+load Gem.bin_path("rubocop", "rubocop", version)
+end

vendor/bundle/ruby/3.2.0/bin/ruby-parse

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby3.2
+#
+# This file was generated by RubyGems.
+#
+# The application 'parser' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('parser', 'ruby-parse', version)
+else
+gem "parser", version
+load Gem.bin_path("parser", "ruby-parse", version)
+end

vendor/bundle/ruby/3.2.0/bin/ruby-rewrite

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby3.2
+#
+# This file was generated by RubyGems.
+#
+# The application 'parser' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('parser', 'ruby-rewrite', version)
+else
+gem "parser", version
+load Gem.bin_path("parser", "ruby-rewrite", version)
+end

vendor/bundle/ruby/3.2.0/bin/standardrb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby3.2
+#
+# This file was generated by RubyGems.
+#
+# The application 'standard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'rubygems'
+
+Gem.use_gemdeps
+
+version = ">= 0.a"
+
+str = ARGV.first
+if str
+  str = str.b[/\A_(.*)_\z/, 1]
+  if str and Gem::Version.correct?(str)
+    version = str
+    ARGV.shift
+  end
+end
+
+if Gem.respond_to?(:activate_bin_path)
+load Gem.activate_bin_path('standard', 'standardrb', version)
+else
+gem "standard", version
+load Gem.bin_path("standard", "standardrb", version)
+end

vendor/bundle/ruby/3.2.0/extensions/x86_64-linux-gnu/3.2.0/bigdecimal-4.0.1/gem_make.out

@@ -0,0 +1,38 @@
+current directory: /home/runner/work/positioning/positioning/vendor/bundle/ruby/3.2.0/gems/bigdecimal-4.0.1/ext/bigdecimal
+/usr/bin/ruby3.2 -I/usr/lib/ruby/vendor_ruby extconf.rb
+checking for __builtin_clz()... yes
+checking for __builtin_clzl()... yes
+checking for __builtin_clzll()... yes
+checking for float.h... yes
+checking for math.h... yes
+checking for stdbool.h... yes
+checking for stdlib.h... yes
+checking for x86intrin.h... yes
+checking for _lzcnt_u32() in x86intrin.h... no
+checking for _lzcnt_u64() in x86intrin.h... no
+checking for intrin.h... no
+checking for ruby/atomic.h... yes
+checking for ruby/internal/has/builtin.h... yes
+checking for ruby/internal/static_assert.h... yes
+checking for rb_complex_real() in ruby.h... yes
+checking for rb_complex_imag() in ruby.h... yes
+checking for rb_opts_exception_p() in ruby.h... yes
+checking for rb_category_warn() in ruby.h... yes
+checking for RB_WARN_CATEGORY_DEPRECATED in ruby.h... yes
+creating Makefile
+
+current directory: /home/runner/work/positioning/positioning/vendor/bundle/ruby/3.2.0/gems/bigdecimal-4.0.1/ext/bigdecimal
+make DESTDIR\= sitearchdir\=./.gem.20260326-4917-qac7dy sitelibdir\=./.gem.20260326-4917-qac7dy clean
+
+current directory: /home/runner/work/positioning/positioning/vendor/bundle/ruby/3.2.0/gems/bigdecimal-4.0.1/ext/bigdecimal
+make DESTDIR\= sitearchdir\=./.gem.20260326-4917-qac7dy sitelibdir\=./.gem.20260326-4917-qac7dy
+compiling bigdecimal.c
+compiling missing.c
+linking shared-object bigdecimal.so
+
+current directory: /home/runner/work/positioning/positioning/vendor/bundle/ruby/3.2.0/gems/bigdecimal-4.0.1/ext/bigdecimal
+make DESTDIR\= sitearchdir\=./.gem.20260326-4917-qac7dy sitelibdir\=./.gem.20260326-4917-qac7dy install
+/usr/bin/install -c -m 0755 bigdecimal.so ./.gem.20260326-4917-qac7dy
+
+current directory: /home/runner/work/positioning/positioning/vendor/bundle/ruby/3.2.0/gems/bigdecimal-4.0.1/ext/bigdecimal
+make DESTDIR\= sitearchdir\=./.gem.20260326-4917-qac7dy sitelibdir\=./.gem.20260326-4917-qac7dy clean