positioning 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02113cf1d0279ee7f3b304429eb5af8a4e6e46254f2397cae704191900cfd0a5
-  data.tar.gz: b248f330a5b3373b396f487bb11008a14cdf1c6f292b6c63a7000dd1150cfa8a
+  metadata.gz: '04080c2e27b8d0545c86d69fb4a7794530971ca19c1e9db969181ff01bab2f96'
+  data.tar.gz: 3e81bbd7406e0221378d78e4404629c70eb84d82849d96c6a3506982cbfdf756
 SHA512:
-  metadata.gz: 94333e70ecd013a4970c4667fb715e91fca7450bcb6c52dd57706d8134c8a02ab8fc698a4a2abcb34bbe69dac640f528cce45df351a2bb2d42958e2a77468f23
-  data.tar.gz: f273602f9fff96622aa9d9d7706570629de601468b782e186df71936084053a2368595cf116827d4c1f86775cfa4ca150eef0e662895bf79c3afd6560d3002b0
+  metadata.gz: ef7cd59860371c435080925d38d994ac8b6a538de4c3a2687f602959792d7d9d1ba91c3df8c91c74ecf284f65ac432d7fc88b2d7ea3710c22c5f27641398f58e
+  data.tar.gz: 108ded7f5f7756f05dbc19b863bc723ed4e32e41737b6eecded5d0a6e0ab8a19e65a05bb330ce3625f5a61736ed0c4f816a3183efde8b7d17d0bcfbd5518ddda

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.2.5] - 2024-08-10
+
+- Implemented composite primary key support. Thanks @jackozi for the original PR and the nudge to get this done!
+
 ## [0.2.4] - 2024-07-31
 
 - Avoid unnecessary SQL queries when the position hasn't changed.

data/lib/positioning/mechanisms.rb

@@ -50,12 +50,8 @@ module Positioning
       @positioned.class.base_class
     end
 
-    def primary_key_column
-      base_class.primary_key
-    end
-
     def primary_key
-      @positioned.send primary_key_column
+      base_class.primary_key
     end
 
     def quoted_column
@@ -63,7 +59,7 @@ module Positioning
     end
 
     def record_scope
-      base_class.where("#{primary_key_column}": primary_key)
+      base_class.where(primary_key => [@positioned.id])
     end
 
     def position
@@ -125,19 +121,19 @@ module Positioning
       when nil, "", :last, {before: nil}, {before: ""}
         self.position = last_position
       when Hash
-        relative_position, relative_record_or_primary_key = *position_before_type_cast.first
+        relative_position, relative_record_or_id = *position_before_type_cast.first
 
         unless [:before, :after].include? relative_position
           raise Error.new, "relative `#{@column}` must be either :before, :after"
         end
 
-        relative_primary_key = if relative_record_or_primary_key.is_a? base_class
-          relative_record_or_primary_key.send(primary_key_column)
+        relative_id = if relative_record_or_id.is_a? base_class
+          relative_record_or_id.id
         else
-          relative_record_or_primary_key
+          relative_record_or_id
         end
 
-        relative_record_scope = positioning_scope.where("#{primary_key_column}": relative_primary_key)
+        relative_record_scope = positioning_scope.where(primary_key => [relative_id])
 
         unless relative_record_scope.exists?
           raise Error.new, "relative `#{@column}` record must be in the same scope"
@@ -153,8 +149,8 @@ module Positioning
       unless position.is_a? Integer
         raise Error.new,
           %(`#{@column}` must be an Integer, :first, :last, ) +
-            %{before: (#{base_class.name}, #{primary_key_column}, nil, or ""), } +
-            %{after: (#{base_class.name}, #{primary_key_column}, nil or ""), nil or ""}
+            %{before: (#{base_class.name}, #{primary_key}, nil, or ""), } +
+            %{after: (#{base_class.name}, #{primary_key}, nil or ""), nil or ""}
       end
     end
 
@@ -175,7 +171,7 @@ module Positioning
     end
 
     def in_positioning_scope?
-      @positioned.persisted? && positioning_scope.where("#{primary_key_column}": primary_key).exists?
+      @positioned.persisted? && positioning_scope.where(primary_key => [@positioned.id]).exists?
     end
 
     def positioning_scope_changed?

data/lib/positioning/version.rb

@@ -1,3 +1,3 @@
 module Positioning
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: positioning
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Brendon Muir
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport