unique_identifier 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fba706996f4d605d85e6e8a9364981d7150fc6d
-  data.tar.gz: ef8444f104bbc9eb045416441e449da3516c8a05
+  metadata.gz: 65d39ff883a6392b2533fa103315d13c1575fbe5
+  data.tar.gz: 8d3d2a2432d6a3b0a45125142fda0b7d2a140653
 SHA512:
-  metadata.gz: 2dc1fb3c4245a81f3cfec364af9553c33fd95619a7877f47bea6e125230d3c8d193e5e311646945708d7cb67a1d1f4140c6eaa12d0441ca3f7757dcf6f833a8c
-  data.tar.gz: c48adcce59cc91713e0baba12e7c7786ee1a7617769a1b5c181ee997d768c5f4a2bab93407980efc578eca48f8fb60816dcef956ba2b9ff058d9bcf8c9783a4d
+  metadata.gz: 01cca76a6c1416116e1b9919c9b8a429d7036330020ab8d0c0d91aec16b6533ee1723be7d0677d42dc7e27adf15b187cc02d360fae2f663578af0aa8f879468c
+  data.tar.gz: 40fe3058df5421908a9def579afd41d1f6d5388ca848051c906c7f7587668e9004d3e4e8afb161eaed7492b1fbe6799393d5bd32cb59f38112fd5fcbd48819f7

data/Changes.md

@@ -0,0 +1,6 @@
+0.0.4
+--------
+**Fixes**
+- PR #1 - updates `before_create` call back to `before_validation, on: :create`
+  - fixes issue where `unique_id` attribute is validated, and `generate_unique_id` wasn't called
+    until after validations

data/README.md

@@ -23,12 +23,12 @@ Or install it yourself as:
   class SomeModel < ActiveRecord::Base
 
     # name of column to store unique identifier
-    #            | 
+    #            |
     #         -------
     unique_id :number, -> { Array.new(9) { rand(9) }.join }
     #                  ------------------------------------
     #                                    |
-    # proc to be run before_create to generate unique identifier
+    # proc to be run `before_validation, on: :create` to generate unique identifier
 
   end
 
@@ -45,7 +45,7 @@ The above example is equivalent to this:
 
   class SomeModel < ActiveRecord::Base
 
-    before_create :generate_unique_id
+    before_validation :generate_unique_id, on: :create
 
     def generate_unique_id
       self.number = loop do

data/lib/unique_identifier.rb

@@ -8,10 +8,9 @@ module UniqueIdentifier
     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)
+      const_set('BLOCK', block)
+      const_set('FIELD', field)
+      before_validation :generate_unique_id, on: :create
     end
 
   end

data/lib/unique_identifier/version.rb

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

data/spec/spec_helper.rb

@@ -29,7 +29,7 @@ RSpec.configure do |config|
 end
 
 
-def build_class(name, options = {})
+def build_dummy_class(unique_attr_name, unique_options = {}, class_options = {})
   # setup class and include delayed_cron
 
   class_name = "DummyModel"
@@ -42,8 +42,11 @@ def build_class(name, options = {})
 
   klass.class_eval do
 
-    unique_id name, options
+    unique_id unique_attr_name, unique_options
 
+    if class_options.fetch(:validate, false)
+      validates unique_attr_name, presence: true
+    end
   end
 
   klass

data/spec/unique_identifier_spec.rb

@@ -5,17 +5,41 @@ describe UniqueIdentifier do
 
     context "callbacks" do
 
-      before do
-        DummyModel = build_class(
-          :number,
-          Proc.new { "R#{Array.new(9) { rand(9) }.join}" }
-        )
+      context "when unique_id attribute +is not+ validated" do
+        before do
+          DummyModel = build_dummy_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
       end
 
-      let(:model) { DummyModel.create }
+      context "when unique_id attribute +is+ validated" do
+        before do
+          DummyModel = build_dummy_class(
+            :number,
+            Proc.new { "R#{Array.new(9) { rand(9) }.join}" },
+            validate: true
+          )
+        end
+
+        let(:model) { DummyModel.create }
+
+        it "populates the specified field before any validations, on create" do
+          expect(model.number).to match(/R\d{9}/)
+        end
+
+        it "creates a valid instance" do
+          expect(model.valid?).to be_truthy
+          expect(model.errors).to be_empty
+        end
 
-      it "populates the specified field on create" do
-        expect(model.number).to match(/R\d{9}/)
       end
 
     end
@@ -24,7 +48,7 @@ describe UniqueIdentifier do
 
       before do
         i = -1
-        DummyModel = build_class(:number, Proc.new { i += 1 })
+        DummyModel = build_dummy_class(:number, Proc.new { i += 1 })
         class InheritedModel < DummyModel
           x = -1
           unique_id :number, Proc.new { x += 1 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unique_identifier
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Justin Grubbs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Changes.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -131,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: before_create helper to create unique idenfication fields