glue 0.25.0 → 0.26.0

data/ProjectInfo

@@ -2,7 +2,7 @@
 
 TITLE    : &title Glue
 NAME     : &pkg glue
-VERSION  : '0.25.0'
+VERSION  : '0.26.0'
 STATUS   : beta
 
 AUTHOR   : George Moschovitis

data/README

@@ -1,4 +1,4 @@
-= Glue 0.24.0 README
+= Glue 0.26.0 README
 
 Useful utilites and methods.
 

data/doc/RELEASES

@@ -1,3 +1,8 @@
+== Version 0.26.0
+
+This is the release with the most community contributions. Many 
+fixes and minor improvements. Download now!
+
 == Version 0.25.0
 
 This is the first in a series of releases focused on stability 

data/lib/glue.rb

@@ -22,7 +22,7 @@ module Glue
 
   # The version.
 
-  Version = '0.25.0'
+  Version = '0.26.0'
   
   # Library path.
 

data/lib/glue/accumulate.rb

@@ -0,0 +1,21 @@
+require 'mega/functor'
+
+module Enumerable
+
+  # Project has_many Group
+  # Group has_many User
+  # projects.groups.accumulate.users
+  #--
+  # gmosx: any idea for a better name?
+  #++
+  
+  def accumulate
+    Functor.new do |op, *args|
+      self.inject([]) { |a, x| a << x.send(op, *args) }.flatten
+    end  
+  end
+  alias_method :acc, :accumulate
+  
+end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/glue/expirable.rb

@@ -27,6 +27,11 @@ module Expirable
       return false
     end
   end
+  
+  # Update the expiration period. Override in your application.
+  
+  def touch!
+  end  
 end
 
 end

data/lib/glue/fixture.rb

@@ -76,6 +76,10 @@ class Fixture < Hash
     if path = "#{root_dir}/#{@name}.yml" and File.exist?(path)
       parse_yaml(path)
     end
+
+    if path = "#{root_dir}/#{@name}.yaml" and File.exist?(path)
+      parse_yaml(path)
+    end
     
     if path = "#{root_dir}/#{@name}.csv" and File.exist?(path)
       parse_csv(path)

data/lib/glue/html.rb

@@ -0,0 +1,12 @@
+module Glue
+module Html
+  def self.cleanup(buf)
+    out = buf.dup
+    elements = "input|img|br|hr|link|style|render|include|inject|base|meta"
+    out.gsub! /<textarea ([^>]*)><\/textarea>/, '<textarea \1>#{}</textarea>'
+    out.gsub! /<(#{elements}) ([^>]*)><\/\1>/, '<\1 \2 />'
+    out.gsub! /<(#{elements})><\/\1>/, '<\1 />'
+    out
+  end
+end
+end

data/lib/glue/mailer.rb

@@ -3,6 +3,8 @@ require 'glue/mailer/incoming'
 require 'glue/mailer/outgoing'  
 require 'glue/configuration'
 
+require 'socket'
+
 module Glue
 
 # Handles incoming and outgoing emails. Can be called from
@@ -17,7 +19,7 @@ class Mailer < Mail
   setting :server, :default => {
     :address => 'localhost',
     :port => 25,
-    :domain => 'localhost.localdomain',
+    :domain => Socket.gethostname,
     :username => nil,
     :password => nil,
     :authentication => nil

data/lib/glue/markup.rb

@@ -2,6 +2,8 @@ require 'singleton'
 require 'redcloth'
 require 'cgi'
 
+require 'mega/class_inherit'
+
 require 'glue/sanitize'
 
 module Glue
@@ -49,7 +51,7 @@ module Markup
       xstr = str.dup
       xstr.gsub!(/</, '&lt;')    
       xstr.gsub!(/>/, '&gt;')
-      xstr.gsub!(/\n/m, '<br/>')
+      xstr.gsub!(/\r/, '<br />')
       return String.sanitize(xstr)
     end
     return nil
@@ -92,7 +94,7 @@ module Markup
     CGI.unescape(str.gsub(/_/, ' '))
   end      
   
-  class << self
+  class_inherit do
     # Helper method for manipulating the sanitize transformation.
     
     def setup_sanitize_transform(&block)

data/lib/glue/property.rb

@@ -38,6 +38,7 @@ class Property
   def to_s
     @hash[:symbol].to_s
   end  
+  alias_method :name, :to_s
 end
 
 # Property related utils and helpers.
@@ -57,65 +58,70 @@ class Property
     obj = obj.new if obj.is_a?(Class) 
 
     for prop in obj.class.properties.values
+      
       unless options[:all]
-        next if :oid == prop.symbol or prop.editor == :none # TODO check for real key.
-      end      
+        next if prop.symbol == obj.class.primary_key.symbol or prop.control == :none
+      end
+      
       prop_name = prop.symbol.to_s
       
       # See if there is an incoming request param for this prop.
       
       if values.has_key?(prop_name)
         
-        # if incoming file then read contents into a string.
-        
         prop_value = values[prop_name]
-        #TODO remove this? prop_value.read if prop_value.respond_to?(:read)
-        prop_value = prop_value.to_s unless prop_value.is_a?(Hash) or prop_value.is_a?(Array)        
         
-        # If property is a Blob dont overwrite current property's data if "".
+        # to_s must be called on the prop_value incase the request is IOString
+        prop_value = prop_value.to_s unless prop_value.is_a?(Hash) or prop_value.is_a?(Array)
         
+        # If property is a Blob dont overwrite current property's data if "".
         break if prop.klass == Og::Blob and prop_value.empty?
         
-        # Pass to property force.
-        
+        # if custom preprocessing is active then try and preprocess
+        prop_value = preprocess_value(obj, prop, prop_value) if options[:preprocess]
+
+        # assign using __force_ methods.
         obj.send("__force_#{prop_name}", prop_value)
-      elsif options[:force_boolean] and (prop.klass == TrueClass or prop.klass == FalseClass)
-        # Set a boolean property to false if it is not in the request.
-        # Only enabled if force_boolean == true.
+      
+      # Set a boolean property to false if it is not in the request.
+      # requires force_boolean == true.
         
+      elsif options[:force_boolean] and (prop.klass == TrueClass or prop.klass == FalseClass)
         obj.send("__force_#{prop_name}", 0)
-        
       end
     end
 
     if options[:assign_relations]
       for rel in obj.class.relations
+        
         unless options[:all]
-          next if rel.options[:editor] == :none 
+          next if rel.options[:control] == :none 
         end
         
         rel_name = rel.name.to_s
         
         # Renew the relations from values
-        # TODO, farms: custom callbacks for processing relations?
         
-        if rel.kind_of? Og::RefersTo
+        if rel.kind_of?(Og::RefersTo)
           if foreign_oid = values[rel_name]
+            foreign_oid = foreign_oid.to_s
             foreign_oid = nil if foreign_oid == 'nil' or foreign_oid == 'none'
+            # if custom preprocessing is active then try and preprocess
+            foreign_oid = preprocess_value(obj, rel, foreign_oid) if options[:preprocess]
           end
-          obj.send("__force_#{rel.foreign_key}", foreign_oid.to_s)
-        elsif rel.kind_of? Og::JoinsMany or rel.kind_of? Og::HasMany
-          # Empty current relationships.
-
+          obj.send("__force_#{rel.foreign_key}", foreign_oid)
+        elsif rel.kind_of?(Og::JoinsMany) || rel.kind_of?(Og::HasMany)
           collection = obj.send(rel_name)
           collection.remove_all 
-          
-          # Set new.
-          
           if values.has_key?(rel_name)
-            values[rel_name].each do |v|
-              child = rel.target_class[v.to_s.to_i]
-              collection << child
+            primary_keys = values[rel_name]
+            
+            # if custom preprocessing is active then try and preprocess
+            primary_keys = preprocess_value(obj, rel, primary_keys) if options[:preprocess]
+            
+            primary_keys.each do |v|
+              next if v == 'nil' or v == 'none'
+              collection << rel.target_class[v.to_s.to_i]
             end
           end
         end
@@ -125,6 +131,31 @@ class Property
     return obj
   end 
   
+  # This method will attempt to process [value] through the
+  # any on_populate preprocessors availible
+  #
+  # first looks if a method was specified on the property
+  #
+  # ie. property :this, String, :on_populate => :change_value
+  # ==> would mean #change_value(val) would get called
+  # set :on_populate to false to exclude it from any preprocessing
+  #
+  # next an #on_populate method will be looked for on any
+  # associated Nitro::Control (if controls is running)
+  #
+  # otherwise [value] is left untouched
+  def preprocess_value(obj, prop_or_rel, value)
+    if prop_or_rel.on_populate && obj.respond_to?(prop_or_rel.on_populate.to_sym)
+      return obj.send(prop_or_rel.on_populate.to_sym, value)
+    elsif Object.const_defined? :Nitro
+      if control = Control.fetch(obj, prop_or_rel, nil) and control.respond_to?(:on_populate)
+        return control.on_populate(value)
+      end
+    else
+      return value
+    end
+  end
+  
   def eval_helpers(writer, m, sym, klass)
     return unless writer
   
@@ -139,7 +170,7 @@ class Property
             when Float.name: 'val.to_f'
             when Time.name: 'val.is_a?(Hash) ? Time.local(val["year"],val["month"],val["day"],val["hour"],val["min"]) : Time.parse(val.to_s)'
             when Date.name: 'val.is_a?(Hash) ? Time.local(val["year"],val["month"],val["day"]).to_date : Time.parse(val.to_s).to_date'
-            when TrueClass.name, FalseClass.name: 'val == "on" or val == "true" ? true
+            when TrueClass.name, FalseClass.name: 'val == "on" or val == "true" ? true: val.to_i > 0'
             else 'val'    
           end + %{) 
         end
@@ -164,7 +195,7 @@ class Module
     writer = (m != :reader)
     code = %{
       def prop#{m} (*args)
-        inheritor(:properties, {}, :merge) unless @properties
+        inheritor(:properties, Dictionary.new, :merge) unless @properties
 
         args = args.flatten
         harg = {}
@@ -225,3 +256,4 @@ end
 # * George Moschovitis <gm@navel.gr>
 # * Tom Sawyer <transfire@gmail.com>
 # * Chris Farmiloe <chris.farmiloe@farmiloe.com>
+# * Bryan Soto <bryan.a.soto@gmail.com>

data/lib/glue/template.rb

@@ -59,12 +59,8 @@ module TemplateMixin
     # xform render/inject instructions <render href="xxx" />
     # must be transformed before the processinc instructions.
 
-    text.gsub!(/<inject href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-      "<?r render '#$1' ?>"
-    end
-    
-    text.gsub!(/<render href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
-      "<?r render '#$1' ?>"
+    text.gsub!(/<(render|inject) href=["|'](.*?)["|'](.*)(.?)\/>/) do |match|
+      "<?r render '#$2' ?>"
     end
 
     # Remove <root> elements. typically removed by xslt but lets
@@ -155,6 +151,10 @@ class Template
   
   setting :extension, :default => 'xhtml', :doc => 'The default template file extension'
 
+  # Strip xml comments from templates?
+  
+  setting :strip_xml_comments, :default => false, :doc => 'Strip xml comments from templates?'
+
   class << self
     include TemplateMixin
     alias_method :compile, :compile_template

data/lib/glue/validation.rb

@@ -55,9 +55,8 @@ module Glue
 #  else
 #    p errors[:name]
 #  end
-#
 #--
-# TODO: all validation methods should imply validate_value
+# TODO: all validation methods should imply validate_value.
 #++
 
 module Validation
@@ -115,6 +114,25 @@ module Validation
       @errors.clear
     end
   end
+
+  # A Key is used to uniquely identify a validation rule.
+  
+  class Key
+    attr_reader :validation
+    attr_reader :field
+
+    def initialize(validation, field)
+      @validation, @field = validation.to_s, field.to_s
+    end
+
+    def hash
+      "#{@validation}-#{@field}".hash
+    end
+
+    def ==(other)
+      self.validation == other.validation and self.field == other.field
+    end
+  end
     
   # If the validate method returns true, this
   # attributes holds the errors found.
@@ -127,40 +145,22 @@ module Validation
   # returns true.
   
   def valid?
-    begin
-      @errors = self.class.validate(self)
-      return @errors.empty?
-    rescue NoMethodError => e
-      # gmosx: hmm this is potentially dangerous.
-      Glue::Validation.eval_validate(self.class)
-      retry 
-    end
+    validate
+    @errors.empty?
   end
     
-  # Evaluate the 'validate' method for the calling
-  # class.
-  #
-  # WARNING: for the moment only evaluates for 
-  # on == :save
-  
-  def self.eval_validate(klass)
-    code = %{  
-      def self.validate(obj, on = :save)
-        errors = Errors.new
-    }
-
-    for val, on in klass.validations
-      code << %{
-        #{val}
-      } 
-    end
+  # Evaluate the class and see if it is valid.
+  # Can accept any parameter for 'on' event,
+  # and defaults to :save
 
-    code << %{
-        return errors
-      end    
-    }
+  def validate(on = :save)
+    @errors = Errors.new
 
-    klass.module_eval(code)
+    return if self.class.validations.length == 0
+
+    for event, block in self.class.validations
+      block.call(self) if event == on.to_sym
+    end
   end
 
   on_included %{
@@ -178,7 +178,6 @@ module Validation
   # Implements the Validation meta-language.
   
   module ClassMethods 
-    
     # Validates that the attributes have a values, ie they are
     # neither nil or empty.
     #
@@ -187,23 +186,13 @@ module Validation
     # validate_value :param, :msg => 'No confirmation'
     
     def validate_value(*params)
-      c = { 
-        :msg => Glue::Validation::Errors.no_value, 
-        :on => :save 
-      }
-      c.update(params.pop) if params.last.is_a?(Hash)
-
-      idx = 0
-      for name in params
-        code = %{
-          if obj.#{name}.nil?
-            errors.add(:#{name}, '#{c[:msg]}')
-          elsif obj.#{name}.respond_to?(:empty?)
-            errors.add(:#{name}, '#{c[:msg]}') if obj.#{name}.empty?
-          end
-        }
-        
-        validations! << [code, c[:on]]
+      c = parse_config(params, :msg => Glue::Validation::Errors.no_value, :on => :save)
+
+      params.each do |field|
+        define_validation(:value, field, c[:on]) do |obj|
+          value = obj.send(field)
+          obj.errors.add(field, c[:msg]) if value.nil? || (value.respond_to?(:empty) && value.empty?)
+        end
       end
     end
 
@@ -214,25 +203,20 @@ module Validation
     # validate_confirmation :password, :msg => 'No confirmation'
     
     def validate_confirmation(*params)
-      c = { 
+      c = parse_config(params,
         :msg => Glue::Validation::Errors.no_confirmation, 
         :postfix => Glue::Validation.confirmation_postfix,
         :on => :save 
-      }
-      c.update(params.pop) if params.last.is_a?(Hash)
+      )
 
+      params.each do |field|
+        confirm_name = field.to_s + c[:postfix]
+        attr_accessor confirm_name.to_sym
 
-      for name in params
-        confirm_name = "#{name}#{c[:postfix]}"
-        eval "attr_accessor :#{confirm_name}"
-
-        code = %{
-          if obj.#{confirm_name}.nil? or (obj.#{confirm_name} != obj.#{name})
-            errors.add(:#{name}, '#{c[:msg]}')
-          end
-        }
-        
-        validations! << [code, c[:on]]
+        define_validation(:confirmation, field, c[:on]) do |obj|
+          value = obj.send(field)
+          obj.errors.add(field, c[:msg]) if value.nil? or obj.send(confirm_name) != value
+        end
       end
     end
 
@@ -246,33 +230,24 @@ module Validation
     #--
     # FIXME: how to get the Regexp options?
     #++
-    
+
     def validate_format(*params)
-      c = { 
+      c = parse_config(params,
         :format => nil, 
         :msg_no_value => Glue::Validation::Errors.no_value,
         :msg => Glue::Validation::Errors.invalid_format, 
         :on => :save 
-      }
-      c.update(params.pop) if params.last.is_a?(Hash)
-    
+      )
+
       unless c[:format].is_a?(Regexp)
-        raise(ArgumentError, 
-            'A regular expression must be supplied as the :format option')
+        raise ArgumentError, "A regular expression must be supplied as the :format option for validate_format."
       end
 
-      for name in params
-        code = %{
-          if obj.#{name}.nil?
-            errors.add(:#{name}, '#{c[:msg_no_value]}')
-          else
-            unless obj.#{name}.to_s.match(/#{c[:format].source}/)
-              errors.add(:#{name}, '#{c[:msg]}')
-            end
-          end;
-        }
-
-        validations! << [code, c[:on]]
+      params.each do |field|
+        define_validation(:format, field, c[:on]) do |obj|
+          value = obj.send(field)
+          obj.errors.add(field, c[:msg]) if value.nil? or not value.to_s.match(c[:format].source)
+        end
       end                                                
     end
     
@@ -285,85 +260,62 @@ module Validation
     # validate_length :name, :range => 2..30
     # validate_length :name, :length => 15, :msg => 'Name should be %d chars long'
     
+    LENGTHS = [:min, :max, :range, :length].freeze
+    
     def validate_length(*params)
-      c = { 
-        :min => nil, :max => nil, :range => nil, :length => nil, 
+      c = parse_config(params,
+#       :lengths => {:min => nil, :max => nil, :range => nil, :length => nil},
+        :min => nil, :max => nil, :range => nil, :length => nil,
         :msg => nil, 
         :msg_no_value => Glue::Validation::Errors.no_value,
         :msg_short => Glue::Validation::Errors.too_short,
         :msg_long => Glue::Validation::Errors.too_long,
+        :msg_invalid => Glue::Validation::Errors.invalid_length,
         :on => :save 
-      }
-      c.update(params.pop) if params.last.is_a?(Hash)
-
-      min, max = c[:min], c[:max]
-      range, length = c[:range], c[:length]
-
-      count = 0
-      [min, max, range, length].each { |o| count += 1 if o }
-
-      if count == 0 
-        raise(ArgumentError, 
-            'One of :min, :max, :range, :length must be provided!')
-      end
-
-      if count > 1
-        raise(ArgumentError, 
-            'The :min, :max, :range, :length options are mutually exclusive!')
+      )
+
+      length_params = c.reject {|k,v| !LENGTHS.include?(k) || v.nil? }
+      valid_count = length_params.reject{|k,v| v.nil?}.length
+      
+      if valid_count == 0
+        raise ArgumentError, 'One of :min, :max, :range, or :length must be provided!'
+      elsif valid_count > 1
+        raise ArgumentError, 'You can only use one of :min, :max, :range, or :length options!'
       end
 
-      for name in params
-        if min
-          c[:msg] ||= Glue::Validation::Errors.too_short 
-          code = %{
-            if obj.#{name}.nil?
-              errors.add(:#{name}, '#{c[:msg_no_value]}')
-            elsif obj.#{name}.to_s.length < #{min}
-              msg = '#{c[:msg]}'
-              msg = (msg % #{min}) rescue msg
-              errors.add(:#{name}, msg)
-            end;
-          }
-        elsif max 
-          c[:msg] ||= Glue::Validation::Errors.too_long
-          code = %{
-            if obj.#{name}.nil?
-              errors.add(:#{name}, '#{c[:msg_no_value]}')
-            elsif obj.#{name}.to_s.length > #{max}
-              msg = '#{c[:msg]}'
-              msg = (msg % #{max}) rescue msg
-              errors.add(:#{name}, msg)
-            end;
-          }
-        elsif range
-          code = %{
-            if obj.#{name}.nil?
-              errors.add(:#{name}, '#{c[:msg_no_value]}')
-            elsif obj.#{name}.to_s.length < #{range.first}
-              msg = '#{c[:msg_short]}'
-              msg = (msg % #{range.first}) rescue msg
-              errors.add(:#{name}, msg)
-            elsif obj.#{name}.to_s.length > #{range.last}
-              msg = '#{c[:msg_long]}'
-              msg = (msg % #{range.last}) rescue msg
-              errors.add(:#{name}, msg)
-            end;
-          }
-        elsif length
-          c[:msg] ||= Glue::Validation::Errors.invalid_length
-          code = %{
-            if obj.#{name}.nil?
-              errors.add(:#{name}, '#{c[:msg_no_value]}')
-            elsif obj.#{name}.to_s.length != #{length}
-              msg = '#{c[:msg]}'
-              msg = (msg % #{length}) rescue msg
-              errors.add(:#{name}, msg)
-            end;
-          }
+      operation, required = length_params.keys[0], length_params.values[0]
+     
+      params.each do |field|
+        define_validation(:length, field, c[:on]) do |obj|
+          msg = c[:msg]
+          value = obj.send(field)
+          if value.nil?
+            obj.errors.add(field, c[:msg_no_value])
+          else 
+            case operation
+            when :min
+              msg ||= c[:msg_short]
+              obj.errors.add(field, msg % required) if value.length < required
+            when :max
+              msg ||= c[:msg_long]
+              obj.errors.add(field, msg % required) if value.length > required
+            when :range
+              min, max = required.first, required.last
+              if value.length < min
+                msg ||= c[:msg_short]
+                obj.errors.add(field, msg % min)
+              end
+              if value.length > max
+                msg ||= c[:msg_long]
+                obj.errors.add(field, msg % min)
+              end
+            when :length
+              msg ||= c[:msg_invalid]
+              obj.errors.add(field, msg % required) if value.length != required
+            end
+          end
         end
-
-        validations! << [code, c[:on]]
-      end                                                
+      end
     end
     
     # Validates that the attributes are included in 
@@ -375,35 +327,24 @@ module Validation
     # validate_inclusion :age, :in => 5..99 
 
     def validate_inclusion(*params)
-      c = { 
+      c = parse_config(params,
         :in => nil, 
         :msg => Glue::Validation::Errors.no_inclusion, 
         :allow_nil => false,
         :on => :save 
-      }
-      c.update(params.pop) if params.last.is_a?(Hash)
-    
+      )
+
       unless c[:in].respond_to?('include?')
-        raise(ArgumentError, 
-            'An object that responds to #include? must be supplied as the :in option')
+        raise(ArgumentError, 'An object that responds to #include? must be supplied as the :in option')
       end
 
-      for name in params
-        if c[:allow_nil]
-          code = %{
-            unless obj.#{name}.nil? or (#{c[:in].inspect}).include?(obj.#{name})
-              errors.add(:#{name}, '#{c[:msg]}')
-            end;
-          }
-        else
-          code = %{
-            unless (#{c[:in].inspect}).include?(obj.#{name})
-              errors.add(:#{name}, '#{c[:msg]}')
-            end;
-          }
+      params.each do |field|
+        define_validation(:inclusion, field, c[:on]) do |obj|
+          value = obj.send(field)
+          unless (c[:allow_nil] && value.nil?) or c[:in].include?(value)
+            obj.errors.add(field, c[:msg])
+          end
         end
-
-        validations! << [code, c[:on]]
       end                                                
     end
 
@@ -423,35 +364,67 @@ module Validation
     # validate_numeric :age, :msg => 'Must be an integer'
 
     def validate_numeric(*params)
-      c = { 
+      c = parse_config(params, 
         :integer => false,
         :msg => Glue::Validation::Errors.no_numeric, 
         :on => :save 
-      }
-      c.update(params.pop) if params.last.is_a?(Hash)
-
-      for name in params
-        if c[:integer]
-          code = %{
-            unless obj.#{name}.to_s =~ /^[\\+\\-]?\\d+$/
-              errors.add(:#{name}, '#{c[:msg]}')
-            end;
-          }
-        else
-          code = %{
+      )
+
+      params.each do |field|
+        define_validation(:numeric, field, c[:on]) do |obj|
+          value = obj.send(field).to_s
+          if c[:integer] 
+            unless value =~ /^[\+\-]*\d+$/
+              obj.errors.add(field, c[:msg])
+            end
+          else
             begin
-              Kernel.Float(obj.#{name})
+              Float(value)
             rescue ArgumentError, TypeError
-              errors.add(:#{name}, '#{c[:msg]}')
-            end;
-          }
+              obj.errors.add(field, c[:msg])
+            end
+          end
         end
-
-        validations! << [code, c[:on]]
-      end                                                
+      end
     end
     alias_method :validate_numericality, :validate_numeric
 
+  protected
+
+    # Parse the configuration for a validation by comparing
+    # the default options with the user-specified options,
+    # and returning the results.
+
+    def parse_config(params, defaults = {})
+      defaults.update(params.pop) if params.last.is_a?(Hash)
+      defaults
+    end
+
+    # Define a validation for this class on the specified event.
+    # Specify the on event for when this validation should be
+    # checked.
+    #
+    # An extra check is performed to avoid multiple validations.
+    #
+    # This example creates a validation for the 'save' event,
+    # and will add an error to the record if the 'name' property
+    # of the validating object is nil.
+    #
+    # === Example
+    #
+    # field = :name
+    #
+    # define_validation(:value, field, :save) do |object|
+    #   object.errors.add(field, "You must set a value for #{field}") if object.send(field).nil?
+    # end
+    
+    def define_validation(val, field, on = :save, &block)
+      vk = Validation::Key.new(val, field)
+      unless validations.find { |v| v[2] == vk }
+        validations! << [on, block, vk]
+      end
+    end
+    
   end
 
 end
@@ -462,4 +435,6 @@ class Module # :nodoc: all
   include Glue::Validation::ClassMethods
 end
 
-# * George Moschovitis  <gm@navel.gr>
+# * George Moschovitis <gm@navel.gr>
+# * Brian Bugh <brian@xsi-design.com>
+# * Bryan Soto <bryan.a.soto@gmail.com>

data/test/glue/multi_validations_model.rb

@@ -0,0 +1,5 @@
+class User
+  property :name, String
+  validate_length :name, :range => 2..6 
+  validate_format :name, :format => /[a-z]*/, :msg => 'invalid format', :on => :create 
+end

data/test/glue/tc_accumulate.rb

@@ -0,0 +1,37 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+require 'glue/accumulate'
+
+class TC_Accumulate < Test::Unit::TestCase # :nodoc: all
+  
+  class Project
+    attr_accessor :groups
+  end
+
+  class Group
+    attr_accessor :users
+  end
+
+  class User
+  end
+
+  def test_all
+    pr = Project.new
+    gr1 = Group.new
+    gr2 = Group.new
+    us1 = User.new
+    us2 = User.new
+    gr1.users = [ us1 ]
+    gr2.users = [ us2 ]
+    pr.groups = [ gr1, gr2 ]
+        
+    users = pr.groups.accumulate.users
+    assert_equal 2, users.size    
+    assert_equal us1, users[0]
+    assert_equal us2, users[1]
+  end
+
+end
+
+# * George Moschovitis <gm@navel.gr>

data/test/glue/tc_multi_validations.rb

@@ -0,0 +1,19 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+
+require 'test/unit'
+
+require 'glue'
+require 'glue/property'
+require 'glue/validation'
+
+class TC_MultiValidation < Test::Unit::TestCase # :nodoc: all
+
+  def test_all
+    file = File.join(File.dirname($0), 'multi_validations_model.rb')
+    load file
+    assert_equal 2, User.validations.size
+    load file
+    assert_equal 2, User.validations.size
+  end
+ 
+end

data/test/glue/tc_validation.rb

@@ -1,4 +1,5 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', '..', 'lib')
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', 'og', 'lib')
 
 require 'test/unit'
 
@@ -78,7 +79,7 @@ class TC_Validation < Test::Unit::TestCase # :nodoc: all
     include Mixin
     validate_length :value, :min => 3
   end
-    
+  
   def test_validate_value
     d = Dummy1.new
     
@@ -90,7 +91,7 @@ class TC_Validation < Test::Unit::TestCase # :nodoc: all
     d.str = 'yeah'
     assert d.valid?
   end
-
+  
   def test_validate_confirmation
     d = Dummy2.new
 
@@ -212,4 +213,5 @@ class TC_Validation < Test::Unit::TestCase # :nodoc: all
     d.age = 123
     assert d.valid?
   end
+
 end

data/test/glue/tc_validation2.rb

@@ -0,0 +1,208 @@
+path = File.expand_path(File.dirname($0))
+$: << path + '/og/lib'
+$: << path + '/glue/lib'
+require 'test/unit'
+require 'og'
+
+module UnitTestClasses
+class NoValidation
+  property :prop, String
+
+  def initialize(prop)
+    @prop = prop
+  end
+end
+
+class UniqueValidation < NoValidation
+  property :slop, String
+  validate_unique :prop, :slop
+end
+
+class ValueValidation < NoValidation
+  validate_value :prop
+end
+
+class ConfirmValidation < NoValidation
+  validate_confirmation :prop
+end
+
+class FormatValidation < NoValidation
+  validate_format :prop, :format => /^\w\d\w-\d\w\d$/
+end
+
+class MinValidation < NoValidation
+  validate_length :prop, :min => 4
+end
+
+class MaxValidation < NoValidation
+  validate_length :prop, :max => 8
+end
+
+class RangeValidation < NoValidation
+  validate_length :prop, :range => 10..20
+end
+
+class LengthValidation < NoValidation
+  validate_length :prop, :length => 8
+end
+
+class InclusionValidation < NoValidation
+  validate_inclusion :prop, :in => %w{ Male Female }
+end
+
+class NumericValidation < NoValidation
+  property :prop, Fixnum
+  validate_numeric :prop, :integer => true
+
+  prop_accessor :prop2, Float
+  validate_numeric :prop2
+end
+
+class RelatedClass
+  prop_accessor :test, String
+  belongs_to :relation_validation, RelationValidation
+end
+
+class RelationValidation < NoValidation
+  has_many :relations, RelatedClass
+  validate_related :relations
+end
+end
+
+config = {
+  :destroy => true, 
+  :store => :sqlite,
+  :prop => 'dbtest_additions'
+}
+
+db = Og.setup(config)
+
+require 'breakpoint'
+module Test::Unit::Assertions
+  # Assert than an Og object is successfully saved and is error free.
+  def assert_saved_without_errors(obj)
+    assert_block(obj.class.to_s + ' was expected to save, but failed.') do
+      obj.save
+      obj.saved? && obj.errors.size == 0
+    end
+  end
+
+  # Assert that an Og object did not save and has errors.
+  def assert_save_failed(obj)
+    assert_block(obj.class.to_s + ' saving was expected to fail, but it succeeded.') do
+      obj.save
+      !obj.saved? && obj.errors.size > 0
+    end
+  end
+end
+
+# Unit tests for the Og validation system 
+class TestFixes < Test::Unit::TestCase
+  include UnitTestClasses
+
+  def test_no_validation
+    t = NoValidation.new('nochecking')
+    assert_saved_without_errors t
+  end
+  
+  def test_validation_unique
+    assert_saved_without_errors UniqueValidation.new('test')
+    assert_save_failed UniqueValidation.new('test')
+  end
+
+  def test_value_validation
+    assert_saved_without_errors ValueValidation.new('value')
+    assert_save_failed ValueValidation.new(nil)
+  end
+  
+  def test_confirmation
+    prop = 'confirm'
+    c = ConfirmValidation.new(prop)
+    c.prop_confirmation = prop
+    assert_saved_without_errors c
+
+    assert_save_failed ConfirmValidation.new(prop)
+  end
+
+  def test_format
+    assert_saved_without_errors FormatValidation.new('a1b-2c3')
+    assert_save_failed FormatValidation.new('banana_pudding')
+  end
+
+  def test_length_min
+    assert_saved_without_errors MinValidation.new('12345')
+    assert_save_failed MinValidation.new('1')
+  end
+
+  def test_length_max
+    assert_saved_without_errors MaxValidation.new('12345')
+    assert_save_failed MaxValidation.new('123456789012345')
+  end
+  
+  def test_length_range
+    l = RangeValidation.new('12345678901234')
+    assert_saved_without_errors l
+
+    l = RangeValidation.new('12')
+    assert_save_failed l
+
+    l = RangeValidation.new('1234567890123456789012345')
+    assert_save_failed l
+  end
+
+  def test_length_length
+    assert_saved_without_errors LengthValidation.new('12345678')
+    assert_save_failed LengthValidation.new('1')
+    assert_save_failed LengthValidation.new('123456789012345')
+  end
+
+  def test_inclusion
+    assert_saved_without_errors InclusionValidation.new('Male')
+    assert_save_failed InclusionValidation.new('Shemale')
+  end
+
+  def test_numeric
+    # Both valid
+    n = NumericValidation.new(100)
+    n.prop2 = 1.52
+    assert_saved_without_errors n 
+
+    # float for required integer
+    n = NumericValidation.new(1.52)
+    n.prop2 = 1.52
+    assert_save_failed n
+    assert_equal 1, n.errors.count
+
+    # string for required integer
+    n = NumericValidation.new('sausage')
+    n.prop2 = 1.52
+    assert_save_failed n
+    assert_equal 1, n.errors.count
+
+    # string for required integer and float
+    n = NumericValidation.new('sausage')
+    n.prop2 = 'cheese'
+    assert_save_failed n
+    assert_equal 2, n.errors.count
+
+    # string for float
+    n = NumericValidation.new(15)
+    n.prop2 = 'cheese'
+    assert_save_failed n
+    assert_equal 1, n.errors.count
+  end
+
+  def test_related
+    r = RelatedClass.new
+    test_prop = 'example string'
+    r.test = test_prop
+    rv = RelationValidation.new('relation')
+    rv.relations << r
+
+    assert_saved_without_errors rv
+    assert_equal test_prop, rv.relations.members[0].test
+
+    # Test bad
+    assert_save_failed RelationValidation.new('relation')
+  end
+end  

data/test/glue/tc_validation_loop.rb

@@ -0,0 +1,36 @@
+require 'test/unit'
+
+require 'rubygems'
+
+require 'og'
+
+class ManagedClass
+  prop_accessor :thing
+
+  validate_unique :thing
+end
+
+Og.start
+
+class TC_Loop < Test::Unit::TestCase
+  def setup
+    @thing_1 = ManagedClass.new
+    @thing_1.thing = 'thing'
+    @thing_1.save
+  end
+
+  def test_loop
+    thing_2 = ManagedClass.new
+    thing_2.thing = @thing_1.thing
+#    assert_raises(NoMethodError) {
+#      thing_2.valid?
+#      assert thing_2.errors
+#    }
+  end
+
+  def teardown
+    ManagedClass.all.each { |i| i.delete }
+  end
+end
+
+# * Bryan Soto <bryan.a.soto@gmail.com>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: glue
 version: !ruby/object:Gem::Version 
-  version: 0.25.0
-date: 2005-11-17
+  version: 0.26.0
+date: 2005-12-21
 summary: Utility methods and classes for Nitro.
 require_paths: 
   - lib
@@ -42,6 +42,7 @@ files:
   - lib/glue
   - lib/glue.rb
   - lib/html
+  - lib/glue/accumulate.rb
   - lib/glue/aspects.rb
   - lib/glue/attribute.rb
   - lib/glue/builder
@@ -50,6 +51,7 @@ files:
   - lib/glue/expirable.rb
   - lib/glue/fixture.rb
   - lib/glue/flexob.rb
+  - lib/glue/html.rb
   - lib/glue/localization.rb
   - lib/glue/logger.rb
   - lib/glue/mail.rb
@@ -77,6 +79,8 @@ files:
   - test/fixture/article.yml
   - test/fixture/user.yml
   - test/glue/builder
+  - test/glue/multi_validations_model.rb
+  - test/glue/tc_accumulate.rb
   - test/glue/tc_aspects.rb
   - test/glue/tc_attribute.rb
   - test/glue/tc_builder.rb
@@ -86,12 +90,15 @@ files:
   - test/glue/tc_localization.rb
   - test/glue/tc_logger.rb
   - test/glue/tc_mail.rb
+  - test/glue/tc_multi_validations.rb
   - test/glue/tc_property.rb
   - test/glue/tc_property_mixins.rb
   - test/glue/tc_property_type_checking.rb
   - test/glue/tc_template.rb
   - test/glue/tc_uri.rb
   - test/glue/tc_validation.rb
+  - test/glue/tc_validation2.rb
+  - test/glue/tc_validation_loop.rb
   - test/glue/builder/tc_xml.rb
   - test/public/dummy_mailer
   - test/public/dummy_mailer/registration.xhtml