doodle 0.0.7 → 0.0.8

data/examples/event-location.rb

@@ -41,8 +41,12 @@ puts str
 loaded_event = YAML::load(str)
 pp loaded_event
 
-another_event = YAML::load(DATA.read)
-another_event.validate!(true)
+str =<<EOS
+--- !ruby/object:Event
+name: Glastonbury
+date: 2000-07-01
+EOS
+event = YAML::load(str).validate! # will raise Doodle::ValidationError
 
 __END__
 --- !ruby/object:Event 

data/lib/doodle.rb

@@ -696,14 +696,15 @@ module Doodle
           if att.name == :default || att.default_defined?
             # nop
           elsif !ivar_defined?(att.name)
-            handle_error name, ArgumentError, "#{self} missing required attribute '#{name}'", [caller[-1]]
+            handle_error name, Doodle::ValidationError, "#{self} missing required attribute '#{name}'", [caller[-1]]
           end
-          # if all == true, validate all attributes - e.g. when loaded from YAML
+          # if all == true, reset values so conversions and validations are applied to raw instance variables
+          # e.g. when loaded from YAML
           if all
-            att.validate(send(att.name))
+            send(att.name, instance_variable_get("@#{att.name}"))
           end
         end
-
+        # now apply instance level validations
         validations.each do |v|
           #Doodle::Debug.d { [:validate!, self, v ] }
           if !instance_eval(&v.block)
@@ -776,7 +777,10 @@ module Doodle
         mklass = class << klass; self; end
         #p [:names, klass, mklass]
         #eval src = "def #{ names.join('::') }::#{name}(*args, &block); #{ names.join('::') }::#{name}.new(*args, &block); end"
-        klass.class_eval src = "def self.#{name}(*args, &block); #{name}.new(*args, &block); end"
+        # TODO: check how many times this is being called
+        if !klass.respond_to?(name)
+          klass.class_eval(src = "def self.#{name}(*args, &block); #{name}.new(*args, &block); end")
+        end
       end
       #p [:factory, mklass, klass, src]
     end

data/spec/bugs_spec.rb

@@ -18,4 +18,63 @@ describe 'Doodle', 'parents' do
       foo.validations.size.should == 1
     end
   end
+end
+
+describe 'Doodle', ' loading good data from yaml' do
+  temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle::Base
+        has :date, :kind => Date do
+          from String do |s|
+            Date.parse(s)
+          end
+        end
+      end      
+      @str = %[
+      --- !ruby/object:Foo
+      date: "2000-7-01"
+      ]
+      
+    end
+
+    it 'should succeed without validation' do
+      proc { foo = YAML::load(@str)}.should_not raise_error
+    end
+
+    it 'should validate ok' do
+      proc { foo = YAML::load(@str).validate! }.should_not raise_error
+    end
+  
+    it 'should apply conversions' do
+      foo = YAML::load(@str).validate!
+      foo.date.should == Date.new(2000, 7, 1)
+      foo.date.class.should == Date
+    end
+  end
+end
+
+describe 'Doodle', ' loading bad data from yaml' do
+  temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle::Base
+        has :date, :kind => Date do
+          from String do |s|
+            Date.parse(s)
+          end
+        end
+      end
+      @str = %[
+      --- !ruby/object:Foo
+      date: "2000"
+      ]      
+    end
+
+    it 'should succeed without validation' do
+      proc { foo = YAML::load(@str)}.should_not raise_error
+    end
+
+    it 'should fail with ConversionError when it cannot convert' do
+      proc { foo = YAML::load(@str).validate! }.should raise_error(Doodle::ConversionError)
+    end
+  end
 end

data/spec/defaults_spec.rb

@@ -67,8 +67,8 @@ describe Doodle, 'defaults which have not been set' do
       end
     end
 
-    it 'should raise error if required attributes not passed to new' do
-      proc { foo = Foo.new }.should raise_error(ArgumentError)
+    it 'should raise Doodle::ValidationError if required attributes not passed to new' do
+      proc { foo = Foo.new }.should raise_error(Doodle::ValidationError)
     end
 
     it 'should not raise error if required attributes passed to new' do
@@ -124,8 +124,8 @@ describe Doodle, "overriding inherited defaults" do
       text.value.should == 'any'
     end
   
-    it 'should raise ArgumentError if initialized without all required values' do
-      proc { KeyValue.new(:value => 'Enter name:') }.should raise_error(ArgumentError)
+    it 'should raise Doodle::ValidationError if initialized without all required values' do
+      proc { KeyValue.new(:value => 'Enter name:') }.should raise_error(Doodle::ValidationError)
     end
   
     it 'should allow initialization using inherited defaults' do

data/spec/required_spec.rb

@@ -9,8 +9,8 @@ describe Doodle, 'defaults which have not been set' do
       end
     end
 
-    it 'should have raise error if required value not set' do
-      proc { Foo.new }.should raise_error(ArgumentError)
+    it 'should raise Doodle::ValidationError if required value not set' do
+      proc { Foo.new }.should raise_error(Doodle::ValidationError)
     end
   end
 end

metadata

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