uniqable 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4291fffdee96aa5e85cc2ea3207125e104bf544d
-  data.tar.gz: a9fc14ee36417858c15a2079d550c0175351ab6a
+SHA256:
+  metadata.gz: b28ea2e4128fd506d1983847dfde61915acf8550c417fbc5eaba75e11da56986
+  data.tar.gz: 39ef933406d49dcf040aabf68f2c5469c317d52630dd4f65a52b4a40a993bb97
 SHA512:
-  metadata.gz: 180a1eebaccd029ce8cbdbebadc96a9994993ed73b3da0b8697d616d81c7f4ecc9f02d999af35cf428c194584414cb692ce3df6ea9f4500abbac2d3ea60c1dc3
-  data.tar.gz: d4d0f5f90ae81f5a542d0ae895fb0ec23f351b05fa70c75924548a88890cb486f8734e0cf8953814f391c0091391708149a4630f002120577fe40569be4c84f7
+  metadata.gz: 45d7d098218f0071b1373e23c824f119f0c9b03cf5ee097fb668e34653a11328b9d0684c519a6eaeaa9e450d265f34fa3fc4e7035c4989186b00faef987b088e
+  data.tar.gz: 37802f6ce7ba3f591559a271d597111ca13743b43345b8b37e986426e2360a9e089b032de476567ed444a924864aca22dba1e339b9fb04603b7e48dcf2fac3d2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uniqable (0.3.0)
+    uniqable (0.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -23,46 +23,46 @@ GEM
     ast (2.4.0)
     awesome_print (1.8.0)
     builder (3.2.3)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.3)
     json (1.8.6)
     minitest (5.11.3)
-    parallel (1.12.1)
-    parser (2.5.1.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
-    powerpack (0.1.1)
     rainbow (3.0.0)
     rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.56.0)
+    rubocop (0.71.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
     sqlite3 (1.3.13)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -75,8 +75,8 @@ DEPENDENCIES
   rspec (~> 3.0)
   rspec_junit_formatter
   rubocop (~> 0.49)
-  sqlite3
+  sqlite3 (~> 1.3.6)
   uniqable!
 
 BUNDLED WITH
-   1.16.3
+   1.17.3

data/README.md

@@ -43,10 +43,6 @@ anyway you have one more method `.find_uniqable` which one you can use to find y
   MyModel.find_uniqable params[:uid]
   # or
   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
@@ -57,7 +53,7 @@ You can also create your own token callback method and set the field:
 
 ```ruby
   class MyModel
-    ...
+    #...
     def uniqable_uid(field)
       self[field] = 100_000 + rand(999_999)
     end

data/Rakefile

@@ -6,3 +6,4 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+task test: :spec

data/lib/uniqable.rb

@@ -24,6 +24,7 @@ module Uniqable
       end
 
       return if to_param.blank? # :to_param option
+
       define_method :to_param do
         public_send(to_param)
       end
@@ -32,10 +33,10 @@ module Uniqable
 
     # @return [self]
     def where_uniqable(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)
+      where(
+        uniqable_fields.map { |r| "#{table_name}.#{r} = :uid" }.join(' OR '),
+        uid: uid
+      )
     end
 
     # Find record by one of the uniq field
@@ -53,12 +54,6 @@ 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

data/lib/uniqable/version.rb

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

data/uniqable.gemspec

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)
@@ -22,11 +21,11 @@ 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_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 'sqlite3'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: uniqable
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Renat "MpaK" Ibragimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-26 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +108,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.49'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Generate a unique, random token for ActiveRecord models.
 email:
 - mrak69@gmail.com
@@ -151,8 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Uniqable - uniq and random token for ActiveRecord models