public_uid 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eae2510dbf2fc8bb27deb0152a09c9a16c076200e11c9b59d3cc4d773dae188
-  data.tar.gz: 7b63a89f445c5ac69c20173d61cdfe2cb951aa87454afdca21306ee605a403b3
+  metadata.gz: d8df1654181a314bd55f3b19088d5da0637a81e3a84837b9a9f544cab4bfcf4e
+  data.tar.gz: c1c7658bec15be557d28fb91080973a98817931441dbb5733fa89fa4685c3b03
 SHA512:
-  metadata.gz: 4702fd22920d3386b9ad00aa89524fb3c48fd5d9be9424803f9dff4b869eca2672b448757ba4ab00d756778b43c93ea472653545189f2c27d42b90fa00c1a175
-  data.tar.gz: ff06e39666089367fec172e0c3e4a3b07725ee7196715943590f7e0a5ef9b242ac1171578e816f36d592eeb078ac6433f9ecc82a50ac43a28e63c725cda82023
+  metadata.gz: 1a6dba79147370f0d36de14b9ae4d9de0fe58614f6a088cfd63dbf67674a6cafb477524514e7441060fad6bff1ed10092c1a8d08a2d9cbc83da4628dc987bff1
+  data.tar.gz: 5f4343c40e9575faa3f4bab8795b2025ac5bc44988aecfe7806059e28b02acbf9842023a509aabbd0b321c6c008ed5d55157f0b855a6b04b9c78259c0a6f2baf

data/.travis.yml

@@ -1,9 +1,8 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.2.2
-  - 2.3.0
-  - 2.4.0
-  - 2.5.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
+  - 2.6.5
+before_install:
+  - gem install bundler

data/README.md

@@ -311,3 +311,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,4 +1,4 @@
-require 'orm_adapter'
+require 'active_record'
 require "public_uid/version"
 require "public_uid/set_public_uid"
 require "public_uid/model"
@@ -8,4 +8,4 @@ require "public_uid/generators/number_secure_random"
 require "public_uid/generators/hex_string_secure_random"
 require 'public_uid/tasks' if defined?(Rails)
 
-require 'orm/active_record' if defined?(ActiveRecord::Base)
+ActiveRecord::Base.send(:include, PublicUid::Model)

data/lib/public_uid/tasks/generate.rake

@@ -3,7 +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!
+    Rails.application.eager_load! if defined?(Rails)
     ActiveRecord::Base.descendants.each do |model|
       model.connection # establish conection
 
@@ -15,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.3.1"
+  VERSION = "2.0.0"
 end

data/public_uid.gemspec

@@ -18,11 +18,10 @@ 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 "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"
 end

data/test/lib/generators/hex_string_secure_random_test.rb

@@ -8,26 +8,26 @@ describe 'HexStringSecureRandom' do
     context 'by default' do
       let(:instance){ PublicUid::Generators::HexStringSecureRandom.new }
       it 'generates 8 chars hexa 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 hexadecimal chars' do
-        subject.must_match(/^[a-f0-9]*$/)
+        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
-        subject.length.must_equal 10
+        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
-        subject.length.must_equal 11
+        expect(subject.length).must_equal 11
       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 integer has to be 20 or 21' do
-        [20, 21].must_include subject
+        expect([20, 21]).must_include subject
       end
     end
   end

data/test/lib/generators/number_secure_random_test.rb

@@ -8,32 +8,32 @@ describe 'NumberSecureRandom' do
     context 'by default' do
       let(:instance){ PublicUid::Generators::NumberSecureRandom.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::NumberSecureRandom.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 integer has to be 20 or 21' do
-        [20, 21].must_include subject
+        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
-        subject.to_i.to_s.length.must_equal 4
-        subject.must_be_kind_of Integer
+        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
-        (1000..9999).must_include subject
+        expect((1000..9999)).must_include subject
       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

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: public_uid
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Tomas Valent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-11-29 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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -82,32 +82,18 @@ dependencies:
         version: 1.1.2
 - !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'
-- !ruby/object:Gem::Dependency
-  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 1.4.1
 description: Automatic generates public unique identifier for model
 email:
 - equivalent@eq8.eu
@@ -121,7 +107,6 @@ 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

data/lib/orm/active_record.rb

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