uniqable 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b28ea2e4128fd506d1983847dfde61915acf8550c417fbc5eaba75e11da56986
-  data.tar.gz: 39ef933406d49dcf040aabf68f2c5469c317d52630dd4f65a52b4a40a993bb97
+  metadata.gz: 380e4507b0e28fda9883c3b9308d849e5f79b14499116318c6f53d91e3858e1f
+  data.tar.gz: bc71daee409bc388694fca896ad5f93de3c0ee5f96dd39b5691e28c42c9da6a9
 SHA512:
-  metadata.gz: 45d7d098218f0071b1373e23c824f119f0c9b03cf5ee097fb668e34653a11328b9d0684c519a6eaeaa9e450d265f34fa3fc4e7035c4989186b00faef987b088e
-  data.tar.gz: 37802f6ce7ba3f591559a271d597111ca13743b43345b8b37e986426e2360a9e089b032de476567ed444a924864aca22dba1e339b9fb04603b7e48dcf2fac3d2
+  metadata.gz: 67cb4c95fb2be012c5435b7244bc7903d74763e53f47d4b1b137a47470fe5531be89fa156c2c28a6249561453dd86483873370be304f938827ec9c3eaf979565
+  data.tar.gz: c630d62afa874d11c0a2b4b0e774266561b0aaf3fe7a01de46f72c1766f46a53abd03b0864e5369731308fedb189aef89942dbca4b11053f0f03788828f696e2

data/.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-       - image: circleci/ruby:2.3-node-browsers
+       - image: circleci/ruby:2.4-node-browsers
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images

data/.rakeTasks

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>

data/.rubocop.yml

@@ -3,4 +3,21 @@ Metrics/LineLength:
 Metrics/BlockLength:
   ExcludedMethods: ['describe', 'context']
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
+Style/ExponentialNotation:
+  Enabled: true
+Style/HashEachMethods:
+  Enabled: true
+Style/HashTransformKeys:
+  Enabled: true
+Style/HashTransformValues:
+  Enabled: true
+Style/MultilineTernaryOperator:
+  Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.4.4

data/Gemfile.lock

@@ -1,81 +1,84 @@
 PATH
   remote: .
   specs:
-    uniqable (0.3.2)
+    uniqable (0.4.1)
+      nanoid (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.14.2)
-      activesupport (= 4.1.14.2)
-      builder (~> 3.1)
-    activerecord (4.1.14.2)
-      activemodel (= 4.1.14.2)
-      activesupport (= 4.1.14.2)
-      arel (~> 5.0.0)
-    activesupport (4.1.14.2)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activerecord (5.2.4.3)
+      activemodel (= 5.2.4.3)
+      activesupport (= 5.2.4.3)
+      arel (>= 9.0)
+    activesupport (5.2.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
-    ast (2.4.0)
+    arel (9.0.0)
+    ast (2.4.1)
     awesome_print (1.8.0)
-    builder (3.2.3)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    i18n (0.9.5)
+    concurrent-ruby (1.1.6)
+    diff-lcs (1.4.2)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    json (1.8.6)
-    minitest (5.11.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
+    minitest (5.14.1)
+    nanoid (2.0.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.1)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.71.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.86.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
     ruby-progressbar (1.10.1)
     sqlite3 (1.3.13)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 4.1.14.1)
-  awesome_print
+  activerecord (~> 5.0)
+  awesome_print (~> 1.8.0)
   bundler (~> 1.16)
-  rake (~> 10.0)
-  rspec (~> 3.0)
+  rake (>= 13.0.1)
+  rspec (~> 3.9)
   rspec_junit_formatter
-  rubocop (~> 0.49)
-  sqlite3 (~> 1.3.6)
+  rubocop (~> 0.82)
+  sqlite3 (~> 1.3.13)
   uniqable!
 
 BUNDLED WITH

data/lib/uniqable.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'uniqable/version'
+require 'nanoid'
 
 # Generates uniq, random token for ActiveRecord model's fields
 module Uniqable
@@ -33,10 +34,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}.#{primary_key} = :uid"
+      where(where_sql, uid: uid)
     end
 
     # Find record by one of the uniq field
@@ -54,15 +55,23 @@ 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
   # @TODO: split into 2 actions generate and set
   def uniqable_uid(field)
     loop do
-      uniq_code = SecureRandom.hex(8)
-      send("#{field}=", uniq_code)
-      break unless self.class.where(field => uniq_code).exists?
+      uniq_code = Nanoid.generate(size: 16)
+      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.4.1'
 end

data/uniqable.gemspec

@@ -21,11 +21,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'sqlite3', '~> 1.3.6'
-  spec.add_development_dependency 'activerecord', '~> 4.1.14.1'
-  spec.add_development_dependency 'awesome_print'
+  spec.add_dependency 'nanoid', '~> 2.0'
+
+  spec.add_development_dependency 'activerecord', '~> 5.0'
+  spec.add_development_dependency 'awesome_print', '~> 1.8.0'
   spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49'
+  spec.add_development_dependency 'rake', '>= 13.0.1'
+  spec.add_development_dependency 'rspec', '~> 3.9'
+  spec.add_development_dependency 'rubocop', '~> 0.82'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.13'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: uniqable
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Renat "MpaK" Ibragimov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2020-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: nanoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
+        version: '2.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.14.1
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.14.1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,44 +70,58 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.82'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.82'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: 1.3.13
 description: Generate a unique, random token for ActiveRecord models.
 email:
 - mrak69@gmail.com
@@ -117,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- ".rakeTasks"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-gems"
@@ -136,7 +151,7 @@ files:
 homepage: https://github.com/mpakus/uniqable
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Uniqable - uniq and random token for ActiveRecord models
 test_files: []