doodle 0.0.3 → 0.0.4

data/examples/event-location.rb

@@ -1,7 +1,8 @@
 require 'rubygems'
 require 'date'
-require 'pp'
 require 'doodle'
+require "yaml"
+require "pp"
 
 class Location < Doodle::Base
   has :name, :kind => String
@@ -35,4 +36,27 @@ event = Event "Festival" do
   end
 end
 
-pp event
+str = event.to_yaml
+puts str
+loaded_event = YAML::load(str)
+pp loaded_event
+
+another_event = YAML::load(DATA.read)
+another_event.validate!(true)
+
+__END__
+--- !ruby/object:Event 
+date: 2000-04-01
+locations: 
+- !ruby/object:Location 
+  events: []
+
+  name: The muddy field
+- !ruby/object:Location 
+  events: 
+  - !ruby/object:Event 
+    locations: []
+
+    name: Drinking
+  name: Beer tent
+name: Festival

data/lib/doodle.rb

@@ -638,29 +638,32 @@ module Doodle
     private :ivar_defined?
 
     # validate this object by applying all validations in sequence
-    def validate!
-      #d# d { [:validate!, self] }
+    # - if all == true, validate all attributes, e.g. when loaded from YAML
+    def validate!(all = false)
+      #Doodle::Debug.d { [:validate!, self] }
+      #Doodle::Debug.d { [:validate!, self, __doodle__.validation_on] }
       if __doodle__.validation_on
         attributes.each do |name, att|
-          # d { [:validate!, self, self.class, att.name, att.default_defined? ] }
-          #p collect_inherited(:attributes)
           # treat default as special case
           if att.name == :default || att.default_defined?
+            # nop
           elsif !ivar_defined?(att.name)
             raise ArgumentError, "#{self} missing required attribute '#{name}'", [caller[-1]]
           end
+          # if all == true, validate all attributes - e.g. when loaded from YAML
+          if all
+            att.validate(send(att.name))
+          end
         end
 
         validations.each do |v|
-          #d# d { [:validate!, self, v ] }
+          Doodle::Debug.d { [:validate!, self, v ] }
           if !instance_eval(&v.block)
-            #        if !instance_eval{ v.block.call(self) }
             raise ValidationError, "#{ self.inspect } must #{ v.message }", [caller[-1]]
           end
         end
       end
     end
-    private :validate!
 
     # turn off validation, execute block, then set validation to same
     # state as it was before +defer_validation+ was called - can be nested

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-12 00:00:00 +00:00
+date: 2008-03-15 00:00:00 +00:00
 default_executable: 
 dependencies: []