prefixed_ids 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bad6535e46cad00a977806102164ad2f8d79dae1f9d24beb50c12888829c5d6
-  data.tar.gz: a50ee9b602318c9a412887ddfd28274848eb5cdd2e5465e40ef7357bb11b2bd1
+  metadata.gz: e542fdd356a7d0a1ccc8ad8ca90cc2d218dd4d22e01b2cd82c07ab9e36c52141
+  data.tar.gz: 9c788fc9bf605656ddcfc1c3c3c854eb9fbef1068b1e9b963b6dfa4f6bb72cbe
 SHA512:
-  metadata.gz: 6b0f42366a454e83682535538d072ae2bd1bf166386dcdfe767d75f40046cdfa466c0b763b86d6a1e5475fcff9c5b42970a5e1f5ae876ba56b1d55ca034713b5
-  data.tar.gz: 66d904378b4db97609cdd8db76c23fe765a30699c8e4f65b0cb85c656eaff486ab3efa05f74908e7694b7840000682c58e8bd1a96ff6da4437b1f6566c29ada7
+  metadata.gz: 933bfccd3abb8e3f1c1dd4df15a4babe8e530fce7c3afab6e998db177c61e433fca20bafb8849b73795a961977e4a8e23fd9580f2aec80c8fc868e063e1275f2
+  data.tar.gz: d1c9e97f317478f2d2f2b4d63f3f5606f5d5eb9c16548d9404bd62c984c40d4bae4db6e544ac73917a8795a82f72e1625825741f5b502650f05979e406a9b3b6

data/lib/prefixed_ids.rb

@@ -8,9 +8,7 @@ module PrefixedIds
 
   autoload :PrefixId, "prefixed_ids/prefix_id"
 
-  TOKEN = 123
-  DELIMITER = "_"
-
+  mattr_accessor :delimiter, default: "_"
   mattr_accessor :alphabet, default: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"
   mattr_accessor :minimum_length, default: 24
 
@@ -24,8 +22,8 @@ module PrefixedIds
   end
 
   # Splits a prefixed ID into its prefix and ID
-  def self.split_id(prefix_id)
-    prefix, _, id = prefix_id.to_s.rpartition(DELIMITER)
+  def self.split_id(prefix_id, delimiter = PrefixedIds.delimiter)
+    prefix, _, id = prefix_id.to_s.rpartition(delimiter)
     [prefix, id]
   end
 
@@ -74,7 +72,7 @@ module PrefixedIds
 
     class_methods do
       def find(*ids)
-        super(*ids.map { |id| _prefix_id.decode(id) })
+        super(*ids.map { |id| _prefix_id.decode(id, fallback: true) })
       end
     end
   end

data/lib/prefixed_ids/prefix_id.rb

@@ -1,24 +1,33 @@
 module PrefixedIds
   class PrefixId
-    attr_reader :hashids, :model, :prefix
+    attr_reader :hashids, :prefix
 
-    def initialize(model, prefix, minimum_length: PrefixedIds.minimum_length, alphabet: PrefixedIds.alphabet, **options)
-      @alphabet = alphabet
-      @model = model
+    TOKEN = 123
+
+    def initialize(model, prefix, minimum_length: PrefixedIds.minimum_length, alphabet: PrefixedIds.alphabet, delimiter: PrefixedIds.delimiter, **options)
       @prefix = prefix.to_s
-      @hashids = Hashids.new(model.table_name, minimum_length)
+      @delimiter = delimiter.to_s
+      @hashids = Hashids.new(model.table_name, minimum_length, alphabet)
     end
 
     def encode(id)
-      prefix + "_" + @hashids.encode(TOKEN, id)
+      @prefix + @delimiter + @hashids.encode(TOKEN, id)
     end
 
     # decode returns an array
     def decode(id, fallback: false)
       fallback_value = fallback ? id : nil
-      _, id_without_prefix = PrefixedIds.split_id(id)
-      decoded_id = @hashids.decode(id_without_prefix).last
-      decoded_id || fallback_value
+      _, id_without_prefix = PrefixedIds.split_id(id, @delimiter)
+      decoded_hashid = @hashids.decode(id_without_prefix)
+      return fallback_value unless valid?(decoded_hashid)
+
+      decoded_hashid.last || fallback_value
+    end
+
+    private
+
+    def valid?(decoded_hashid)
+      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.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prefixed_ids
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-22 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails