has_unique_identifier 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8297a453b96808f1f92e967cff6c8ae331822c27
-  data.tar.gz: 247efc8edb1cfcdda610da4f2b58542e68ea0861
+SHA256:
+  metadata.gz: 7825723098ab566018574a086305673bbd077790f29dac349f5728c89bb97bb1
+  data.tar.gz: 9565c5c0639109eb07b76f7da47a4f21fbba57911e982f9de45542fc8ecf61e2
 SHA512:
-  metadata.gz: d2d4579fcc72ea6ef4c8675f0c5569b575f1ed5e1661b05794389ddb48471030fab903e1b6766a37590a61fbe908491595bcf0aa3fd25437b97156270fb3bac9
-  data.tar.gz: e9256637898f776c2e020b11f84aa3b0b61dc04268cad5e1ae1ca253037822f5103763fd80d4f3df281b6c529b48eb3e2f68895593a588ecb971cffd4436a3be
+  metadata.gz: d094d4019f90a9ff5fdd557380f459bede65a1fe93e09282f0d0de773057abe5417c18aa5df1acd09c0055987d41dde22fb10201cbc3dfdee2e7c17845e40678
+  data.tar.gz: 7cc010860c47131c6b5d084ea6822159763236c554880d2ca492ffbac4600038e1d0b39ae86837a36047ec873d7ceb7cefaaba02724d9a0548139f51b8207d85

data/gems.locked

@@ -0,0 +1,57 @@
+PATH
+  remote: .
+  specs:
+    has_unique_identifier (0.2.0)
+      activemodel (>= 4.0)
+      activesupport (>= 4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    method_source (0.9.0)
+    minitest (5.11.3)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    rake (10.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.10)
+  has_unique_identifier!
+  pry
+  rake (~> 10.0)
+  rspec
+
+BUNDLED WITH
+   1.16.1

data/has_unique_identifier.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
 
-  spec.add_dependency 'rails', '>= 4.0'
+  spec.add_dependency 'activesupport', '>= 4.0'
+  spec.add_dependency 'activemodel'  , '>= 4.0'
 end

data/lib/has_unique_identifier/class_methods.rb

@@ -1,7 +1,10 @@
 module HasUniqueIdentifier
   module ClassMethods
     def unique_identifier
-      @unique_identifier
+      return @unique_identifier if @unique_identifier
+      if superclass.respond_to?(:unique_identifier)
+        return superclass.unique_identifier
+      end
     end
 
     def has_unique_identifier(name, opts = {})

data/lib/has_unique_identifier/instance_methods.rb

@@ -1,8 +1,14 @@
 module HasUniqueIdentifier
   module InstanceMethods
     DEFAULT_RANDOM_IDENTIFIER_LENGTH = 24
+    DEFAULT_SAFE_CHARS = (
+      ('A'..'Z').to_a +
+      ('a'..'z').to_a +
+      ('0'..'9').to_a +
+      %w[- _ ~]
+    ).freeze
 
-    extend ActiveSupport::Concern
+    extend ::ActiveSupport::Concern
 
     def to_param
       if self.class.unique_identifier &&
@@ -14,7 +20,7 @@ module HasUniqueIdentifier
     end
 
     included do
-      before_create :ensure_unique_identifier
+      before_validation :ensure_unique_identifier
 
       private
 
@@ -25,16 +31,29 @@ module HasUniqueIdentifier
         length = self.class.unique_identifier.options[:length] ||
           DEFAULT_RANDOM_IDENTIFIER_LENGTH
 
+        unless self.class.unique_identifier.options[:force]
+          return if self[self.class.unique_identifier.name].present?
+        end
         send("#{self.class.unique_identifier.name}=",
           loop do
-            hash =
-              if self.class.unique_identifier.options[:only_numbers]
-                number_size = 10 ** length
-                SecureRandom.random_number(9 * number_size) + number_size
+            chars =
+              if self.class.unique_identifier.options[:safe_chars]
+                self.class.unique_identifier.options[:safe_chars].dup
+              elsif self.class.unique_identifier.options[:only_numbers]
+                (0..9).to_a
+              elsif self.class.unique_identifier.options[:only_letters]
+                ('a'..'z').to_a + ('A'..'Z').to_a
+              elsif self.class.unique_identifier.options[:no_symbols]
+                ('a'..'z').to_a + ('A'..'Z').to_a + (0..9).to_a
               else
-                SecureRandom.hex(length)
+                DEFAULT_SAFE_CHARS.dup
               end
-            break hash unless self.class.exists?(self.class.unique_identifier.name => hash)
+            chars.shuffle!
+
+            hash = Array.new(length) { chars.sample }.join
+            unless self.class.exists?(self.class.unique_identifier.name => hash.to_s)
+              break hash
+            end
           end
         )
       end

data/lib/has_unique_identifier/railtie.rb

@@ -3,9 +3,9 @@ require 'rails/railtie'
 module HasUniqueIdentifier
   class Railtie < Rails::Railtie
 
-    initializer "has_unique_identifier.setup_orm" do |app|
+    initializer 'has_unique_identifier.setup_orm' do |app|
       [:active_record, :sequel].each do |orm|
-        ActiveSupport.on_load orm do
+        ::ActiveSupport.on_load orm do
           HasUniqueIdentifier.setup_orm self
         end
       end

data/lib/has_unique_identifier/version.rb

@@ -1,3 +1,3 @@
 module HasUniqueIdentifier
-  VERSION = "0.1.0"
+  VERSION = '0.2.0'
 end

data/lib/has_unique_identifier.rb

@@ -1,3 +1,6 @@
+require 'active_support'
+require 'active_model'
+
 require 'has_unique_identifier/version'
 require 'has_unique_identifier/class_methods'
 require 'has_unique_identifier/instance_methods'
@@ -5,10 +8,8 @@ require 'has_unique_identifier/instance_methods'
 require_relative 'has_unique_identifier/railtie' if defined? Rails
 
 module HasUniqueIdentifier
-  def self.setup_orm(base)
-    base.class_eval do
-      extend ClassMethods
-      include InstanceMethods
-    end
+  def self.included(base)
+    base.send :extend, ClassMethods
+    base.send :include, InstanceMethods
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_unique_identifier
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey Besedin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -76,12 +90,13 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- gems.locked
+- gems.rb
 - has_unique_identifier.gemspec
 - lib/has_unique_identifier.rb
 - lib/has_unique_identifier/class_methods.rb
@@ -108,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Make random unique identifiers with ease