public_uid 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 032aafb0e5f3992c4ea4197a2eb9e78585d60eee
-  data.tar.gz: d39558dc338f02cd9355fc618660f4cfcd70c57a
+  metadata.gz: e60e9adac30a4438f4749528b067dc3574adf28e
+  data.tar.gz: fb17f29505924fad7949a2b173b6ff15b76910e4
 SHA512:
-  metadata.gz: 42e863949ee643c5d3b88315b7d7cac6a1d93b870c00f79f47be4a78300d7a8b2ffd45046525bad14bd50433d3cb5ccc6fd743b98ca206b5c974f7c4210af380
-  data.tar.gz: 72cb950c7a4b950fa1c6cb7ff070cdecbd5b34e855dceafc1b41a91094efad682db57b3fb63d87002fc75e8bdf612a60b1adca9bda2c0673f9603644de17d79f
+  metadata.gz: caca27924c4a11a42333a5e0da57c41441056988d35e58a2e4c49314619b920f95020a7e5c3c01336f7e8d29e5700224975cc4fec316db076b6fd594f0ec376a
+  data.tar.gz: 05e33a8dabd884f4b369591d249f1073969f173293f33be3a8997512bcdc68ef72699837704be8ed8978d0dd954c7d929486e64b0a5398aea1ea74f87e6e4e9b

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
+  - ruby-head

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in public_uid.gemspec
 gemspec
+
+gem "activerecord", '~> 3.2'

data/README.md

@@ -1,5 +1,10 @@
 # PublicUid
 
+
+[![Build Status](https://api.travis-ci.org/equivalent/lpgrid.png?branch=master)](http://travis-ci.org/equivalent/public_uid)
+[![Code Climate](https://codeclimate.com/github/equivalent/public_uid.png)](https://codeclimate.com/github/equivalent/public_uid)
+
+
 Generates random string (or random number) to represent public unique
 record identifier.
 

data/lib/orm/active_record.rb

@@ -0,0 +1,2 @@
+require 'orm_adapter/adapters/active_record'
+ActiveRecord::Base.send(:include, PublicUid::Model)

data/lib/public_uid/model.rb

@@ -0,0 +1,24 @@
+module PublicUid
+  module Model
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def generate_uid
+      pub_uid = SetPublicUid.new(record: self, column: self.class.public_uid_column)
+      pub_uid.generate self.class.public_uid_generator
+      pub_uid.set
+    end
+
+    module ClassMethods
+      attr_reader :public_uid_column
+      attr_reader :public_uid_generator
+
+      def generate_public_uid(options={})
+        @public_uid_column    = options[:column]    || :public_uid
+        @public_uid_generator = options[:generator] || Generators::NumberRandom.new
+        before_create :generate_uid, unless: @public_uid_column
+      end
+    end
+  end
+end

data/lib/public_uid/version.rb

@@ -1,3 +1,3 @@
 module PublicUid
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/public_uid.rb

@@ -1,29 +1,8 @@
+require 'orm_adapter'
 require "public_uid/version"
 require "public_uid/set_public_uid"
+require "public_uid/model"
 require "public_uid/generators/number_random"
 require "public_uid/generators/range_string"
 
-module PublicUid
-
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  def generate_uid
-    pub_uid = SetPublicUid.new(record: self, column: self.class.public_uid_column)
-    pub_uid.generate self.class.public_uid_generator
-    pub_uid.set
-  end
-
-  module ClassMethods
-    attr_reader :public_uid_column
-    attr_reader :public_uid_generator
-
-    def generate_public_uid(options={})
-      @public_uid_column    = options[:column]    || :public_uid
-      @public_uid_generator = options[:generator] || Generators::NumberRandom.new
-      before_create :generate_uid, unless: @public_uid_column
-    end
-  end
-
-end
+require 'orm/active_record'

data/public_uid.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["equivalent@eq8.eu"]
   spec.description   = %q{Automatic generates public unique identifier for model}
   spec.summary       = %q{Automatic generates public UID column}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/equivalent/public_uid"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "orm_adapter", "~> 0.5"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "activerecord", "~> 3.2"
   spec.add_development_dependency "minitest", "~> 5"
   spec.add_development_dependency "sqlite3"
 end

data/test/models/custom_public_uid_column_test.rb

@@ -1,29 +1,25 @@
 require 'test_helper'
 
-class CustomPublicUidColumnModel < ActiveRecord::Base
-  self.table_name = "users"
-  include PublicUid
-  generate_public_uid column: :custom_uid
-end
-
-describe 'CustomPublicUidColumnModel' do
-  let(:user){CustomPublicUidColumnModel.new}
+TestConf.orm_modules.each do |orm_module|
+  describe orm_module.description do
+    let(:user) { "#{orm_module}::CustomPublicUidColumnModel".constantize.new }
 
-  describe '#custom_uid' do
-    subject{ user.custom_uid }
+    describe '#custom_uid' do
+      subject{ user.custom_uid }
 
-    context 'in new record' do
-      it{ subject.must_be_nil }
-    end
-
-    context 'after save' do
-      before do
-        user.save
-        user.reload
+      context 'in new record' do
+        it{ subject.must_be_nil }
       end
-      it{ subject.wont_be_nil }
-      it 'by default should generate 7 digit number string' do
-        subject.to_i.to_s.length.must_equal(7)
+
+      context 'after save' do
+        before do
+          user.save
+          user.reload
+        end
+        it{ subject.wont_be_nil }
+        it 'by default should generate 7 digit number string' do
+          subject.to_i.to_s.length.must_equal(7)
+        end
       end
     end
   end

data/test/models/model_with_custom_generator_test.rb

@@ -1,40 +1,33 @@
 require 'test_helper'
 
-class ModelWithCustomGererator < ActiveRecord::Base
-  self.table_name = "users"
-  include PublicUid
-
-  gener_range = ('a'..'z').to_a+('A'..'Z').to_a
-
-  generate_public_uid generator: PublicUid::Generators::RangeString.
-                                   new(10, gener_range)
-end
-
-describe 'ModelWithCustomGererator' do
-  let(:user){ModelWithCustomGererator.new}
-
-  describe '#public_uid' do
-    subject{ user.public_uid }
-
-    context 'in new record' do
-      it{ subject.must_be_nil }
-    end
-
-    context 'after save' do
-      before do
-        user.save
-        user.reload
-      end
-
-      it 'should generate 10 chars' do
-        subject.must_be_kind_of String
-        subject.length.must_equal(10)
+TestConf.orm_modules.each do |orm_module|
+  describe orm_module.description do
+    describe 'ModelWithCustomGererator' do
+      let(:user) { "#{orm_module}::ModelWithCustomGererator".constantize.new }
+
+      describe '#public_uid' do
+        subject{ user.public_uid }
+
+        context 'in new record' do
+          it{ subject.must_be_nil }
+        end
+
+        context 'after save' do
+          before do
+            user.save
+            user.reload
+          end
+
+          it 'should generate 10 chars' do
+            subject.must_be_kind_of String
+            subject.length.must_equal(10)
+          end
+
+          it 'string including up & down case' do
+            subject.must_match(/^[a-zA-Z]+$/)
+          end
+        end
       end
-
-      it 'string including up & down case' do
-        subject.must_match(/^[a-zA-Z]+$/)
-      end
-
     end
   end
 end

data/test/models/model_with_generator_defaults_test.rb

@@ -1,31 +1,28 @@
 require 'test_helper'
 
-class ModelWithGeneratorDefaults < ActiveRecord::Base
-  self.table_name =  "users"
-  include PublicUid
-  generate_public_uid
-end
-
-describe 'ModelWithGeneratorDefaults' do
-  let(:user){ModelWithGeneratorDefaults.new}
+TestConf.orm_modules.each do |orm_module|
+  describe orm_module.description do
+    describe 'ModelWithGeneratorDefaults' do
+      let(:user) { "#{orm_module}::ModelWithGeneratorDefaults".constantize.new }
 
-  describe '#public_uid' do
-    subject{ user.public_uid }
+      describe '#public_uid' do
+        subject{ user.public_uid }
 
-    context 'in new record' do
-      it{ subject.must_be_nil }
-    end
+        context 'in new record' do
+          it{ subject.must_be_nil }
+        end
 
-    context 'after save' do
-      before do
-        user.save
-        user.reload
-      end
-      it{ subject.wont_be_nil }
-      it 'by default should generate 7 digit number string' do
-        subject.to_i.to_s.length.must_equal(7)
+        context 'after save' do
+          before do
+            user.save
+            user.reload
+          end
+          it{ subject.wont_be_nil }
+          it 'by default should generate 7 digit number string' do
+            subject.to_i.to_s.length.must_equal(7)
+          end
+        end
       end
     end
   end
 end
-

data/test/support/orm/active_record.rb

@@ -0,0 +1,29 @@
+ActiveRecord::Base::establish_connection(adapter: 'sqlite3', database: ':memory:')
+ActiveRecord::Base.connection.execute(%{CREATE TABLE users  (id INTEGER PRIMARY KEY, public_uid VARCHAR, custom_uid INTEGER);})
+
+module ActRec
+  def self.description
+    'ActiveRecord based'
+  end
+
+  class CustomPublicUidColumnModel < ActiveRecord::Base
+    self.table_name = "users"
+    generate_public_uid column: :custom_uid
+  end
+
+  class ModelWithCustomGererator < ActiveRecord::Base
+    self.table_name = "users"
+
+    gener_range = ('a'..'z').to_a+('A'..'Z').to_a
+
+    generate_public_uid generator: PublicUid::Generators::RangeString.
+                                     new(10, gener_range)
+  end
+
+  class ModelWithGeneratorDefaults < ActiveRecord::Base
+    self.table_name =  "users"
+    generate_public_uid
+  end
+end
+
+TestConf.add_orm_module(ActRec)

data/test/test_helper.rb

@@ -1,7 +1,7 @@
+require 'pathname'
 require 'bundler/setup'
-require 'public_uid'
 require 'minitest/autorun'
-require 'active_record'
+require 'public_uid'
 
 class Minitest::Spec
   class << self
@@ -9,6 +9,26 @@ class Minitest::Spec
   end
 end
 
-ActiveRecord::Base::establish_connection(adapter: 'sqlite3', database: ':memory:')
-ActiveRecord::Base.connection.execute(%{CREATE TABLE users  (id INTEGER PRIMARY KEY, public_uid VARCHAR, custom_uid INTEGER);})
+class TestConf
+  class << self
+    def root_path
+      Pathname.new(File.expand_path '../..', __FILE__)
+    end
 
+    def orm_modules
+      @orm_modules ||= []
+    end
+
+    def add_orm_module(konstant)
+      orm_modules << konstant
+    end
+  end
+end
+
+['active_record'].each do |orm|
+  begin
+    load  TestConf.root_path.join 'test', 'support', 'orm', "#{orm}.rb"
+  rescue LoadError
+    raise "ORM #{orm} not available"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: public_uid
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tomas Valent
@@ -11,47 +11,47 @@ cert_chain: []
 date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: orm_adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+        version: '0.5'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -88,13 +88,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/orm/active_record.rb
 - lib/public_uid.rb
 - lib/public_uid/generators/number_random.rb
 - lib/public_uid/generators/range_string.rb
+- lib/public_uid/model.rb
 - lib/public_uid/set_public_uid.rb
 - lib/public_uid/version.rb
 - public_uid.gemspec
@@ -104,8 +107,9 @@ files:
 - test/models/custom_public_uid_column_test.rb
 - test/models/model_with_custom_generator_test.rb
 - test/models/model_with_generator_defaults_test.rb
+- test/support/orm/active_record.rb
 - test/test_helper.rb
-homepage: ''
+homepage: https://github.com/equivalent/public_uid
 licenses:
 - MIT
 metadata: {}
@@ -136,4 +140,5 @@ test_files:
 - test/models/custom_public_uid_column_test.rb
 - test/models/model_with_custom_generator_test.rb
 - test/models/model_with_generator_defaults_test.rb
+- test/support/orm/active_record.rb
 - test/test_helper.rb