uidable 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 049db3fd13da41c90f3f26522a6a3fbe7ed7fc0a
-  data.tar.gz: e229b43eedd837dfa33a2fb7add8bf6e76cfbe15
+  metadata.gz: 932433d8f3888343b55428409e091316f90f5e41
+  data.tar.gz: 2004454ac043c3bc3e8dcbccecd141e1f1c4dfb0
 SHA512:
-  metadata.gz: 666c26af8fcd4071393c5ad29faa6b3a5a51d9dca8ecefe899ad2683cad3fc199ff300eb51e826e1c82e6aad7ee26519214ef5cec554ad7610cac287bdb616f2
-  data.tar.gz: 6dc71358a57cf9dff53d8e5cb67d846e677587382d55244e2b1b4a592e4ebbe960d985d431ca787c8a5c750be498a1b24d414e3357a5aadb20248686ff8a6ba2
+  metadata.gz: 5e6e856d7c9c914ac5b02755ad779011374286a198061d5c62524346adf1effc28e73ac3600b00d91f390837dc6ce666f441aec8512827bb206883797447e70a
+  data.tar.gz: 8663d0c4cb2790a919d73e20d8b72d9de7d664761e56ed64be11fbdcd6ec61bd4c0af235de6f47090de844714f29b221a3920f14a944f377a6a7b2de1b7d70a4

data/README.md

@@ -8,7 +8,7 @@
 [travis]: https://travis-ci.org/sibevin/uidable
 [coveralls]: https://coveralls.io/github/sibevin/uidable?branch=cover-check
 
-Create the uid(unqiue identifier) attribute in your model or class.
+Create the uid(unique identifier) attribute in your model or class.
 
 ## Installation
 
@@ -90,13 +90,17 @@ The uid is read only by default. You can disabled it with `read_only: false`.
 
 ## Options for ActiveRecord
 
-### Uniqueness and Presence Validation
+### Presence
 
-The uniqueness and presence validation is enabled by default. You can disable them with `uniqueness: false` and `presence: false`. Note that you should change your migration as well if needed.
+The presence validation is enabled by default. You can disable them with `presence: false`.
+
+### Uniqueness
+
+There are three options for the uniqueness validation - `:create`, `:always`, `:none`. `:create` is the default option, it means only check the uniqueness when creating a record. `:always` means doing uniqueness validation each time when the model is saved. `:none` means the uniqueness validation is disabled. Note that you should change your migration to support uniqueness as well if needed.
 
 ### Set to_param
 
-If the option `set_to_param: true` is given, the `to_param` is overrided with uid and it means you can use uid in your routes path.
+If the option `set_to_param: true` is given, the `to_param` is overridden with uid and it means you can use uid in your routes path.
 
 ### Scope
 

data/lib/uidable.rb

@@ -1,4 +1,4 @@
-require "uidable/version"
+require 'uidable/version'
 
 module Uidable
   DEFAULT_UID_SIZE = 32
@@ -27,29 +27,34 @@ module Uidable
 
   module ClassMethods
     def uidable(
-        uid_name: "uid",
+        uid_name: 'uid',
         uid_size: DEFAULT_UID_SIZE,
         read_only: true,
         presence: true,
-        uniqueness: true,
+        uniqueness: :create,
         set_to_param: false,
         scope: false)
       unless uidable_cols.include?(uid_name.to_sym)
+        uniqueness_check = case (uniqueness.to_sym)
+                           when :create then "base.validates :'#{uid_name}', uniqueness: true, on: :create"
+                           when :always then "base.validates :'#{uid_name}', uniqueness: true"
+                           else ''
+        end
         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}'" : "" }
+              #{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}'" }
+              #{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" : "" }
+              #{presence ? "base.validates :'#{uid_name}', presence: true" : ''}
+              #{uniqueness_check}
             end
           end
 
@@ -77,5 +82,4 @@ module Uidable
       @uidable_cols ||= []
     end
   end
-
 end

data/lib/uidable/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uidable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sibevin Wang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Create the uid attribute in your model or class.