validatable 1.3.2 → 1.3.4

data/lib/errors.rb

@@ -7,14 +7,17 @@ module Validatable
 
     # call-seq: on(attribute)
     # 
-    # Returns nil, if no errors are associated with the specified attribute.
-    # Returns the error message, if one error is associated with the specified attribute.
+    # * Returns nil, if no errors are associated with the specified +attribute+.
+    # * Returns the error message, if one error is associated with the specified +attribute+.
+    # * Returns an array of error messages, if more than one error is associated with the specified +attribute+.
     def on(attribute)
-      errors[attribute.to_sym]
+      return nil if errors[attribute.to_sym].nil?
+      errors[attribute.to_sym].size == 1 ? errors[attribute.to_sym].first : errors[attribute.to_sym]
     end
-
+    
     def add(attribute, message) #:nodoc:
-      errors[attribute.to_sym] = message
+      errors[attribute.to_sym] = [] if errors[attribute.to_sym].nil?
+      errors[attribute.to_sym] << message
     end
 
     def merge!(errors) #:nodoc:
@@ -22,14 +25,25 @@ module Validatable
       self
     end
 
+    def replace(attribute, value)
+      errors[attribute.to_sym] = value
+    end
+
+    def raw(attribute)
+      errors[attribute.to_sym]
+    end
+    
     def errors #:nodoc:
       @errors ||= {}
     end
 
-    def count
+    def count #:nodoc:
       size
     end
 
+    # call-seq: full_messages -> an_array_of_messages
+    # 
+    # Returns an array containing the full list of error messages.
     def full_messages
       full_messages = []
 
@@ -47,7 +61,7 @@ module Validatable
       full_messages
     end
     
-    def humanize(lower_case_and_underscored_word)
+    def humanize(lower_case_and_underscored_word) #:nodoc:
       lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
     end
   end

data/lib/validatable_class_methods.rb

@@ -200,8 +200,14 @@ module Validatable
         next unless child_validation.should_validate?(instance)
         child = instance.send child_validation.attribute
         child.valid?(*groups)
-        child.errors.each do |attribute, message|
-          add_error(instance, child_validation.map[attribute.to_sym] || attribute, message)
+        child.errors.each do |attribute, messages|
+          if messages.is_a?(String)
+            add_error(instance, child_validation.map[attribute.to_sym] || attribute, messages)
+          else
+            messages.each do |message|
+              add_error(instance, child_validation.map[attribute.to_sym] || attribute, message)
+            end
+          end
         end
       end
     end
@@ -210,8 +216,8 @@ module Validatable
       @validations ||= []
     end
     
-    def add_error(instance, attribute, message) #:nodoc:
-      instance.errors.add(attribute, message)
+    def add_error(instance, attribute, msg) #:nodoc:
+      instance.errors.add(attribute, msg)
     end
     
     protected

data/lib/validatable_instance_methods.rb

@@ -36,7 +36,7 @@ module Validatable
 
   def run_validation(validation) #:nodoc:
     validation_result = validation.valid?(self)
-    add_error(validation.attribute, validation.message) unless validation_result
+    add_error(validation.attribute, validation.message(self)) unless validation_result
     validation.run_after_validate(validation_result, self, validation.attribute)
   end
   

data/lib/validations/validates_acceptance_of.rb

@@ -4,7 +4,7 @@ module Validatable
       instance.send(self.attribute) == "true"
     end
     
-    def message
+    def message(instance)
       super || "must be accepted"
     end
   end

data/lib/validations/validates_confirmation_of.rb

@@ -8,7 +8,7 @@ module Validatable
       instance.send(self.attribute).to_s.casecmp(instance.send("#{self.attribute}_confirmation".to_sym).to_s) == 0
     end
     
-    def message
+    def message(instance)
       super || "doesn't match confirmation"
     end
   end

data/lib/validations/validates_format_of.rb

@@ -6,7 +6,7 @@ module Validatable
       not (instance.send(self.attribute).to_s =~ self.with).nil?
     end
     
-    def message
+    def message(instance)
       super || "is invalid"
     end
   end

data/lib/validations/validates_length_of.rb

@@ -2,7 +2,7 @@ module Validatable
   class ValidatesLengthOf < ValidationBase #:nodoc:
     option :minimum, :maximum, :is, :within, :allow_nil
     
-    def message
+    def message(instance)
       super || "is invalid"
     end
     
@@ -22,4 +22,4 @@ module Validatable
       valid
     end
   end
-end
+end

data/lib/validations/validates_numericality_of.rb

@@ -8,7 +8,7 @@ module Validatable
       not (value =~ regex).nil?
     end
     
-    def message
+    def message(instance)
       super || "must be a number"
     end
   end

data/lib/validations/validates_presence_of.rb

@@ -5,7 +5,7 @@ module Validatable
       instance.send(self.attribute).respond_to?(:strip) ? instance.send(self.attribute).strip.length != 0 : true
     end
     
-    def message
+    def message(instance)
       super || "can't be empty"
     end
   end

data/lib/validations/validates_true_for.rb

@@ -6,7 +6,7 @@ module Validatable
       instance.instance_eval(&logic) == true
     end
     
-    def message
+    def message(instance)
       super || "is invalid"
     end
   end

data/lib/validations/validation_base.rb

@@ -60,6 +60,10 @@ module Validatable
       instance.instance_eval(&self.if) && validate_this_time?
     end
     
+    def message(instance)
+      @message.respond_to?(:call) ? instance.instance_eval(&@message) : @message
+    end
+    
     def validate_this_time?
       return true if @times.nil?
       self.times -= 1

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.3.2"
+	s.version = "1.3.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

@@ -175,17 +175,17 @@ module Functional
       
       Validatable::ValidationBase.class_eval do
         after_validate do |result, instance, attribute|
-          instance.errors.add(attribute, instance.errors.on(attribute) + " changed message")
+          instance.errors.add(attribute, " changed message")
         end
       end
       Validatable::ValidatesPresenceOf.class_eval do
         after_validate do |result, instance, attribute|
-          instance.errors.add(attribute, instance.errors.on(attribute) + " twice")
+          instance.errors.add(attribute, " twice")
         end
       end
       instance = klass.new
       instance.valid?
-      assert_equal "can't be empty twice changed message", instance.errors.on(:name) 
+      assert_equal "can't be empty twice changed message", instance.errors.on(:name).join
       Validatable::ValidatesPresenceOf.after_validations.clear
       Validatable::ValidationBase.after_validations.clear
     end

data/test/unit/errors_test.rb

@@ -7,6 +7,19 @@ class ErrorsTest < Test::Unit::TestCase
     errors.on(:attribute)
   end
   
+  expect ["message"] do
+    errors = Validatable::Errors.new
+    errors.add(:attribute, "message")
+    errors.raw(:attribute)
+  end
+  
+  expect "something new" do
+    errors = Validatable::Errors.new
+    errors.add(:attribute, "something old")
+    errors.replace(:attribute, ["something new"])
+    errors.on(:attribute)
+  end
+  
   expect "Capitalized word" do
     errors = Validatable::Errors.new
     errors.humanize("capitalized_word")
@@ -27,4 +40,11 @@ class ErrorsTest < Test::Unit::TestCase
   test "includes enumerable" do
     assert_equal true, Validatable::Errors.included_modules.include?(Enumerable)
   end
+  
+  expect ["message1", "message2"] do
+    errors = Validatable::Errors.new
+    errors.add(:attribute, "message1")
+    errors.add(:attribute, "message2")
+    errors.on(:attribute)
+  end
 end

data/test/unit/validation_base_test.rb

@@ -33,6 +33,11 @@ class ValidationBaseTest < Test::Unit::TestCase
     validation.level
   end
   
+  expect "some message 100" do
+    validation = Validatable::ValidationBase.new :base, :message => lambda { "some message #{a_method}" }
+    validation.message(stub(:a_method=>'100'))
+  end
+  
   test "invalid option causes raise" do
     assert_raises ArgumentError do
       Validatable::ValidationBase.new(:base).must_understand(:foo => 1, :bar => 2)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.0
 specification_version: 1
 name: validatable
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
-date: 2007-05-30 00:00:00 -04:00
+  version: 1.3.4
+date: 2007-05-31 00:00:00 -04:00
 summary: Validatable is a library for adding validations.
 require_paths: 
 - lib