jnunemaker-validatable 1.8.0 → 1.8.1

data/Rakefile

@@ -3,12 +3,13 @@ require 'rake'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
-  gem.name     = "jnunemaker-validatable"
-  gem.summary  = %Q{Validatable is a library for adding validations.}
-  gem.email    = "nunemaker@gmail.com"
-  gem.homepage = "http://github.com/jnunemaker/validatable"
-  gem.authors  = ['Jay Fields', 'John Nunemaker']
-  gem.files    = FileList['lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a
+  gem.name        = "jnunemaker-validatable"
+  gem.summary     = %Q{Validatable is a library for adding validations.}
+  gem.description = %Q{Validatable is a library for adding validations.}
+  gem.email       = "nunemaker@gmail.com"
+  gem.homepage    = "http://github.com/jnunemaker/validatable"
+  gem.authors     = ['Jay Fields', 'John Nunemaker']
+  gem.files       = FileList['lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a
 end
 
 Jeweler::GemcutterTasks.new

data/VERSION.yml

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

data/lib/validatable.rb

@@ -18,5 +18,7 @@ require 'validatable/validations/validates_confirmation_of'
 require 'validatable/validations/validates_length_of'
 require 'validatable/validations/validates_true_for'
 require 'validatable/validations/validates_numericality_of'
+require 'validatable/validations/validates_exclusion_of'
+require 'validatable/validations/validates_inclusion_of'
 require 'validatable/validations/validates_each'
 require 'validatable/validations/validates_associated'

data/lib/validatable/macros.rb

@@ -193,6 +193,14 @@ module Validatable
     def validates_true_for(*args)
       add_validations(args, ValidatesTrueFor)
     end
+    
+    def validates_exclusion_of(*args)
+      add_validations(args, ValidatesExclusionOf)
+    end
+
+    def validates_inclusion_of(*args)
+      add_validations(args, ValidatesInclusionOf)
+    end
 
     # call-seq: validates_associated(*args)
     #

data/lib/validatable/validations/validates_exclusion_of.rb

@@ -0,0 +1,17 @@
+module Validatable
+  class ValidatesExclusionOf < ValidationBase #:nodoc:
+    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 reserved"
+    end
+  end
+end

data/lib/validatable/validations/validates_inclusion_of.rb

@@ -0,0 +1,17 @@
+module Validatable
+  class ValidatesInclusionOf < 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 in the list"
+    end
+  end
+end

data/test/functional/test_validates_exclusion_of.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Functional
+  class ValidatesExclusionOfTest < Test::Unit::TestCase
+    test "given excluded state, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :state
+        validates_exclusion_of :state, :within => %w(in out)
+      end
+      instance = klass.new
+      instance.state = 'in'
+      instance.valid?
+      assert_equal "is reserved", instance.errors.on(:state)
+    end
+    
+    test "given non-excluded state, when validated, then no error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :state
+        validates_exclusion_of :state, :within => %w(in out)
+      end
+      instance = klass.new
+      instance.state = 'foo'
+      instance.valid?
+      assert_nil instance.errors.on(:state)
+    end
+  end
+end

data/test/functional/test_validates_inclusion_of.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Functional
+  class ValidatesInclusionOfTest < Test::Unit::TestCase
+    test "given state not in list, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :state
+        validates_inclusion_of :state, :within => %w(in out)
+      end
+      instance = klass.new
+      instance.state = 'foo'
+      instance.valid?
+      assert_equal "is not in the list", instance.errors.on(:state)
+    end
+    
+    test "given state in list, when validated, then no error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :state
+        validates_inclusion_of :state, :within => %w(in out)
+      end
+      instance = klass.new
+      instance.state = 'in'
+      instance.valid?
+      assert_nil instance.errors.on(:state)
+    end
+  end
+end

data/test/unit/test_validates_exclusion_of.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+Expectations do
+  expect false do
+    validation = Validatable::ValidatesExclusionOf.new stub_everything, :state, :within => %w(in out)
+    validation.valid?(stub(:state => 'in'))
+  end
+  
+  expect true do
+    validation = Validatable::ValidatesExclusionOf.new stub_everything, :state, :within => %w(in out)
+    validation.valid?(stub(:state => 'foo'))
+  end
+  
+  expect true do
+    validation = Validatable::ValidatesExclusionOf.new stub_everything, :state, :within => %w(in out), :allow_blank => true
+    validation.valid?(stub(:state => ''))
+  end
+
+  expect true do
+    validation = Validatable::ValidatesExclusionOf.new stub_everything, :state, :within => %w(in out), :allow_nil => true
+    validation.valid?(stub(:state => nil))
+  end
+end

data/test/unit/test_validates_inclusion_of.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+Expectations do
+  expect true do
+    validation = Validatable::ValidatesInclusionOf.new stub_everything, :state, :within => %w(in out)
+    validation.valid?(stub(:state => 'in'))
+  end
+  
+  expect false do
+    validation = Validatable::ValidatesInclusionOf.new stub_everything, :state, :within => %w(in out)
+    validation.valid?(stub(:state => 'foo'))
+  end
+  
+  expect true do
+    validation = Validatable::ValidatesInclusionOf.new stub_everything, :state, :within => %w(in out), :allow_blank => true
+    validation.valid?(stub(:state => ''))
+  end
+
+  expect true do
+    validation = Validatable::ValidatesInclusionOf.new stub_everything, :state, :within => %w(in out), :allow_nil => true
+    validation.valid?(stub(:state => nil))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 -04:00
+date: 2009-11-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: 
+description: Validatable is a library for adding validations.
 email: nunemaker@gmail.com
 executables: []
 
@@ -40,7 +40,9 @@ files:
 - lib/validatable/validations/validates_associated.rb
 - lib/validatable/validations/validates_confirmation_of.rb
 - lib/validatable/validations/validates_each.rb
+- lib/validatable/validations/validates_exclusion_of.rb
 - lib/validatable/validations/validates_format_of.rb
+- lib/validatable/validations/validates_inclusion_of.rb
 - lib/validatable/validations/validates_length_of.rb
 - lib/validatable/validations/validates_numericality_of.rb
 - lib/validatable/validations/validates_presence_of.rb
@@ -51,7 +53,9 @@ files:
 - test/functional/test_validates_associated.rb
 - test/functional/test_validates_confirmation_of.rb
 - test/functional/test_validates_each.rb
+- test/functional/test_validates_exclusion_of.rb
 - test/functional/test_validates_format_of.rb
+- test/functional/test_validates_inclusion_of.rb
 - test/functional/test_validates_length_of.rb
 - test/functional/test_validates_numericality_of.rb
 - test/functional/test_validates_presence_of.rb
@@ -63,7 +67,9 @@ 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
@@ -103,7 +109,9 @@ test_files:
 - test/functional/test_validates_associated.rb
 - test/functional/test_validates_confirmation_of.rb
 - test/functional/test_validates_each.rb
+- test/functional/test_validates_exclusion_of.rb
 - test/functional/test_validates_format_of.rb
+- test/functional/test_validates_inclusion_of.rb
 - test/functional/test_validates_length_of.rb
 - test/functional/test_validates_numericality_of.rb
 - test/functional/test_validates_presence_of.rb
@@ -115,7 +123,9 @@ 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