validatable 1.5.2 → 1.6.0

data/lib/validatable_class_methods.rb

@@ -22,6 +22,11 @@ module Validatable
       end
     end
 
+    def all_validations
+      return validations + self.superclass.validations if self.superclass.respond_to? :validations
+      validations
+    end
+
     def validations
       @validations ||= []
     end

data/lib/validatable_instance_methods.rb

@@ -65,12 +65,12 @@ module Validatable
   end
   
   def validations_for_level_and_group(level, group) #:nodoc:
-    validations_for_level = self.class.validations.select { |validation| validation.level == level }
+    validations_for_level = self.class.all_validations.select { |validation| validation.level == level }
     return validations_for_level.select { |validation| validation.groups.empty? } if group.nil?
     validations_for_level.select { |validation| validation.groups.include?(group) }
   end
   
   def validation_levels #:nodoc:
-    self.class.validations.inject([1]) { |accum,validation| accum << validation.level }.uniq.sort
+    self.class.all_validations.inject([1]) { |result, validation| result << validation.level }.uniq.sort
   end
 end

data/rakefile.rb

@@ -29,7 +29,7 @@ Gem::manage_gems
 specification = Gem::Specification.new do |s|
 	s.name   = "validatable"
   s.summary = "Validatable is a library for adding validations."
-	s.version = "1.5.2"
+	s.version = "1.6.0"
 	s.author = 'Jay Fields'
 	s.description = "Validatable is a library for adding validations."
 	s.email = 'validatable-developer@rubyforge.org'
@@ -38,7 +38,7 @@ specification = Gem::Specification.new do |s|
 
   s.has_rdoc = true
   s.extra_rdoc_files = ['README']
-  s.rdoc_options << '--title' << 'SQL DSL' << '--main' << 'README' << '--line-numbers'
+  s.rdoc_options << '--title' << 'Validatable' << '--main' << 'README' << '--line-numbers'
 
   s.autorequire = 'validatable'
   s.files = FileList['{lib,test}/**/*.rb', '[A-Z]*$', 'rakefile.rb'].to_a

data/test/functional/validatable_test.rb

@@ -1,299 +1,321 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
-module Functional
-  class ValidatableTest < Test::Unit::TestCase 
-    
-    expect ArgumentError do
-      Class.new do
-        include Validatable
-        attr_accessor :name
-        validates_presence_of :name, :times => 1
-        validates_presence_of :name, :times => 1
-      end
-    end
-    
-    expect ArgumentError do
-      Class.new do
-        include Validatable
-        attr_accessor :name
-        validates_presence_of :name, :times => 1, :key => 'anything'
-        validates_presence_of :name, :times => 1, :key => 'anything'
-      end
+functional_tests do
+  
+  expect false do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :name
+      validates_presence_of :name
     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_validations_for :child 
-        define_method :child do
-          child_class.new
-        end
-      end
-      instance = klass.new
-      instance.valid?
-      instance.errors.on(:address)
-    end
-    
-    expect "can't be empty" 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_validations_for :child 
-        define_method :child do
-          child_class.new
-        end
-      end
-      instance = klass.new
-      instance.valid?
-      instance.errors.on(:name)
-    end
-    
-    
-    test "when child validations have errors, level 2 and higher parent validations are not performed" do
-      child_class = Class.new do
-        include Validatable
-        attr_accessor :name
-        validates_presence_of :name
-      end
-      
-      klass = Class.new do
-        include Validatable
-        extend Forwardable
-        def_delegator :child, :name
-        validates_true_for :name, :logic => lambda { false }, :level => 2, :message => "invalid message"
-        include_validations_for :child 
-        define_method :child do
-          @child ||= child_class.new
-        end
-      end
-      instance = klass.new
-      instance.valid?
-      assert_equal "can't be empty", instance.errors.on(:name)
+    subclass = Class.new klass do
     end
+    subclass.new.valid?
+  end
   
-   test "when child validations have errors, level 1 parent validations are still performed" do
-      child_class = Class.new do
-        include Validatable
-        attr_accessor :name
-        validates_presence_of :name
-      end
+  expect true do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :name
+      validates_presence_of :name
+    end
+    subclass = Class.new klass do
+    end
+    instance = subclass.new
+    instance.name = 'a name'
+    instance.valid?
+  end
 
-      klass = Class.new do
-        include Validatable
-        validates_true_for :address, :logic => lambda { false }, :level => 1, :message => "invalid message"
-        include_validations_for :child 
-        define_method :child do
-          @child ||= child_class.new
-        end
+  expect ArgumentError do
+    Class.new do
+      include Validatable
+      attr_accessor :name
+      validates_presence_of :name, :times => 1
+      validates_presence_of :name, :times => 1
+    end
+  end
 
-      end
-      instance = klass.new
-      instance.valid?
-      assert_equal "can't be empty", instance.errors.on(:name)
-      assert_equal "invalid message", instance.errors.on(:address)
+  expect ArgumentError do
+    Class.new do
+      include Validatable
+      attr_accessor :name
+      validates_presence_of :name, :times => 1, :key => 'anything'
+      validates_presence_of :name, :times => 1, :key => 'anything'
     end
-  
-    expect "can't be empty" do
-      child_class = Class.new do
-        include Validatable
-        attr_accessor :name, :address
-        validates_presence_of :name
-      end
-      klass = Class.new do
-        include Validatable
-        include_validations_for :child, :map => {:name => :namen}
-        define_method :child do
-          child_class.new
-        end
-      end
-      instance = klass.new
-      instance.valid?
-      instance.errors.on(:namen)
-    end
-    
-    expect "can't be empty" do
-      child_class = Class.new do
-        include Validatable
-        attr_accessor :name, :address
-        validates_presence_of :name
-      end
-      klass = Class.new do
-        include Validatable
-        include_validations_for :child, :if => lambda { true }
-        define_method :child do
-          child_class.new
-        end
-      end
-      instance = klass.new
-      instance.valid?
-      instance.errors.on(:name)
-    end
-    
-    expect true do
-      child_class = Class.new do
-        include Validatable
-        attr_accessor :name, :address
-        validates_presence_of :name
-      end
-      klass = Class.new do
-        include Validatable
-        include_validations_for :child, :if => lambda { false }
-        define_method :child do
-          child_class.new
-        end
-      end
-      instance = klass.new
-      instance.valid?
-    end
-    
-    test "classes only have valid_for_* methods for groups that appear in their validations" do
-      class_with_group_one = Class.new do
-        include Validatable
-        validates_presence_of :name, :groups => :group_one
-        attr_accessor :name
-      end
-      class_with_group_two = Class.new do
-        include Validatable
-        validates_presence_of :name, :groups => :group_two
-        attr_accessor :name
-      end
-      assert_equal false, class_with_group_one.public_instance_methods.include?(:valid_for_group_two?)
-      assert_equal false, class_with_group_two.public_instance_methods.include?(:valid_for_group_one?)
-    end
-    
-    test "nonmatching groups are not used as validations" do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :groups => :group_one
-        validates_presence_of :address, :groups => :group_two
-        attr_accessor :name, :address
-      end
-      instance = klass.new
-      assert_equal nil, instance.errors.on(:name)
-    end
-    
-    expect "can't be empty twice changed message" do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name
-        attr_accessor :name
-      end
-      
-      Validatable::ValidationBase.class_eval do
-        after_validate do |result, instance, attribute|
-          instance.errors.add(attribute, " changed message")
-        end
-      end
-      Validatable::ValidatesPresenceOf.class_eval do
-        after_validate do |result, instance, attribute|
-          instance.errors.add(attribute, " twice")
-        end
+  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_validations_for :child 
+      define_method :child do
+        child_class.new
       end
-      instance = klass.new
-      instance.valid?
-      Validatable::ValidatesPresenceOf.after_validations.clear
-      Validatable::ValidationBase.after_validations.clear
-      instance.errors.on(:name).join
     end
+    instance = klass.new
+    instance.valid?
+    instance.errors.on(:address)
+  end
 
-    expect false do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :groups => :group_one
-        attr_accessor :name
+  expect "can't be empty" 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_validations_for :child 
+      define_method :child do
+        child_class.new
       end
-      instance = klass.new
-      instance.valid_for_group_one?
-    end
-    
-    expect false do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :groups => [:group_one, :group_two]
-        attr_accessor :name
+    end
+    instance = klass.new
+    instance.valid?
+    instance.errors.on(:name)
+  end
+
+
+  test "when child validations have errors, level 2 and higher parent validations are not performed" do
+    child_class = Class.new do
+      include Validatable
+      attr_accessor :name
+      validates_presence_of :name
+    end
+
+    klass = Class.new do
+      include Validatable
+      extend Forwardable
+      def_delegator :child, :name
+      validates_true_for :name, :logic => lambda { false }, :level => 2, :message => "invalid message"
+      include_validations_for :child 
+      define_method :child do
+        @child ||= child_class.new
       end
-      instance = klass.new
-      instance.valid_for_group_one?
-    end
-    
-    expect true do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :groups => :group_one
-        validates_presence_of :address
-        attr_accessor :name, :address
+    end
+    instance = klass.new
+    instance.valid?
+    assert_equal "can't be empty", instance.errors.on(:name)
+  end
+
+  test "when child validations have errors, level 1 parent validations are still performed" do
+    child_class = Class.new do
+      include Validatable
+      attr_accessor :name
+      validates_presence_of :name
+    end
+
+    klass = Class.new do
+      include Validatable
+      validates_true_for :address, :logic => lambda { false }, :level => 1, :message => "invalid message"
+      include_validations_for :child 
+      define_method :child do
+        @child ||= child_class.new
       end
-      instance = klass.new
-      instance.address = 'anything'
-      instance.valid?
-    end
-    
-    expect true do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :groups => :group_one
-        attr_accessor :name
+
+    end
+    instance = klass.new
+    instance.valid?
+    assert_equal "can't be empty", instance.errors.on(:name)
+    assert_equal "invalid message", instance.errors.on(:address)
+  end
+
+  expect "can't be empty" do
+    child_class = Class.new do
+      include Validatable
+      attr_accessor :name, :address
+      validates_presence_of :name
+    end
+    klass = Class.new do
+      include Validatable
+      include_validations_for :child, :map => {:name => :namen}
+      define_method :child do
+        child_class.new
       end
-      instance = klass.new
-      instance.valid?
-    end
-    
-    expect true do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :times => 1
-        attr_accessor :name
+    end
+    instance = klass.new
+    instance.valid?
+    instance.errors.on(:namen)
+  end
+
+  expect "can't be empty" do
+    child_class = Class.new do
+      include Validatable
+      attr_accessor :name, :address
+      validates_presence_of :name
+    end
+    klass = Class.new do
+      include Validatable
+      include_validations_for :child, :if => lambda { true }
+      define_method :child do
+        child_class.new
       end
-      instance = klass.new
-      instance.valid?
-      instance.valid?
-    end
-    
-    expect false do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :times => 1
-        attr_accessor :name
+    end
+    instance = klass.new
+    instance.valid?
+    instance.errors.on(:name)
+  end
+
+  expect true do
+    child_class = Class.new do
+      include Validatable
+      attr_accessor :name, :address
+      validates_presence_of :name
+    end
+    klass = Class.new do
+      include Validatable
+      include_validations_for :child, :if => lambda { false }
+      define_method :child do
+        child_class.new
       end
-      instance1 = klass.new
-      instance1.valid?
-      instance2 = klass.new
-      instance2.valid?
-    end
-        
-    expect "name message" do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :level => 1, :message => "name message"
-        validates_presence_of :address, :level => 2
-        attr_accessor :name, :address
+    end
+    instance = klass.new
+    instance.valid?
+  end
+
+  test "classes only have valid_for_* methods for groups that appear in their validations" do
+    class_with_group_one = Class.new do
+      include Validatable
+      validates_presence_of :name, :groups => :group_one
+      attr_accessor :name
+    end
+    class_with_group_two = Class.new do
+      include Validatable
+      validates_presence_of :name, :groups => :group_two
+      attr_accessor :name
+    end
+    assert_equal false, class_with_group_one.public_instance_methods.include?(:valid_for_group_two?)
+    assert_equal false, class_with_group_two.public_instance_methods.include?(:valid_for_group_one?)
+  end
+
+  test "nonmatching groups are not used as validations" do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :groups => :group_one
+      validates_presence_of :address, :groups => :group_two
+      attr_accessor :name, :address
+    end
+    instance = klass.new
+    assert_equal nil, instance.errors.on(:name)
+  end
+
+  expect "can't be empty twice changed message" do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name
+      attr_accessor :name
+    end
+
+    Validatable::ValidationBase.class_eval do
+      after_validate do |result, instance, attribute|
+        instance.errors.add(attribute, " changed message")
       end
-      instance = klass.new
-      instance.valid?
-      instance.errors.on(:name)
-    end
-    
-    expect nil do
-      klass = Class.new do
-        include Validatable
-        validates_presence_of :name, :level => 1, :message => "name message"
-        validates_presence_of :address, :level => 2
-        attr_accessor :name, :address
+    end
+    Validatable::ValidatesPresenceOf.class_eval do
+      after_validate do |result, instance, attribute|
+        instance.errors.add(attribute, " twice")
       end
-      instance = klass.new
-      instance.valid?
-      instance.errors.on(:address)
     end
+    instance = klass.new
+    instance.valid?
+    Validatable::ValidatesPresenceOf.after_validations.clear
+    Validatable::ValidationBase.after_validations.clear
+    instance.errors.on(:name).join
+  end
+
+  expect false do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :groups => :group_one
+      attr_accessor :name
+    end
+    instance = klass.new
+    instance.valid_for_group_one?
+  end
+
+  expect false do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :groups => [:group_one, :group_two]
+      attr_accessor :name
+    end
+    instance = klass.new
+    instance.valid_for_group_one?
+  end
+
+  expect true do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :groups => :group_one
+      validates_presence_of :address
+      attr_accessor :name, :address
+    end
+    instance = klass.new
+    instance.address = 'anything'
+    instance.valid?
+  end
+
+  expect true do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :groups => :group_one
+      attr_accessor :name
+    end
+    instance = klass.new
+    instance.valid?
+  end
+
+  expect true do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :times => 1
+      attr_accessor :name
+    end
+    instance = klass.new
+    instance.valid?
+    instance.valid?
+  end
+
+  expect false do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :times => 1
+      attr_accessor :name
+    end
+    instance1 = klass.new
+    instance1.valid?
+    instance2 = klass.new
+    instance2.valid?
+  end
+
+  expect "name message" do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :level => 1, :message => "name message"
+      validates_presence_of :address, :level => 2
+      attr_accessor :name, :address
+    end
+    instance = klass.new
+    instance.valid?
+    instance.errors.on(:name)
+  end
+
+  expect nil do
+    klass = Class.new do
+      include Validatable
+      validates_presence_of :name, :level => 1, :message => "name message"
+      validates_presence_of :address, :level => 2
+      attr_accessor :name, :address
+    end
+    instance = klass.new
+    instance.valid?
+    instance.errors.on(:address)
   end
-end
+end

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'rubygems'
 require 'mocha'
+require 'dust'
 require 'set'
 
 require File.dirname(__FILE__) + '/../lib/validatable'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: validatable
 version: !ruby/object:Gem::Version 
-  version: 1.5.2
-date: 2007-06-19 00:00:00 -04:00
+  version: 1.6.0
+date: 2007-08-14 00:00:00 -04:00
 summary: Validatable is a library for adding validations.
 require_paths: 
 - lib
@@ -77,7 +77,7 @@ test_files:
 - test/all_tests.rb
 rdoc_options: 
 - --title
-- SQL DSL
+- Validatable
 - --main
 - README
 - --line-numbers