mongomatic 0.0.2 → 0.0.3

data/lib/mongomatic/validatable/validatable_instance_methods.rb

@@ -0,0 +1,108 @@
+module Mongomatic
+  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
+end

data/lib/mongomatic/validatable/validations/validates_acceptance_of.rb

@@ -0,0 +1,16 @@
+module Mongomatic
+  module Validatable
+    class ValidatesAcceptanceOf < ValidationBase #:nodoc:    
+      def valid?(instance)
+        value = instance[self.attribute.to_s]
+        return true if allow_nil && value.nil?
+        return true if allow_blank && value.blank?
+        %w(1 true t).include?(value)
+      end
+    
+      def message(instance)
+        super || "must be accepted"
+      end
+    end
+  end
+end

data/lib/mongomatic/validatable/validations/validates_associated.rb

@@ -0,0 +1,15 @@
+module Mongomatic
+  module Validatable
+    class ValidatesAssociated < ValidationBase #:nodoc:
+      def valid?(instance)
+        Array(instance.send(attribute)).compact.map do |child|
+          child.valid?
+        end.all?
+      end
+
+      def message(instance)
+        super || "is invalid"
+      end
+    end
+  end
+end

data/lib/mongomatic/validatable/validations/validates_confirmation_of.rb

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

data/lib/mongomatic/validatable/validations/validates_each.rb

@@ -0,0 +1,16 @@
+module Mongomatic
+  module Validatable
+    class ValidatesEach < ValidationBase #:nodoc:
+      required_option :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
+    end
+  end
+end

data/lib/mongomatic/validatable/validations/validates_exclusion_of.rb

@@ -0,0 +1,19 @@
+module Mongomatic
+  module Validatable
+    class ValidatesExclusionOf < ValidationBase #:nodoc:
+      required_option :within
+
+      def valid?(instance)
+        value = instance.send(attribute)
+        return true if allow_nil && value.nil?
+        return true if allow_blank && value.blank?
+
+        !within.include?(value)
+      end
+
+      def message(instance)
+        super || "is reserved"
+      end
+    end
+  end
+end

data/lib/mongomatic/validatable/validations/validates_format_of.rb

@@ -0,0 +1,18 @@
+module Mongomatic
+  module Validatable
+    class ValidatesFormatOf < ValidationBase #:nodoc:
+      required_option :with
+  
+      def valid?(instance)
+        value = instance[self.attribute.to_s]
+        return true if allow_nil && value.nil?
+        return true if allow_blank && value.blank?
+        not (value.to_s =~ self.with).nil?
+      end
+    
+      def message(instance)
+        super || "is invalid"
+      end
+    end
+  end
+end

data/lib/mongomatic/validatable/validations/validates_inclusion_of.rb

@@ -0,0 +1,19 @@
+module Mongomatic
+  module Validatable
+    class ValidatesInclusionOf < ValidationBase
+      required_option :within
+    
+      def valid?(instance)
+        value = instance.send(attribute)
+        return true if allow_nil && value.nil?
+        return true if allow_blank && value.blank?
+      
+        within.include?(value)
+      end
+    
+      def message(instance)
+        super || "is not in the list"
+      end
+    end
+  end
+end

data/lib/mongomatic/validatable/validations/validates_length_of.rb

@@ -0,0 +1,32 @@
+module Mongomatic
+  module Validatable
+    class ValidatesLengthOf < ValidationBase #:nodoc:
+      option :minimum, :maximum, :is, :within
+    
+      def message(instance)
+        super || "is invalid"
+      end
+    
+      def valid?(instance)
+        valid = true
+        value = instance[self.attribute.to_s]
+      
+        if value.nil?
+          return true if allow_nil
+          value = ''
+        end
+
+        if value.blank?
+          return true if allow_blank
+          value = ''
+        end
+      
+        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?
+        valid
+      end
+    end
+  end
+end

data/lib/mongomatic/validatable/validations/validates_numericality_of.rb

@@ -0,0 +1,28 @@
+module Mongomatic
+  module Validatable 
+    class ValidatesNumericalityOf < ValidationBase #:nodoc:
+      option :only_integer
+    
+      def valid?(instance)
+        value = value_for(instance)
+        return true if allow_nil && value.nil?
+        return true if allow_blank && value.blank?
+      
+        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"
+          value_method = instance.respond_to?(before_typecast_method.intern) ? before_typecast_method : self.attribute
+          instance.send(value_method)
+        end
+    end
+  end
+end

data/lib/mongomatic/validatable/validations/validates_presence_of.rb

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

data/lib/mongomatic/validatable/validations/validates_true_for.rb

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

data/lib/mongomatic/validatable/validations/validation_base.rb

@@ -0,0 +1,93 @@
+module Mongomatic
+  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 :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
+        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)
+        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
+        end
+        instance.instance_eval_with_params result, attribute, &self.after_validate unless self.after_validate.nil?
+      end
+    end
+  end
+end

data/lib/{validatable.rb → mongomatic/validatable.rb}

@@ -24,6 +24,8 @@ require "#{File.dirname(__FILE__)}/validatable/validations/validates_inclusion_o
 require "#{File.dirname(__FILE__)}/validatable/validations/validates_each"
 require "#{File.dirname(__FILE__)}/validatable/validations/validates_associated"
 
-module Validatable
-  Version = "1.8.4"
+module Mongomatic
+  module Validatable
+    Version = "1.8.4"
+  end
 end

data/lib/mongomatic.rb

@@ -27,7 +27,7 @@ module Mongomatic
   end
 end
 
-require "#{File.dirname(__FILE__)}/validatable"
+require "#{File.dirname(__FILE__)}/mongomatic/validatable"
 
 require "#{File.dirname(__FILE__)}/mongomatic/cursor"
 require "#{File.dirname(__FILE__)}/mongomatic/modifiers"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -07:00
+date: 2010-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -36,7 +35,6 @@ dependencies:
   name: bson
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -51,7 +49,6 @@ dependencies:
   name: bson_ext
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -66,7 +63,6 @@ dependencies:
   name: mongo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -81,7 +77,6 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -106,32 +101,30 @@ files:
 - lib/mongomatic/base.rb
 - lib/mongomatic/cursor.rb
 - lib/mongomatic/modifiers.rb
-- lib/validatable.rb
-- 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/validations/validates_acceptance_of.rb
-- lib/validatable/validations/validates_associated.rb
-- lib/validatable/validations/validates_confirmation_of.rb
-- lib/validatable/validations/validates_each.rb
-- lib/validatable/validations/validates_exclusion_of.rb
-- lib/validatable/validations/validates_format_of.rb
-- lib/validatable/validations/validates_inclusion_of.rb
-- lib/validatable/validations/validates_length_of.rb
-- lib/validatable/validations/validates_numericality_of.rb
-- lib/validatable/validations/validates_presence_of.rb
-- lib/validatable/validations/validates_true_for.rb
-- lib/validatable/validations/validation_base.rb
+- lib/mongomatic/validatable.rb
+- lib/mongomatic/validatable/child_validation.rb
+- lib/mongomatic/validatable/errors.rb
+- lib/mongomatic/validatable/included_validation.rb
+- lib/mongomatic/validatable/macros.rb
+- lib/mongomatic/validatable/object_extension.rb
+- lib/mongomatic/validatable/requireable.rb
+- lib/mongomatic/validatable/understandable.rb
+- lib/mongomatic/validatable/validatable_class_methods.rb
+- lib/mongomatic/validatable/validatable_instance_methods.rb
+- lib/mongomatic/validatable/validations/validates_acceptance_of.rb
+- lib/mongomatic/validatable/validations/validates_associated.rb
+- lib/mongomatic/validatable/validations/validates_confirmation_of.rb
+- lib/mongomatic/validatable/validations/validates_each.rb
+- lib/mongomatic/validatable/validations/validates_exclusion_of.rb
+- lib/mongomatic/validatable/validations/validates_format_of.rb
+- lib/mongomatic/validatable/validations/validates_inclusion_of.rb
+- lib/mongomatic/validatable/validations/validates_length_of.rb
+- lib/mongomatic/validatable/validations/validates_numericality_of.rb
+- lib/mongomatic/validatable/validations/validates_presence_of.rb
+- lib/mongomatic/validatable/validations/validates_true_for.rb
+- lib/mongomatic/validatable/validations/validation_base.rb
 - LICENSE
 - README.rdoc
-- test/helper.rb
-- test/test_meta_mongo.rb
 has_rdoc: true
 homepage: http://github.com/benmyles/mongomatic
 licenses: []
@@ -142,7 +135,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -150,7 +142,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -160,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Mongomatic is a simple Ruby object mapper for Mongo

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