public_uid 1.2.2 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7323c6067a97bf3479759130f27f3ab6a2629084
-  data.tar.gz: 2a5aa34772776cc391d103d9f1ecb776899f0b0e
+SHA256:
+  metadata.gz: 789c1469292aaeac0682a128fa3edcb9a4e2adcb792c94acef5c41fa20a56160
+  data.tar.gz: 9fe04f567ebd19658ea950585fadccf98a42f0414a2d35451b23d7245f301287
 SHA512:
-  metadata.gz: 51f04e7f8a1331cacee37033b013237a49cbd9946d9f564998705c4ba5be1a1a2e16960a09d9de298579178cc97bcb612d361301795aa80c21178974eb4ff4c9
-  data.tar.gz: 935f54f79fcd7b681e8ad76f28a5b98d45810236ed2fc86862a6a38dad9e1d1b0a30c13a6815a460d27ffc45c3411ac55b839236c043dc67c5ead9e1eee9d49e
+  metadata.gz: 26d3176ede91d962cf2a3debfcbf967c50e20cff478ea67176d6ea4f60ebbdf2a086c4941b823a49717fbf724d342d725291a92979bcd35bf987db21845d80ce
+  data.tar.gz: f55e66e2fb2a868e28c6b2bf209a39d13a6cb68635c5af308623e3f0939442b3df9c85e581e5c3667e932e8de056271b0d820907fecb657c2c8ccee654252242

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.2.2
-  - 2.3.0
-  - ruby-head
+  - 2.4.5
+  - 2.5.3
+  - 2.6.5
+before_install:
+  - gem install bundler

data/README.md

@@ -48,16 +48,67 @@ And then execute:
 
 ## Usage
 
+
+### Step 1 - db column
+
 Create database column for public unique ID.
 
 ```ruby
 class AddPublicUidToUsers < ActiveRecord::Migration
   def change
     add_column :users, :public_uid, :string
+    add_index  :users, :public_uid
   end
 end
 ```
 
+### Step 2a - Using Rails concern
+
+> a.k.a - the easy way for Rails (availible since version 2.1.0)
+
+```ruby
+class User < ActiveRecord::Base
+  include PublicUid::ModelConcern
+end
+```
+
+Example:
+
+
+```ruby
+user = User.create
+user.public_uid
+# => "xxxxxxxx"
+
+user.to_param
+# => "xxxxxxxx"
+
+User.find_puid('xxxxxxxx')
+# => <#User ...>
+User.find_puid('not_existing')
+# => nil
+
+User.find_puid!('xxxxxxxx')
+# => <#User ...>
+User.find_puid!('not_existing')
+# PublicUid::RecordNotFound (User 'not_existing' not found)
+```
+
+This will automatically:
+
+* assumes your model has `public_uid` column and generate public_uid value for you
+* will automatically tell model to use `public_uid` as `to_param` method   ffectively turning `user.public_uid` the attribute passed in routes when you do routes (instead of `id`). Example `user_path(@user)` => `/users/xxxxxxx` 
+* provides `User.find_puid('xxxxxx')` and `User.find_puid!('xxxxxx')` class methods as more convenient replacement for `find_by!(public_uid: 'xxxxxxx')` to find records in controllers.
+* `User.find_puid!('xxxxxx')` will raise `PublicUid::RecordNotFound`   instead of `ActiveRecord::RecordNotFound` for more accurate error handling in Rails controller (check [Rails rescue_from](https://apidock.com/rails/ActiveSupport/Rescuable/ClassMethods/rescue_from) for inspiration)
+
+> more info check > [source](https://github.com/equivalent/public_uid/blob/master/lib/public_uid/model_concern.rb)
+
+If you need more customization please  follow **Step 2b** instead
+
+### Step 2b - Using manual generate method
+
+> a.k.a bit harder than `2.a` but more flexible way for Rails
+
 Tell your model to generate the public identifier
 
 ```ruby
@@ -84,7 +135,7 @@ Then you can do more clever things like having urls based on `public_uid` and `t
 class User < ActiveRecord::Base
   generate_public_uid
 
-  def self.find_param(param)
+  def self.find_puid(param)
     find_by! public_uid: param.split('-').first
   end
   
@@ -97,7 +148,7 @@ end
 class UsersController < ActionController::Base
   # ...
   def show
-    @user = User.find_param(param[:id])
+    @user = User.find_puid(param[:id])
     # ...
   end
   # ...
@@ -141,6 +192,36 @@ generator wont work if your public uniq ID column is a String (as the
 gem would try to set Integer on a String). If you really want a number
 like string you can specify number range for Range String Generator
 
+If you want to generate random Integer using SecureRandom ruby library you can use built-in number secure generator:
+
+```ruby
+class User < ActiveRecord::Base
+  generate_public_uid generator: PublicUid::Generators::NumberSecureRandom.new
+end
+```
+
+```irb
+u = User.new
+u.public_uid  #=> nil
+u.save!       #=> true
+u.public_uid  #=> 4567123
+```
+
+If you want to generate random Hexadecimal String using SecureRandom ruby library you can use built-in hexadecimal string secure generator:
+
+```ruby
+class User < ActiveRecord::Base
+  generate_public_uid generator: PublicUid::Generators::HexStringSecureRandom.new
+end
+```
+
+```irb
+u = User.new
+u.public_uid  #=> nil
+u.save!       #=> true
+u.public_uid  #=> 0b30ffbc7de3b362
+```
+
 ### Customizing generated string
 
 ```ruby
@@ -150,6 +231,14 @@ class User < ActiveRecord::Base
 end
 ```
 
+or in case you are using SecureRandom ruby library: 
+
+```ruby
+class User < ActiveRecord::Base
+  generate_public_uid generator: PublicUid::Generators::HexStringSecureRandom.new(4)  #4 is length of hexadecimal string. If this argument is not set, length of hexadecimal string will be 8 characters. 
+end
+```
+
 ```irb
 u = User.new
 u.public_uid  #=> nil
@@ -177,6 +266,14 @@ class User < ActiveRecord::Base
 end
 ```
 
+or in case you are using SecureRandom ruby library: 
+```ruby
+class User < ActiveRecord::Base
+  UID_RANGE = 1_000..4_000
+  generate_public_uid generator: PublicUid::Generators::NumberSecureRandom.new(UID_RANGE)
+end
+```
+
 ```irb
 u = User.new
 u.public_uid  #=> nil
@@ -264,3 +361,23 @@ In future gem version we will actually introduce this two generators.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Changelog
+
+##### 2019-11-29
+
+Version 2.0.0 released
+
+Till version [public_uid 1.3.1](https://github.com/equivalent/public_uid/tree/version-1.3.1) gem used [orm_adapter](https://github.com/ianwhite/orm_adapter) which mean
+that you could use ActiveRecord or any other data mapping adapter (e.g. Mongoid) supported by orm adapter.
+
+Problem is that orm_adapter is not maintained for 6 years now and cause some
+gem conflicts with latest ActiveRecord development environment. That's
+why I've decided to remove the ORM adapter ([commit](https://github.com/equivalent/public_uid/commit/e66b5dbf659fcdddc6b284b3eb2051a9b8a31968))
+and use `ActiveRecord::Base` directly.
+
+That means any Rails application using `public_uid` gem  ActiveRecord will **not** be affected by the 2.0 release.
+If anyone want to see public_uid v 2.0 to support other data mappers (e.g. mongo) please open an issue or create PR with the fix.
+
+Sorry for any inconvenience
+

data/lib/public_uid.rb

@@ -1,10 +1,16 @@
-require 'orm_adapter'
+require 'active_record'
 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"
-
+require "public_uid/generators/number_secure_random"
+require "public_uid/generators/hex_string_secure_random"
+require 'public_uid/model_concern'
 require 'public_uid/tasks' if defined?(Rails)
 
-require 'orm/active_record' if defined?(ActiveRecord::Base)
+module PublicUid
+  RecordNotFound = Class.new(StandardError)
+end
+
+ActiveRecord::Base.send(:include, PublicUid::Model)

data/lib/public_uid/generators/hex_string_secure_random.rb

@@ -0,0 +1,20 @@
+require 'securerandom'
+
+module PublicUid
+  module Generators
+    class HexStringSecureRandom
+      def initialize(length=8)
+        @length = length
+      end
+
+      def generate
+        if @length.odd?
+          result = SecureRandom.hex( (@length+1)/2 )  #because in "SecureRandom.hex(@length)" @length means length in bytes = 2 hexadecimal characters  
+          return result[0...-1]
+        else
+         SecureRandom.hex(@length/2)
+        end
+      end
+    end
+  end
+end

data/lib/public_uid/generators/number_secure_random.rb

@@ -0,0 +1,16 @@
+require 'securerandom'
+
+module PublicUid
+  module Generators
+    class NumberSecureRandom
+      def initialize(scale = 1_000_000..9_999_999)
+        @scale = scale
+      end
+
+      def generate()
+        generated_number = SecureRandom.random_number( (@scale.max - @scale.min) )  #because SecureRandom.random_number can have only one argument = max value.
+        return (generated_number + @scale.min)
+      end
+    end
+  end
+end

data/lib/public_uid/model.rb

@@ -34,7 +34,7 @@ module PublicUid
       end
 
       def public_uid_generator
-        @public_uid_generator || Generators::RangeString.new
+        @public_uid_generator || Generators::HexStringSecureRandom.new
       end
 
       private

data/lib/public_uid/model_concern.rb

@@ -0,0 +1,29 @@
+module PublicUid
+  module ModelConcern
+    RecordNotFound = Class.new(StandardError)
+
+    extend ActiveSupport::Concern
+
+    included do
+      generate_public_uid
+    end
+
+    class_methods do
+      def find_puid!(public_uid)
+        find_by!(public_uid: public_uid)
+      rescue ActiveRecord::RecordNotFound
+        raise PublicUid::RecordNotFound, "#{self.name} '#{public_uid}' not found"
+      end
+
+      def find_puid(public_uid)
+        find_puid!(public_uid)
+      rescue PublicUid::RecordNotFound
+        nil
+      end
+    end
+
+    def to_param
+      public_uid
+    end
+  end
+end

data/lib/public_uid/set_public_uid.rb

@@ -27,7 +27,7 @@ module PublicUid
     private
 
     def similar_uid_exist?
-      @klass.where(@column => new_uid).count > 0
+      @klass.where(@column => new_uid).exists?
     end
 
     def check_column_existance

data/lib/public_uid/tasks/generate.rake

@@ -3,6 +3,7 @@ require 'rake'
 namespace :public_uid do
   desc "Generate public_uid on Models that have public_uid column on records that have nil value"
   task :generate => :environment do
+    Rails.application.eager_load! if defined?(Rails)
     ActiveRecord::Base.descendants.each do |model|
       model.connection # establish conection
 
@@ -14,7 +15,7 @@ namespace :public_uid do
           .tap { |scope| puts "  * generating #{scope.count} #{uid_column_name}(s) for #{model.table_name}" }
           .find_each do |record_without_public_uid|
           record_without_public_uid.generate_uid
-          record_without_public_uid.save!
+          record_without_public_uid.save!(validate: false)
         end
         puts ''
       end

data/lib/public_uid/version.rb

@@ -1,3 +1,3 @@
 module PublicUid
-  VERSION = "1.2.2"
+  VERSION = "2.1.1"
 end

data/public_uid.gemspec

@@ -18,11 +18,12 @@ 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_dependency "activerecord", '> 4.2' # ensures compatibility for ruby 2.0.0+ to head
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "pry"
   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", '~> 4.2' # ensures compatibility for ruby 2.0.0+ to head
+  spec.add_development_dependency "sqlite3", "~> 1.4.1"
+  spec.add_development_dependency "activesupport", '> 4.2'
 end

data/test/lib/generators/hex_string_secure_random_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+describe 'HexStringSecureRandom' do
+
+  describe "#generate" do
+    subject{ instance.generate }
+
+    context 'by default' do
+      let(:instance){ PublicUid::Generators::HexStringSecureRandom.new }
+      it 'generates 8 chars hexa string' do
+        expect(subject.length).must_equal 8
+        expect(subject).must_be_kind_of String
+      end
+
+      it 'generates hexadecimal chars' do
+        expect(subject).must_match(/^[a-f0-9]*$/)
+      end
+    end
+
+    context 'when 10 hexa chars' do
+      let(:instance){ PublicUid::Generators::HexStringSecureRandom.new(10) }
+      it 'generates 10 chars string' do
+        expect(subject.length).must_equal 10
+      end
+    end
+
+    context 'when 11 hexa chars' do
+      let(:instance){ PublicUid::Generators::HexStringSecureRandom.new(11) }
+      it 'generates 11 chars string' do
+        expect(subject.length).must_equal 11
+      end
+    end
+  end
+end

data/test/lib/generators/number_random_test.rb

@@ -8,20 +8,20 @@ describe 'NumberRandom' do
     context 'by default' do
       let(:instance){ PublicUid::Generators::NumberRandom.new }
       it 'generates 7 digits' do
-        subject.to_i.to_s.length.must_equal 7
-        subject.must_be_kind_of Integer
+        expect(subject.to_i.to_s.length).must_equal 7
+        expect(subject).must_be_kind_of Integer
       end
     end
 
     context 'when specifying number between 20 - 21' do
       let(:instance){ PublicUid::Generators::NumberRandom.new(20..21) }
       it 'generates 2 digits' do
-        subject.to_i.to_s.length.must_equal 2
-        subject.must_be_kind_of Integer
+        expect(subject.to_i.to_s.length).must_equal 2
+        expect(subject).must_be_kind_of Integer
       end
 
-      it 'generates string containing chars x,y,z' do
-        [20, 21].must_include subject
+      it 'generates integer has to be 20 or 21' do
+        expect([20, 21]).must_include subject
       end
     end
   end

data/test/lib/generators/number_secure_random_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+describe 'NumberSecureRandom' do
+
+  describe "#generate" do
+    subject{ instance.generate }
+
+    context 'by default' do
+      let(:instance){ PublicUid::Generators::NumberSecureRandom.new }
+      it 'generates 7 digits' do
+        expect(subject.to_i.to_s.length).must_equal 7
+        expect(subject).must_be_kind_of Integer
+      end
+    end
+
+    context 'when specifying number between 20 - 21' do
+      let(:instance){ PublicUid::Generators::NumberSecureRandom.new(20..21) }
+      it 'generates 2 digits' do
+        expect(subject.to_i.to_s.length).must_equal 2
+        expect(subject).must_be_kind_of Integer
+      end
+
+      it 'generates integer has to be 20 or 21' do
+        expect([20, 21]).must_include subject
+      end
+    end
+
+    context 'when specifying number between 1000 - 9999' do
+      let(:instance){ PublicUid::Generators::NumberSecureRandom.new(1000..9999) }
+      it 'generates 4 digits' do
+        expect(subject.to_i.to_s.length).must_equal 4
+        expect(subject).must_be_kind_of Integer
+      end
+
+      it 'generates integer has to be between 1000 and 9999' do
+        expect((1000..9999)).must_include subject
+      end
+    end
+  end
+end

data/test/lib/generators/range_string_test.rb

@@ -8,23 +8,23 @@ describe 'RangeString' do
     context 'by default' do
       let(:instance){ PublicUid::Generators::RangeString.new }
       it 'generates 8 chars string' do
-        subject.length.must_equal 8
-        subject.must_be_kind_of String
+        expect(subject.length).must_equal 8
+        expect(subject).must_be_kind_of String
       end
 
       it 'generates downcase chars' do
-        subject.must_match(/^[a-z]*$/)
+        expect(subject).must_match(/^[a-z]*$/)
       end
     end
 
     context 'when 10 chars x-y' do
       let(:instance){ PublicUid::Generators::RangeString.new(3, ('x'..'z')) }
       it 'generates 10 chars string' do
-        subject.length.must_equal 3
+        expect(subject.length).must_equal 3
       end
 
       it 'generates string containing chars x,y,z' do
-        subject.must_match(/^[x-z]*$/)
+        expect(subject).must_match(/^[x-z]*$/)
       end
     end
   end

data/test/lib/set_public_uid_test.rb

@@ -26,12 +26,20 @@ TestConf.orm_modules.each do |orm_module|
       describe 'initialization' do
         context 'when column not specified' do
           let(:options) { { record: record } }
-          it{ ->{ instance } .must_raise(PublicUid::SetPublicUid::NoPublicUidColumnSpecified) }
+          it do
+            assert_raises PublicUid::SetPublicUid::NoPublicUidColumnSpecified do
+              instance
+            end
+          end
         end
 
         context 'when record not specified' do
           let(:options) { {column: :foo} }
-          it{ ->{ instance } .must_raise(PublicUid::SetPublicUid::NoRecordSpecified) }
+          it do
+            assert_raises PublicUid::SetPublicUid::NoRecordSpecified do
+              instance
+            end
+          end
         end
       end
 
@@ -40,7 +48,7 @@ TestConf.orm_modules.each do |orm_module|
 
         it "should ask generator to generate random string" do
           instance.generate(DummyGenerator.new)
-          subject.must_equal 'first try'
+          expect(subject).must_equal 'first try'
         end
 
         context 'when record match random' do
@@ -49,7 +57,7 @@ TestConf.orm_modules.each do |orm_module|
 
           it "should generate string once again" do
             instance.generate(DummyGenerator.new)
-            subject.must_equal 'second try'
+            expect(subject).must_equal 'second try'
           end
         end
       end
@@ -58,7 +66,11 @@ TestConf.orm_modules.each do |orm_module|
         subject { instance.new_uid }
 
         context 'when @new id is not set' do
-          it{ ->{ instance.set }.must_raise(PublicUid::SetPublicUid::NewUidNotSetYet) }
+          it do
+            assert_raises PublicUid::SetPublicUid::NewUidNotSetYet do
+              instance.set
+            end
+          end
         end
 
         context 'when @new id is set' do
@@ -66,7 +78,7 @@ TestConf.orm_modules.each do |orm_module|
 
           it 'must set new_uid for record pubilc_uid column' do
             instance.set
-            subject.must_equal '123'
+            expect(subject).must_equal '123'
           end
         end
       end
@@ -84,7 +96,7 @@ TestConf.orm_modules.each do |orm_module|
           count_mock = stub(record_class).count { 10 }
           stub(record_class).where( { public_uid: 567 } ) { count_mock }
 
-          trigger.must_equal true
+          expect(trigger).must_equal true
         end
       end
     end

data/test/lib/tasks/generate_test.rb

@@ -29,23 +29,20 @@ describe 'Generate' do
               initial_uid = user.send(uid_column)
 
               # simulate an existing record with no uid value
-              user.update_attribute(uid_column, nil).must_equal true
-              user.send(uid_column).must_be_nil
+              expect(user.update_attribute(uid_column, nil)).must_equal true
+              expect(user.send(uid_column)).must_be_nil
 
               # run the rake task
               run_generate_task
 
               user.reload
-              user.send(uid_column).must_be_kind_of String
-              user.send(uid_column).wont_be_empty
-              user.send(uid_column).wont_be_same_as initial_uid
+              expect(user.send(uid_column)).must_be_kind_of String
+              expect(user.send(uid_column)).wont_be_empty
+              expect(user.send(uid_column)).wont_be_same_as initial_uid
             end
           end
         end
-
       end
-
     end
   end
-
 end

data/test/models/custom_public_uid_column_test.rb

@@ -9,14 +9,14 @@ TestConf.orm_modules.each do |orm_module|
         subject{ user.custom_uid }
 
         context 'in new record' do
-          it{ subject.must_be_nil }
+          it{ expect(subject).must_be_nil }
 
           describe '#generate_uid' do
             before do
               user.generate_uid
             end
 
-            it { subject.wont_be_nil }
+            it { expect(subject).wont_be_nil }
           end
         end
 
@@ -27,8 +27,8 @@ TestConf.orm_modules.each do |orm_module|
             user.reload
           end
 
-          it{ subject.must_be_kind_of(String) }
-          it{ subject.length.must_equal(8) }
+          it{ expect(subject).must_be_kind_of(String) }
+          it{ expect(subject.length).must_equal(8) }
         end
       end
     end

data/test/models/instance_methods_initialization_test.rb

@@ -9,7 +9,7 @@ TestConf.orm_modules.each do |orm_module|
       end
 
       it 'model should not expose :generate_uid public instance method' do
-        model.instance_methods.wont_include :generate_uid
+        expect(model.instance_methods).wont_include :generate_uid
       end
     end
 
@@ -19,7 +19,7 @@ TestConf.orm_modules.each do |orm_module|
       end
 
       it 'model should expose :generate_uid public instance method' do
-        model.instance_methods.must_include :generate_uid
+        expect(model.instance_methods).must_include :generate_uid
       end
     end
   end

data/test/models/model_with_custom_generator_test.rb

@@ -9,14 +9,14 @@ TestConf.orm_modules.each do |orm_module|
         subject{ user.public_uid }
 
         context 'in new record' do
-          it{ subject.must_be_nil }
+          it{ expect(subject).must_be_nil }
 
           describe '#generate_uid' do
             before do
               user.generate_uid
             end
 
-            it { subject.wont_be_nil }
+            it { expect(subject).wont_be_nil }
           end
         end
 
@@ -27,12 +27,12 @@ TestConf.orm_modules.each do |orm_module|
           end
 
           it 'should generate 10 chars' do
-            subject.must_be_kind_of String
-            subject.length.must_equal(10)
+            expect(subject).must_be_kind_of String
+            expect(subject.length).must_equal(10)
           end
 
           it 'string including up & down case' do
-            subject.must_match(/^[a-zA-Z]+$/)
+            expect(subject).must_match(/^[a-zA-Z]+$/)
           end
         end
       end

data/test/models/model_with_generator_defaults_test.rb

@@ -9,14 +9,14 @@ TestConf.orm_modules.each do |orm_module|
         subject{ user.public_uid }
 
         context 'in new record' do
-          it{ subject.must_be_nil }
+          it{ expect(subject).must_be_nil }
 
           describe '#generate_uid' do
             before do
               user.generate_uid
             end
 
-            it { subject.wont_be_nil }
+            it { expect(subject).wont_be_nil }
           end
         end
 
@@ -27,8 +27,8 @@ TestConf.orm_modules.each do |orm_module|
             user.reload
           end
 
-          it{ subject.must_be_kind_of(String) }
-          it{ subject.length.must_equal(8) }
+          it{ expect(subject).must_be_kind_of(String) }
+          it{ expect(subject.length).must_equal(8) }
         end
       end
     end

data/test/models/model_with_public_uid_concern_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+TestConf.orm_modules.each do |orm_module|
+  describe orm_module.description do
+    context 'Model with default generator' do
+      let(:model_class) { "#{orm_module}::ModelWithPublicUidConcern".constantize }
+      let(:user) { model_class.new }
+
+      describe '#public_uid' do
+        subject{ user.public_uid }
+
+        context 'in new record' do
+          it{ expect(subject).must_be_nil }
+
+          describe '#generate_uid' do
+            before do
+              user.generate_uid
+            end
+
+            it { expect(subject).wont_be_nil }
+          end
+        end
+
+        context 'after save' do
+
+          before do
+            user.save
+            user.reload
+          end
+
+          it{ expect(subject).must_be_kind_of(String) }
+          it{ expect(subject.length).must_equal(8) }
+
+          it{ expect(user.to_param).must_equal(subject) }
+          it{ expect(model_class.find_puid(subject)).must_equal(user) }
+          it{ expect(model_class.find_puid!(subject)).must_equal(user) }
+
+
+          it{ expect(model_class.find_puid('nonexisting')).must_be_nil }
+          it do
+            assert_raises PublicUid::RecordNotFound do
+              model_class.find_puid!('nonexisting')
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/support/orm/active_record.rb

@@ -29,6 +29,12 @@ module ActRec
     generate_public_uid
   end
 
+  class ModelWithPublicUidConcern  < ActiveRecord::Base
+    include PublicUid::ModelConcern
+    self.table_name =  'user_puids'
+    generate_public_uid
+  end
+
   class ModelWithoutGenaratePublicUid < ActiveRecord::Base
     self.table_name =  'users'
   end

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: public_uid
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.1.1
 platform: ruby
 authors:
 - Tomas Valent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: orm_adapter
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,28 +98,28 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '4.2'
 description: Automatic generates public unique identifier for model
@@ -121,17 +135,21 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/orm/active_record.rb
 - lib/public_uid.rb
+- lib/public_uid/generators/hex_string_secure_random.rb
 - lib/public_uid/generators/number_random.rb
+- lib/public_uid/generators/number_secure_random.rb
 - lib/public_uid/generators/range_string.rb
 - lib/public_uid/model.rb
+- lib/public_uid/model_concern.rb
 - lib/public_uid/set_public_uid.rb
 - lib/public_uid/tasks.rb
 - lib/public_uid/tasks/generate.rake
 - lib/public_uid/version.rb
 - public_uid.gemspec
+- test/lib/generators/hex_string_secure_random_test.rb
 - test/lib/generators/number_random_test.rb
+- test/lib/generators/number_secure_random_test.rb
 - test/lib/generators/range_string_test.rb
 - test/lib/set_public_uid_test.rb
 - test/lib/tasks/generate_test.rb
@@ -139,6 +157,7 @@ files:
 - test/models/instance_methods_initialization_test.rb
 - test/models/model_with_custom_generator_test.rb
 - test/models/model_with_generator_defaults_test.rb
+- test/models/model_with_public_uid_concern_test.rb
 - test/support/orm/active_record.rb
 - test/support/test_conf.rb
 - test/test_helper.rb
@@ -161,13 +180,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Automatic generates public UID column
 test_files:
+- test/lib/generators/hex_string_secure_random_test.rb
 - test/lib/generators/number_random_test.rb
+- test/lib/generators/number_secure_random_test.rb
 - test/lib/generators/range_string_test.rb
 - test/lib/set_public_uid_test.rb
 - test/lib/tasks/generate_test.rb
@@ -175,6 +195,7 @@ test_files:
 - test/models/instance_methods_initialization_test.rb
 - test/models/model_with_custom_generator_test.rb
 - test/models/model_with_generator_defaults_test.rb
+- test/models/model_with_public_uid_concern_test.rb
 - test/support/orm/active_record.rb
 - test/support/test_conf.rb
 - test/test_helper.rb

data/lib/orm/active_record.rb

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