uniqueable 0.0.3 → 0.0.4

data/lib/uniqueable/validates_uniqueable.rb

@@ -11,11 +11,16 @@ module Uniqueable
       checks.each do |klass, keys|
         keys.each do |key|
           #Check nothing exists with this pair
+          conditions = []
+          if key.kind_of?(Hash)
+            conditions = key[key.keys.first][:conditions]
+            key = key.keys.first
+          end
           if options[:case_sensitive]
-            result = klass.where(key => value)
+            result = klass.where(["#{key} = ?", value]).where(conditions).all
           else
             value = value.downcase if value.kind_of?(String)
-            result = klass.find(:all, :conditions => ["lower(#{key}) = ?", value]) 
+            result = klass.where(["lower(#{key}) = ?", value]).where(conditions).all
           end
 
           unless result.empty?

data/lib/uniqueable/version.rb

@@ -1,3 +1,3 @@
 module Uniqueable
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/uniqueable.rb

@@ -17,11 +17,14 @@ module Uniqueable
     attr_accessor :uniqueable_checks
     def uniqueable(*values)
       options = values.last.kind_of?(Hash) ? values.pop : {}
-      group = options[:group]
+      group = options.delete(:group)
       klass = self
       uniqueable_checks[group] ||= {}
       uniqueable_checks[group][klass] ||= []
       values.each do |value|
+        unless options.empty?
+          value = {value => options}
+        end
         uniqueable_checks[group][klass] << value
       end
       uniqueable_checks[group][klass].uniq!

data/spec/schema.rb

@@ -7,6 +7,7 @@ ActiveRecord::Schema.define(:version => 0) do
   create_table :organisations do |t|
     t.string :alias
     t.string :name
+    t.boolean :public
   end
 
   create_table :admin_users do |t|

data/spec/uniqueable/module_spec.rb

@@ -60,4 +60,17 @@ describe Uniqueable do
       Tester.uniqueable_checks.should eql({:aliases => {Tester => [:name], AnotherTester=> [:name]}})
     end
   end
+
+  context "coniditionals" do
+    it "should store the conditions if applicable" do
+      Tester.uniqueable(:name, :group => :aliases, :conditions => ["admin = ?", true]) 
+      AnotherTester.uniqueable(:name, :group => :aliases) 
+      Tester.uniqueable_checks.should eql({
+        :aliases => {
+          Tester => [{:name => {:conditions => ["admin = ?", true]}}],
+          AnotherTester=> [:name]
+        }
+      })
+    end
+  end
 end

data/spec/uniqueable/validates_uniqueable_spec.rb

@@ -128,5 +128,71 @@ describe Uniqueable::UniqueableValidator do
       user.should_not be_valid
     end
   end
+
+  context "Conditionals" do
+    before(:each) do
+      Uniqueable.instance_variable_set(:@uniqueable_checks, nil)
+      class User < ActiveRecord::Base
+        include Uniqueable
+        uniqueable :username
+        validates :username, :uniqueable => true
+      end
+
+      class Organisation < ActiveRecord::Base
+        include Uniqueable
+        uniqueable :alias, :conditions => ["public = ?", true]
+        validates :alias, :uniqueable => true
+      end
+      User.delete_all
+      Organisation.delete_all
+    end
+
+    it "should ignore non-public organisations" do
+      organisation = Organisation.create(:name => "Gazler", :alias => "gazler", :public => false)
+      organisation.should be_valid
+      user = User.create(:name => "Gazler", :username => "gazler")
+      user.should be_valid
+    end
+
+    it "should validate when  public is true" do
+      organisation = Organisation.create(:name => "Gazler", :alias => "gazler", :public => true)
+      organisation.should be_valid
+      user = User.create(:name => "Gazler", :username => "gazler")
+      user.should_not be_valid
+    end
+  end
+
+  context "Case Sensitive with Conditionals" do
+    before(:each) do
+      Uniqueable.instance_variable_set(:@uniqueable_checks, nil)
+      class User < ActiveRecord::Base
+        include Uniqueable
+        uniqueable :username
+        validates :username, :uniqueable => {:case_sensitive => false}
+      end
+
+      class Organisation < ActiveRecord::Base
+        include Uniqueable
+        uniqueable :alias, :conditions => ["public = ?", true]
+        validates :alias, :uniqueable => {:case_sensitive => false}
+      end
+      User.delete_all
+      Organisation.delete_all
+    end
+
+    it "should ignore non-public organisations" do
+      organisation = Organisation.create(:name => "Gazler", :alias => "Gazler", :public => false)
+      organisation.should be_valid
+      user = User.create(:name => "Gazler", :username => "gazler")
+      user.should be_valid
+    end
+
+    it "should validate when  public is true" do
+      organisation = Organisation.create(:name => "Gazler", :alias => "Gazler", :public => true)
+      organisation.should be_valid
+      user = User.create(:name => "Gazler", :username => "gazler")
+      user.should_not be_valid
+    end
+  end
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uniqueable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-03 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: -753480171143598750
+      hash: -2039842943075345764
 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: -753480171143598750
+      hash: -2039842943075345764
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24