jnunemaker-validatable 1.7.3 → 1.7.4

data/README.rdoc

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

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "validatable"
+    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"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 7
-:patch: 3
+:patch: 4

data/lib/validatable_class_methods.rb

@@ -4,18 +4,20 @@ module Validatable
     def validate_children(instance, group)
       self.children_to_validate.each do |child_validation|
         next unless child_validation.should_validate?(instance)
-        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)
+        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)
           else
-            messages.each do |message|
-              add_error(instance, child_validation.map[attribute.to_sym] || attribute, message)
+            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
             end
           end
         end

data/test/functional/test_validatable.rb

@@ -138,7 +138,53 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -04:00
+date: 2009-10-11 00:00:00 -04:00
 default_executable: 
 dependencies: []