validatable2 0.0.2 → 0.0.3

data/Rakefile

@@ -17,7 +17,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.ruby_opts << '-rubygems'
   test.pattern = 'test/**/test_*.rb'
-  # test.pattern = 'test/**/unit/test_validates_true_for.rb'  
+  # test.pattern = 'test/**/unit/test_validates_true_for.rb'
   test.verbose = true
 end
 

data/lib/validatable.rb

@@ -1,14 +1,8 @@
 # gem 'activesupport', '2.3.5'
 
-require 'validatable/object_extension'
 require 'validatable/errors'
-require 'validatable/validatable_class_methods'
 require 'validatable/macros'
-require 'validatable/validatable_instance_methods'
-require 'validatable/included_validation'
-require 'validatable/child_validation'
-require 'validatable/understandable'
-require 'validatable/requireable'
+require 'validatable/validatable'
 require 'validatable/validations/validation_base'
 require 'validatable/validations/validates_format_of'
 require 'validatable/validations/validates_presence_of'

data/lib/validatable/errors.rb

@@ -1,111 +1,7 @@
 module Validatable
-  class Errors
-    # extend Forwardable
-    include Enumerable
-    
-    %w(clear each each_pair empty? length size).each do |m|
-      define_method m do |*a, &b|
-        errors.send(m, *a, &b)
-      end
-    end
-    # def_delegators :errors, :clear, :each, :each_pair, :empty?, :length, :size
-
-    # Returns true if the specified +attribute+ has errors associated with it.
-    #
-    #   class Company < ActiveRecord::Base
-    #     validates_presence_of :name, :address, :email
-    #     validates_length_of :name, :in => 5..30
-    #   end
-    #
-    #   company = Company.create(:address => '123 First St.')
-    #   company.errors.invalid?(:name)      # => true
-    #   company.errors.invalid?(:address)   # => false
-    def invalid?(attribute)
-      !@errors[attribute.to_sym].nil?
-    end
-
-    # Adds an error to the base object instead of any particular attribute. This is used
-    # to report errors that don't tie to any specific attribute, but rather to the object
-    # as a whole. These error messages don't get prepended with any field name when iterating
-    # with +each_full+, so they should be complete sentences.
-    def add_to_base(msg)
-      add(:base, msg)
-    end
-
-    # Returns errors assigned to the base object through +add_to_base+ according to the normal rules of <tt>on(attribute)</tt>.
-    def on_base
-      on(:base)
-    end    
-
-    # 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 an array of error messages, if more than one error is associated with the specified +attribute+.
-    def on(attribute)
-      return nil if errors[attribute.to_sym].nil?
-      errors[attribute.to_sym].size == 1 ? errors[attribute.to_sym].first : errors[attribute.to_sym]
-    end
-
-    # Rails 3 API for errors, always return array.
-    def [](attribute)
-      errors[attribute.to_sym] || []
-    end
-
-    def add(attribute, message) #:nodoc:
-      errors[attribute.to_sym] = [] if errors[attribute.to_sym].nil?
-      errors[attribute.to_sym] << message
-    end
-
-    def merge!(errors) #:nodoc:
-      errors.each_pair{|k, v| add(k,v)}
-      self
-    end
-
-    # call-seq: replace(attribute)
-    #
-    # * Replaces the errors value for the given +attribute+
-    def replace(attribute, value)
-      errors[attribute.to_sym] = value
-    end
-
-    # call-seq: raw(attribute)
-    #
-    # * Returns an array of error messages associated with the specified +attribute+.
-    def raw(attribute)
-      errors[attribute.to_sym]
-    end
-
-    def errors #:nodoc:
-      @errors ||= {}
-    end
-
-    def count #:nodoc:
-      errors.values.flatten.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 = []
-
-      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) #:nodoc:
-      lower_case_and_underscored_word.to_s.gsub(/_id$/, "").gsub(/_/, " ").capitalize
+  class Errors < Hash
+    def add attribute, message
+      (self[attribute] ||= []) << message
     end
   end
 end

data/lib/validatable/macros.rb

@@ -1,9 +1,9 @@
 module Validatable
   module Macros
     # call-seq: validates_each(*args)
-    # 
+    #
     # Validates that the logic evaluates to true
-    # 
+    #
     #   class Address
     #     include Validatable
     #     validates_each :zip_code, :logic => lambda { errors.add(:zip_code, "is not valid") if ZipCodeService.allows(zip_code) }
@@ -12,7 +12,7 @@ module Validatable
     # The logic option is required.
     #
     # Configuration options:
-    # 
+    #
     #     * after_validate - A block that executes following the run of a validation
     #     * group - The group that this validation belongs to.  A validation can belong to multiple groups
     #     * if - A block that when executed must return true of the validation will not occur
@@ -23,21 +23,21 @@ module Validatable
     def validates_each(*args)
       add_validations(args, ValidatesEach)
     end
-    
+
     # call-seq: validates_format_of(*args)
-    # 
-    # Validates whether the value of the specified attribute is of the 
+    #
+    # Validates whether the value of the specified attribute is of the
     # correct form by matching it against the regular expression provided.
-    # 
+    #
     #   class Person
-    #     include Validatable    
+    #     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.
-    # 
+    #
     # Configuration options:
-    # 
+    #
     #     * after_validate - A block that executes following the run of a validation
     #     * message - The message to add to the errors collection when the validation fails
     #     * times - The number of times the validation applies
@@ -48,19 +48,19 @@ module Validatable
     def validates_format_of(*args)
       add_validations(args, ValidatesFormatOf)
     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:
-    # 
+    #
     #     * after_validate - A block that executes following the run of a validation
     #     * message - The message to add to the errors collection when the validation fails
     #     * times - The number of times the validation applies
@@ -76,16 +76,16 @@ module Validatable
     end
 
     # call-seq: validates_numericality_of(*args)
-    # 
+    #
     # Validates that the specified attribute is numeric.
-    # 
+    #
     #   class Person
     #     include Validatable
     #     validates_numericality_of :age
     #   end
-    # 
+    #
     # Configuration options:
-    # 
+    #
     #     * after_validate - A block that executes following the run of a validation
     #     * message - The message to add to the errors collection when the validation fails
     #     * times - The number of times the validation applies
@@ -100,7 +100,7 @@ module Validatable
     # 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
@@ -108,7 +108,7 @@ module Validatable
     #   end
     #
     # Configuration options:
-    # 
+    #
     #     * after_validate - A block that executes following the run of a validation
     #     * message - The message to add to the errors collection when the validation fails
     #     * times - The number of times the validation applies
@@ -122,20 +122,20 @@ module Validatable
     # 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" %>
     #
     # Configuration options:
-    # 
+    #
     #     * after_validate - A block that executes following the run of a validation
     #     * case_sensitive - Whether or not to apply case-sensitivity on the comparison.  Defaults to true.
     #     * message - The message to add to the errors collection when the validation fails
@@ -146,11 +146,11 @@ module Validatable
     def validates_confirmation_of(*args)
       add_validations(args, ValidatesConfirmationOf)
     end
-  
+
     # call-seq: validates_presence_of(*args)
-    # 
+    #
     # Validates that the specified attributes are not nil or an empty string
-    # 
+    #
     #   class Person
     #     include Validatable
     #     validates_presence_of :first_name
@@ -159,7 +159,7 @@ module Validatable
     # The first_name attribute must be in the object and it cannot be nil or empty.
     #
     # Configuration options:
-    # 
+    #
     #     * after_validate - A block that executes following the run of a validation
     #     * message - The message to add to the errors collection when the validation fails
     #     * times - The number of times the validation applies
@@ -169,11 +169,11 @@ module Validatable
     def validates_presence_of(*args)
       add_validations(args, ValidatesPresenceOf)
     end
-    
+
     # call-seq: validates_true_for(*args)
-    # 
+    #
     # Validates that the logic evaluates to true
-    # 
+    #
     #   class Person
     #     include Validatable
     #     validates_true_for :first_name, :logic => lambda { first_name == 'Jamie' }
@@ -182,7 +182,7 @@ module Validatable
     # The logic option is required.
     #
     # Configuration options:
-    # 
+    #
     #     * after_validate - A block that executes following the run of a validation
     #     * message - The message to add to the errors collection when the validation fails
     #     * times - The number of times the validation applies
@@ -193,7 +193,7 @@ module Validatable
     def validates_true_for(*args)
       add_validations(args, ValidatesTrueFor)
     end
-    
+
     def validates_exclusion_of(*args)
       add_validations(args, ValidatesExclusionOf)
     end
@@ -226,13 +226,13 @@ module Validatable
     end
 
     # call-seq: include_validations_from(attribute)
-    # 
+    #
     # Includes all the validations that are defined on the attribute.
     #   class Person
     #     include Validatable
     #     validates_presence_of :name
     #   end
-    # 
+    #
     #   class PersonPresenter
     #     include Validatable
     #     include_validataions_from :person
@@ -245,70 +245,65 @@ module Validatable
     #       @person = person
     #     end
     #   end
-    #   
+    #
     #   presenter = PersonPresenter.new(Person.new)
     #   presenter.valid? #=> false
     #   presenter.errors.on(:name) #=> "can't be blank"
     #
     # The name attribute whose validations should be added.
-    def include_validations_from(attribute_to_validate, options = {})
-      validations_to_include << IncludedValidation.new(attribute_to_validate)
-    end
+    # def include_validations_from(attribute_to_validate, options = {})
+    #   validations_to_include << IncludedValidation.new(attribute_to_validate)
+    # end
 
     # call-seq: include_errors_from(attribute_to_validate, options = {})
-    # 
+    #
     # Validates the specified attributes.
     #   class Person
     #     include Validatable
     #     validates_presence_of :name
     #     attr_accessor :name
     #   end
-    # 
+    #
     #   class PersonPresenter
     #     include Validatable
     #     include_errors_from :person, :map => { :name => :namen }, :if => lambda { not person.nil? }
     #     attr_accessor :person
-    #     
+    #
     #     def initialize(person)
     #       @person = person
     #     end
     #   end
-    #   
+    #
     #   presenter = PersonPresenter.new(Person.new)
     #   presenter.valid? #=> false
     #   presenter.errors.on(:namen) #=> "can't be blank"
     #
-    # The person attribute will be validated.  
+    # The person attribute will be validated.
     # If person is invalid the errors will be added to the PersonPresenter errors collection.
     #
     # Configuration options:
-    # 
+    #
     #     * map - A hash that maps attributes of the child to attributes of the parent.
     #     * if - A block that when executed must return true of the validation will not occur.
-    def include_errors_from(attribute_to_validate, options = {})
-      children_to_validate << ChildValidation.new(attribute_to_validate, options[:map] || {}, options[:if] || lambda {|_self| true })
-    end
-    
-    def include_validations_for(attribute_to_validate, options = {}) #:nodoc:
-      puts "include_validations_for is deprecated; use include_errors_from instead"
-      children_to_validate << ChildValidation.new(attribute_to_validate, options[:map] || {}, options[:if] || lambda {|_self| true })
-    end
-    
+    # def include_errors_from(attribute_to_validate, options = {})
+    #   children_to_validate << ChildValidation.new(attribute_to_validate, options[:map] || {}, options[:if] || lambda {|_self| true })
+    # end
+
     # call-seq: before_validation(&block)
-    # 
+    #
     # Is called before valid? or valid_for_*?
-    # 
+    #
     #   class Person
     #     include Validatable
     #     before_validation do
     #       self.name = "default name"
     #     end
-    # 
+    #
     #     attr_accessor :name
     #   end
-    # 
-    def before_validation(&block)
-      before_validations << block
-    end
+    #
+    # def before_validation(&block)
+    #   before_validations << block
+    # end
   end
 end

data/lib/validatable/validatable.rb

@@ -0,0 +1,43 @@
+module Validatable
+  # call-seq: valid?
+  #
+  # Returns true if no errors were added otherwise false. Only executes validations that have no :groups option specified
+  def valid?
+    errors.clear
+    self.class.all_validations.each do |validation|
+      validation.validate self
+    end
+    errors.empty?
+  end
+
+  # call-seq: errors
+  #
+  # Returns the Errors object that holds all information about attribute error messages.
+  def errors
+    @_errors ||= Validatable::Errors.new
+  end
+
+  module ClassMethods #:nodoc:
+    include ::Validatable::Macros
+
+    def all_validations
+      if self.respond_to?(:superclass) && self.superclass.respond_to?(:all_validations)
+        return validations + self.superclass.all_validations
+      end
+      validations
+    end
+
+    def validations
+      @validations ||= []
+    end
+
+    protected
+      def add_validations(args, klass)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        args.each do |attribute|
+          new_validation = klass.new self, attribute, options
+          self.validations << new_validation
+        end
+      end
+  end
+end

data/lib/validatable/validations/validates_acceptance_of.rb

@@ -1,12 +1,12 @@
 module Validatable
-  class ValidatesAcceptanceOf < ValidationBase #:nodoc:    
+  class ValidatesAcceptanceOf < ValidationBase #:nodoc:
     def valid?(instance)
       value = instance.send(self.attribute)
       return true if allow_nil && value.nil?
       return true if allow_blank && (!value or (value.respond_to?(:empty?) and value.empty?))
       %w(1 true t).include?(value)
     end
-    
+
     def message(instance)
       super || "must be accepted"
     end

data/lib/validatable/validations/validates_confirmation_of.rb

@@ -1,13 +1,13 @@
 module Validatable
   class ValidatesConfirmationOf < ValidationBase #:nodoc:
-    option :case_sensitive
-    default :case_sensitive => true
-    
+    attr_accessor :case_sensitive
+
     def initialize(klass, attribute, options={})
       klass.class_eval { attr_accessor "#{attribute}_confirmation" }
       super
+      self.case_sensitive = true if self.case_sensitive == nil
     end
-    
+
     def valid?(instance)
       confirmation_value = instance.send("#{self.attribute}_confirmation")
       return true if allow_nil && confirmation_value.nil?
@@ -15,7 +15,7 @@ module Validatable
       return instance.send(self.attribute) == instance.send("#{self.attribute}_confirmation".to_sym) if case_sensitive
       instance.send(self.attribute).to_s.casecmp(instance.send("#{self.attribute}_confirmation".to_sym).to_s) == 0
     end
-    
+
     def message(instance)
       super || "doesn't match confirmation"
     end

data/lib/validatable/validations/validates_each.rb

@@ -1,12 +1,12 @@
 module Validatable
   class ValidatesEach < ValidationBase #:nodoc:
-    required_option :logic
-  
+    attr_accessor :logic
+
     def valid?(instance)
       instance.instance_eval(&logic)
       true # return true so no error is added. should look in the future at doing this different.
     end
-    
+
     def message(instance)
       super || "is invalid"
     end

data/lib/validatable/validations/validates_exclusion_of.rb

@@ -1,6 +1,6 @@
 module Validatable
   class ValidatesExclusionOf < ValidationBase #:nodoc:
-    required_option :within
+    attr_accessor :within
 
     def valid?(instance)
       value = instance.send(attribute)

data/lib/validatable/validations/validates_format_of.rb

@@ -1,14 +1,14 @@
 module Validatable
   class ValidatesFormatOf < ValidationBase #:nodoc:
-    required_option :with
-  
+    attr_accessor :with
+
     def valid?(instance)
       value = instance.send(self.attribute)
       return true if allow_nil && value.nil?
       return true if allow_blank && (!value or (value.respond_to?(:empty?) and value.empty?))
       not (value.to_s =~ self.with).nil?
     end
-    
+
     def message(instance)
       super || "is invalid"
     end

data/lib/validatable/validations/validates_inclusion_of.rb

@@ -1,15 +1,15 @@
 module Validatable
   class ValidatesInclusionOf < ValidationBase
-    required_option :within
-    
+    attr_accessor :within
+
     def valid?(instance)
       value = instance.send(attribute)
       return true if allow_nil && value.nil?
       return true if allow_blank && (!value or (value.respond_to?(:empty?) and value.empty?))
-      
+
       within.include?(value)
     end
-    
+
     def message(instance)
       super || "is not in the list"
     end

data/lib/validatable/validations/validates_length_of.rb

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

data/lib/validatable/validations/validates_numericality_of.rb

@@ -1,21 +1,21 @@
-module Validatable 
+module Validatable
   class ValidatesNumericalityOf < ValidationBase #:nodoc:
-    option :only_integer
-    
+    attr_accessor :only_integer
+
     def valid?(instance)
       value = value_for(instance)
       return true if allow_nil && value.nil?
       return true if allow_blank && (!value or (value.respond_to?(:empty?) and value.empty?))
-      
+
       value = value.to_s
       regex = self.only_integer ? /\A[+-]?\d+\Z/ : /^\d*\.{0,1}\d+$/
       not (value =~ regex).nil?
     end
-    
+
     def message(instance)
       super || "must be a number"
     end
-    
+
     private
       def value_for(instance)
         before_typecast_method = "#{self.attribute}_before_typecast"

data/lib/validatable/validations/validates_presence_of.rb

@@ -1,14 +1,14 @@
-module Validatable 
+module Validatable
   class ValidatesPresenceOf < ValidationBase #:nodoc:
     def valid?(instance)
       value = instance.send(self.attribute)
       return true if allow_nil && value.nil?
       return true if allow_blank && (!value or (value.respond_to?(:empty?) and value.empty?))
-      
+
       return false if instance.send(self.attribute).nil?
       value.respond_to?(:strip) ? instance.send(self.attribute).strip.length != 0 : true
     end
-    
+
     def message(instance)
       super || "can't be empty"
     end

data/lib/validatable/validations/validates_true_for.rb

@@ -1,11 +1,11 @@
 module Validatable
   class ValidatesTrueFor < ValidationBase #:nodoc:
-    required_option :logic
-  
+    attr_accessor :logic
+
     def valid?(instance)
       instance.instance_eval(&logic) == true
     end
-    
+
     def message(instance)
       super || "is invalid"
     end

data/lib/validatable/validations/validation_base.rb

@@ -1,92 +1,33 @@
 module Validatable
   class ValidationBase #:nodoc:
-    def self.required_option(*args)
-      option(*args)
-      requires(*args)
-    end
-    
-    def self.option(*args)
-      attr_accessor(*args)
-      understands(*args)
-    end
-    
-    def self.default(hash)
-      defaults.merge! hash
-    end
-    
-    def self.defaults
-      @defaults ||= {}
-    end
-    
-    def self.all_defaults
-      return defaults.merge(self.superclass.all_defaults) if self.superclass.respond_to? :all_defaults
-      defaults
-    end
-    
-    def self.after_validate(&block)
-      after_validations << block
-    end
-    
-    def self.after_validations
-      @after_validations ||= []
-    end
-    
-    def self.all_after_validations
-      return after_validations + self.superclass.all_after_validations if self.superclass.respond_to? :all_after_validations
-      after_validations
-    end
-
-    include Understandable
-    include Requireable
-    
-    option :message, :if, :times, :level, :groups, :key, :after_validate, :allow_nil, :allow_blank
-    default :level => 1, :groups => []
+    attr_accessor :message, :if, :after_validate, :allow_nil, :allow_blank
     attr_accessor :attribute
-    
+
     def initialize(klass, attribute, options={})
-      must_understand options
-      requires options
-      self.class.all_understandings.each do |understanding|
-        options[understanding] = self.class.all_defaults[understanding] unless options.has_key? understanding
-        self.instance_variable_set("@#{understanding}", options[understanding])
-      end
+      options.each{|k, v| self.send :"#{k}=", v}
       self.attribute = attribute
-      self.groups = [self.groups] unless self.groups.is_a?(Array)
-      self.key = "#{klass.name}/#{self.class.name}/#{self.key || self.attribute}"
-      raise_error_if_key_is_dup(klass)
-    end
-    
-    def raise_error_if_key_is_dup(klass)
-      message = "key #{self.key} must be unique, provide the :key option to specify a unique key"
-      raise ArgumentError.new(message) if klass.validation_keys_include? self.key
     end
-    
-    def should_validate?(instance)
-      result = validate_this_time?(instance)
-      case self.if
-        when Proc
-          result &&= instance.instance_eval(&self.if)
-        when Symbol, String
-          result &&= instance.instance_eval(self.if.to_s)
+
+    def validate instance
+      if should_validate?(instance) and !valid?(instance)
+        instance.errors.add attribute, message(self)
       end
-      result
-    end
-    
-    def message(instance)
-      @message.respond_to?(:call) ? instance.instance_eval(&@message) : @message
-    end
-    
-    def validate_this_time?(instance)
-      return true if @times.nil?
-      self.times > instance.times_validated(self.key)
     end
-    
-    def run_after_validate(result, instance, attribute)
-      self.class.all_after_validations.each do |block|
-        block.call result, instance, attribute
+
+    protected
+      def message instance
+        @message.respond_to?(:call) ? instance.instance_eval(&@message) : @message
+      end
+
+      def should_validate? instance
+        result = true # validate_this_time?(instance)
+        case self.if
+          when Proc
+            result &&= instance.instance_eval(&self.if)
+          when Symbol, String
+            result &&= instance.instance_eval(self.if.to_s)
+        end
+        result
       end
-      # instance.instance_eval_with_params result, attribute, &self.after_validate unless self.after_validate.nil?
-      instance.instance_eval &self.after_validate unless self.after_validate.nil?
-    end
   end
 end

data/readme.md

@@ -1,16 +1,34 @@
+# V2 Changes:
+
 Validatable is a library for adding validations.
 
-Version 2:
+In version 2 I removed all dependencies and extra stuff and left only pure validation logic. 
+You can use these validations with any plain Ruby object, and not only wit ActiveRecord-compatible models.
+
+Also, I removed the "self.included ..." hook (because it caused problems with some libraries), if You need it (and You probably do) add this line after requiring 'validatable':
+
+``` ruby
+require 'validatable'
+
+module Validatable
+  def self.included(klass) #:nodoc:
+    klass.extend ClassMethods
+  end
+end
+```
+
+For contributors - right now it uses TestUnit framework, it would be great if someone rewrite all tests using RSpec.
 
-- active_support dependency removed 
-- compatible with ruby 1.9.2
+# Old Docs
+
+Validatable is a library for adding validations.
 
 == Installation
- 
+
  $ gem install validatable2
 
 == License
- 	
+
 You may use, copy and redistribute this library under the same terms as Ruby itself (see http://www.ruby-lang.org/en/LICENSE.txt).
 
 == Examples
@@ -27,7 +45,7 @@ Validation of an entire hierarchy of objects with errors aggregated at the root
 	  include Validatable
 	  include_validations_for :person
 	  attr_accessor :person
-  
+
 	  def initialize(person)
 	    @person = person
 	  end
@@ -71,12 +89,12 @@ Validations can also be given groups. Groups can be used to validate an object w
     validates_presence_of :name, :groups => :underwriting
     attr_accessor :name, :ssn
   end
-  
+
   application = MortgageApplication.new
   application.ssn = 377990118
   application.valid_for_saving? #=> true
   application.valid_for_underwriting? #=> false
-  
+
 As you can see, you can use an array if the validation needs to be part of various groups.  However, if the validation only applies to one group you can simply use a symbol for the group name.
 
 Similar to Rails, Validatable also supports conditional validation.
@@ -87,7 +105,7 @@ Similar to Rails, Validatable also supports conditional validation.
 	  validates_format_of :name, :with => /.+/, :if => Proc.new { !name.nil? }
 	end
 	Person.new.valid? #=> true
-		
+
 Validatable also exposes an after_validate hook method.
 
 	class Person
@@ -95,7 +113,7 @@ Validatable also exposes an after_validate hook method.
 	  validates_presence_of :name
 	  attr_accessor :name
 	end
-	
+
 	class ValidatesPresenceOf
 	  after_validate do |result, instance, attribute|
 			instance.errors.add("#{attribute} can't be blank") unless result
@@ -105,8 +123,8 @@ Validatable also exposes an after_validate hook method.
 	person = Person.new
 	person.valid? #=> false
 	person.errors.on(:name) #=> "name can't be blank"
-	
-The after_validate hook yields the result of the validation being run, 
+
+The after_validate hook yields the result of the validation being run,
 the instance the validation was run on, and the attribute that was validated
 
 In the above example the attribute "name" is appended to the message.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validatable2
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000Z
+date: 2011-08-29 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -19,15 +19,9 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
-- lib/validatable/child_validation.rb
 - lib/validatable/errors.rb
-- lib/validatable/included_validation.rb
 - lib/validatable/macros.rb
-- lib/validatable/object_extension.rb
-- lib/validatable/requireable.rb
-- lib/validatable/understandable.rb
-- lib/validatable/validatable_class_methods.rb
-- lib/validatable/validatable_instance_methods.rb
+- lib/validatable/validatable.rb
 - lib/validatable/validations/validates_acceptance_of.rb
 - lib/validatable/validations/validates_associated.rb
 - lib/validatable/validations/validates_confirmation_of.rb

data/lib/validatable/child_validation.rb

@@ -1,15 +0,0 @@
-module Validatable
-  class ChildValidation #:nodoc:
-    attr_accessor :attribute, :map, :should_validate_proc
-    
-    def initialize(attribute, map, should_validate_proc)
-      @attribute = attribute
-      @map = map
-      @should_validate_proc = should_validate_proc
-    end
-    
-    def should_validate?(instance)
-      instance.instance_eval &should_validate_proc
-    end
-  end
-end

data/lib/validatable/included_validation.rb

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

data/lib/validatable/object_extension.rb

@@ -1,21 +0,0 @@
-# class Object #:nodoc:
-#   module InstanceExecHelper #:nodoc:
-#   end
-#   include InstanceExecHelper
-#   def instance_eval_with_params(*args, &block)
-#     begin
-#       old_critical, Thread.critical = Thread.critical, true
-#       n = 0
-#       n += 1 while respond_to?(mname="__instance_exec#{n}")
-#       InstanceExecHelper.module_eval{ define_method(mname, &block) }
-#     ensure
-#       Thread.critical = old_critical
-#     end
-#     begin
-#       ret = send(mname, *args)
-#     ensure
-#       InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
-#     end
-#     ret
-#   end
-# end

data/lib/validatable/requireable.rb

@@ -1,26 +0,0 @@
-module Validatable
-  module Requireable #:nodoc:
-    module ClassMethods #:nodoc:
-      def requires(*args)
-        required_options.concat args        
-      end
-      
-      def required_options
-        @required_options ||= []
-      end
-    end
-    
-    def self.included(klass)
-      klass.extend ClassMethods
-    end
-    
-    def requires(options)
-      required_options = self.class.required_options.inject([]) do |errors, attribute|
-        errors << attribute.to_s unless options.has_key?(attribute)
-        errors
-      end
-      raise ArgumentError.new("#{self.class} requires options: #{required_options.join(', ')}") if required_options.any?
-      true
-    end
-  end
-end

data/lib/validatable/understandable.rb

@@ -1,31 +0,0 @@
-module Validatable
-  module Understandable #:nodoc:
-    module ClassMethods #:nodoc:
-      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)
-        errors
-      end
-      raise ArgumentError.new("invalid options: #{invalid_options.join(', ')}") if invalid_options.any?
-      true
-    end
-  end
-end

data/lib/validatable/validatable_class_methods.rb

@@ -1,87 +0,0 @@
-module Validatable
-  module ClassMethods #:nodoc:
-    
-    def validate_children(instance, group)
-      self.children_to_validate.each do |child_validation|
-        next unless child_validation.should_validate?(instance)
-        child_or_children = instance.send child_validation.attribute
-        [child_or_children].flatten.each do |child|
-          if (child.respond_to?(:valid_for_group?))
-            child.valid_for_group?(group)
-          else
-            child.valid?
-          end
-          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
-    end
-    
-    def all_before_validations
-      if self.superclass.respond_to? :all_before_validations
-        return before_validations + self.superclass.all_before_validations 
-      end
-      before_validations
-    end
-    
-    def before_validations
-      @before_validations ||= []
-    end
-
-    def all_validations
-      if self.respond_to?(:superclass) && self.superclass.respond_to?(:all_validations)
-        return validations + self.superclass.all_validations 
-      end
-      validations
-    end
-
-    def validations
-      @validations ||= []
-    end
-    
-    def add_error(instance, attribute, msg)
-      instance.errors.add(attribute, msg)
-    end
-    
-    def validation_keys_include?(key)
-      validations.map { |validation| validation.key }.include?(key)
-    end
-    
-    def validations_to_include
-      @validations_to_include ||= []
-    end
-    
-    protected
-    
-    def add_validations(args, klass)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      args.each do |attribute|
-        new_validation = klass.new self, attribute, options
-        self.validations << new_validation
-        self.create_valid_method_for_groups new_validation.groups
-      end
-    end
-    
-    def create_valid_method_for_groups(groups)
-      groups.each do |group|
-        self.class_eval do
-          define_method "valid_for_#{group}?".to_sym do
-            valid_for_group?(group)
-          end
-        end
-      end
-    end
-    
-    def children_to_validate
-      @children_to_validate ||= []
-    end
-    
-  end
-end

data/lib/validatable/validatable_instance_methods.rb

@@ -1,106 +0,0 @@
-module Validatable
-  def self.included(klass) #:nodoc:
-    klass.extend Validatable::ClassMethods
-    klass.extend Validatable::Macros
-  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:
-    errors.clear
-    run_before_validations
-    self.class.validate_children(self, group)
-    self.validate_group(group)
-    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?
-        times_validated_hash[validation.key] = 1
-      else
-        times_validated_hash[validation.key] += 1
-      end
-    end
-  end
-
-  # call-seq: validate_only(key)
-  #
-  # Only executes a specified validation. The argument should follow a pattern based on the key of the validation.
-  #   Examples:
-  #     * validates_presence_of :name can be run with obj.validate_only("presence_of/name")
-  #     * validates_presence_of :birthday, :key => "a key" can be run with obj.validate_only("presence_of/a key")
-  def validate_only(key)
-    validation_name, attribute_name = key.split("/")
-    validation_name = validation_name.split("_").collect{|word| word.capitalize}.join
-    validation_key = "#{self.class.name}/Validatable::Validates#{validation_name}/#{attribute_name}"
-    validation = self.class.all_validations.find { |validation| validation.key == validation_key }
-    raise ArgumentError.new("validation with key #{validation_key} could not be found") if validation.nil?
-    errors.clear
-    run_validation(validation)
-  end
-
-  protected
-  def times_validated_hash #:nodoc:
-    @times_validated_hash ||= {}
-  end
-
-  def validate_group(group) #:nodoc:
-    validation_levels.each do |level|
-      validations_for_level_and_group(level, group).each do |validation|
-        run_validation(validation) if validation.should_validate?(self)
-      end
-      return unless self.errors.empty?
-    end
-  end
-
-  def run_validation(validation) #:nodoc:
-    validation_result = validation.valid?(self)
-    add_error(validation.attribute, validation.message(self)) unless validation_result
-    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