paulcarey-relaxdb 0.2.5 → 0.2.6

data/Rakefile

@@ -4,7 +4,7 @@ require 'spec/rake/spectask'
 
 PLUGIN = "relaxdb"
 NAME = "relaxdb"
-GEM_VERSION = "0.2.5"
+GEM_VERSION = "0.2.6"
 AUTHOR = "Paul Carey"
 EMAIL = "paul.p.carey@gmail.com"
 HOMEPAGE = "http://github.com/paulcarey/relaxdb/"

data/lib/relaxdb/document.rb

@@ -181,8 +181,11 @@ module RelaxDB
         id = instance_variable_get("@#{relationship}_id".to_sym)
         s << ", #{relationship}_id: #{id}" if id
       end
+      s << ", errors: #{errors.inspect}" unless errors.empty?
       s << ">"
     end
+    
+    alias_method :to_s, :inspect
             
     def to_json
       data = {}
@@ -197,7 +200,7 @@ module RelaxDB
       data["class"] = self.class.name
       data.to_json      
     end
-        
+            
     # Order changed as of 30/10/2008 to be consistent with ActiveRecord
     # Not yet sure of final implemention for hooks - may lean more towards DM than AR
     def save(*validation_skip_list)
@@ -219,34 +222,48 @@ module RelaxDB
     end
     
     def validates?(*skip_list)
-      total_success = true
-      properties.each do |prop|
-        next if skip_list.include? prop
-        if methods.include? "validate_#{prop}"
-          prop_val = instance_variable_get("@#{prop}")
-          success = send("validate_#{prop}", prop_val) rescue false
-          unless success
-            if methods.include? "#{prop}_validation_msg"
-              @errors[prop] = send("#{prop}_validation_msg", prop_val) rescue "validation_msg_exception:invalid:#{prop_val}"
-            else
-              @errors[prop] = "invalid:#{prop}"
-            end
-          end
-          total_success &= success          
-        end
-      end
+      props = properties - skip_list
+      prop_vals = props.map { |prop| instance_variable_get("@#{prop}") }
+      
+      rels = self.class.belongs_to_rels.keys - skip_list
+      rel_vals = rels.map { |rel| instance_variable_get("@#{rel}_id") }
+      
+      att_names = props + rels
+      att_vals =  prop_vals + rel_vals
       
-      self.class.belongs_to_rels.each do |rel, opts|
-        if methods.include? "validate_#{rel}"
-          rel_val = instance_variable_get("@#{rel}_id")
-          success = send("validate_#{rel}", rel_val) rescue false
-          @errors[rel] = "invalid:#{rel_val}" unless success
-          total_success &= success
+      total_success = true      
+      att_names.each_index do |i|
+        att_name, att_val = att_names[i], att_vals[i]
+        if methods.include? "validate_#{att_name}"
+          total_success &= validate_att(att_name, att_val)
         end
       end
-      
+            
       total_success
     end
+    
+    def validate_att(att_name, att_val)
+      begin
+        success = send("validate_#{att_name}", att_val)
+      rescue => e
+        RelaxDB.logger.warn("Validating #{att_name} with #{att_val} raised #{e}")
+        succes = false
+      end
+
+      unless success
+        if methods.include? "#{att_name}_validation_msg"
+          begin
+            @errors[att_name] = send("#{att_name}_validation_msg", att_val)
+          rescue => e
+            RelaxDB.logger.warn("Validation_msg for #{att_name} with #{att_val} raised #{e}")
+            @errors[att_name] = "validation_msg_exception:invalid:#{att_name_val}"
+          end
+        else
+          @errors[att_name] = "invalid:#{att_val}"
+        end
+      end
+      success
+    end
             
     def new_document?
       @_rev.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paulcarey-relaxdb
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Paul Carey
@@ -9,7 +9,7 @@ autorequire: relaxdb
 bindir: bin
 cert_chain: []
 
-date: 2009-01-07 00:00:00 -08:00
+date: 2009-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency