jnunemaker-validatable 1.8.1 → 1.8.2

data/Rakefile

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'rake'
 
+require File.dirname(__FILE__) + '/lib/validatable'
+
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   gem.name        = "jnunemaker-validatable"
@@ -10,6 +12,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage    = "http://github.com/jnunemaker/validatable"
   gem.authors     = ['Jay Fields', 'John Nunemaker']
   gem.files       = FileList['lib/**/*.rb', '[A-Z]*', 'test/**/*'].to_a
+  gem.version     = Validatable::Version
 end
 
 Jeweler::GemcutterTasks.new

data/lib/validatable.rb

@@ -1,5 +1,5 @@
 require 'forwardable'
-require 'active_support'
+require 'active_support/all'
 
 require 'validatable/object_extension'
 require 'validatable/errors'
@@ -22,3 +22,7 @@ require 'validatable/validations/validates_exclusion_of'
 require 'validatable/validations/validates_inclusion_of'
 require 'validatable/validations/validates_each'
 require 'validatable/validations/validates_associated'
+
+module Validatable
+  Version = '1.8.2'
+end

data/lib/validatable/validatable_instance_methods.rb

@@ -2,10 +2,6 @@ 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?
@@ -23,14 +19,8 @@ module Validatable
   end
   
   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
-    
+    run_before_validations
     self.class.validate_children(self, group)
     self.validate_group(group)
     errors.empty?

data/test/functional/test_validatable.rb

@@ -516,120 +516,4 @@ 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.8.1
+  version: 1.8.2
 platform: ruby
 authors: 
 - Jay Fields
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-01 00:00:00 -04:00
+date: 2010-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: []