jnunemaker-validatable 1.1.10 → 1.7.0

data/README.rdoc

@@ -2,11 +2,13 @@
 
 Validatable is a library for adding validations.
 
-Created by Jay Fields, updated by John Nunemaker
+by Jay[http://jayfields.blogspot.com] Fields[http://jayfields.blogspot.com]
 
-== Installation
- 
- $ gem install jnunemaker-validatable -s http://gemcutter.org
+== Download and Installation
+
+You can download Validatable from here[http://rubyforge.org/projects/validatable] or install it with the following command.
+
+ $ gem install validatable
 
 == License
  	

data/Rakefile

@@ -1,29 +1,54 @@
 require 'rubygems'
 require 'rake'
 
-require File.dirname(__FILE__) + '/lib/validatable'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  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
-  gem.version     = Validatable::Version
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "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 is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-Jeweler::GemcutterTasks.new
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'test'
-  test.ruby_opts << '-rubygems'
+  test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-task :test    => :check_dependencies
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+
 task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "validatable #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION.yml

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

data/lib/{validatable/errors.rb → errors.rb}

@@ -28,8 +28,6 @@ module Validatable
       return nil if errors[attribute.to_sym].nil?
       errors[attribute.to_sym].size == 1 ? errors[attribute.to_sym].first : errors[attribute.to_sym]
     end
-    
-    alias [] on
 
     def add(attribute, message) #:nodoc:
       errors[attribute.to_sym] = [] if errors[attribute.to_sym].nil?

data/lib/{validatable/macros.rb → macros.rb}

@@ -194,37 +194,6 @@ module Validatable
       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)
-    #
-    # Checks the validity of an associated object or objects and adds a single
-    # error if validation fails.
-    #
-    #   class Person
-    #     include Validatable
-    #     attr_accessor :addresses
-    #     validates_associated :addresses
-    #   end
-    #
-    # Configuration options:
-    #
-    #     * after_validate - A block that executes following the run of a validation
-    #     * message - The message to add to the errors collection when the validation fails
-    #     * times - The number of times the validation applies
-    #     * level - The level at which the validation should occur
-    #     * if - A block that when executed must return true of the validation will not occur
-    #     * group - The group that this validation belongs to.  A validation can belong to multiple groups
-    def validates_associated(*args)
-      add_validations(args, ValidatesAssociated)
-    end
-
     # call-seq: include_validations_from(attribute)
     # 
     # Includes all the validations that are defined on the attribute.
@@ -311,4 +280,4 @@ module Validatable
       before_validations << block
     end
   end
-end
+end

data/lib/validatable.rb

@@ -1,28 +1,22 @@
 require 'forwardable'
-require 'active_support/all'
+require 'rubygems'
+require 'activesupport'
 
-require 'validatable/object_extension'
-require 'validatable/errors'
-require 'validatable/validatable_class_methods'
-require 'validatable/macros'
-require 'validatable/validatable_instance_methods'
-require 'validatable/included_validation'
-require 'validatable/child_validation'
-require 'validatable/understandable'
-require 'validatable/requireable'
-require 'validatable/validations/validation_base'
-require 'validatable/validations/validates_format_of'
-require 'validatable/validations/validates_presence_of'
-require 'validatable/validations/validates_acceptance_of'
-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'
-
-module Validatable
-  Version = '1.1.10'
-end
+require File.expand_path(File.dirname(__FILE__) + '/object_extension')
+require File.expand_path(File.dirname(__FILE__) + '/errors')
+require File.expand_path(File.dirname(__FILE__) + '/validatable_class_methods')
+require File.expand_path(File.dirname(__FILE__) + '/macros')
+require File.expand_path(File.dirname(__FILE__) + '/validatable_instance_methods')
+require File.expand_path(File.dirname(__FILE__) + '/included_validation')
+require File.expand_path(File.dirname(__FILE__) + '/child_validation')
+require File.expand_path(File.dirname(__FILE__) + '/understandable')
+require File.expand_path(File.dirname(__FILE__) + '/requireable')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validation_base')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validates_format_of')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validates_presence_of')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validates_acceptance_of')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validates_confirmation_of')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validates_length_of')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validates_true_for')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validates_numericality_of')
+require File.expand_path(File.dirname(__FILE__) + '/validations/validates_each')

data/lib/{validatable/validatable_class_methods.rb → validatable_class_methods.rb}

@@ -4,20 +4,18 @@ module Validatable
     def validate_children(instance, group)
       self.children_to_validate.each do |child_validation|
         next unless child_validation.should_validate?(instance)
-        child_or_children = instance.send child_validation.attribute
-        [child_or_children].flatten.each do |child|
-          if (child.respond_to?(:valid_for_group?))
-            child.valid_for_group?(group)
+        child = instance.send child_validation.attribute
+        if (child.respond_to?(:valid_for_group?))
+          child.valid_for_group?(group)
+        else
+          child.valid?
+        end
+        child.errors.each do |attribute, messages|
+          if messages.is_a?(String)
+            add_error(instance, child_validation.map[attribute.to_sym] || attribute, messages)
           else
-            child.valid?
-          end
-          child.errors.each do |attribute, messages|
-            if messages.is_a?(String)
-              add_error(instance, child_validation.map[attribute.to_sym] || attribute, messages)
-            else
-              messages.each do |message|
-                add_error(instance, child_validation.map[attribute.to_sym] || attribute, message)
-              end
+            messages.each do |message|
+              add_error(instance, child_validation.map[attribute.to_sym] || attribute, message)
             end
           end
         end

data/lib/{validatable/validatable_instance_methods.rb → validatable_instance_methods.rb}

@@ -19,10 +19,10 @@ module Validatable
   end
   
   def valid_for_group?(group) #:nodoc:
-    errors.clear
     run_before_validations
+    errors.clear
     self.class.validate_children(self, group)
-    self.validate_group(group)
+    self.validate(group)
     errors.empty?
   end
   
@@ -61,7 +61,7 @@ module Validatable
     @times_validated_hash ||= {}
   end
 
-  def validate_group(group) #:nodoc:
+  def validate(group) #:nodoc:
     validation_levels.each do |level|
       validations_for_level_and_group(level, group).each do |validation|
         run_validation(validation) if validation.should_validate?(self)

data/lib/{validatable/validations → validations}/validation_base.rb

@@ -63,12 +63,7 @@ module Validatable
     
     def should_validate?(instance)
       result = validate_this_time?(instance)
-      case self.if
-        when Proc
-          result &&= instance.instance_eval(&self.if)
-        when Symbol, String
-          result &&= instance.instance_eval(self.if.to_s)
-      end
+      result &&= instance.instance_eval(&self.if) unless self.if.nil?
       result
     end
     

data/test/all_tests.rb

@@ -0,0 +1 @@
+Dir['test/**/test_*.rb'].each { |test_case| require test_case }

data/test/functional/test_validatable.rb

@@ -138,53 +138,7 @@ functional_tests do
     instance.valid?
     instance.errors.on(:address)
   end
-  
-  expect "is invalid" do
-    child_class = Class.new do
-      include Validatable
-      attr_accessor :name, :address
-      validates_presence_of :name
-      validates_format_of :address, :with => /.+/
-    end
-    klass = Class.new do
-      include Validatable
-      include_errors_from :child 
-      define_method :child do
-        valid_child = child_class.new
-        valid_child.name = "nom de plume"
-        valid_child.address = "nowhere"
-        [valid_child, child_class.new]
-      end
-    end
-    instance = klass.new
-    instance.valid?
-    instance.errors.on(:address)
-  end
 
-  expect true do
-    child_class = Class.new do
-      include Validatable
-      attr_accessor :name, :address
-      validates_presence_of :name
-      validates_format_of :address, :with => /.+/
-    end
-    klass = Class.new do
-      include Validatable
-      include_errors_from :child 
-      define_method :child do
-        valid_child = child_class.new
-        valid_child.name = "nom de plume"
-        valid_child.address = "nowhere"
-        also_valid = child_class.new
-        also_valid.name = "nom de guerre"
-        also_valid.address = "somewhere else"
-        [valid_child, valid_child]
-      end
-    end
-    instance = klass.new
-    instance.valid?
-  end
-  
   expect "can't be empty" do
     child_class = Class.new do
       include Validatable
@@ -301,42 +255,6 @@ functional_tests do
     instance = klass.new
     instance.valid?
   end
-  
-  test ':if with symbol should work' do
-    klass = Class.new do
-      include Validatable
-      attr_accessor :name, :name_required
-      validates_presence_of :name, :if => :name_required?
-      
-      def name_required?
-        name_required
-      end
-    end
-    instance = klass.new
-    instance.name_required = false
-    assert instance.valid?
-    instance.name_required = true
-    assert !instance.valid?
-    assert_equal "can't be empty", instance.errors.on(:name)
-  end
-  
-  test ':if with string should work' do
-    klass = Class.new do
-      include Validatable
-      attr_accessor :name, :name_required
-      validates_presence_of :name, :if => 'name_required?'
-      
-      def name_required?
-        name_required
-      end
-    end
-    instance = klass.new
-    instance.name_required = false
-    assert instance.valid?
-    instance.name_required = true
-    assert !instance.valid?
-    assert_equal "can't be empty", instance.errors.on(:name)
-  end
 
   test "classes only have valid_for_* methods for groups that appear in their validations" do
     class_with_group_one = Class.new do

data/test/test_helper.rb

@@ -1,10 +1,11 @@
 require 'test/unit'
+require 'rubygems'
 require 'mocha'
 require 'dust'
 require 'set'
 require 'expectations'
 
-require File.expand_path(File.dirname(__FILE__) + '/../lib/validatable')
+require File.dirname(__FILE__) + '/../lib/validatable'
 
 class << Test::Unit::TestCase
   def expect(expected_value, &block)

data/test/unit/test_errors.rb

@@ -60,11 +60,5 @@ Expectations do
     errors.add(:attribute1, "message1")
     errors.add(:attribute2, "message2")
     errors.count
-  end
-  
-  expect "message" do
-    errors = Validatable::Errors.new
-    errors.add(:attribute, "message")
-    errors[:attribute]
-  end
+  end   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.1.10
+  version: 1.7.0
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -05:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Validatable is a library for adding validations.
+description: 
 email: nunemaker@gmail.com
 executables: []
 
@@ -26,36 +26,31 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- lib/child_validation.rb
+- lib/errors.rb
+- lib/included_validation.rb
+- lib/macros.rb
+- lib/object_extension.rb
+- lib/requireable.rb
+- lib/understandable.rb
 - lib/validatable.rb
-- lib/validatable/child_validation.rb
-- lib/validatable/errors.rb
-- lib/validatable/included_validation.rb
-- lib/validatable/macros.rb
-- lib/validatable/object_extension.rb
-- lib/validatable/requireable.rb
-- lib/validatable/understandable.rb
-- lib/validatable/validatable_class_methods.rb
-- lib/validatable/validatable_instance_methods.rb
-- lib/validatable/validations/validates_acceptance_of.rb
-- 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
-- lib/validatable/validations/validates_true_for.rb
-- lib/validatable/validations/validation_base.rb
+- lib/validatable_class_methods.rb
+- lib/validatable_instance_methods.rb
+- lib/validations/validates_acceptance_of.rb
+- lib/validations/validates_confirmation_of.rb
+- lib/validations/validates_each.rb
+- lib/validations/validates_format_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/validation_base.rb
+- test/all_tests.rb
 - test/functional/test_validatable.rb
 - test/functional/test_validates_acceptance_of.rb
-- 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
@@ -65,11 +60,8 @@ files:
 - test/unit/test_understandable.rb
 - test/unit/test_validatable.rb
 - 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
@@ -77,8 +69,6 @@ files:
 - test/unit/test_validation_base.rb
 has_rdoc: true
 homepage: http://github.com/jnunemaker/validatable
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -99,19 +89,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Validatable is a library for adding validations.
 test_files: 
+- test/all_tests.rb
 - test/functional/test_validatable.rb
 - test/functional/test_validates_acceptance_of.rb
-- 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
@@ -121,11 +109,8 @@ test_files:
 - test/unit/test_understandable.rb
 - test/unit/test_validatable.rb
 - 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

data/lib/validatable/validations/validates_associated.rb

@@ -1,13 +0,0 @@
-module Validatable
-  class ValidatesAssociated < ValidationBase #:nodoc:
-    def valid?(instance)
-      Array(instance.send(attribute)).compact.map do |child|
-        child.valid?
-      end.all?
-    end
-
-    def message(instance)
-      super || "is invalid"
-    end
-  end
-end

data/lib/validatable/validations/validates_exclusion_of.rb

@@ -1,17 +0,0 @@
-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

@@ -1,17 +0,0 @@
-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_associated.rb

@@ -1,41 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-
-module Functional
-  class ValidatesAssociatedTest < Test::Unit::TestCase
-    def setup
-      @parent = Class.new do
-        include Validatable
-        attr_accessor :children
-        validates_associated :children
-      end
-      @child = Class.new do
-        include Validatable
-        attr_accessor :name
-        validates_presence_of :name
-      end
-    end
-
-    test "given invalid child, when validated, then error is in the parent's error collection" do
-      instance = @parent.new
-      instance.children = [@child.new]
-      instance.valid?
-      assert_equal "is invalid", instance.errors.on(:children)
-    end
-
-    test "given two invalid children, when validated, then both children have errors" do
-      instance = @parent.new
-      instance.children = [@child.new, @child.new]
-      instance.valid?
-      instance.children.each do |child|
-        assert_not_nil child.errors.on(:name)
-      end
-    end
-
-    test "given valid child, when validated, the parent is valid" do
-      instance = @parent.new
-      instance.children = [@child.new]
-      instance.children.first.name = 'x'
-      assert instance.valid?
-    end
-  end
-end

data/test/functional/test_validates_exclusion_of.rb

@@ -1,29 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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_associated.rb

@@ -1,29 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
-
-Expectations do
-
-  expect false do
-    parent = stub('parent', :child => stub(:valid? => false))
-    validation = Validatable::ValidatesAssociated.new stub_everything, :child
-    validation.valid?(parent)
-  end
-
-  expect true do
-    parent = stub('parent', :child => stub(:valid? => true))
-    validation = Validatable::ValidatesAssociated.new stub_everything, :child
-    validation.valid?(parent)
-  end
-
-  expect false do
-    parent = stub('parent', :children => [stub(:valid? => false)])
-    validation = Validatable::ValidatesAssociated.new stub_everything, :children
-    validation.valid?(parent)
-  end
-
-  expect true do
-    parent = stub('parent', :children => [stub(:valid? => true)])
-    validation = Validatable::ValidatesAssociated.new stub_everything, :children
-    validation.valid?(parent)
-  end
-
-end

data/test/unit/test_validates_exclusion_of.rb

@@ -1,23 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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