unique_identifier 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef2436a63aa5338ba9990158576c833975acb805
-  data.tar.gz: 6569f75cf20811cbbcc35f35facb961784edc7b3
+  metadata.gz: 6fba706996f4d605d85e6e8a9364981d7150fc6d
+  data.tar.gz: ef8444f104bbc9eb045416441e449da3516c8a05
 SHA512:
-  metadata.gz: 104ca7b13cabdc8c20b017558b6a4d7ac289a2a5f46f859d8a479db320cf12252aad99a03a3b121a20ca4d2c688ce9319660278effd4645f7a7e45d5fa9565f8
-  data.tar.gz: 935896bf3463c6917e5c82b7648af904ed1fb283f0a9af5ca18e49e298d39a52dc9c3bef7c5d87559430084fcb07ff4fc1340965322b1859f35f95d7f52ef7e3
+  metadata.gz: 2dc1fb3c4245a81f3cfec364af9553c33fd95619a7877f47bea6e125230d3c8d193e5e311646945708d7cb67a1d1f4140c6eaa12d0441ca3f7757dcf6f833a8c
+  data.tar.gz: c48adcce59cc91713e0baba12e7c7786ee1a7617769a1b5c181ee997d768c5f4a2bab93407980efc578eca48f8fb60816dcef956ba2b9ff058d9bcf8c9783a4d

data/lib/unique_identifier/version.rb

@@ -1,3 +1,3 @@
 module UniqueIdentifier
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/unique_identifier.rb

@@ -6,14 +6,14 @@ module UniqueIdentifier
   module ClassMethods
 
     mattr_accessor :field, :block, :klass
-  
+
     def unique_id(field, block)
       @klass = self.name.constantize
       @klass.const_set('BLOCK', block)
       @klass.const_set('FIELD', field)
       @klass.set_callback(:create, :before, :generate_unique_id)
     end
-  
+
   end
 
   module InstanceMethods
@@ -21,7 +21,9 @@ module UniqueIdentifier
       return if self.send(self.class::FIELD)
       identifier = loop do
         random = self.class::BLOCK.call
-        break random unless self.class.exists?(self.class::FIELD => random)
+        unless self.class.base_class.exists?(self.class::FIELD => random)
+          break random
+        end
       end
       self.send "#{self.class::FIELD}=", identifier
     end

data/spec/spec_helper.rb

@@ -10,13 +10,14 @@ UniqueIdentifier::Railtie.insert
 ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
 
 RSpec.configure do |config|
-  
+
   config.before(:all) do
     m = ActiveRecord::Migration.new
-    m.verbose = false  
-    m.create_table :dummy_models do |t| 
+    m.verbose = false
+    m.create_table :dummy_models do |t|
       t.string :number
-    end  
+      t.string :type
+    end
   end
 
   config.after(:all) do
@@ -39,14 +40,11 @@ def build_class(name, options = {})
   # Set class as a constant
   klass = Object.const_set(class_name, Class.new(ActiveRecord::Base))
 
-  klass.const_set("MODE", "test")
-
   klass.class_eval do
-    include UniqueIdentifier::Glue
 
-    unique_identifier name, options
+    unique_id name, options
 
   end
-  
+
   klass
-end
+end

data/spec/unique_identifier_spec.rb

@@ -1,15 +1,51 @@
 require 'spec_helper'
 
 describe UniqueIdentifier do
+  describe ".unique_identifier" do
+
+    context "callbacks" do
+
+      before do
+        DummyModel = build_class(
+          :number,
+          Proc.new { "R#{Array.new(9) { rand(9) }.join}" }
+        )
+      end
+
+      let(:model) { DummyModel.create }
+
+      it "populates the specified field on create" do
+        expect(model.number).to match(/R\d{9}/)
+      end
 
-  describe "unique_identifier" do
-    
-    it "should" do
-      DummyModel = build_class( :number, Proc.new { "#{DummyModel::MODE}#{Array.new(9) { rand(9) }.join}" } )
-      model1 = DummyModel.create
-      model1.number.should_not be_nil
     end
 
-  end
+    context "uniqueness" do
+
+      before do
+        i = -1
+        DummyModel = build_class(:number, Proc.new { i += 1 })
+        class InheritedModel < DummyModel
+          x = -1
+          unique_id :number, Proc.new { x += 1 }
+        end
+        class FurtherInheritedModel < InheritedModel
+          j = -1
+          unique_id :number, Proc.new { j += 1 }
+        end
+      end
 
-end
+      let!(:model)                   { DummyModel.create }
+      let!(:inherited_model)         { InheritedModel.create }
+      let!(:further_inherited_model) { FurtherInheritedModel.create }
+
+      it "creates only truely unique fields" do
+        expect(model.number).to eq("0")
+        expect(inherited_model.number).to eq("1")
+        expect(further_inherited_model.number).to eq("2")
+      end
+
+    end
+
+  end
+end

data/unique_identifier.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rails"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "debugger"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "sqlite3"
 
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: unique_identifier
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Justin Grubbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rails
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
-  name: debugger
+  name: byebug
   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'
 - !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: before_create helper to create unique idenfication fields
@@ -101,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -121,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: before_create helper to create unique idenfication fields