raxb 0.1 → 0.2

data/lib/raxb.rb

@@ -3,7 +3,7 @@ require 'rexml/element'
 
 module RAXB
   
-  # This function is used to create a RAXB object from a source doucment (either 
+  # This function is used to create a RAXB object from a source document (either 
   # REXML::Document, or anything accepted by the REXML::Document constructor).
   def unmarshal(source)
     if source.kind_of? REXML::Element
@@ -19,10 +19,15 @@ module RAXB
   
   class ElementList < Array
     def initialize(parent, name)
+      super()
       @parent = parent
       @name = name
     end
     
+    def <<(element)
+      self[0] << element
+    end
+    
     def [](i)
       if i == size
         if i == 1 and !at(0).exists?
@@ -44,20 +49,20 @@ module RAXB
         rexml = element.to_rexml.dup
         @parent.to_rexml.elements[i+1] = rexml        
         fill Element.new(rexml, @parent, true), i, 1
-      elsif i = size
-        @parent.__attach__ element  
-        e = Element.new(@name, element)
-        push e
-        return e
+      # QUESTION should this be included?
+#      elsif i = size
+#        @parent.__attach__ element.to_rexml
+#        push(element)
       else
         raise "Index out of bounds: (#{i}) when size=#{size}"
       end
     end
-    
+        
     def method_missing( name, *args )
       name = name.to_s
       self[0].send( name, *args )
     end
+
   end
   
   class Element  
@@ -79,7 +84,10 @@ module RAXB
       return @rexml
     end
     
-    def get_elements(name)
+    def get_elements(name)         
+      # TODO have the namespace carry through if it is provided... unless false
+      # is specified as the second param
+      
       out = __create_new_list__ name
       @rexml.each_element( name ) do |elem|
         out.push( __wrap__( elem ) )
@@ -89,7 +97,7 @@ module RAXB
     
     def get_attribute(name)
       return @rexml.attributes[ name ].to_s
-    end  
+    end      
     
     def text
       return @rexml.text
@@ -97,6 +105,10 @@ module RAXB
     
     def text=(t)
       @rexml.text=t
+      create!
+    end
+    
+    def create!
       if @parent and !@attached
         @parent.__attach__ @rexml
         @attached = true
@@ -109,10 +121,12 @@ module RAXB
     
     def __attach__(element)
       @rexml.add element
-      if @parent and !@attached
-        @parent.__attach__ @rexml
-        @attached = true
-      end
+      create!
+    end
+    
+    def <<(element)
+      @rexml.add_element element.to_rexml
+      create!
     end
     
     def method_missing(name,*args, &block)  
@@ -120,14 +134,17 @@ module RAXB
       if name.gsub!(/=$/,"")   
         if name.gsub!( ATTRIBUTE_RE, "" )
           @rexml.attributes[name] = args[0]
+          create!
         else
-          elems = self.send(name)
-          elems[0] = args[0]        
+          raise 'Element setting is not supported yet'
+#          elems = self.send(name)
+#          elems[0] = args[0]        
         end
       else
         if name.gsub!( ATTRIBUTE_RE, "" )
           return get_attribute(name)
         else
+          name = "#{args[0]}:#{name}" if args[0]          
           elems = get_elements(name)
           if elems.empty?
             e = REXML::Element.new(name) 
@@ -142,6 +159,15 @@ module RAXB
       return @rexml.to_s
     end
     
+    # QUESTION do we need these
+#    def dup
+#      return __wrap__(@rexml.dup, false)
+#    end
+#    
+#    def clone
+#      return __wrap__(@rexml.clone, false)
+#    end
+    
     private 
     def __create_new_list__(name)
       ElementList.new self, name

data/tests/test.rb

@@ -1,3 +1,6 @@
+$LOAD_PATH << File.join(File.dirname(__FILE__), '../lib/')
+
+require 'rubygems'
 require 'raxb'
 require 'test/unit'
 
@@ -18,15 +21,16 @@ class SimpleTest < Test::Unit::TestCase
     assert_equal test1.to_s, test2.to_s
   end
   
-  def test_1
-    test1 = unmarshal('<test><foo><bar>hello</bar></foo></test>')    
-    test2 = unmarshal("<test><etc></etc></test>")  
-    
-    test2.etc = test1.foo
-    
-    assert_equal test1.to_s, test2.to_s
-    assert_equal test2.etc.exists?, false
-  end
+  # TODO? element setting
+#  def test_1
+#    test1 = unmarshal('<test><foo><bar>hello</bar></foo></test>')    
+#    test2 = unmarshal("<test><etc></etc></test>")  
+#    
+#    test2.etc = test1.foo
+#    
+#    assert_equal test1.to_s, test2.to_s
+#    assert_equal test2.etc.exists?, false
+#  end
   
   def test_2
     test1 = unmarshal('<test><foo>hello</foo><foo>bonjour</foo></test>')    
@@ -36,25 +40,25 @@ class SimpleTest < Test::Unit::TestCase
     
     assert_equal test1.foo[0].text, 'hello'
     assert_equal test1.foo[1].text, 'hola'
-    assert_equal test1.foo[2].exists?, false    
+    assert_equal false, test1.foo[2].exists?
     assert_equal test2.foo.text, 'hola'
   end
   
   def test_3
-    test1 = unmarshal('<test><foo><bar>hello</bar></foo></test>')    
+    s = '<test><foo><bar>hello</bar></foo></test>'
+    test1 = unmarshal(s)    
     test2 = unmarshal("<test></test>")  
     
-    test2.etc = test1.foo
+    test2 << test1.foo
     
-    assert_equal test1.to_s, test2.to_s
-    assert_equal test2.etc.exists?, false
+    assert_equal s, test2.to_s
   end
   
   def test_4
     test = unmarshal('<test><foo><bar>hello</bar></foo></test>')    
     test.foo._taxi = 'cab'
     
-    assert_equal test.foo._taxi, 'cab'
+    assert_equal 'cab', test.foo._taxi
   end
   
   def test_5
@@ -69,4 +73,39 @@ class SimpleTest < Test::Unit::TestCase
     
     assert_equal rexml.to_s, rexml2.to_s
   end
+  
+  def test_6
+    test = create "test"
+    
+    test.foo.text = 'hello'
+    
+    a = create "foo" 
+    a.text = 'hola'
+    
+    test << a
+    
+    assert_equal 'hello', test.foo[0].text
+    assert_equal 'hola',  test.foo[1].text
+    assert_equal false, test.foo[2].exists?
+  end
+  
+  def test_7
+    test = create "test"
+    
+    test.foo._bar = 'hello'
+    
+    assert test.foo.exists?
+    assert_equal 'hello', test.foo._bar
+  end
+  
+  def test_8
+    ja = Element.new('JobAnnouncement')
+    jaDutyLocation = Element.new('DutyLocation')  
+    jaDutyLocation.Location.text = 'hello'     
+    ja.DutyLocations << jaDutyLocation
+    
+    assert ja.DutyLocations.exists?
+    assert ja.DutyLocations.DutyLocation.exists?
+    assert_equal 'hello', ja.DutyLocations.DutyLocation.Location.text
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: raxb
 version: !ruby/object:Gem::Version 
-  version: "0.1"
-date: 2008-03-18 00:00:00 -05:00
+  version: "0.2"
+date: 2008-06-16 00:00:00 -05:00
 summary: Ruby API for XML Binding
 require_paths: 
 - lib