doodle 0.1.9 → 0.2.0

data/spec/serialization_spec.rb

@@ -1,10 +1,11 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'yaml'
 
+# TODO: add more complex (e.g. nested doodles) scenarios here
 describe Doodle, "Serialization" do
   temporary_constant :Foo do
     before :each do
-      class Foo < Doodle
+      class ::Foo < Doodle
         has :var, :kind => Integer
       end
       @foo = Foo 42 
@@ -14,9 +15,8 @@ describe Doodle, "Serialization" do
     end
     
     it "should be serializable to yaml" do
-      # is this a bug in the MRI yaml implementation? why the space after Foo?
       # (note: all on one line to pass coverage)
-      RUBY_PLATFORM == 'java' ? @foo.to_yaml.should == "--- !ruby/object:Foo\nvar: 42\n" : @foo.to_yaml.should == "--- !ruby/object:Foo \nvar: 42\n"
+      @foo.to_yaml.should == "--- !ruby/object:Foo \nvar: 42\n"
     end
     
     it "should be loadable from yaml" do

data/spec/spec.template

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'yaml'
+
+describe 'Doodle', '' do
+  temporary_constant :Foo do
+    before :each do
+      class Foo < Doodle
+        has :ivar1, :kind => String
+      end
+    end
+    
+    it 'should behave' do
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -51,4 +51,8 @@ def remove_ivars(*args)
   args.each do |ivar|
     remove_instance_variable "@#{ivar}"
   end
-end 
+end
+
+def no_error(&block)
+  proc(&block).should_not raise_error
+end

data/spec/to_hash_spec.rb

@@ -4,7 +4,7 @@ require 'yaml'
 describe 'Doodle', 'block initialization of scalar attributes' do
   temporary_constant :Foo, :Bar, :Farm, :Barn, :Animal do
     before :each do
-      class Animal < Doodle
+      class ::Animal < Doodle
         has :species
       end
       class Barn < Doodle
@@ -20,7 +20,7 @@ describe 'Doodle', 'block initialization of scalar attributes' do
         has :block, :kind => Proc
       end
     end
-    
+
     it 'should initialize an scalar attribute from a block' do
       farm = Farm do
         barn do
@@ -30,6 +30,16 @@ describe 'Doodle', 'block initialization of scalar attributes' do
       farm.to_hash.should_be( {:barn=>{:animals=>[{:species=>"pig"}]}} )
       farm.to_string_hash.should_be( {"barn"=>{"animals"=>[{"species"=>"pig"}]}} )
     end
+
+    it 'should do something sensible with Proc-valued attributes' do
+      pending
+      source_block = proc { puts "hello" }
+      b = Bar do
+        block(&source_block)
+      end
+      b.to_hash.should_be( { :block => source_block } )
+    end
+
   end
 end
 

data/spec/validation2_spec.rb

@@ -4,7 +4,7 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
 shared_code = proc do
-  class DateRange < Doodle
+  class ::DateRange < Doodle
     has :start_date, :kind => Date do
       from String do |s|
         Date.parse(s)
@@ -63,13 +63,13 @@ end
       before :each, &shared_code
       before :each do
 
-        class DerivedDateRange < DateRange
+        class ::DerivedDateRange < DateRange
         end
 
-        class SecondLevelDerivedDateRange < DateRange
+        class ::SecondLevelDerivedDateRange < DateRange
         end
 
-        @klass = self.class.const_get(klass)
+        @klass = Object.const_get(klass)
         @meth = @klass.method(:new)
 
       end
@@ -155,13 +155,13 @@ end
     temporary_constants :AttributeDate, :Base, :DateRange, :DerivedDateRange, :SecondLevelDerivedDateRange do
       before :each, &shared_code
       before :each do
-        class DerivedDateRange < DateRange
+        class ::DerivedDateRange < DateRange
         end
 
-        class SecondLevelDerivedDateRange < DateRange
+        class ::SecondLevelDerivedDateRange < DateRange
         end
 
-        @klass = self.class.const_get(klass)
+        @klass = Object.const_get(klass)
         @dr = @klass.new
       end
   
@@ -179,13 +179,13 @@ end
     temporary_constants :AttributeDate, :Base, :DateRange, :DerivedDateRange, :SecondLevelDerivedDateRange do
       before :each, &shared_code
       before :each do
-        class DerivedDateRange < DateRange
+        class ::DerivedDateRange < DateRange
         end
 
-        class SecondLevelDerivedDateRange < DateRange
+        class ::SecondLevelDerivedDateRange < DateRange
         end
 
-        @klass = self.class.const_get(klass)
+        @klass = Object.const_get(klass)
         @dr = @klass.new
       end
 

data/spec/validation_spec.rb

@@ -5,7 +5,7 @@ describe :DateRange, 'validation & conversions' do
     
     before :each do
 
-      class DateRange < Doodle
+      class ::DateRange < Doodle
         has :start_date, :kind => Date do
           Doodle::Debug.d { [:start_date, self, self.class] }
           from String do |s|

data/spec/xml_spec.rb

@@ -0,0 +1,219 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'doodle/xml'
+
+describe Doodle, 'xml serialization within a module' do
+  temporary_constants :Container, :Base, :Slideshow, :Layout do
+    before(:each) do
+      @xml_source = '<Slideshow id="1" name="test"><Layout template="generic" /></Slideshow>'
+      module ::Container
+        class Base < Doodle
+          include Doodle::XML
+        end
+        class Layout < Base
+          has :template
+        end
+        class Slideshow < Base
+          has :id, :kind => Integer do
+            from String do |s|
+              s.to_i
+            end
+          end
+          has :name, :kind => String
+          has Layout
+        end
+      end
+    end
+    it 'should serialize to xml' do
+      slideshow = Container::Slideshow.new do
+        id 1
+        name "test"
+        layout "generic"
+      end
+      slideshow.to_xml.should_be @xml_source
+    end
+    it 'should serialize from xml' do
+      slideshow = Container::Slideshow.new do
+        id 1
+        name "test"
+        layout "generic"
+      end
+      ss2 = Doodle::XML.from_xml(Container, @xml_source)
+      ss2.should_be slideshow
+    end
+  end
+end
+
+describe Doodle, 'xml serialization at top level' do
+  temporary_constants :Base, :Slideshow, :Layout do
+    before(:each) do
+      @xml_source = '<Slideshow id="1" name="test"><Layout template="generic" /></Slideshow>'
+      class ::Base < Doodle
+        include Doodle::XML
+      end
+      class ::Layout < Base
+        has :template
+      end
+      class ::Slideshow < Base
+        has :id, :kind => Integer do
+          from String do |s|
+            s.to_i
+          end
+        end
+        has :name, :kind => String
+        has Layout
+      end
+    end
+    it 'should serialize to xml' do
+      slideshow = ::Slideshow.new do
+        id 1
+        name "test"
+        layout "generic"
+      end
+      slideshow.to_xml.should_be @xml_source
+    end
+    it 'should serialize from xml' do
+      slideshow = ::Slideshow.new do
+        id 1
+        name "test"
+        layout "generic"
+      end
+      ss2 = Doodle::XML.from_xml(Object, @xml_source)
+      ss2.should_be slideshow
+    end
+  end
+end
+
+describe Doodle, 'if default specified before required attributes, they are ignored if defined in block' do
+  temporary_constant :Address do
+    before :each do
+      class Address < Doodle
+        include Doodle::XML
+        has :where, :default => "home"
+        has :city
+      end
+    end
+
+    it 'should raise an error that required attributes have not been set' do
+      proc {
+        Address do
+          city "London"
+        end
+      }.should_not raise_error
+    end
+
+    it 'should define required attributes' do
+      a = Address do
+        city "London"
+      end
+      a.city.should_be "London"
+    end
+
+    it 'should output required attributes in XML' do
+      a = Address do
+        city "London"
+      end
+      a.to_xml.should_be '<Address city="London" />'
+    end
+  end
+end
+
+describe Doodle, 'if default specified before required attributes, they are ignored if defined in block #2' do
+  temporary_constant :Base, :City, :Address do
+    before :each do
+      class Base < Doodle
+        include Doodle::XML
+      end
+      class City < Base
+        has :_text_
+        has :country, :default => "UK"
+      end
+      class Address < Base
+        has :where, :default => "home"
+        has City
+      end
+    end
+
+    it 'should output required tags in XML' do
+      a = Address do
+        city "London"
+      end
+      a.to_xml.should_be '<Address><City>London</City></Address>'
+    end
+
+    it 'should output specified optional attributes as xml attributes if kind not a doodle class' do
+      a = Address :where => 'home' do
+        city "London"
+      end
+      a.to_xml.should_be %[<Address where="home"><City>London</City></Address>]
+    end
+
+    it 'should output specified optional attributes' do
+      a = Address :where => 'home' do
+        city "London", :country => "England" do
+          country "UK"
+        end
+      end
+      a.to_xml.should_be %[<Address where="home"><City country="UK">London</City></Address>]
+    end
+
+  end
+
+end
+
+describe Doodle, 'if default specified before required attributes, they are ignored if defined in block #2' do
+  temporary_constant :Base, :City, :Address, :Country do
+    before :each do
+
+      @country_example = %[<Address where="home"><City>London<Country>UK</Country></City></Address>]
+
+      class ::Base < Doodle
+        include Doodle::XML
+      end
+      class ::Country < Base
+        has :_text_
+      end
+      class ::City < Base
+        has :_text_
+        has Country, :default => "UK"
+      end
+      class ::Address < Base
+        has :where, :default => "home"
+        has City
+      end
+    end
+
+    it 'should output required tags in XML' do
+      a = Address do
+        city "London"
+      end
+      a.to_xml.should_be '<Address><City>London</City></Address>'
+    end
+
+    it 'should output specified optional attributes' do
+      a = Address :where => 'home' do
+        city "London"
+      end
+      a.to_xml.should_be %[<Address where="home"><City>London</City></Address>]
+    end
+
+    it 'should output specified optional attributes as tags if kind is a Doodle class' do
+      a = Address :where => 'home' do
+        city "London", :country => "England" do
+          country "UK"
+        end
+      end
+      a.to_xml.should_be @country_example
+    end
+
+    it 'should reconstruct object graph from xml source' do
+      a = Address :where => 'home' do
+        city "London", :country => "England" do
+          country "UK"
+        end
+      end
+      a.to_xml.should_be @country_example
+      b = Doodle::XML.from_xml(Base, a.to_xml)
+      b.should_be a
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: doodle
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sean O'Halpin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 +00:00
+date: 2009-03-02 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,6 +68,7 @@ files:
 - lib/doodle/rfc822.rb
 - lib/doodle/utils.rb
 - lib/doodle/version.rb
+- lib/doodle/xml.rb
 - lib/molic_orderedhash.rb
 - log/debug.log
 - script/console
@@ -77,6 +78,7 @@ files:
 - setup.rb
 - spec/arg_order_spec.rb
 - spec/attributes_spec.rb
+- spec/block_init_spec.rb
 - spec/bugs_spec.rb
 - spec/class_spec.rb
 - spec/class_validation_spec.rb
@@ -86,21 +88,31 @@ files:
 - spec/defaults_spec.rb
 - spec/doodle_context_spec.rb
 - spec/doodle_spec.rb
+- spec/equality_spec.rb
 - spec/extra_args_spec.rb
 - spec/factory_spec.rb
 - spec/flatten_first_level_spec.rb
+- spec/from_spec.rb
+- spec/has_spec.rb
 - spec/inheritance_spec.rb
 - spec/init_spec.rb
+- spec/kind_spec.rb
+- spec/member_init_spec.rb
 - spec/new_doodle_spec.rb
+- spec/readonly_spec.rb
 - spec/required_spec.rb
 - spec/serialization_spec.rb
 - spec/singleton_spec.rb
 - spec/spec.opts
+- spec/spec.template
 - spec/spec_helper.rb
 - spec/specialized_attribute_class_spec.rb
 - spec/superclass_spec.rb
+- spec/symbolize_keys_spec.rb
+- spec/to_hash_spec.rb
 - spec/validation2_spec.rb
 - spec/validation_spec.rb
+- spec/xml_spec.rb
 - tasks/deployment.rake
 - tasks/environment.rake
 - tasks/rspec.rake
@@ -146,6 +158,7 @@ test_files:
 - spec/defaults_spec.rb
 - spec/doodle_context_spec.rb
 - spec/doodle_spec.rb
+- spec/equality_spec.rb
 - spec/extra_args_spec.rb
 - spec/factory_spec.rb
 - spec/flatten_first_level_spec.rb
@@ -155,6 +168,7 @@ test_files:
 - spec/init_spec.rb
 - spec/kind_spec.rb
 - spec/member_init_spec.rb
+- spec/modules_spec.rb
 - spec/new_doodle_spec.rb
 - spec/readonly_spec.rb
 - spec/required_spec.rb
@@ -166,3 +180,4 @@ test_files:
 - spec/to_hash_spec.rb
 - spec/validation2_spec.rb
 - spec/validation_spec.rb
+- spec/xml_spec.rb