validatable 1.3.0 → 1.3.2

data/README

@@ -115,4 +115,4 @@ In the above example the attribute "name" is appended to the message.
 See the tests for more examples
 
 == Contributors
-Rick Bradley, Anonymous Z, Jason Miller, Ali Aghareza, Xavier Shay
+Rick Bradley, Anonymous Z, Jason Miller, Ali Aghareza, Xavier Shay, Dan Manges, Karthik Krishnan and Venkat

data/lib/errors.rb

@@ -1,9 +1,10 @@
 module Validatable
   class Errors
     extend Forwardable
-    
-    def_delegators :errors, :any?, :clear, :each, :each_pair, :empty?, :length, :size
-    
+    include Enumerable
+
+    def_delegators :errors, :clear, :each, :each_pair, :empty?, :length, :size
+
     # call-seq: on(attribute)
     # 
     # Returns nil, if no errors are associated with the specified attribute.
@@ -11,11 +12,11 @@ module Validatable
     def on(attribute)
       errors[attribute.to_sym]
     end
-    
+
     def add(attribute, message) #:nodoc:
       errors[attribute.to_sym] = message
     end
-    
+
     def merge!(errors) #:nodoc:
       errors.each_pair{|k, v| add(k,v)}
       self
@@ -24,5 +25,30 @@ module Validatable
     def errors #:nodoc:
       @errors ||= {}
     end
+
+    def count
+      size
+    end
+
+    def full_messages
+      full_messages = []
+
+      errors.each_key do |attribute|
+        errors[attribute].each do |msg|
+          next if msg.nil?
+
+          if attribute.to_s == "base"
+            full_messages << msg
+          else
+            full_messages << humanize(attribute.to_s) + " " + msg
+          end
+        end
+      end
+      full_messages
+    end
+    
+    def humanize(lower_case_and_underscored_word)
+      lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
+    end
   end
 end

data/lib/understandable.rb

@@ -4,21 +4,21 @@ module Validatable
       def understands(*args)
         understandings.concat args
       end
-    
+
       def understandings
         @understandings ||= []
       end
-    
+
       def all_understandings
         return understandings + self.superclass.all_understandings if self.superclass.respond_to? :all_understandings
         understandings
       end
     end
-    
+
     def self.included(klass)
       klass.extend ClassMethods
     end
-    
+
     def must_understand(hash)
       invalid_options = hash.inject([]) do |errors, (key, value)|
         errors << key.to_s unless self.class.all_understandings.include?(key)

data/lib/validatable_assertions.rb

@@ -1,18 +1,18 @@
 module ValidatableAssertions
-  
+
   def create_message_for_assertion(assertion)
     message = "#{assertion.klass} does not contain a #{assertion.validation_type} for #{assertion.attribute}"
     message += " with options #{assertion.options.inspect}" unless assertion.options == {}
     message
   end
-  
+
   def create_backtrace
     backtrace = caller
     backtrace.shift
     backtrace.shift
     backtrace
   end
-  
+
   def validation_matching_proc(assertion)
     lambda do |validation|
       result = assertion.validation_type === validation
@@ -25,13 +25,13 @@ module ValidatableAssertions
       result
     end
   end
-  
+
   def self.included(klass)
     Test::Unit::TestCase.class_eval do
       def self.create_test_name(assertion)
         "test#{assertion.validation_type.to_s.gsub(/Validatable::/,'').gsub(/([A-Z])/, '_\1').downcase}_#{assertion.attribute}"
       end
-      
+
       def self.define_test_method name, &block
         class_eval do
           define_method name, &block

data/lib/validations/validates_length_of.rb

@@ -1,6 +1,6 @@
 module Validatable
   class ValidatesLengthOf < ValidationBase #:nodoc:
-    option :minimum, :maximum, :is, :within
+    option :minimum, :maximum, :is, :within, :allow_nil
     
     def message
       super || "is invalid"
@@ -8,8 +8,13 @@ module Validatable
     
     def valid?(instance)
       valid = true
-      value = instance.send(self.attribute) || ""
-
+      value = instance.send(self.attribute)
+      
+      if value.nil?
+        return true if allow_nil
+        value = ""
+      end
+      
       valid &&= value.length <= maximum unless maximum.nil? 
       valid &&= value.length >= minimum unless minimum.nil?
       valid &&= value.length == is unless is.nil?

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.0"
+	s.version = "1.3.2"
 	s.author = 'Jay Fields'
 	s.description = "Validatable is a library for adding validations."
 	s.email = 'validatable-developer@rubyforge.org'

data/test/functional/validation_assertion_collector_test.rb

@@ -27,7 +27,7 @@ class ValidationAssertionCollectorTest < Test::Unit::TestCase
       presence_of(:name).invalid_option
     end
   end
-  
+    
   expect NoMethodError do
     assertions = ValidationAssertionCollector.gather(Class.new) do
       true_for(:name)

data/test/unit/errors_test.rb

@@ -6,4 +6,25 @@ class ErrorsTest < Test::Unit::TestCase
     errors.add(:attribute, "message")
     errors.on(:attribute)
   end
+  
+  expect "Capitalized word" do
+    errors = Validatable::Errors.new
+    errors.humanize("capitalized_word")
+  end
+  
+  expect "Capitalized word without" do
+    errors = Validatable::Errors.new
+    errors.humanize("capitalized_word_without_id")
+  end
+  
+  expect ["A humanized message", "a base message"] do
+    errors = Validatable::Errors.new
+    errors.add(:base, "a base message")
+    errors.add(:a_humanized, "message")
+    errors.full_messages.sort
+  end
+  
+  test "includes enumerable" do
+    assert_equal true, Validatable::Errors.included_modules.include?(Enumerable)
+  end
 end

data/test/unit/validatable_test.rb

@@ -3,7 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 module Unit
   class ValidatableTest < Test::Unit::TestCase
     expect false do
-      validation = stub(:valid? => false, :should_validate? => true, :attribute => "attribute", :message => "message", :level => 1, :run_after_validate => nil)
+      validation = stub(:valid? => false, :should_validate? => true, 
+                        :attribute => "attribute", :message => "message", :level => 1, :run_after_validate => nil)
       klass = Class.new do
         include Validatable
         validations << validation

data/test/unit/validates_length_of_test.rb

@@ -2,10 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 module Unit
   class ValidatesLengthOfTest < Test::Unit::TestCase
-    test "max length" do
+    expect false do
       validation = Validatable::ValidatesLengthOf.new :username, :maximum => 8
-      instance = stub(:username=>"usernamefdfd")
-      assert_equal false, validation.valid?(instance)
+      validation.valid?(stub(:username=>"usernamefdfd"))
     end
     
     test "min length" do
@@ -56,8 +55,21 @@ module Unit
       assert_equal false, validation.valid?(instance)
     end
 
+    test "given nil value, should not be valid" do
+      validation = Validatable::ValidatesLengthOf.new :username, :within => 2..4
+      instance = stub(:username => nil)
+      assert_equal false, validation.valid?(instance)
+    end
+
+
+    test "given allow_nil is true, nil value should be valid" do
+      validation = Validatable::ValidatesLengthOf.new :username, :within => 2..4, :allow_nil => true
+      instance = stub(:username => nil)
+      assert_equal true, validation.valid?(instance)
+    end
+    
     expect true do
-      options = [:message, :if, :times, :level, :groups, :maximum, :minimum, :is, :within]
+      options = [:message, :if, :times, :level, :groups, :maximum, :minimum, :is, :within, :allow_nil]
       Validatable::ValidatesLengthOf.new(:test).must_understand(options.to_blank_options_hash)
     end
     

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: validatable
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
-date: 2007-05-02 00:00:00 -04:00
+  version: 1.3.2
+date: 2007-05-30 00:00:00 -04:00
 summary: Validatable is a library for adding validations.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Jay Fields
 files: