durran-validatable 1.8.4 → 2.0.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 1
-:minor: 8
-:patch: 4
+:major: 2
+:minor: 0
+:patch: 0
 :build: 

data/lib/macros.rb

@@ -353,7 +353,7 @@ module Validatable
     #     attr_accessor :name
     #   end
     # 
-    def before_validation(&block)
+    def before_validate(&block)
       before_validations << block
     end
   end

data/lib/validatable_instance_methods.rb

@@ -4,42 +4,38 @@ module Validatable
     klass.extend Validatable::Macros
     klass.class_eval do
       include ActiveSupport::Callbacks
-      define_callbacks :validate, :validate_on_create, :validate_on_update
+      define_callbacks :before_validation, :after_validation
     end
   end
-  
+
   # call-seq: valid?
   #
   # Returns true if no errors were added otherwise false. Only executes validations that have no :groups option specified
   def valid?
     valid_for_group?(nil)
   end
-  
+
   # call-seq: errors
   #
   # Returns the Errors object that holds all information about attribute error messages.
   def errors
     @errors ||= Validatable::Errors.new
   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_callbacks(:before_validation)
     self.class.validate_children(self, group)
     self.validate_group(group)
+    run_callbacks(:after_validation)
     errors.empty?
   end
-  
+
   def times_validated(key) #:nodoc:
     times_validated_hash[key] || 0
   end
-  
+
   def increment_times_validated_for(validation) #:nodoc:
     if validation.key != nil
       if times_validated_hash[validation.key].nil?
@@ -86,31 +82,31 @@ module Validatable
     increment_times_validated_for(validation)
     validation.run_after_validate(validation_result, self, validation.attribute)
   end
-  
+
   def run_before_validations #:nodoc:
     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
-  
+
   def validations_for_level_and_group(level, group) #:nodoc:
     validations_for_level = self.all_validations.select { |validation| validation.level == level }
     return validations_for_level.select { |validation| validation.groups.empty? } if group.nil?
     validations_for_level.select { |validation| validation.groups.include?(group) }
   end
-  
+
   def all_validations #:nodoc:
     res = self.class.validations_to_include.inject(self.class.all_validations) do |result, included_validation_class|
       result += self.send(included_validation_class.attribute).all_validations
       result
     end
   end
-  
+
   def validation_levels #:nodoc:
     self.class.all_validations.inject([1]) { |result, validation| result << validation.level }.uniq.sort
   end
-end
+end

data/test/functional/test_validatable.rb

@@ -9,7 +9,7 @@ functional_tests do
     end
     klass = Class.new do
       include Validatable
-      include_validations_from :child 
+      include_validations_from :child
       define_method :child do
         child_class
       end
@@ -19,7 +19,7 @@ functional_tests do
     instance.valid?
     instance.errors.on(:name)
   end
-  
+
   expect "can't be blank" do
     child_class = Module.new do
       include Validatable
@@ -28,7 +28,7 @@ functional_tests do
     klass = Class.new do
       include Validatable
       validates_presence_of :address
-      include_validations_from :child 
+      include_validations_from :child
       define_method :child do
         child_class
       end
@@ -38,21 +38,21 @@ functional_tests do
     instance.valid?
     instance.errors.on(:address)
   end
-  
+
   expect :is_set do
     klass = Class.new do
       include Validatable
       attr_accessor :result
-      before_validation do
+      before_validate 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
@@ -77,7 +77,7 @@ functional_tests do
     end
     subsubclass.new.valid?
   end
-  
+
   expect false do
     klass = Class.new do
       include Validatable
@@ -88,7 +88,7 @@ functional_tests do
     end
     subclass.new.valid?
   end
-  
+
   expect true do
     klass = Class.new do
       include Validatable
@@ -129,7 +129,7 @@ functional_tests do
     end
     klass = Class.new do
       include Validatable
-      include_errors_from :child 
+      include_errors_from :child
       define_method :child do
         child_class.new
       end
@@ -148,7 +148,7 @@ functional_tests do
     end
     klass = Class.new do
       include Validatable
-      include_errors_from :child 
+      include_errors_from :child
       define_method :child do
         child_class.new
       end
@@ -171,7 +171,7 @@ functional_tests do
       extend Forwardable
       def_delegator :child, :name
       validates_true_for :name, :logic => lambda { false }, :level => 2, :message => "invalid message"
-      include_errors_from :child 
+      include_errors_from :child
       define_method :child do
         @child ||= child_class.new
       end
@@ -191,7 +191,7 @@ functional_tests do
     klass = Class.new do
       include Validatable
       validates_true_for :address, :logic => lambda { false }, :level => 1, :message => "invalid message"
-      include_errors_from :child 
+      include_errors_from :child
       define_method :child do
         @child ||= child_class.new
       end
@@ -255,13 +255,13 @@ functional_tests do
     instance = klass.new
     instance.valid?
   end
-  
+
   test ':if with symbol should work' do
     klass = Class.new do
       include Validatable
       attr_accessor :name, :name_required
       validates_presence_of :name, :if => :name_required?
-      
+
       def name_required?
         name_required
       end
@@ -273,13 +273,13 @@ functional_tests do
     assert !instance.valid?
     assert_equal "can't be blank", instance.errors.on(:name)
   end
-  
+
   test ':if with string should work' do
     klass = Class.new do
       include Validatable
       attr_accessor :name, :name_required
       validates_presence_of :name, :if => 'name_required?'
-      
+
       def name_required?
         name_required
       end
@@ -430,7 +430,7 @@ functional_tests do
     instance.valid?
     instance.errors.on(:address)
   end
-  
+
   expect "Mod::Klass/Validatable::ValidatesPresenceOf/name" do
     module Mod
       class Klass
@@ -448,7 +448,7 @@ functional_tests do
     end
     klass.validations.first.key
   end
-  
+
   expect "can't be blank" do
     klass = Class.new do
       include Validatable
@@ -470,61 +470,13 @@ 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
+      before_validation :action_presence
 
-  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?
@@ -532,58 +484,11 @@ functional_tests do
     end
     instance = klass.new
     instance.valid?
-    assert_nil instance.errors.on(:action)
-    
-    instance.action = 'walk'
-    instance.valid?
-    assert_nil instance.errors.on(:action)
-  end
+    assert_equal 'is invalid', instance.errors.on(:action)
 
-  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: durran-validatable
 version: !ruby/object:Gem::Version 
-  version: 1.8.4
+  version: 2.0.0
 platform: ruby
 authors: 
 - Jay Fields
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 -05:00
+date: 2010-01-09 00:00:00 -05:00
 default_executable: 
 dependencies: []