jnunemaker-validatable 1.7.2 → 1.7.3

data/VERSION.yml

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

data/lib/errors.rb

@@ -28,6 +28,8 @@ 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/macros.rb

@@ -193,7 +193,30 @@ module Validatable
     def validates_true_for(*args)
       add_validations(args, ValidatesTrueFor)
     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.
@@ -280,4 +303,4 @@ module Validatable
       before_validations << block
     end
   end
-end
+end

data/lib/validatable.rb

@@ -21,4 +21,5 @@ require File.join(dir, 'validations/validates_confirmation_of')
 require File.join(dir, 'validations/validates_length_of')
 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_each')
+require File.join(dir, 'validations/validates_associated')

data/lib/validations/validates_associated.rb

@@ -0,0 +1,13 @@
+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/test/functional/test_validates_associated.rb

@@ -0,0 +1,41 @@
+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/unit/test_errors.rb

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

data/test/unit/test_validates_associated.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-27 00:00:00 -07:00
+date: 2009-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -37,6 +37,7 @@ files:
 - lib/validatable_class_methods.rb
 - lib/validatable_instance_methods.rb
 - lib/validations/validates_acceptance_of.rb
+- lib/validations/validates_associated.rb
 - lib/validations/validates_confirmation_of.rb
 - lib/validations/validates_each.rb
 - lib/validations/validates_format_of.rb
@@ -48,6 +49,7 @@ 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_format_of.rb
@@ -60,6 +62,7 @@ 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_format_of.rb
 - test/unit/test_validates_length_of.rb
@@ -69,7 +72,8 @@ files:
 - test/unit/test_validation_base.rb
 has_rdoc: true
 homepage: http://github.com/jnunemaker/validatable
-licenses: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -92,12 +96,13 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 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_format_of.rb
@@ -110,6 +115,7 @@ 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_format_of.rb
 - test/unit/test_validates_length_of.rb