uniqueable 0.0.5 → 0.0.6

data/README.md

@@ -22,59 +22,90 @@ Or install it yourself as:
 
 Uniqueable adds a uniqueable method and validator to your models.  Uniqueable is most useful when validating uniqueness across multiple Models and fields.
 
-    class User < ActiveRecord::Base
-      include Uniqueable
-      uniquable :username
-      validates :username, :uniqueable => true
-    end
-
-    class Organsation < ActiveRecord::Base
-      include Uniqueable
-      uniquable :alias
-      validates :alias, :uniqueable => true
-    end
-
-    user = User.create(:username => "gazler")                 # Works
-    organisation = Organisation.create(:alias => "gazler")    # Does not work
-    organisation.errors.messages                              # {:alias => ["has already been taken"]}
+```ruby
+class User < ActiveRecord::Base
+  include Uniqueable
+  uniquable :username
+  validates :username, :uniqueable => true
+end
+
+class Organsation < ActiveRecord::Base
+  include Uniqueable
+  uniquable :alias
+  validates :alias, :uniqueable => true
+end
+
+user = User.create(:username => "gazler")                 # Works
+organisation = Organisation.create(:alias => "gazler")    # Does not work
+organisation.errors.messages                              # {:alias => ["has already been taken"]}
+```
 
 ### Groups
 In a large application, you may want to check uniqueness for multiple groups of things.  Uniqueable includes groups for this:
 
-    class User < ActiveRecord::Base
-      include Uniqueable
-      uniquable :username, :group => :names_for_stuff
-      validates :username, :uniqueable => {:group => :names_for_stuff}
-    end
+```ruby
+class User < ActiveRecord::Base
+  include Uniqueable
+  uniquable :username, :group => :names_for_stuff
+  validates :username, :uniqueable => {:group => :names_for_stuff}
+end
+
+class Organsation < ActiveRecord::Base
+  include Uniqueable
+  uniquable :alias, :group => :names_for_stuff
+  validates :alias, :uniqueable => {:group => :names_for_stuff}
+end
+
+class AdminUser < ActiveRecord::Base
+  include Uniqueable
+  uniquable :alias, :group => :names_for_stuff
+  uniquable :alias
+  validates :uniquable
+end
+
+
+admin_user = AdminUser.create(:alias => "gazler")         # Works
+user = User.create(:username => "gazler")                 # Does not work
+organisation = Organisation.create(:alias => "gazler")    # Does not work
+admin_user = AdminUser.create(:alias => "gazler")         # Does not work
+```
+    
+### Conditions
+
+Sometimes you will only want a field to be checked if certain conditions are satisfied.  Let's say we only want public Organisations to be validated against with a user.
+ 
+```ruby
+class User < ActiveRecord::Base
+  include Uniqueable
+  uniquable :username, :group => :names_for_stuff
+  validates :username, :uniqueable => {:group => :names_for_stuff}
+end
+
+class Organsation < ActiveRecord::Base
+  include Uniqueable
+  uniquable :alias, :group => :names_for_stuff, :conditions => ["public = ?", true]
+  validates :alias, :uniqueable => {:group => :names_for_stuff}
+end
+
+Organisation.create(:alias => "gazler", :public => true)         # Works
+Organisation.create(:alias => "powershift", :public => false)    # Works
+User.create(:username => "powershift")                           # Works
+User.create(:username => "gazler")                               # Does Not Work
+```
 
-    class Organsation < ActiveRecord::Base
-      include Uniqueable
-      uniquable :alias, :group => :names_for_stuff
-      validates :alias, :uniqueable => {:group => :names_for_stuff}
-    end
 
-    class Organsation < ActiveRecord::Base
-      include Uniqueable
-      uniquable :alias, :group => :names_for_stuff
-      uniquable :alias
-      validates :uniquable
-    end
-
-
-    admin_user = AdminUser.create(:alias => "gazler")         # Works
-    user = User.create(:username => "gazler")                 # Does not work
-    organisation = Organisation.create(:alias => "gazler")    # Does not work
-    admin_user = AdminUser.create(:alias => "gazler")         # Does not work
 
 ### Other options
 
 The `case_sensitive` option can be sent through with the validator.  It defaults to true.
 
-    class User < ActiveRecord::Base
-      include Uniqueable
-      uniquable :username, :group => :names_for_stuff
-      validates :username, :uniqueable => {:group => :names_for_stuff, :case_sensitive => false}
-    end
+```ruby
+class User < ActiveRecord::Base
+  include Uniqueable
+  uniquable :username, :group => :names_for_stuff
+  validates :username, :uniqueable => {:group => :names_for_stuff, :case_sensitive => false}
+end
+```
 
 ### Notes
 

data/lib/uniqueable/validates_uniqueable.rb

@@ -6,7 +6,7 @@ module Uniqueable
 
     def validate_each(record, attribute, value)
       checks = record.class.uniqueable_checks[options[:group]]
-      #Make the check atomic
+      #TODO: Make the check atomic
       return unless checks
       checks.each do |klass, keys|
         keys.each do |key|
@@ -25,7 +25,7 @@ module Uniqueable
 
           unless result.empty?
             #Check that the result isn't the record we are validating
-            unless result.first == record
+            unless result.first.attributes.except(:updated_at) == record.attributes.except(:updated_at)
               return record.errors.add(attribute, :taken)
             end
           end

data/lib/uniqueable/version.rb

@@ -1,3 +1,3 @@
 module Uniqueable
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uniqueable
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -127,7 +127,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2704558754954571647
+      hash: -2060387812442946570
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2704558754954571647
+      hash: -2060387812442946570
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24