doodle 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.5 / 2008-05-06
+- Bug fixes:
+  - fixed bug where defaults were preventing validation working when loading from 
+    YAML and added spec
+
 == 0.1.4 / 2008-05-06
 - Features:
   - keyed collections - see http://doodle.rubyforge.org/#keyed_collections for details

data/examples/example-01.rb

@@ -12,6 +12,6 @@ class DateRange < Doodle
 end
 
 dr = DateRange.new
-dr.start_date                   # => #<Date: 4908855/2,0,2299161>
-dr.end_date                     # => #<Date: 4908855/2,0,2299161>
+dr.start_date                   # => #<Date: 4909185/2,0,2299161>
+dr.end_date                     # => #<Date: 4909185/2,0,2299161>
 

data/lib/doodle.rb

@@ -774,11 +774,6 @@ class Doodle
           ##DBG: Doodle::Debug.d { [:validate!, "using instance_attributes", attributes] }
         end
         attribs.each do |name, att|
-          # treat default as special case
-          if att.default_defined?
-            ##DBG: Doodle::Debug.d { [:validate!, "default_defined - breaking" ]}
-            break
-          end
           ivar_name = "@#{att.name}"
           if instance_variable_defined?(ivar_name)
             # if all == true, reset values so conversions and
@@ -788,10 +783,14 @@ class Doodle
               ##DBG: Doodle::Debug.d { [:validate!, :sending, att.name, instance_variable_get(ivar_name) ] }
               __send__("#{att.name}=", instance_variable_get(ivar_name))
             end
+          elsif att.optional?   # treat default/init as special case
+            ##DBG: Doodle::Debug.d { [:validate!, :optional, name ]}
+            break
           elsif self.class != Class
             handle_error name, Doodle::ValidationError, "#{self} missing required attribute '#{name}'", [caller[-1]]
           end
         end
+        
         # now apply instance level validations
         
         ##DBG: Doodle::Debug.d { [:validate!, "validations", validations ]}

data/lib/doodle/version.rb

@@ -2,7 +2,7 @@ class Doodle #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/bugs_spec.rb

@@ -80,6 +80,33 @@ describe 'Doodle', ' loading bad data from yaml' do
   end
 end
 
+describe 'Doodle', 'loading bad data from yaml with default defined' do
+  temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle
+        has :date, :kind => Date do
+          default Date.today
+          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
+
 describe Doodle, 'class attributes:' do
   temporary_constant :Foo do
     before :each do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Sean O'Halpin