doodle 0.0.4 → 0.0.5

data/spec/flatten_first_level_spec.rb

@@ -1,6 +1,4 @@
-$:.unshift(File.join(File.dirname(__FILE__), '../.'))
-
-require 'lib/doodle'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe 'flatten_first_level' do
 
@@ -26,6 +24,9 @@ describe 'flatten_first_level' do
       [1, [2, 3]],
       ]
   end
+  after :each do
+    remove_ivars :data, :results
+  end
 
   it 'should flatten first level' do
     @data.zip(@results).each do |input, result|

data/spec/init_spec.rb

@@ -1,57 +1,53 @@
-$:.unshift(File.join(File.dirname(__FILE__), '../.'))
-require 'lib/spec_helper'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe Doodle, 'init' do
+  temporary_constant :Foo do
   
-  before(:each) do
-    raise_if_defined :Foo
-    class Foo
-      include Doodle::Helper
-      has :name, :init => 'D1'
-      class << self
-        has :metadata, :init => 'D2'
+    before(:each) do
+      class Foo
+        include Doodle::Helper
+        has :name, :init => 'D1'
+        class << self
+          has :metadata, :init => 'D2'
+        end
+      end
+      @foo = Foo.new
+      class << @foo
+        has :special, :init => 'D3'
       end
     end
-    @foo = Foo.new
-    class << @foo
-      has :special, :init => 'D3'
-    end
-  end
-  after :each do
-    undefine_const :Foo
-  end    
   
-  it 'should have instance attribute init via class' do
-    Foo.attributes[:name].init.should == 'D1'
-  end
-  it 'should have instance attribute init via instance' do
-    @foo.attributes[:name].init.should == 'D1'
-  end
-  it 'should have class attribute init via class.singleton_class' do
-    Foo.singleton_class.attributes(false)[:metadata].init.should == 'D2'
-  end
-  it 'should have class attribute init via class.singleton_class' do
-    Foo.singleton_class.attributes[:metadata].init.should == 'D2'
-  end
-  it 'should have singleton attribute init via instance.singleton_class' do
-    @foo.singleton_class.attributes(false)[:special].init.should == 'D3'
-  end
-  it 'should have singleton attribute init via instance.singleton_class' do
-    @foo.singleton_class.attributes[:special].init.should == 'D3'
-  end
-  it 'should have an attribute :name from init' do
-    @foo.name.should == 'D1'
-  end
-  it 'should have an instance_variable for attribute :name' do
-    @foo.instance_variables.include?('@name').should == true
-  end
-  it 'should have an initialized class attribute :metadata' do
-    pending 'deciding how this should work'
-    Foo.metadata.should == 'D2'
-  end
-  it 'should have an initialized singleton attribute :special' do
-    pending 'deciding how this should work'
-    @foo.special.should == 'D3'
+    it 'should have instance attribute init via class' do
+      Foo.attributes[:name].init.should == 'D1'
+    end
+    it 'should have instance attribute init via instance' do
+      @foo.attributes[:name].init.should == 'D1'
+    end
+    it 'should have class attribute init via class.singleton_class' do
+      Foo.singleton_class.attributes(false)[:metadata].init.should == 'D2'
+    end
+    it 'should have class attribute init via class.singleton_class' do
+      Foo.singleton_class.attributes[:metadata].init.should == 'D2'
+    end
+    it 'should have singleton attribute init via instance.singleton_class' do
+      @foo.singleton_class.attributes(false)[:special].init.should == 'D3'
+    end
+    it 'should have singleton attribute init via instance.singleton_class' do
+      @foo.singleton_class.attributes[:special].init.should == 'D3'
+    end
+    it 'should have an attribute :name from init' do
+      @foo.name.should == 'D1'
+    end
+    it 'should have an instance_variable for attribute :name' do
+      @foo.instance_variables.include?('@name').should == true
+    end
+    it 'should have an initialized class attribute :metadata' do
+      pending 'deciding how this should work'
+      #Foo.metadata.should == 'D2'
+    end
+    it 'should have an initialized singleton attribute :special' do
+      pending 'deciding how this should work'
+      #@foo.special.should == 'D3'
+    end
   end
 end
-raise_if_defined :Foo

data/spec/required_spec.rb

@@ -1,25 +1,17 @@
-$:.unshift(File.join(File.dirname(__FILE__), '../.'))
-
-require 'lib/spec_helper'
-require 'date'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe Doodle, 'defaults which have not been set' do
-  after :each do
-    undefine_const(:Foo)
-  end
-  before :each do
-    raise_if_defined :Foo
-
-    class Foo < Doodle::Base
-      has :baz
-      has :start do
-        default { Date.today }
+  temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle::Base
+        has :baz
+        has :start, :default => 1
       end
     end
-  end
 
-  it 'should have raise error if required value not set' do
-    proc { Foo.new }.should raise_error(ArgumentError)
+    it 'should have raise error if required value not set' do
+      proc { Foo.new }.should raise_error(ArgumentError)
+    end
   end
 end
 

data/spec/serialization_spec.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'yaml'
+
+describe Doodle, "Serialization" do
+  temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle::Base
+        has :var, :kind => Integer
+      end
+      @foo = Foo 42 
+    end
+    after :each do
+      remove_ivars :foo
+    end
+    
+    it "should be serializable to yaml" do
+      @foo.to_yaml.should == "--- !ruby/object:Foo \nvar: 42\n"
+    end
+    
+    it "should be loadable from yaml" do
+      src = @foo.to_yaml
+      new_foo = YAML::load(src)
+      new_foo.var.should == 42
+    end
+    
+    it "should make it possible to validate already set instance variables" do
+      new_foo = YAML::load("--- !ruby/object:Foo \nvar: Hello World!\n")
+      proc { new_foo.validate!(true) }.should raise_error(Doodle::ValidationError)
+    end
+    
+  end
+end

data/spec/superclass_spec.rb

@@ -1,27 +1,24 @@
-require 'lib/spec_helper'
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
-describe 'Doodle', 'singleton superclass == self' do
-  after :each do
-    undefine_const(:Foo)
-  end
-  before :each do
-    raise_if_defined :Foo
-
-    class Foo < Doodle::Base
+describe 'Doodle', 'parents' do
+  temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle::Base
+      end
+      @foo = Foo.new
+      @sc = class << @foo; self; end
+      @scc = class << @sc; self; end
+      @sclass_doodle_root = class << Doodle::Base; self; end
+      @sclass_foo = class << @foo; class << self; self; end; end
     end
-    @foo = Foo.new
-    @sc = class << @foo; self; end
-    @scc = class << @sc; self; end
-    @sclass_doodle_root = class << Doodle::Base; self; end
-    @sclass_foo = class << @foo; class << self; self; end; end
-  end
   
-  it 'should have singleton class superclass == self' do
-    @sc.parents.should == [@sclass_foo, @sclass_doodle_root]
-  end
+    it 'should have singleton class parents == class, doodle root' do
+      @sc.parents.should == [@sclass_foo, @sclass_doodle_root]
+    end
 
-  it 'should have singleton class superclass == self' do
-    @scc.parents.should == []
+    it "should have singleton class's singleton class parents == []" do
+      @scc.parents.should == []
+    end
   end
 end
 

data/spec/validation_spec.rb

@@ -1,108 +1,99 @@
-$:.unshift(File.join(File.dirname(__FILE__), '../.'))
-
-require 'lib/spec_helper'
-require 'date'
-
+require File.dirname(__FILE__) + '/spec_helper.rb'
 
 describe :DateRange, 'validation & conversions' do
-  after :each do
-    undefine_const :DateRange
-    undefine_const :Base
-    undefine_const :ClassMethods
-  end
-  before :each do
-    raise_if_defined :Base, :ClassMethods, :DateRange
-  
-    module ClassMethods
-      def date(*a, &b)
-#        if a.size > 0
-          name = a.shift
-#        else
-#          name = :date
-#        end
-        td = has(name, :kind => Date, *a) do
-          # it is a bit clumsy to define these conversions &
-          # conditions for every attribute/typedef - could define a
-          # subclass of Typedef which does this by default (so we
-          # instances can override or defer to class level conversions
-          # and conditions)
-          from String do |s|
-            Date.parse(s)
-          end
-          from Array do |y,m,d|
-            #p [:from, Array, y, m, d]
-            Date.new(y, m, d)
-          end
-          from Integer do |jd|
-            Doodle::Debug.d { [:converting_from, Integer, jd] }
-            Date.new(*Date.jd_to_civil(jd))
+  temporary_constants :Base, :DateRange, :ClassMethods do
+    
+    before :each do
+      module ClassMethods
+        def date(*a, &b)
+  #        if a.size > 0
+            name = a.shift
+  #        else
+  #          name = :date
+  #        end
+          td = has(name, :kind => Date, *a) do
+            # it is a bit clumsy to define these conversions &
+            # conditions for every attribute/typedef - could define a
+            # subclass of Typedef which does this by default (so we
+            # instances can override or defer to class level conversions
+            # and conditions)
+            from String do |s|
+              Date.parse(s)
+            end
+            from Array do |y,m,d|
+              #p [:from, Array, y, m, d]
+              Date.new(y, m, d)
+            end
+            from Integer do |jd|
+              Doodle::Debug.d { [:converting_from, Integer, jd] }
+              Date.new(*Date.jd_to_civil(jd))
+            end
           end
+          Doodle::Debug.d { [:date, td] }
+          td.instance_eval(&b) if block_given? # user's block should override default
         end
-        Doodle::Debug.d { [:date, td] }
-        td.instance_eval(&b) if block_given? # user's block should override default
       end
-    end
 
-    class Base < Doodle::Base
-      extend ClassMethods
-    end
+      class Base < Doodle::Base
+        extend ClassMethods
+      end
 
-    class DateRange < Base
-      date :start_date do
-        Doodle::Debug.d { [:start_date, self, self.class] }
-        default { Date.today }
-        must "be >= 2007-01-01" do |d|
-          d >= Date.new(2007, 01, 01)
+      class DateRange < Base
+        date :start_date do
+          Doodle::Debug.d { [:start_date, self, self.class] }
+          default { Date.today }
+          must "be >= 2007-01-01" do |d|
+            d >= Date.new(2007, 01, 01)
+          end
+        end
+        date :end_date do
+          default { start_date }
+        end
+        must "have end_date >= start_date" do
+          end_date >= start_date
         end
-      end
-      date :end_date do
-        default { start_date }
-      end
-      must "have end_date >= start_date" do
-        end_date >= start_date
       end
     end
-  end
   
-  it 'should not raise an exception if end_date >= start_date' do
-    proc { DateRange.new('2007-01-01', '2007-01-02') }.should_not raise_error
-  end
+    it 'should not raise an exception if end_date >= start_date' do
+      proc { DateRange.new('2007-01-01', '2007-01-02') }.should_not raise_error
+    end
   
-  it 'should raise an exception if end_date < start_date' do
-    proc { DateRange.new('2007-01-02', '2007-01-01') }.should raise_error
-  end
+    it 'should raise an exception if end_date < start_date' do
+      proc { DateRange.new('2007-01-02', '2007-01-01') }.should raise_error
+    end
 
-  it 'should raise an exception if end_date < start_date' do
-    proc { DateRange.new('2007-01-01', '2007-01-01') }.should_not raise_error
-  end
+    it 'should raise an exception if end_date < start_date' do
+      proc { DateRange.new('2007-01-01', '2007-01-01') }.should_not raise_error
+    end
 
-  it 'should have start_date kind == Date' do
-    d = DateRange.new
-    d.attributes[:start_date].kind == Date
-  end
+    it 'should have start_date kind == Date' do
+      d = DateRange.new
+      d.attributes[:start_date].kind == Date
+    end
 
-  it 'should have two validations' do
-    d = DateRange.new
-    d.attributes[:start_date].validations.size.should == 2    
-    d.attributes[:start_date].validations(false).size.should == 2
-  end
+    it 'should have two validations' do
+      d = DateRange.new
+      d.attributes[:start_date].validations.size.should == 2    
+      d.attributes[:start_date].validations(false).size.should == 2
+    end
 
-  it 'should have two conversions' do
-    d = DateRange.new
-    d.attributes[:start_date].conversions.size.should == 3    
-    d.attributes[:start_date].conversions(false).size.should == 3
-  end
+    it 'should have two conversions' do
+      d = DateRange.new
+      d.attributes[:start_date].conversions.size.should == 3    
+      d.attributes[:start_date].conversions(false).size.should == 3
+    end
 
-  it 'should convert from Array' do
-    d = DateRange.new [2007,01,01], [2007,01,02]
-    d.start_date.should == Date.new(2007,01,01)
-    d.end_date.should == Date.new(2007,01,02)
-  end
+    it 'should convert from Array' do
+      d = DateRange.new [2007,01,01], [2007,01,02]
+      d.start_date.should == Date.new(2007,01,01)
+      d.end_date.should == Date.new(2007,01,02)
+    end
   
-  it 'should convert Integer representing Julian date to Date' do
-    d = DateRange.new 2454428, 2454429
-    d.start_date.should == Date.new(2007,11,23)
-    d.end_date.should == Date.new(2007,11,24)
+    it 'should convert Integer representing Julian date to Date' do
+      d = DateRange.new 2454428, 2454429
+      d.start_date.should == Date.new(2007,11,23)
+      d.end_date.should == Date.new(2007,11,24)
+    end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-15 00:00:00 +00:00
+date: 2008-03-16 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
@@ -26,16 +26,12 @@ extra_rdoc_files:
 files: 
 - lib/doodle.rb
 - lib/molic_orderedhash.rb
-- lib/spec_helper.rb
 - examples/event-location.rb
 - examples/event.rb
 - examples/event1.rb
 - examples/event2.rb
 - examples/example-01.rb
-- examples/example-01.rdoc
 - examples/example-02.rb
-- examples/example-02.rdoc
-- examples/foo.rb
 - README
 - COPYING
 - ChangeLog
@@ -68,12 +64,15 @@ summary: Declarative attribute definitions, validations and conversions
 test_files: 
 - spec/arg_order_spec.rb
 - spec/attributes_spec.rb
+- spec/bugs_spec.rb
 - spec/class_spec.rb
+- spec/collector_spec.rb
 - spec/conversion_spec.rb
 - spec/defaults_spec.rb
 - spec/doodle_spec.rb
 - spec/flatten_first_level_spec.rb
 - spec/init_spec.rb
 - spec/required_spec.rb
+- spec/serialization_spec.rb
 - spec/superclass_spec.rb
 - spec/validation_spec.rb