jnunemaker-validatable 1.7.0 → 1.7.1

data/VERSION.yml

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

data/lib/validatable.rb

@@ -2,21 +2,23 @@ require 'forwardable'
 require 'rubygems'
 require 'activesupport'
 
-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')
-require File.expand_path(File.dirname(__FILE__) + '/validatable_instance_methods')
-require File.expand_path(File.dirname(__FILE__) + '/included_validation')
-require File.expand_path(File.dirname(__FILE__) + '/child_validation')
-require File.expand_path(File.dirname(__FILE__) + '/understandable')
-require File.expand_path(File.dirname(__FILE__) + '/requireable')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validation_base')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_format_of')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_presence_of')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_acceptance_of')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_confirmation_of')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_length_of')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_true_for')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_numericality_of')
-require File.expand_path(File.dirname(__FILE__) + '/validations/validates_each')
+dir = File.expand_path(File.dirname(__FILE__))
+
+require File.join(dir, 'object_extension')
+require File.join(dir, 'errors')
+require File.join(dir, 'validatable_class_methods')
+require File.join(dir, 'macros')
+require File.join(dir, 'validatable_instance_methods')
+require File.join(dir, 'included_validation')
+require File.join(dir, 'child_validation')
+require File.join(dir, 'understandable')
+require File.join(dir, 'requireable')
+require File.join(dir, 'validations/validation_base')
+require File.join(dir, 'validations/validates_format_of')
+require File.join(dir, 'validations/validates_presence_of')
+require File.join(dir, 'validations/validates_acceptance_of')
+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')

data/lib/validatable_instance_methods.rb

@@ -2,6 +2,10 @@ module Validatable
   def self.included(klass) #:nodoc:
     klass.extend Validatable::ClassMethods
     klass.extend Validatable::Macros
+    klass.class_eval do
+      include ActiveSupport::Callbacks
+      define_callbacks :validate, :validate_on_create, :validate_on_update
+    end
   end
   
   # call-seq: valid?
@@ -21,8 +25,14 @@ module Validatable
   def valid_for_group?(group) #:nodoc:
     run_before_validations
     errors.clear
+    run_callbacks(:validate)
+    
+    if respond_to?(:new?)
+      new? ? run_callbacks(:validate_on_create) : run_callbacks(:validate_on_update)
+    end
+    
     self.class.validate_children(self, group)
-    self.validate(group)
+    self.validate_group(group)
     errors.empty?
   end
   
@@ -61,7 +71,7 @@ module Validatable
     @times_validated_hash ||= {}
   end
 
-  def validate(group) #:nodoc:
+  def validate_group(group) #:nodoc:
     validation_levels.each do |level|
       validations_for_level_and_group(level, group).each do |validation|
         run_validation(validation) if validation.should_validate?(self)

data/test/functional/test_validatable.rb

@@ -434,4 +434,120 @@ functional_tests do
     instance.validate_only("presence_of/name")
     instance.errors.on(:address)
   end
+  
+  test 'validate callback' do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :action
+      validate :action_presence
+      
+      private
+        def action_presence
+          errors.add(:action, 'is invalid') if action.blank?
+        end
+    end
+    instance = klass.new
+    instance.valid?
+    assert_equal 'is invalid', instance.errors.on(:action)
+    
+    instance.action = 'walk'
+    instance.valid?
+    assert_nil instance.errors.on(:action)
+  end
+  
+  test 'validate on create callback for new record' do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :action
+      validate_on_create :action_presence
+      
+      def new?
+        true
+      end
+      
+      private
+        def action_presence
+          errors.add(:action, 'is invalid') if action.blank?
+        end
+    end
+    instance = klass.new
+    instance.valid?
+    assert_equal 'is invalid', instance.errors.on(:action)
+    
+    instance.action = 'walk'
+    instance.valid?
+    assert_nil instance.errors.on(:action)
+  end
+
+  test 'validate on create callback for not new record' do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :action
+      validate_on_create :action_presence
+      
+      def new?
+        false
+      end
+      
+      private
+        def action_presence
+          errors.add(:action, 'is invalid') if action.blank?
+        end
+    end
+    instance = klass.new
+    instance.valid?
+    assert_nil instance.errors.on(:action)
+    
+    instance.action = 'walk'
+    instance.valid?
+    assert_nil instance.errors.on(:action)
+  end
+
+  test 'validate on update callback for new record' do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :action
+      validate_on_update :action_presence
+      
+      def new?
+        true
+      end
+      
+      private
+        def action_presence
+          errors.add(:action, 'is invalid') if action.blank?
+        end
+    end
+    instance = klass.new
+    instance.valid?
+    assert_nil instance.errors.on(:action)
+    
+    instance.action = 'walk'
+    instance.valid?
+    assert_nil instance.errors.on(:action)
+  end
+
+  test 'validate on update callback for not new record' do
+    klass = Class.new do
+      include Validatable
+      attr_accessor :action
+      validate_on_update :action_presence
+      
+      def new?
+        false
+      end
+      
+      private
+        def action_presence
+          errors.add(:action, 'is invalid') if action.blank?
+        end
+    end
+    instance = klass.new
+    instance.valid?
+    assert_equal 'is invalid', instance.errors.on(:action)
+    
+    instance.action = 'walk'
+    instance.valid?
+    assert_nil instance.errors.on(:action)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-28 00:00:00 -07:00
+date: 2009-07-05 00:00:00 -07:00
 default_executable: 
 dependencies: []