uniqable 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 614ad5000574685a9eae9222e26c04898a03b22e
-  data.tar.gz: ff0f29efadbf39c75d7b2340af4a3cf628fc3e78
+  metadata.gz: 4114db480c0e9252f47842d2b146924b7e5e1f83
+  data.tar.gz: 0b4f10b5940dfcb66d7c636cce0b5dd0a7fa7f20
 SHA512:
-  metadata.gz: ae466818b9f47c24b1a9a0d5359f37cbde6e189a6ac602c72204d585778323b75a32b02ffa97bbca00ec20f08f8ea7c1284936463043659801ec45dd832a38e0
-  data.tar.gz: c34d784116d1c532248f3aed6884a4ddc5cd8008f2fe2d08ce81f8ce67c3ec93c800fc963ff7b452d635c0ab34521878be3cf12b0e7c477304a1c2fa01d586ef
+  metadata.gz: 261020540cb88c7799eca3add448c1628245e4f02af17c7f5516cdf58224cf57574111f334db84b767ecdb9be36780df99f8587253f48acaf6b32fd153ef3ca9
+  data.tar.gz: b35eb3bdbb3bfa4f2b66ec45775ee46cb7be44fd736ccb2ba957e7ff8d85bfbc5e96533a8173d171c42628bd1514ad4280e54a640aa97d86fe897a8d588a3eea

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-       - image: circleci/ruby:2.4.1-node-browsers
+       - image: circleci/ruby:2.3-node-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -18,6 +18,10 @@ jobs:
 
     steps:
       - checkout
+      - run:
+          name: install sqlite
+          command: |
+            sudo apt-get install sqlite3
 
       # Download and cache dependencies
       - restore_cache:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uniqable (0.1.3)
+    uniqable (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -79,4 +79,4 @@ DEPENDENCIES
   uniqable!
 
 BUNDLED WITH
-   1.16.2
+   1.16.3

data/README.md

@@ -42,7 +42,11 @@ anyway you have one more method `.find_uniqable` which one you can use to find y
 ```ruby
   MyModel.find_uniqable params[:uid]
   # or
- MyModel.find_uniqable! params[:uid] # this will raise exception ActiveRecord::RecordNotFound if record is absent 
+  MyModel.find_uniqable! params[:uid] # this will raise exception ActiveRecord::RecordNotFound if record is absent
+  # or you can use numerical ID same time and Uniqable will detect it and tries to find by primary key (as regular id)
+  MyModel.find_uniqable params[:id]
+  # or
+  MyModel.find_uniqable! params[:id]
 ```
 and another one is `.uniqable_fields`
 ```ruby

data/lib/uniqable.rb

@@ -32,7 +32,9 @@ module Uniqable
 
     # @return [self]
     def where_uniqable(uid)
-      where_sql = uniqable_fields.map { |r| "#{table_name}.#{r} = :uid" }.join(' OR ')
+      where_sql = key_uid?(uid) ?
+                      uniqable_fields.map { |r| "#{table_name}.#{r} = :uid" }.join(' OR ') :
+                      "#{self.primary_key} = :uid"
       where(where_sql, uid: uid)
     end
 
@@ -51,14 +53,21 @@ module Uniqable
     def find_uniqable!(uid)
       where_uniqable(uid).take!
     end
+
+    private
+
+    def key_uid?(uid)
+      uid.to_s =~ /\D+/
+    end
   end
 
   # Generate and set random and uniq field
   # @TODO: split into 2 actions generate and set
   def uniqable_uid(field)
     loop do
-      send("#{field}=", SecureRandom.hex(8))
-      break unless self.class.where(field => send(field.to_sym)).exists?
+      uniq_code = SecureRandom.hex(8)
+      send("#{field}=", uniq_code)
+      break unless self.class.where(field => uniq_code).exists?
     end
   end
 end

data/lib/uniqable/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uniqable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Renat "MpaK" Ibragimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Uniqable - uniq and random token for ActiveRecord models