prefixed_ids 1.7.1 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a72c0361e99045f5e380aafa8e671be149ce14bdfb1bc83fb8520f72f4d63ac
-  data.tar.gz: fe98952521f2b62e4e1bbce4d66fe8a1c6d2074ce61e07cdbfaec2abfd07ac81
+  metadata.gz: 4a8f6545b87098d1b31cc7b509e962f5ffb1e57ab21a883905440d565dd0bcc8
+  data.tar.gz: 9e8d4a6413d67a47c64983207ef9c18b9132320174eeb7d0020512330eb9165e
 SHA512:
-  metadata.gz: 9386a5f418e0c547540e4589fde5633efe4aa61518f472d33f2e812de2140efe4d4cff0474153722e0dae4e6b5c6923a382a9883787ccc9fa5383573c672fd69
-  data.tar.gz: 011ab4e58529325474cbbb6b2f09d0c17daa6118b4ecb2866dad4b10997e1b64234f33e9d306bbec97e150c209617d00ef5a041b9c46f96440a35327082ab0e0
+  metadata.gz: b158bb40a94f3a6a0fc131cb5b5e7bc462d8ee6d5c08c0b74e760ea5e52ee56180fd447a5a7fb2dbca07de8f3f4f8d09ea0fdfb8ee50c3a16849760c6c01cf74
+  data.tar.gz: 2cd81c409ee3ef5b258de3ccd1344bdcfa1677afe92c3fcece799d4ad2c758efc43990111ca584fc955d1dd558d2102f9f3f39fd058379132493389bf8148bb8

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
+        _, *ids = decoded_hashid
+        (ids.size == 1) ? ids.first : ids
       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.1"
 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.1
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails