prefixed_ids 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a72c0361e99045f5e380aafa8e671be149ce14bdfb1bc83fb8520f72f4d63ac
-  data.tar.gz: fe98952521f2b62e4e1bbce4d66fe8a1c6d2074ce61e07cdbfaec2abfd07ac81
+  metadata.gz: 73928771de7b068333b2db44b844d9018cd0a583067268374eafca46426c8bc8
+  data.tar.gz: fc5d49d74a69e210378c8c7ec2d980aa39fce0e61882a96207e4f03beb4ee2c0
 SHA512:
-  metadata.gz: 9386a5f418e0c547540e4589fde5633efe4aa61518f472d33f2e812de2140efe4d4cff0474153722e0dae4e6b5c6923a382a9883787ccc9fa5383573c672fd69
-  data.tar.gz: 011ab4e58529325474cbbb6b2f09d0c17daa6118b4ecb2866dad4b10997e1b64234f33e9d306bbec97e150c209617d00ef5a041b9c46f96440a35327082ab0e0
+  metadata.gz: 1ddaffaaf511acab48e02dee0664a9d6310e24306e36792800e5afeba9e58b0c6a8e0413f2fd0da521d2e900d8dda2c5d8c8dea36b4a67b0b47566971620f28b
+  data.tar.gz: 5d2406555e427e660ddbe71a8c3c9448ab27e54acf0427f6e232c655224524173ed4492c6352a36be191a62b91652efbf1556c6588f26d836da853cc9da99152

data/lib/prefixed_ids/prefix_id.rb

@@ -13,7 +13,7 @@ module PrefixedIds
     def encode(id)
       return if id.nil?
 
-      @prefix + @delimiter + @hashids.encode(TOKEN, id)
+      @prefix + @delimiter + @hashids.encode([TOKEN] + Array.wrap(id))
     end
 
     # decode returns an array
@@ -21,17 +21,19 @@ module PrefixedIds
       fallback_value = fallback ? id : nil
       _, id_without_prefix = PrefixedIds.split_id(id, @delimiter)
       decoded_hashid = @hashids.decode(id_without_prefix)
-      if fallback && !valid?(decoded_hashid)
+
+      if !valid?(decoded_hashid)
         fallback_value
       else
-        decoded_hashid.last
+        _, id, *composite = decoded_hashid
+        composite.empty? ? id : composite
       end
     end
 
     private
 
     def valid?(decoded_hashid)
-      decoded_hashid.size == 2 && decoded_hashid.first == TOKEN
+      decoded_hashid.size >= 2 && decoded_hashid.first == TOKEN
     end
   end
 end

data/lib/prefixed_ids/version.rb

@@ -1,3 +1,3 @@
 module PrefixedIds
-  VERSION = "1.7.1"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefixed_ids
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails