public_uid 1.0.1.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a31599fa3aa29faf3a86df0a77aee9d2b9b2cb4f
-  data.tar.gz: e544912942f5b8faae225bae4c9e820cc7a809ea
+  metadata.gz: 7cd4cccc86e11b76e1a46d7cc471dace3bc5a8c3
+  data.tar.gz: 815f34a839ea4b11419fd11c44b24a6325a396f9
 SHA512:
-  metadata.gz: ba3666a7f34f4e389553044a60f8e89195ed6c6d878d74998c96936e6440ce2c06299813bc7652e9616e80209220910dd9e1d5f3bb1cdb9044c2b7b35cf015a9
-  data.tar.gz: 251ed4921e5e9c6bbf59ad8639451fff7b50b8451d9c74abf8455a7b4d2f33863488d6a88adc745a4747887fe37a9712c15a207f48ac2c2b2f103a96822b3499
+  metadata.gz: 6c4c3b9ba948a19a316c4dc24a57b04a65718415de4e7353f964980ec80f3b99e34a4642fb1547d467fcbde377f4e3b62873b67e62914eb7f6e9e37a4595135f
+  data.tar.gz: ec5c68da6ce0135e8ef1266b847f2d40d3570a34369235050f4be92614aae1729d42e979f109af01cfb7fd0491d1fb9762025ffb753a6928e9e83b337a8c3f67

data/README.md

@@ -1,7 +1,6 @@
 # PublicUid
 
-
-[![Build Status](https://api.travis-ci.org/equivalent/lpgrid.png?branch=master)](http://travis-ci.org/equivalent/public_uid)
+[![Build Status](https://travis-ci.org/equivalent/public_uid.svg?branch=master)](https://travis-ci.org/equivalent/public_uid)
 [![Code Climate](https://codeclimate.com/github/equivalent/public_uid.png)](https://codeclimate.com/github/equivalent/public_uid)
 
 
@@ -48,7 +47,7 @@ And then execute:
 
 ## Usage
 
-Create database column for public unique id
+Create database column for public unique id. It have to be string.
 
 ```ruby
 class AddPublicUidToUsers < ActiveRecord::Migration

data/lib/public_uid/set_public_uid.rb

@@ -6,7 +6,6 @@ module PublicUid
       @record  = options[:record] || raise(NoRecordSpecified)
       @column  = options[:column] || raise(NoPublicUidColumnSpecified)
       @klass   = @record.class
-      @new_uid = nil
       check_column_existance
     end
 
@@ -17,12 +16,13 @@ module PublicUid
     end
 
     def set
-      @record.send("#{@column}=", @new_uid || raise(NewUidNotSetYet))
+      new_uid || raise(NewUidNotSetYet)
+      @record.send("#{@column}=", new_uid )
     end
     private
 
     def similar_uid_exist?
-      @klass.where(public_uid: @new_uid).count > 0
+      @klass.where(public_uid: new_uid.to_s).count > 0
     end
 
     def check_column_existance

data/lib/public_uid/version.rb

@@ -1,3 +1,3 @@
 module PublicUid
-  VERSION = "1.0.1.1"
+  VERSION = "1.0.2"
 end

data/public_uid.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5"
+  spec.add_development_dependency "rr", "~> 1.1.2"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "activerecord", '~> 3.2'
 end

data/test/lib/set_public_uid_test.rb

@@ -1,9 +1,5 @@
 require 'test_helper'
 
-class User < ActiveRecord::Base
-  self.table_name = 'users'
-end
-
 class DummyGenerator
   def initialize
     @counter = 0
@@ -18,58 +14,76 @@ class DummyGenerator
   end
 end
 
-describe 'PublicUid::SetPublicUid' do
-  let(:options) { {record: record, column: :public_uid} }
-  let(:instance){ PublicUid::SetPublicUid.new options }
+TestConf.orm_modules.each do |orm_module|
+  describe orm_module.description do
+    describe 'PublicUid::SetPublicUid' do
+
+      let(:options)  { {record: record, column: :public_uid} }
+      let(:instance) { PublicUid::SetPublicUid.new options }
+      let(:record)   { record_class.new }
+      let(:record_class) { "#{orm_module}::User".constantize }
+
+      describe 'initialization' do
+        context 'when column not specified' do
+          let(:options) { { record: record } }
+          it{ ->{ instance } .must_raise(PublicUid::SetPublicUid::NoPublicUidColumnSpecified) }
+        end
+
+        context 'when record not specified' do
+          let(:options) { {column: :foo} }
+          it{ ->{ instance } .must_raise(PublicUid::SetPublicUid::NoRecordSpecified) }
+        end
+      end
 
-  let(:record){ User.new }
+      describe "#generate" do
+        subject { instance.new_uid }
 
-  describe 'initialization' do
-    context 'when column not specified' do
-      let(:options) { {record: record} }
-      it{ ->{ instance }.must_raise(PublicUid::SetPublicUid::NoPublicUidColumnSpecified) }
-    end
+        it "should ask generator to generate random string" do
+          instance.generate(DummyGenerator.new)
+          subject.must_equal 'first try'
+        end
 
-    context 'when record not specified' do
-      let(:options) { {column: :foo} }
-      it{ ->{ instance }.must_raise(PublicUid::SetPublicUid::NoRecordSpecified) }
-    end
-  end
+        context 'when record match random' do
+          before{ record_class.create public_uid: 'first try' }
+          after { record_class.destroy_all }
 
-  describe "#generate" do
-    subject{ instance.new_uid }
+          it "should generate string once again" do
+            instance.generate(DummyGenerator.new)
+            subject.must_equal 'second try'
+          end
+        end
+      end
 
-    it "should ask generator to generate random string" do
-      instance.generate(DummyGenerator.new)
-      subject.must_equal 'first try'
-    end
+      describe '#set' do
+        subject { instance.new_uid }
+
+        context 'when @new id is not set' do
+          it{ ->{ instance.set }.must_raise(PublicUid::SetPublicUid::NewUidNotSetYet) }
+        end
 
-    context 'when record match random' do
-      before{ User.create public_uid: 'first try' }
-      after { User.destroy_all }
+        context 'when @new id is set' do
+          before { instance.instance_variable_set '@new_uid', '123' }
 
-      it "should generate string once again" do
-        instance.generate(DummyGenerator.new)
-        subject.must_equal 'second try'
+          it 'must set new_uid for record pubilc_uid column' do
+            instance.set
+            subject.must_equal '123'
+          end
+        end
       end
-    end
-  end
 
-  describe '#set' do
-    subject{ instance.new_uid }
+      describe '#similar_uid_exist?' do
+        let(:trigger) { instance.send :similar_uid_exist? }
 
-    context 'when @new id is not set' do
-      it{ ->{ instance.set }.must_raise(PublicUid::SetPublicUid::NewUidNotSetYet) }
-    end
+        before { mock(instance).new_uid { 567 } }
 
-    context 'when @new id is set' do
-      before{ instance.instance_variable_set '@new_uid', '123' }
+        # Due to PostgreSQL type check feature
+        it 'must look for integer generated numbers as a string' do 
+          count_mock = stub(record_class).count { 123 }
+          stub(record_class).where( { public_uid: "567" } ) { count_mock }
 
-      it 'must set new_uid for record pubilc_uid column' do
-        instance.set
-        subject.must_equal '123'
+          trigger.must_equal true
+        end
       end
     end
   end
-
 end

data/test/support/orm/active_record.rb

@@ -24,6 +24,10 @@ module ActRec
     self.table_name =  "users"
     generate_public_uid
   end
+
+  class User < ActiveRecord::Base
+    self.table_name = 'users'
+  end
 end
 
 TestConf.add_orm_module(ActRec)

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'pathname'
 require 'bundler/setup'
 require 'minitest/autorun'
+require 'rr'
 
 class Minitest::Spec
   class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_uid
 version: !ruby/object:Gem::Version
-  version: 1.0.1.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Tomas Valent
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement