durran-validatable 1.7.5 → 1.8.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 7
-:patch: 5
+:minor: 8
+:patch: 0
 :major: 1

data/lib/validatable.rb

@@ -23,3 +23,6 @@ require File.join(dir, 'validations/validates_true_for')
 require File.join(dir, 'validations/validates_numericality_of')
 require File.join(dir, 'validations/validates_each')
 require File.join(dir, 'validations/validates_associated')
+require File.join(dir, 'validations/validates_uniqueness_of')
+require File.join(dir, 'validations/validates_inclusion_of')
+require File.join(dir, 'validations/validates_exclusion_of')

data/lib/validations/validates_exclusion_of.rb

@@ -0,0 +1,16 @@
+module Validatable
+  class ValidatesExclusionOf < Validatable::ValidationBase
+    required_option :within
+
+    def valid?(instance)
+      value = instance.send(attribute)
+      return true if allow_nil && value.nil?
+      return true if allow_blank && value.blank?
+      !within.include?(value)
+    end
+
+    def message(instance)
+      super || "is excluded"
+    end
+  end
+end

data/lib/validations/validates_inclusion_of.rb

@@ -0,0 +1,16 @@
+module Validatable
+  class ValidatesInclusionOf < Validatable::ValidationBase
+    required_option :within
+
+    def valid?(instance)
+      value = instance.send(attribute)
+      return true if allow_nil && value.nil?
+      return true if allow_blank && value.blank?
+      within.include?(value)
+    end
+
+    def message(instance)
+      super || "is not included"
+    end
+  end
+end

data/lib/validations/validates_uniqueness_of.rb

@@ -0,0 +1,18 @@
+module Validatable
+  class ValidatesUniquenessOf < Validatable::ValidationBase
+    option :scope
+
+    def valid?(instance)
+      conditions = { self.attribute => instance.send(attribute) }
+      if scope
+        conditions.merge!(scope => instance.send(scope))
+      end
+      doc = instance.class.first(:conditions => conditions)
+      doc.nil? || instance.id == doc.id
+    end
+
+    def message(instance)
+      super || "must be unique"
+    end
+  end
+end

data/test/unit/test_validates_exclusion_of.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+Expectations do
+
+  expect true do
+    validation = Validatable::ValidatesExclusionOf.new stub_everything, :name, :within => ["test"]
+    validation.valid?(stub(:name => "testing"))
+  end
+
+  expect true do
+    validation = Validatable::ValidatesExclusionOf.new stub_everything, :name, :allow_nil => true, :within => ["test"]
+    validation.valid?(stub(:name => nil))
+  end
+
+  expect true do
+    validation = Validatable::ValidatesExclusionOf.new stub_everything, :name, :allow_blank => true, :within => ["test"]
+    validation.valid?(stub(:name => ''))
+  end
+
+end

data/test/unit/test_validates_inclusion_of.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+Expectations do
+
+  expect false do
+    validation = Validatable::ValidatesInclusionOf.new stub_everything, :name, :within => ["test"]
+    validation.valid?(stub_everything)
+  end
+
+  expect true do
+    validation = Validatable::ValidatesInclusionOf.new stub_everything, :name, :within => ["test"]
+    validation.valid?(stub(:name => "test"))
+  end
+
+  expect true do
+    validation = Validatable::ValidatesInclusionOf.new stub_everything, :name, :allow_nil => true, :within => ["test"]
+    validation.valid?(stub(:name => nil))
+  end
+
+  expect true do
+    validation = Validatable::ValidatesInclusionOf.new stub_everything, :name, :allow_blank => true, :within => ["test"]
+    validation.valid?(stub(:name => ''))
+  end
+
+end

data/test/unit/test_validates_uniqueness_of.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+Expectations do
+
+  expect false do
+    doc = stub(:id => 1)
+    instance = stub(:class => stub(:first => doc), :id => 2, :name => "test")
+    validation = Validatable::ValidatesUniquenessOf.new stub_everything, :name
+    validation.valid?(instance)
+  end
+
+  expect true do
+    instance = stub(:class => stub(:first => nil), :id => 2, :name => "test")
+    validation = Validatable::ValidatesUniquenessOf.new stub_everything, :name
+    validation.valid?(instance)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: durran-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.7.5
+  version: 1.8.0
 platform: ruby
 authors: 
 - Jay Fields
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 -04:00
+date: 2009-10-31 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -41,11 +41,14 @@ files:
 - lib/validations/validates_associated.rb
 - lib/validations/validates_confirmation_of.rb
 - lib/validations/validates_each.rb
+- lib/validations/validates_exclusion_of.rb
 - lib/validations/validates_format_of.rb
+- lib/validations/validates_inclusion_of.rb
 - lib/validations/validates_length_of.rb
 - lib/validations/validates_numericality_of.rb
 - lib/validations/validates_presence_of.rb
 - lib/validations/validates_true_for.rb
+- lib/validations/validates_uniqueness_of.rb
 - lib/validations/validation_base.rb
 - test/all_tests.rb
 - test/functional/test_validatable.rb
@@ -65,11 +68,14 @@ files:
 - test/unit/test_validates_acceptance_of.rb
 - test/unit/test_validates_associated.rb
 - test/unit/test_validates_confirmation_of.rb
+- test/unit/test_validates_exclusion_of.rb
 - test/unit/test_validates_format_of.rb
+- test/unit/test_validates_inclusion_of.rb
 - test/unit/test_validates_length_of.rb
 - test/unit/test_validates_numericality_of.rb
 - test/unit/test_validates_presence_of.rb
 - test/unit/test_validates_true_for.rb
+- test/unit/test_validates_uniqueness_of.rb
 - test/unit/test_validation_base.rb
 has_rdoc: true
 homepage: http://github.com/durran/validatable
@@ -118,9 +124,12 @@ test_files:
 - test/unit/test_validates_acceptance_of.rb
 - test/unit/test_validates_associated.rb
 - test/unit/test_validates_confirmation_of.rb
+- test/unit/test_validates_exclusion_of.rb
 - test/unit/test_validates_format_of.rb
+- test/unit/test_validates_inclusion_of.rb
 - test/unit/test_validates_length_of.rb
 - test/unit/test_validates_numericality_of.rb
 - test/unit/test_validates_presence_of.rb
 - test/unit/test_validates_true_for.rb
+- test/unit/test_validates_uniqueness_of.rb
 - test/unit/test_validation_base.rb