validatable 1.6.2 → 1.6.3

data/lib/macros.rb

@@ -13,12 +13,13 @@ module Validatable
     #
     # Configuration options:
     # 
+    #     * after_validate - A block that executes following the run of a validation
+    #     * group - The group that this validation belongs to.  A validation can belong to multiple groups
+    #     * if - A block that when executed must return true of the validation will not occur
+    #     * level - The level at which the validation should occur
+    #     * logic - A block that executes to perform the 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
-    #     * logic - A block that executes to perform the validation    def validates_each(*args)
     def validates_each(*args)
       add_validations(args, ValidatesEach)
     end
@@ -37,6 +38,7 @@ module Validatable
     # 
     # 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
@@ -59,6 +61,7 @@ module Validatable
     # 
     # 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
@@ -83,6 +86,7 @@ module Validatable
     # 
     # 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
@@ -105,6 +109,7 @@ module Validatable
     #
     # 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
@@ -131,6 +136,7 @@ module Validatable
     #
     # Configuration options:
     # 
+    #     * after_validate - A block that executes following the run of a validation
     #     * case_sensitive - Whether or not to apply case-sensitivity on the comparison.  Defaults to true.
     #     * message - The message to add to the errors collection when the validation fails
     #     * times - The number of times the validation applies
@@ -154,6 +160,7 @@ module Validatable
     #
     # 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
@@ -176,6 +183,7 @@ module Validatable
     #
     # 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

data/lib/validations/validation_base.rb

@@ -41,7 +41,7 @@ module Validatable
     include Understandable
     include Requireable
     
-    option :message, :if, :times, :level, :groups, :key
+    option :message, :if, :times, :level, :groups, :key, :after_validate
     default :level => 1, :groups => []
     attr_accessor :attribute
     
@@ -82,6 +82,7 @@ module Validatable
       self.class.all_after_validations.each do |block|
         block.call result, instance, attribute
       end
+      self.after_validate.call result, instance, attribute unless self.after_validate.nil?
     end
   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.6.2"
+	s.version = "1.6.3"
 	s.author = 'Jay Fields'
 	s.description = "Validatable is a library for adding validations."
 	s.email = 'validatable-developer@rubyforge.org'

data/test/functional/validatable_test.rb

@@ -2,6 +2,18 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 functional_tests do
 
+  expect :is_set do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :name, :result
+      validates_presence_of :name, :after_validate => lambda { |result, instance, attribute| instance.result = :is_set }
+    end
+
+    instance = klass.new
+    instance.valid?
+    instance.result
+  end
+
   expect false do
     klass = Class.new do
       include Validatable

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: validatable
 version: !ruby/object:Gem::Version 
-  version: 1.6.2
+  version: 1.6.3
 date: 2007-08-15 00:00:00 -04:00
 summary: Validatable is a library for adding validations.
 require_paths: