validatable 1.6.3 → 1.6.4

data/lib/macros.rb

@@ -227,5 +227,9 @@ module Validatable
     def include_validations_for(attribute_to_validate, options = {})
       children_to_validate << ChildValidation.new(attribute_to_validate, options[:map] || {}, options[:if] || lambda { true })
     end
+    
+    def before_validation(&block)
+      before_validations << block
+    end
   end
 end

data/lib/object_extension.rb

@@ -0,0 +1,20 @@
+class Object
+  module InstanceExecHelper; end
+  include InstanceExecHelper
+  def instance_eval_with_params(*args, &block)
+    begin
+      old_critical, Thread.critical = Thread.critical, true
+      n = 0
+      n += 1 while respond_to?(mname="__instance_exec#{n}")
+      InstanceExecHelper.module_eval{ define_method(mname, &block) }
+    ensure
+      Thread.critical = old_critical
+    end
+    begin
+      ret = send(mname, *args)
+    ensure
+      InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
+    end
+    ret
+  end
+end

data/lib/validatable.rb

@@ -1,4 +1,5 @@
 require 'forwardable'
+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')

data/lib/validatable_class_methods.rb

@@ -21,6 +21,17 @@ module Validatable
         end
       end
     end
+    
+    def all_before_validations
+      if self.superclass.respond_to? :all_before_validations
+        return before_validations + self.superclass.all_before_validations 
+      end
+      before_validations
+    end
+    
+    def before_validations
+      @before_validations ||= []
+    end
 
     def all_validations
       return validations + self.superclass.all_validations if self.superclass.respond_to? :all_validations

data/lib/validatable_instance_methods.rb

@@ -19,6 +19,7 @@ module Validatable
   end
   
   def valid_for_group?(group) #:nodoc:
+    run_before_validations
     errors.clear
     self.class.validate_children(self, group)
     self.validate(group)
@@ -60,6 +61,12 @@ module Validatable
     validation.run_after_validate(validation_result, self, validation.attribute)
   end
   
+  def run_before_validations
+    self.class.all_before_validations.each do |block|
+      instance_eval &block
+    end
+  end
+  
   def add_error(attribute, message) #:nodoc:
     self.class.add_error(self, attribute, message)
   end

data/lib/validations/validation_base.rb

@@ -82,7 +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?
+      instance.instance_eval_with_params result, attribute, &self.after_validate 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.3"
+	s.version = "1.6.4"
 	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

@@ -1,12 +1,25 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 functional_tests do
-
+  expect :is_set do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :result
+      before_validation do
+        self.result = :is_set
+      end
+    end
+    
+    instance = klass.new
+    instance.valid?
+    instance.result
+  end
+  
   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 }
+      validates_presence_of :name, :after_validate => lambda { |result, attribute| self.result = :is_set }
     end
 
     instance = klass.new

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: validatable
 version: !ruby/object:Gem::Version 
-  version: 1.6.3
+  version: 1.6.4
 date: 2007-08-15 00:00:00 -04:00
 summary: Validatable is a library for adding validations.
 require_paths: 
@@ -32,6 +32,7 @@ files:
 - lib/child_validation.rb
 - lib/errors.rb
 - lib/macros.rb
+- lib/object_extension.rb
 - lib/requireable.rb
 - lib/understandable.rb
 - lib/validatable.rb