uidable 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c85898f6d9f3b6b321e43eea4ef730ca495db7
-  data.tar.gz: b453dbc73825a18c60a66d2e07a2eded6dd1318a
+  metadata.gz: 049db3fd13da41c90f3f26522a6a3fbe7ed7fc0a
+  data.tar.gz: e229b43eedd837dfa33a2fb7add8bf6e76cfbe15
 SHA512:
-  metadata.gz: b9198359b1bfbe61c16f2a18d86fe0b6f818003f9a05a5aac423e4f4cd3acdc64095a96ea40915966c4749b98742c97272a820d1009e2e84a4543997f8712ac3
-  data.tar.gz: 36f8c7a8b82b35694807e5946a4aad5f4745e34165d227a167bc3dbe193a2eb11514b054004e0372a8b46264b96b4a9c49741ac339f1cc0dbb0013492d9282dd
+  metadata.gz: 666c26af8fcd4071393c5ad29faa6b3a5a51d9dca8ecefe899ad2683cad3fc199ff300eb51e826e1c82e6aad7ee26519214ef5cec554ad7610cac287bdb616f2
+  data.tar.gz: 6dc71358a57cf9dff53d8e5cb67d846e677587382d55244e2b1b4a592e4ebbe960d985d431ca787c8a5c750be498a1b24d414e3357a5aadb20248686ff8a6ba2

data/README.md

@@ -104,7 +104,7 @@ If the option `scope: true` is given, a scope `with_uid` is created and you can
 
 ## Redefine Uid Generation
 
-You can override `gen_uid` method in your class/model if you want to generate your own uid. Here is an example:
+You can override `gen_<name>` method in your class/model if you want to generate your own uid. Here is an example:
 
     require `random_token`
 

data/lib/uidable/version.rb

@@ -1,3 +1,3 @@
 module Uidable
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/uidable.rb

@@ -5,6 +5,24 @@ module Uidable
 
   def self.included(base)
     base.extend ClassMethods
+    unless defined?(::ActiveRecord::Base) && base < ::ActiveRecord::Base
+      base.prepend InitUid
+    end
+
+    private
+
+    def uidable_cols_init
+      self.class.uidable_cols.each do |col|
+        instance_variable_set("@#{col}", send("gen_#{col}"))
+      end
+    end
+  end
+
+  module InitUid
+    def initialize
+      uidable_cols_init
+      super
+    end
   end
 
   module ClassMethods
@@ -16,48 +34,48 @@ module Uidable
         uniqueness: true,
         set_to_param: false,
         scope: false)
-      mod = Module.new
-      mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def self.included(base)
-          if defined?(::ActiveRecord::Base) && base < ::ActiveRecord::Base
-            base.before_validation :assign_uid, on: :create
-            #{ scope ? "base.scope :'with_#{uid_name}', -> (uid) { base.where(:'#{uid_name}' => uid) }" : "" }
-            #{ set_to_param ? "base.include SetToParam" : "" }
-            #{ read_only ? "base.attr_readonly :'#{uid_name}'" : "" }
-          else
-            base.prepend InitUid
-            #{ read_only ? "attr_reader :'#{uid_name}'" : "attr_accessor :'#{uid_name}'" }
+      unless uidable_cols.include?(uid_name.to_sym)
+        uidable_cols << uid_name.to_sym
+        mod = Module.new
+        mod.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def self.included(base)
+            if defined?(::ActiveRecord::Base) && base < ::ActiveRecord::Base
+              base.before_validation :uidable_assign_#{uid_name}, on: :create
+              #{ scope ? "base.scope :'with_#{uid_name}', -> (uid) { base.where(:'#{uid_name}' => uid) }" : "" }
+              #{ set_to_param ? "base.include SetToParam#{uid_name}" : "" }
+              #{ read_only ? "base.attr_readonly :'#{uid_name}'" : "" }
+            else
+              #{ read_only ? "attr_reader :'#{uid_name}'" : "attr_accessor :'#{uid_name}'" }
+            end
+            if base.respond_to?(:validates)
+              #{ presence ? "base.validates :'#{uid_name}', presence: true" : "" }
+              #{ uniqueness ? "base.validates :'#{uid_name}', uniqueness: true" : "" }
+            end
           end
-          if base.respond_to?(:validates)
-            #{ presence ? "base.validates :'#{uid_name}', presence: true" : "" }
-            #{ uniqueness ? "base.validates :'#{uid_name}', uniqueness: true" : "" }
-          end
-        end
 
-        module InitUid
-          def initialize
-            @#{uid_name} = gen_uid
-            super
+          module SetToParam#{uid_name}
+            def to_param
+              self.#{uid_name}
+            end
           end
-        end
 
-        module SetToParam
-          def to_param
-            self.#{uid_name}
-          end
-        end
+          private
 
-        private
+          def uidable_assign_#{uid_name}
+            self.#{uid_name} = gen_#{uid_name}
+          end
 
-        def assign_uid
-          self.#{uid_name} = gen_uid
-        end
+          def gen_#{uid_name}
+            Array.new(#{uid_size}){[*'a'..'z', *'0'..'9'].sample}.join
+          end
+        RUBY
+        include mod
+      end
+    end
 
-        def gen_uid
-          Array.new(#{uid_size}){[*'a'..'z', *'0'..'9'].sample}.join
-        end
-      RUBY
-      include mod
+    def uidable_cols
+      @uidable_cols ||= []
     end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uidable
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Sibevin Wang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -49,7 +49,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -79,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Create the uid attribute in your model or class.

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.3
-  - 2.2.2
-  - 2.1.6
-  - 2.1.4
-  - 2.1.3
-before_install:
-  - gem install bundler -v '>= 1.9.0'
-script: "ruby ./test/test_all.rb"
-branches:
-  only:
-    - build
-    - cover-check