validatable 1.0.0 → 1.1.0

data/README

@@ -16,8 +16,6 @@ You may use, copy and redistribute this library under the same terms as Ruby its
 
 == Examples
 
-See the tests for more examples
-
 === Test Helper
 
     require 'test/unit'
@@ -31,87 +29,66 @@ See the tests for more examples
         raise ArgumentError, "#{test_name} is already defined" if self.instance_methods.include? test_name.to_s
         define_method test_name, &block
       end
+      
+      def expect(expected_value, &block)
+        define_method :"test_#{caller.first.split("/").last}" do
+          assert_equal expected_value, instance_eval(&block)
+        end 
+      end
     end
 
-=== Functional Tests
+=== Validations
 
-    require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+    require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
     
-    class FunctionalTest < Test::Unit::TestCase
-      test "given no name, when validated, then error is in the objects error collection" do
-        klass = Class.new do
-          include Validatable
-          attr_accessor :name
-          validates_presence_of :name
+    module Functional
+      class ValidatesPresenceOfTest < Test::Unit::TestCase
+        test "given no name, when validated, then error is in the objects error collection" do
+          klass = Class.new do
+            include Validatable
+            attr_accessor :name
+            validates_presence_of :name
+          end
+          instance = klass.new
+          instance.valid?
+          assert_equal "can't be empty", instance.errors.on(:name)
         end
-        instance = klass.new
-        instance.valid?
-        assert_equal "can't be empty", instance.errors.on(:name)
       end
+    end
+
+    require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
     
-      test "given invalid name format, when validated, then error is in the objects error collection" do
-        klass = Class.new do
-          include Validatable
-          attr_accessor :name
-          validates_format_of :name, :with => /.+/
-        end
-        instance = klass.new
-        instance.valid?
-        assert_equal "is invalid", instance.errors.on(:name)
-      end
-      
-      test "given no acceptance, when validated, then error is in the objects error collection" do
-        klass = Class.new do
-          include Validatable
-          attr_accessor :name
-          validates_acceptance_of :name
-        end
-        instance = klass.new
-        instance.valid?
-        assert_equal "must be accepted", instance.errors.on(:name)
-      end
-      
-      test "given non matching attributes, when validated, then error is in the objects error collection" do
-        klass = Class.new do
-          include Validatable
-          attr_accessor :name, :name_confirmation
-          validates_confirmation_of :name
+    module Functional
+      class ValidatesFormatOfTest < Test::Unit::TestCase
+        test "given invalid name format, when validated, then error is in the objects error collection" do
+          klass = Class.new do
+            include Validatable
+            attr_accessor :name
+            validates_format_of :name, :with => /.+/
+          end
+          instance = klass.new
+          instance.valid?
+          assert_equal "is invalid", instance.errors.on(:name)
         end
-        instance = klass.new
-        instance.name = "foo"
-        instance.name_confirmation = "bar"
-        instance.valid?
-        assert_equal "doesn't match confirmation", instance.errors.on(:name)
-      end
     
-      test "given short value, when validated, then error is in the objects error collection" do
-        klass = Class.new do
-          include Validatable
-          attr_accessor :name
-          validates_length_of :name, :minimum => 2
-        end
-        instance = klass.new
-        instance.valid?
-        assert_equal "is invalid", instance.errors.on(:name)
-      end
-      
-      test "given a child class with validations, when parent class is validated, then the error is in the parent objects error collection" do
-        child_class = Class.new do
-          include Validatable
-          attr_accessor :name, :address
-          validates_presence_of :name
-          validates_format_of :address, :with => /.+/
+        test "given invalid name format and nil name, when validated, then error is in the objects error collection" do
+          klass = Class.new do
+            include Validatable
+            attr_accessor :name
+            validates_format_of :name, :with => /.+/, :if => Proc.new { !name.nil? }
+          end
+          assert_equal true, klass.new.valid?
         end
-        klass = Class.new do
-          include Validatable
-          include_validations_for :child 
-          define_method :child do
-            child_class.new
+        
+        test "given invalid name format and a name, when validated, then error is in the objects error collection" do
+          klass = Class.new do
+            include Validatable
+            attr_accessor :name
+            validates_format_of :name, :with => /.+/, :if => Proc.new { name.nil? }
           end
+          assert_equal false, klass.new.valid?
         end
-        instance = klass.new
-        instance.valid?
-        assert_equal "is invalid", instance.errors.on(:address)
-        assert_equal "can't be empty", instance.errors.on(:name)
       end
-    end
+    end
+
+See the tests for more examples

data/lib/base.rb

@@ -4,35 +4,69 @@ module Validatable
     # 
     # Validates whether the value of the specified attribute is of the correct form by matching it against the regular expression provided.
     # 
-    #   class Person < ActiveRecord::Base
+    #   class Person
+    #     include Validatable    
     #     validates_format_of :first_name, :with => /[ A-Za-z]/
     #   end
     # 
     # A regular expression must be provided or else an exception will be raised.
     def validates_format_of(*args)
-      validate_all(args) do |attribute, message, options|
-        self.validations << ValidatesFormatOf.new(attribute, options[:with], message || "is invalid")
+      add_validations(args, ValidatesFormatOf) do |validation, options|
+        validation.with = options[:with]
       end
     end
     
+    # call-seq: validates_length_of(*args)
+    # 
+    # Validates that the specified attribute matches the length restrictions supplied.
+    # 
+    #   class Person
+    #     include Validatable
+    #     validates_length_of :first_name, :maximum=>30
+    #     validates_length_of :last_name, :minimum=>30
+    #   end
+    # 
+    # Configuration options:
+    # 
+    #     * minimum - The minimum size of the attribute
+    #     * maximum - The maximum size of the attribute
     def validates_length_of(*args)
-      validate_all(args) do |attribute, message, options|
-        self.validations << ValidatesLengthOf.new(attribute, options[:minimum], options[:maximum], message || "is invalid")
+      add_validations(args, ValidatesLengthOf) do |validation, options|
+        validation.minimum = options[:minimum]
+        validation.maximum = options[:maximum]
       end
     end
-    
+
+    # call-seq: validates_acceptance_of(*args)
+    #
+    # Encapsulates the pattern of wanting to validate the acceptance of a terms of service check box (or similar agreement). Example:
+    # 
+    #   class Person
+    #     include Validatable
+    #     validates_acceptance_of :terms_of_service
+    #     validates_acceptance_of :eula, :message => "must be abided"
+    #   end
     def validates_acceptance_of(*args)
-      validate_all(args) do |attribute, message, options|
-        self.validations << ValidatesAcceptanceOf.new(attribute, message || "must be accepted")
-      end
+      add_validations(args, ValidatesAcceptanceOf)
     end
 
+    # call-seq: validates_confirmation_of(*args)
+    #
+    # Encapsulates the pattern of wanting to validate a password or email address field with a confirmation. Example:
+    # 
+    #   Class:
+    #     class PersonPresenter
+    #       include Validatable
+    #       validates_confirmation_of :user_name, :password
+    #       validates_confirmation_of :email_address, :message => "should match confirmation"
+    #     end
+    # 
+    #   View:
+    #     <%= password_field "person", "password" %>
+    #     <%= password_field "person", "password_confirmation" %>
     def validates_confirmation_of(*args)
-      validate_all(args) do |attribute, message, options|
-        self.validations << ValidatesConfirmationOf.new(attribute, message || "doesn't match confirmation")
-      end
+      add_validations(args, ValidatesConfirmationOf)
     end
-
   
     # call-seq: validates_presence_of(*args)
     # 
@@ -45,9 +79,7 @@ module Validatable
     #
     # The first_name attribute must be in the object and it cannot be nil or empty.
     def validates_presence_of(*args)
-      validate_all(args) do |attribute, message, options|
-        self.validations << ValidatesPresenceOf.new(attribute, message || "can't be empty")
-      end
+      add_validations(args, ValidatesPresenceOf)
     end
     
     # call-seq: include_validations_for(*args)
@@ -70,8 +102,14 @@ module Validatable
     end
     
     def validate(instance) #:nodoc:
-      self.validations.each do |validation|
-        instance.errors.add(validation.attribute, validation.message) unless validation.valid?(instance)
+      levels = self.validations.collect { |validation| validation.level }.uniq
+      levels.sort.each do |level|
+        self.validations.select { |validation| validation.level == level }.each do |validation|
+          if validation.should_validate?(instance)
+            instance.errors.add(validation.attribute, validation.message) unless validation.valid?(instance)
+          end
+        end
+        return unless instance.errors.empty?
       end
     end
     
@@ -86,10 +124,12 @@ module Validatable
     end
 
     protected
-    def validate_all(args, &block) #:nodoc:
+    def add_validations(args, klass) #:nodoc:
       options = args.last.is_a?(Hash) ? args.pop : {}
       args.each do |attribute|
-        yield attribute, options[:message], options
+        new_validation = klass.new(attribute, options)
+        yield new_validation, options if block_given?
+        self.validations << new_validation
       end
     end
     

data/lib/validatable.rb

@@ -1,9 +1,9 @@
 require 'forwardable'
 require File.expand_path(File.dirname(__FILE__) + '/errors')
 require File.expand_path(File.dirname(__FILE__) + '/base')
-require File.expand_path(File.dirname(__FILE__) + '/validation_base')
-require File.expand_path(File.dirname(__FILE__) + '/validates_format_of')
-require File.expand_path(File.dirname(__FILE__) + '/validates_presence_of')
-require File.expand_path(File.dirname(__FILE__) + '/validates_acceptance_of')
-require File.expand_path(File.dirname(__FILE__) + '/validates_confirmation_of')
-require File.expand_path(File.dirname(__FILE__) + '/validates_length_of')
+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')

data/lib/{validates_acceptance_of.rb → validations/validates_acceptance_of.rb}

@@ -3,5 +3,9 @@ module Validatable
     def valid?(instance)
       instance.send(self.attribute) == "true"
     end
+    
+    def message
+      super || "must be accepted"
+    end
   end
 end

data/lib/{validates_confirmation_of.rb → validations/validates_confirmation_of.rb}

@@ -3,5 +3,9 @@ module Validatable
     def valid?(instance)
       instance.send(self.attribute) == instance.send("#{self.attribute}_confirmation".to_sym)
     end
+    
+    def message
+      super || "doesn't match confirmation"
+    end
   end
 end

data/lib/validations/validates_format_of.rb

@@ -0,0 +1,13 @@
+module Validatable
+  class ValidatesFormatOf < ValidationBase #:nodoc:
+    attr_accessor :with
+  
+    def valid?(instance)
+      instance.send(self.attribute) =~ self.with && true
+    end
+    
+    def message
+      super || "is invalid"
+    end
+  end
+end

data/lib/{validates_length_of.rb → validations/validates_length_of.rb}

@@ -1,10 +1,9 @@
 module Validatable
   class ValidatesLengthOf < ValidationBase #:nodoc:
-    attr_accessor :attribute, :minimum, :maximum
-    def initialize(attribute, minimum, maximum, message)
-      self.minimum = minimum
-      self.maximum = maximum
-      super attribute, message
+    attr_accessor :minimum, :maximum
+    
+    def message
+      super || "is invalid"
     end
     
     def valid?(instance)

data/lib/{validates_presence_of.rb → validations/validates_presence_of.rb}

@@ -3,5 +3,9 @@ module Validatable
     def valid?(instance)
       (!instance.send(self.attribute).nil? && instance.send(self.attribute).strip.length != 0)
     end
+    
+    def message
+      super || "can't be empty"
+    end
   end
 end

data/lib/validations/validation_base.rb

@@ -0,0 +1,24 @@
+module Validatable
+  class ValidationBase #:nodoc:
+    attr_accessor :attribute, :message
+    attr_reader :level
+    
+    def initialize(attribute, options={})
+      @attribute = attribute
+      @message = options[:message]
+      @conditional = options[:if] || Proc.new { true }
+      @times = options[:times]
+      @level = options[:level] || 1
+    end
+    
+    def should_validate?(instance)
+      instance.instance_eval(&@conditional) && validate_this_time?
+    end
+    
+    def validate_this_time?
+      return true if @times.nil?
+      @times -= 1
+      @times >= 0
+    end
+  end
+end

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

data/test/all_tests.rb

@@ -1 +1 @@
-Dir['**/*_test.rb'].each { |test_case| require test_case }
+Dir['test/**/*_test.rb'].each { |test_case| require test_case }

data/test/functional/validatable_test.rb

@@ -0,0 +1,60 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Functional
+  class ValidatableTest < Test::Unit::TestCase
+    test "given a child class with validations, when parent class is validated, then the error is in the parent objects error collection" do
+      child_class = Class.new do
+        include Validatable
+        attr_accessor :name, :address
+        validates_presence_of :name
+        validates_format_of :address, :with => /.+/
+      end
+      klass = Class.new do
+        include Validatable
+        include_validations_for :child 
+        define_method :child do
+          child_class.new
+        end
+      end
+      instance = klass.new
+      instance.valid?
+      assert_equal "is invalid", instance.errors.on(:address)
+      assert_equal "can't be empty", instance.errors.on(:name)
+    end
+    
+    expect true do
+      klass = Class.new do
+        include Validatable
+        validates_presence_of :name, :times => 1
+        attr_accessor :name
+      end
+      instance = klass.new
+      instance.valid?
+      instance.valid?
+    end
+    
+    expect "name message" do
+      klass = Class.new do
+        include Validatable
+        validates_presence_of :name, :level => 1, :message => "name message"
+        validates_presence_of :address, :level => 2
+        attr_accessor :name, :address
+      end
+      instance = klass.new
+      instance.valid?
+      instance.errors.on(:name)
+    end
+    
+    expect nil do
+      klass = Class.new do
+        include Validatable
+        validates_presence_of :name, :level => 1, :message => "name message"
+        validates_presence_of :address, :level => 2
+        attr_accessor :name, :address
+      end
+      instance = klass.new
+      instance.valid?
+      instance.errors.on(:address)
+    end
+  end
+end

data/test/functional/validates_acceptance_of_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Functional
+  class ValidatesAcceptanceOfTest < Test::Unit::TestCase
+    test "given no acceptance, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :name
+        validates_acceptance_of :name
+      end
+      instance = klass.new
+      instance.valid?
+      assert_equal "must be accepted", instance.errors.on(:name)
+    end
+  end
+end

data/test/functional/validates_confirmation_of_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Functional
+  class ValidatesConfirmationOfTest < Test::Unit::TestCase
+    test "given non matching attributes, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :name, :name_confirmation
+        validates_confirmation_of :name
+      end
+      instance = klass.new
+      instance.name = "foo"
+      instance.name_confirmation = "bar"
+      instance.valid?
+      assert_equal "doesn't match confirmation", instance.errors.on(:name)
+    end
+  end
+end

data/test/functional/validates_format_of_test.rb

@@ -0,0 +1,34 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Functional
+  class ValidatesFormatOfTest < Test::Unit::TestCase
+    test "given invalid name format, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :name
+        validates_format_of :name, :with => /.+/
+      end
+      instance = klass.new
+      instance.valid?
+      assert_equal "is invalid", instance.errors.on(:name)
+    end
+
+    test "given invalid name format and nil name, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :name
+        validates_format_of :name, :with => /.+/, :if => Proc.new { !name.nil? }
+      end
+      assert_equal true, klass.new.valid?
+    end
+    
+    test "given invalid name format and a name, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :name
+        validates_format_of :name, :with => /.+/, :if => Proc.new { name.nil? }
+      end
+      assert_equal false, klass.new.valid?
+    end
+  end
+end

data/test/functional/validates_length_of_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Functional
+  class ValidatesLengthOfTest < Test::Unit::TestCase
+    test "given short value, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :name
+        validates_length_of :name, :minimum => 2
+      end
+      instance = klass.new
+      instance.valid?
+      assert_equal "is invalid", instance.errors.on(:name)
+    end
+  end
+end

data/test/functional/validates_presence_of_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Functional
+  class ValidatesPresenceOfTest < Test::Unit::TestCase
+    test "given no name, when validated, then error is in the objects error collection" do
+      klass = Class.new do
+        include Validatable
+        attr_accessor :name
+        validates_presence_of :name
+      end
+      instance = klass.new
+      instance.valid?
+      assert_equal "can't be empty", instance.errors.on(:name)
+    end
+  end
+end

data/test/test_helper.rb

@@ -9,4 +9,10 @@ class << Test::Unit::TestCase
     raise ArgumentError, "#{test_name} is already defined" if self.instance_methods.include? test_name.to_s
     define_method test_name, &block
   end
+  
+  def expect(expected_value, &block)
+    define_method :"test_#{caller.first.split("/").last}" do
+      assert_equal expected_value, instance_eval(&block)
+    end 
+  end
 end

data/test/unit/errors_test.rb

@@ -0,0 +1,9 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+class ErrorsTest < Test::Unit::TestCase
+  expect "message" do
+    errors = Validatable::Errors.new
+    errors.add(:attribute, "message")
+    errors.on(:attribute)
+  end
+end

data/test/unit/validatable_test.rb

@@ -0,0 +1,47 @@
+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)
+      klass = Class.new do
+        include Validatable
+        validations << validation
+      end
+      klass.new.valid?
+    end
+  
+    expect [:anything, :else] do
+      klass = Class.new do
+        include Validatable
+        include_validations_for :anything, :else
+      end
+      klass.send(:children_to_validate)
+    end
+  
+    test "when validate is executed, then messages are added for each validation that fails" do
+      klass = Class.new do
+        include Validatable
+      end
+      klass.send(:validations) << stub(:valid? => false, :should_validate? => true, :attribute => 'attribute', :message => 'message', :level => 1)
+      klass.send(:validations) << stub(:valid? => false, :should_validate? => true, :attribute => 'attribute2', :message => 'message2', :level => 1)
+      instance=mock
+      instance.expects(:errors).returns(errors=mock).times 3
+      errors.expects(:add).with('attribute', 'message')
+      errors.expects(:add).with('attribute2', 'message2')
+      errors.expects(:empty?).returns true
+      klass.validate(instance)
+    end
+
+    expect true do
+      klass = Class.new do
+        include Validatable
+      end
+      instance = klass.new
+      instance.errors.add(:attribute, "message")
+      instance.valid?
+      instance.errors.empty?
+    end
+  
+  end
+end

data/test/{validates_acceptance_of_test.rb → unit/validates_acceptance_of_test.rb}

@@ -1,14 +1,14 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class ValidatesAcceptanceOfTest < Test::Unit::TestCase
   test "valid acceptance" do
-    validation = Validatable::ValidatesAcceptanceOf.new(:acceptance, :message)
+    validation = Validatable::ValidatesAcceptanceOf.new :acceptance
     instance = stub(:acceptance=>'true')
     assert_equal true, validation.valid?(instance)
   end
   
   test "invalid acceptance" do
-    validation = Validatable::ValidatesAcceptanceOf.new(:acceptance, :message)
+    validation = Validatable::ValidatesAcceptanceOf.new :acceptance
     instance = stub(:acceptance=>'false')
     assert_equal false, validation.valid?(instance)
   end

data/test/{validates_confirmation_of_test.rb → unit/validates_confirmation_of_test.rb}

@@ -1,14 +1,14 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class ValidatesConfirmationOfTest < Test::Unit::TestCase
   test "valid confirmation" do
-    validation = Validatable::ValidatesConfirmationOf.new(:username, :message)
+    validation = Validatable::ValidatesConfirmationOf.new :username
     instance = stub(:username=>"username", :username_confirmation=>"username")
     assert_equal true, validation.valid?(instance)
   end
   
   test "invalid confirmation" do
-    validation = Validatable::ValidatesConfirmationOf.new(:username, :message)
+    validation = Validatable::ValidatesConfirmationOf.new :username
     instance = stub(:username=>"username", :username_confirmation=>"usessrname")
     assert_equal false, validation.valid?(instance)
   end

data/test/{validates_format_of_test.rb → unit/validates_format_of_test.rb}

@@ -1,13 +1,15 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class ValidatesFormatOfTest < Test::Unit::TestCase
   test "when attribute value does not match the given regex, then valid is false" do
-    validation = Validatable::ValidatesFormatOf.new(:name, /book/, "message")
+    validation = Validatable::ValidatesFormatOf.new :name
+    validation.with = /book/
     assert_equal false, validation.valid?(stub_everything)
   end
   
   test "when attribute value does match the given regex, then valid is true" do
-    validation = Validatable::ValidatesFormatOf.new(:name, /book/, "message")
+    validation = Validatable::ValidatesFormatOf.new :name
+    validation.with = /book/
     assert_equal true, validation.valid?(stub(:name=>"book"))
   end
 end

data/test/unit/validates_length_of_test.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+module Unit
+  class ValidatesLengthOfTest < Test::Unit::TestCase
+  
+    test "max length" do
+      validation = Validatable::ValidatesLengthOf.new :username
+      validation.maximum = 8
+      instance = stub(:username=>"usernamefdfd")
+      assert_equal false, validation.valid?(instance)
+    end
+    
+    test "min length" do
+      validation = Validatable::ValidatesLengthOf.new :username
+      validation.minimum = 2
+      instance = stub(:username=>"u")
+      assert_equal false, validation.valid?(instance)
+    end
+  
+    test "valid length" do
+      validation = Validatable::ValidatesLengthOf.new :username
+      validation.minimum = 2
+      validation.maximum = 8
+      instance = stub(:username=>"udfgdf")
+      assert_equal true, validation.valid?(instance)
+    end
+  end
+end

data/test/{validates_presence_of_test.rb → unit/validates_presence_of_test.rb}

@@ -1,13 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class ValidatesPresenceOfTest < Test::Unit::TestCase
   test "when attribute value does not match the given regex, then valid is false" do
-    validation = Validatable::ValidatesPresenceOf.new(:name, "message")
+    validation = Validatable::ValidatesPresenceOf.new :name
     assert_equal false, validation.valid?(stub_everything)
   end
   
   test "when attribute value does match the given regex, then valid is true" do
-    validation = Validatable::ValidatesPresenceOf.new(:name, "message")
+    validation = Validatable::ValidatesPresenceOf.new :name
     assert_equal true, validation.valid?(stub(:name=>"book"))
   end
 end

data/test/unit/validation_base_test.rb

@@ -0,0 +1,35 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+class ValidationBaseTest < Test::Unit::TestCase
+  expect true do
+    validation = Validatable::ValidationBase.new :base
+    validation.should_validate? Object.new
+  end
+  
+  expect true do
+    validation = Validatable::ValidationBase.new :base, :times => 1
+    validation.validate_this_time?
+  end
+  
+  expect true do
+    validation = Validatable::ValidationBase.new :base
+    validation.validate_this_time?
+  end
+  
+  expect true do
+    validation = Validatable::ValidationBase.new :base, :times => 2
+    validation.validate_this_time?
+    validation.validate_this_time?
+  end
+
+  expect false do
+    validation = Validatable::ValidationBase.new :base, :times => 1
+    validation.validate_this_time?
+    validation.validate_this_time?
+  end
+  
+  expect 1 do
+    validation = Validatable::ValidationBase.new :base
+    validation.level
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: validatable
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-02-03 00:00:00 -05:00
+  version: 1.1.0
+date: 2007-02-11 00:00:00 -05:00
 summary: Validatable is a library for adding validations.
 require_paths: 
 - lib
@@ -31,22 +31,28 @@ files:
 - lib/base.rb
 - lib/errors.rb
 - lib/validatable.rb
-- lib/validates_acceptance_of.rb
-- lib/validates_confirmation_of.rb
-- lib/validates_format_of.rb
-- lib/validates_length_of.rb
-- lib/validates_presence_of.rb
-- lib/validation_base.rb
+- lib/validations/validates_acceptance_of.rb
+- lib/validations/validates_confirmation_of.rb
+- lib/validations/validates_format_of.rb
+- lib/validations/validates_length_of.rb
+- lib/validations/validates_presence_of.rb
+- lib/validations/validation_base.rb
 - test/all_tests.rb
-- test/errors_test.rb
-- test/functional_test.rb
 - test/test_helper.rb
-- test/validatable_test.rb
-- test/validates_acceptance_of_test.rb
-- test/validates_confirmation_of_test.rb
-- test/validates_format_of_test.rb
-- test/validates_length_of_test.rb
-- test/validates_presence_of_test.rb
+- test/functional/validatable_test.rb
+- test/functional/validates_acceptance_of_test.rb
+- test/functional/validates_confirmation_of_test.rb
+- test/functional/validates_format_of_test.rb
+- test/functional/validates_length_of_test.rb
+- test/functional/validates_presence_of_test.rb
+- test/unit/errors_test.rb
+- test/unit/validatable_test.rb
+- test/unit/validates_acceptance_of_test.rb
+- test/unit/validates_confirmation_of_test.rb
+- test/unit/validates_format_of_test.rb
+- test/unit/validates_length_of_test.rb
+- test/unit/validates_presence_of_test.rb
+- test/unit/validation_base_test.rb
 - rakefile.rb
 - README
 test_files: 

data/lib/validates_format_of.rb

@@ -1,13 +0,0 @@
-module Validatable
-  class ValidatesFormatOf < ValidationBase #:nodoc:
-    attr_accessor :regex
-    def initialize(attribute, regex, message)
-      self.regex = regex
-      super attribute, message
-    end
-  
-    def valid?(instance)
-      instance.send(self.attribute) =~ self.regex && true
-    end
-  end
-end

data/lib/validation_base.rb

@@ -1,9 +0,0 @@
-module Validatable
-  class ValidationBase #:nodoc:
-    attr_accessor :attribute, :message
-    
-    def initialize(attribute, message)
-      @attribute, @message = attribute, message
-    end
-  end
-end

data/test/errors_test.rb

@@ -1,9 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-class ErrorsTest < Test::Unit::TestCase
-  test "when an error is added, then it can be returned from on" do
-    errors = Validatable::Errors.new
-    errors.add(:attribute, "message")
-    assert_equal "message", errors.on(:attribute)
-  end
-end

data/test/functional_test.rb

@@ -1,80 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-class FunctionalTest < Test::Unit::TestCase
-  test "given no name, when validated, then error is in the objects error collection" do
-    klass = Class.new do
-      include Validatable
-      attr_accessor :name
-      validates_presence_of :name
-    end
-    instance = klass.new
-    instance.valid?
-    assert_equal "can't be empty", instance.errors.on(:name)
-  end
-
-  test "given invalid name format, when validated, then error is in the objects error collection" do
-    klass = Class.new do
-      include Validatable
-      attr_accessor :name
-      validates_format_of :name, :with => /.+/
-    end
-    instance = klass.new
-    instance.valid?
-    assert_equal "is invalid", instance.errors.on(:name)
-  end
-  
-  test "given no acceptance, when validated, then error is in the objects error collection" do
-    klass = Class.new do
-      include Validatable
-      attr_accessor :name
-      validates_acceptance_of :name
-    end
-    instance = klass.new
-    instance.valid?
-    assert_equal "must be accepted", instance.errors.on(:name)
-  end
-  
-  test "given non matching attributes, when validated, then error is in the objects error collection" do
-    klass = Class.new do
-      include Validatable
-      attr_accessor :name, :name_confirmation
-      validates_confirmation_of :name
-    end
-    instance = klass.new
-    instance.name = "foo"
-    instance.name_confirmation = "bar"
-    instance.valid?
-    assert_equal "doesn't match confirmation", instance.errors.on(:name)
-  end
-
-  test "given short value, when validated, then error is in the objects error collection" do
-    klass = Class.new do
-      include Validatable
-      attr_accessor :name
-      validates_length_of :name, :minimum => 2
-    end
-    instance = klass.new
-    instance.valid?
-    assert_equal "is invalid", instance.errors.on(:name)
-  end
-  
-  test "given a child class with validations, when parent class is validated, then the error is in the parent objects error collection" do
-    child_class = Class.new do
-      include Validatable
-      attr_accessor :name, :address
-      validates_presence_of :name
-      validates_format_of :address, :with => /.+/
-    end
-    klass = Class.new do
-      include Validatable
-      include_validations_for :child 
-      define_method :child do
-        child_class.new
-      end
-    end
-    instance = klass.new
-    instance.valid?
-    assert_equal "is invalid", instance.errors.on(:address)
-    assert_equal "can't be empty", instance.errors.on(:name)
-  end
-end

data/test/validatable_test.rb

@@ -1,44 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-class ValidatableTest < Test::Unit::TestCase
-  test "given a validation that returns false when object is validated then valid returns false" do
-    validation = stub(:valid? => false, :attribute => "attribute", :message => "message")
-    klass = Class.new do
-      include Validatable
-      validations << validation
-    end
-    assert_equal false, klass.new.valid?
-  end
-  
-  test "when validations are included for a child, then the list is maintained as an array of args" do
-    klass = Class.new do
-      include Validatable
-      include_validations_for :anything, :else
-    end
-    assert_equal [:anything, :else], klass.send(:children_to_validate)
-  end
-  
-  test "when validate is executed, then messages are added for each validation that fails" do
-    klass = Class.new do
-      include Validatable
-    end
-    klass.send(:validations) << stub(:valid? => false, :attribute => 'attribute', :message => 'message')
-    klass.send(:validations) << stub(:valid? => false, :attribute => 'attribute2', :message => 'message2')
-    instance=mock
-    instance.expects(:errors).returns(errors=mock).times 2
-    errors.expects(:add).with('attribute', 'message')
-    errors.expects(:add).with('attribute2', 'message2')
-    klass.validate(instance)
-  end
-
-  test "when valid is called, then the errors collection is cleared and reinitialized" do
-    klass = Class.new do
-      include Validatable
-    end
-    instance = klass.new
-    instance.errors.add(:attribute, "message")
-    instance.valid?
-    assert_equal true, instance.errors.empty?
-  end
-  
-end

data/test/validates_length_of_test.rb

@@ -1,23 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
-
-class ValidatesLengthOfTest < Test::Unit::TestCase
-  
-  test "max length" do
-    validation = Validatable::ValidatesLengthOf.new(:username,  nil, 8, :message)
-    instance = stub(:username=>"usernamefdfd")
-    assert_equal false, validation.valid?(instance)
-  end
-    
-  test "min length" do
-    validation = Validatable::ValidatesLengthOf.new(:username,  2, nil, :message)
-    instance = stub(:username=>"u")
-    assert_equal false, validation.valid?(instance)
-  end
-  
-  test "valid length" do
-    validation = Validatable::ValidatesLengthOf.new(:username,  2, 8, :message)
-    instance = stub(:username=>"udfgdf")
-    assert_equal true, validation.valid?(instance)
-  end
-end
-