uniqable 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b28ea2e4128fd506d1983847dfde61915acf8550c417fbc5eaba75e11da56986
-  data.tar.gz: 39ef933406d49dcf040aabf68f2c5469c317d52630dd4f65a52b4a40a993bb97
+  metadata.gz: a938de6230632eef5187ee27088c417905c36a9cb3fa01e040890d3e1c55de40
+  data.tar.gz: 7a3fc11f03cfd858431d66805b5b3d22ee567e045bcdeec600d0149fe9af5637
 SHA512:
-  metadata.gz: 45d7d098218f0071b1373e23c824f119f0c9b03cf5ee097fb668e34653a11328b9d0684c519a6eaeaa9e450d265f34fa3fc4e7035c4989186b00faef987b088e
-  data.tar.gz: 37802f6ce7ba3f591559a271d597111ca13743b43345b8b37e986426e2360a9e089b032de476567ed444a924864aca22dba1e339b9fb04603b7e48dcf2fac3d2
+  metadata.gz: 7d750df042075f052d51023c04aa3ff5fc6df91d653abf13d1414d56ab73b0772862669e5377576f1f72c738b397a0fc5ddb214192effbd16fff649fcd9c9638
+  data.tar.gz: 6656b9555fcf0ff34255cb70b323c829e7965a694bf2e624fc3a68cfba51fb886f68af5f9c7dd71c2501706385c22652aee7c78e61fb8cd83cb5ec6620b931ab

data/lib/uniqable.rb

@@ -33,10 +33,10 @@ module Uniqable
 
     # @return [self]
     def where_uniqable(uid)
-      where(
-        uniqable_fields.map { |r| "#{table_name}.#{r} = :uid" }.join(' OR '),
-        uid: uid
-      )
+      where_sql = key_uid?(uid) ?
+                      uniqable_fields.map { |r| "#{table_name}.#{r} = :uid" }.join(' OR ') :
+                      "#{table_name}.#{self.primary_key} = :uid"
+      where(where_sql, uid: uid)
     end
 
     # Find record by one of the uniq field
@@ -54,6 +54,12 @@ module Uniqable
     def find_uniqable!(uid)
       where_uniqable(uid).take!
     end
+
+    private
+
+    def key_uid?(uid)
+      uid.to_s =~ /\D+/ || uid.to_s.length >= 16
+    end
   end
 
   # Generate and set random and uniq field
@@ -61,8 +67,10 @@ module Uniqable
   def uniqable_uid(field)
     loop do
       uniq_code = SecureRandom.hex(8)
-      send("#{field}=", uniq_code)
-      break unless self.class.where(field => uniq_code).exists?
+      if uniq_code =~ /\D+/
+        send("#{field}=", uniq_code)
+        break unless self.class.where(field => uniq_code).exists?
+      end
     end
   end
 end

data/lib/uniqable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uniqable
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uniqable
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Renat "MpaK" Ibragimov