prefixed_ids 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89b486c2c314140be222d50337f74c65b7e3168397bd55c76a7248c70a81fa08
-  data.tar.gz: 568c49fbbf0ca7ce7a4137953cb12213ba898232a4e95451175065f311587b01
+  metadata.gz: 73928771de7b068333b2db44b844d9018cd0a583067268374eafca46426c8bc8
+  data.tar.gz: fc5d49d74a69e210378c8c7ec2d980aa39fce0e61882a96207e4f03beb4ee2c0
 SHA512:
-  metadata.gz: 2b7cdc5be6e1f6923847ce68fb54f6cc095b7da0cd59ff909c7527fcdfb19b87c57ea8317d5809b63578ce72c3878c4df23db243c5364429e3aa3ca34ea05791
-  data.tar.gz: '0872d0c35e310df40ab3aed3c3cb07d3f29a3599f165085081786a9829c74832e529a50c7fe37ea3051fc805c6974ea0dfb7a0beb31e66793f7b9f2d0885c842'
+  metadata.gz: 1ddaffaaf511acab48e02dee0664a9d6310e24306e36792800e5afeba9e58b0c6a8e0413f2fd0da521d2e900d8dda2c5d8c8dea36b4a67b0b47566971620f28b
+  data.tar.gz: 5d2406555e427e660ddbe71a8c3c9448ab27e54acf0427f6e232c655224524173ed4492c6352a36be191a62b91652efbf1556c6588f26d836da853cc9da99152

data/lib/prefixed_ids/prefix_id.rb

@@ -11,7 +11,9 @@ module PrefixedIds
     end
 
     def encode(id)
-      @prefix + @delimiter + @hashids.encode(TOKEN, id)
+      return if id.nil?
+
+      @prefix + @delimiter + @hashids.encode([TOKEN] + Array.wrap(id))
     end
 
     # decode returns an array
@@ -19,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.0"
+  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.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Chris Oliver
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-25 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -65,7 +65,7 @@ metadata:
   homepage_uri: https://github.com/excid3/prefixed_ids
   source_code_uri: https://github.com/excid3/prefixed_ids
   changelog_uri: https://github.com/excid3/prefixed_ids
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +80,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
-signing_key: 
+rubygems_version: 3.5.13
+signing_key:
 specification_version: 4
 summary: Prefixed IDs generates IDs with friendly prefixes for your models
 test_files: []