prefixed_ids 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bac5b304f58877aefa5452f7e1532a65071b7f2eeadd6347a144326d86737cd
-  data.tar.gz: 91facf11c39db364b50ca88138429308436328f22446b19d8d6a6e2c835c51d8
+  metadata.gz: 9f4a7dba39c3feff4c04155095501305cda1f83649a3084587276762bba4bf43
+  data.tar.gz: 94f8821fbe8f4b6144d9f1d88fad5c86d91f6b92c69718d5584214724d07d89e
 SHA512:
-  metadata.gz: 48048178e689a688bae0f048a8b08fe246dc2b60de2a339e3458117d2945b15757b1c1888b655e2306883a78e345256cf23f565b29a94f72972cf4b8c7043883
-  data.tar.gz: 5ae3f646bd1df6a314e15c12a732257b1eb242058ec7775d75a60f9862ff5034e20d2eed190d88e4190456109d76754e4d56e7c970ef2a0e229d2d4aea9a1156
+  metadata.gz: 800ac6f9df59cfe8d75a9606e66ee926f0d03eff86360d3ff23b1f1286a4746ca04d865e89ac2fabd377d0632310abbcfc7b37980ef2b595d0eb8e6f14ef0a3d
+  data.tar.gz: 9c90c492213661c063cdbe3510369fee96958fc00845a18cb6c831f3741bdd2a6ee52ebf6b94ceb1d2a55ee9fdd769b0526dddd9e4a8a4af8979604a2cbbd30b

data/lib/prefixed_ids/prefix_id.rb

@@ -5,6 +5,7 @@ module PrefixedIds
     TOKEN = 123
 
     def initialize(model, prefix, salt: PrefixedIds.salt, minimum_length: PrefixedIds.minimum_length, alphabet: PrefixedIds.alphabet, delimiter: PrefixedIds.delimiter, **options)
+      @model = model
       @prefix = prefix.to_s
       @delimiter = delimiter.to_s
       @hashids = Hashids.new("#{model.table_name}#{salt}", minimum_length, alphabet)
@@ -43,8 +44,14 @@ module PrefixedIds
       []
     end
 
+    # The number of IDs must match the primary key, so a hash of several IDs can't be used on a single column primary key
     def valid?(decoded_hashid)
-      decoded_hashid.size >= 2 && decoded_hashid.first == TOKEN
+      decoded_hashid.first == TOKEN && decoded_hashid.size == primary_key_size + 1
+    end
+
+    # Read lazily since the primary key isn't known when `has_prefix_id` is called
+    def primary_key_size
+      Array.wrap(@model.primary_key).size
     end
   end
 end

data/lib/prefixed_ids/version.rb

@@ -1,3 +1,3 @@
 module PrefixedIds
-  VERSION = "1.9.0"
+  VERSION = "1.9.2"
 end

data/lib/prefixed_ids.rb

@@ -166,13 +166,11 @@ module PrefixedIds
         super.tap { |r| r.extend ClassMethods }
       end
 
-      def belongs_to(*args, **options, &block)
-        association = super
+      def belongs_to(name, *args, **options, &block)
+        super
 
-        name = args.first
-        reflection = association[name] || association[name.to_s]
-
-        return association if reflection.polymorphic?
+        reflection = reflect_on_association(name)
+        return if reflection.polymorphic?
 
         # Skip helpers if the associated class can't be loaded yet, so Rails only raises when the association is used
         klass = begin
@@ -180,7 +178,7 @@ module PrefixedIds
         rescue NameError
           nil
         end
-        return association if klass.nil? || klass._prefix_id.blank?
+        return if klass.nil? || klass._prefix_id.blank?
 
         generated_association_methods.class_eval <<-CODE, __FILE__, __LINE__ + 1
           def #{name}_prefix_id
@@ -192,8 +190,6 @@ module PrefixedIds
             send("#{reflection.foreign_key}=", decoded_id)
           end
         CODE
-
-        association
       end
 
       def has_many(*args, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prefixed_ids
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - Chris Oliver