sequel-nonsequential_id 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 556975d177a23d88c9c79a0dbbfd5b10dfa0da907848ae8a18e048c5983cb855
-  data.tar.gz: 1e4ffcbf3f5e29577d17a23d9cdd06a17534fef107218cd42edf4f57cba66684
+  metadata.gz: 840ea9c131d342706670449161549bdb60d487d1f840d55b9d2ea62a0a739638
+  data.tar.gz: 546f9996f736dbf205dc5a371267f4be1a2df900066ac2c069242176bf440c27
 SHA512:
-  metadata.gz: d036cefe901807033faf13f000406edaf5bf28f73b179a781185859538168434d9213bf0f886b73b03d8a774a1d519a2aa42a2d67501901c89380eed185545a8
-  data.tar.gz: 4ded9c4e5449800b4ff0433ae1549acf8611ae15685ee00295b7b17c8b996ed917a1000cca2ed2785d2be673d52235d94b4b38b48e3fa1d573344a57fc112765
+  metadata.gz: 755931214c9f7dd82076f0d5c66f2fb9b69f418a5beeb25b26eb2cc021c91f472ab4701266e478f102012929dbb27a3ca69666e841ee828503b348a4933a5e10
+  data.tar.gz: 1367bc011bb4014671b7dce4e2326d1f9fe723698351dc4f29bd455f832f04d0559d28cb01a3d24bef4bc89803e1999f9aae1314abe4b54fc93bae5cd5303491

data/.ruby-gemset

@@ -0,0 +1 @@
+sequel-uniqueid

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/lib/sequel/plugins/nonsequential_id.rb

@@ -15,21 +15,24 @@ module Sequel
       end
 
       module InstanceMethods
-        def before_create
-          set_nonsequential_id
-          super
+        def around_create
+          begin
+            set_nonsequential_id
+            super
+          rescue Sequel::UniqueConstraintViolation => e
+            if e.message =~ /\b#{model.table_name}\.#{model.id_field}\b/
+              retry
+            else
+              raise
+            end
+          end
         end
 
+
         private def set_nonsequential_id
           method = :"#{model.id_field}="
-
-          loop do
-            id = SecureRandom.hex.hex.to_s(36)
-            unless model.first("#{model.id_field}": id)
-              set_column_value(method, id)
-              return id
-            end
-          end
+          id = SecureRandom.hex.hex.to_s(36)
+          set_column_value(method, id)
         end
       end
     end

data/sequel-unique_id.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'sequel-nonsequential_id'
-  spec.version       = '1.0.0'
+  spec.version       = '1.0.1'
   spec.authors       = ['Jesse Bowes']
   spec.email         = ['jbowes@dashingrocket.com']
   spec.summary       = 'Sequel Non-Sequential Unique ID Plugin'
@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
+  spec.add_development_dependency 'mocha', '~> 1.7'
 end

data/test/nonsequential_id_test.rb

@@ -1,5 +1,8 @@
 require 'test/unit'
+require 'mocha/test_unit'
+
 require 'sequel'
+require 'timeout'
 
 require_relative '../lib/sequel/plugins/nonsequential_id'
 
@@ -7,7 +10,7 @@ DB = Sequel.sqlite
 
 DB.create_table :test_models do
   primary_key :id, type: String, auto_increment: false
-  String :name
+  String :name, unique: true
 end
 
 DB.create_table :test_model2s do
@@ -28,6 +31,11 @@ class NonsequentialIdTest < Test::Unit::TestCase
 
   end
 
+  def teardown
+    DB[:test_models].delete
+    DB[:test_model2s].delete
+  end
+
   def test_nonsequential_id
     obj1 = TestModel.create(name: 'obj1')
     obj2 = TestModel.create(name: 'obj2')
@@ -44,7 +52,7 @@ class NonsequentialIdTest < Test::Unit::TestCase
     assert_equal(obj2.id, TestModel.first(id: obj2.id).id)
   end
 
-  def test_test_nonsequential_id_custom_field
+  def test_nonsequential_id_custom_field
     obj1 = TestModel2.create(name: 'obj1')
     obj2 = TestModel2.create(name: 'obj2')
 
@@ -59,4 +67,22 @@ class NonsequentialIdTest < Test::Unit::TestCase
     assert_equal(obj1.custom_id, TestModel2.first(custom_id: obj1.custom_id).custom_id)
     assert_equal(obj2.custom_id, TestModel2.first(custom_id: obj2.custom_id).custom_id)
   end
+
+  def test_duplicate_id
+    SecureRandom.stubs(:hex).returns('a', 'a', 'b')
+    obj1 = TestModel.create(name: 'obj1')
+    obj2 = nil
+
+    Timeout::timeout(1) do
+      obj2 = TestModel.create(name: 'obj2')
+    end
+
+    assert_equal 'a', obj1.id
+    assert_equal 'b', obj2.id
+  end
+
+  def test_duplicate_other
+    TestModel.create(name: 'obj1')
+    assert_raise(Sequel::UniqueConstraintViolation){TestModel.create(name: 'obj1')}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-nonsequential_id
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jesse Bowes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 description: Automatically generate non-sequential (pseudo-random) IDs for Sequel
   Models
 email:
@@ -89,6 +103,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.md