xmlcodec 0.0.5 → 0.1.0

data/Rakefile

@@ -1,10 +1,11 @@
 PKG_NAME = 'xmlcodec'
-PKG_VERSION = '0.0.5'
+PKG_VERSION = '0.1.0'
 
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rcov/rcovtask'
 require 'rubygems'
 
 task :default => ['test']
@@ -46,10 +47,7 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/Test*.rb']
-  t.libs = ['../lib','..']
-  t.ruby_opts = ['-xtest']
+  t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end
 
@@ -74,6 +72,13 @@ task :stats do
   puts "Code to test ratio: 1:%.2f" % ratio
 end
 
+Rcov::RcovTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb']
+  t.output_dir = 'test/coverage'
+  t.verbose = true
+end
+
 def count_lines(files)
   code = 0
   comments = 0

data/lib/{XMLElement.rb → element.rb}

@@ -1,7 +1,7 @@
-require 'XMLStreamObjectParser'
-require 'XMLSubElements'
-
 module XMLCodec
+  class ElementClassNotFound < RuntimeError
+  end
+
   # This class should be inherited from to create classes that are able to
   # import and export XML elements and their children. It provides three main
   # functions: xmlattr, xmlsubel and xmlsubel_mult.
@@ -61,8 +61,7 @@ module XMLCodec
       attr_reader name
       define_method((name.to_s+"=").to_sym) { |value|
         if value.is_a? String or value.is_a? Fixnum
-          elclass = XMLCodec::XMLElement.get_element_class(name)
-          value = elclass.new(value)
+          value = self.class.get_element_class(name).new(value)
         end
         value.__parent = self if value
         instance_variable_set "@#{name}", value
@@ -182,6 +181,18 @@ module XMLCodec
         end
         @subelements
       }
+      define_method('<<') {|value|
+        subelements << value
+      }
+      define_method(:find_first_named) {|name|
+        subelements.find_first_named(name)
+      }
+      define_method('[]') {|name|
+        subelements.find_first_named(name)
+      }
+      define_method(:find_all_named) {|name|
+        subelements.find_all_named(name)
+      }
       define_method(:has_subelements?) {true}
     end
   
@@ -191,8 +202,15 @@ module XMLCodec
       attr_accessor name
     end
     
-    # This is the hash that gives classes for the element names that are declared.
-    ElClasses = {}
+    # Defines a new xml format (like XHTML or DocBook). This should be used in 
+    # a class that's the super class of all the elements of a format
+    def self.xmlformat(name=nil)
+      class_variable_set('@@elclasses', {})
+    end
+    
+    def self.elclasses
+      class_variable_get('@@elclasses')
+    end
     
     # Sets the element name for the element
     def self.elname(name)
@@ -202,10 +220,10 @@ module XMLCodec
     # Sets several element names for the element
     def self.elnames(*names)
       define_method(:elname){names[0].to_sym}
-    
+
       eln = get_elnames
       names.each {|n| eln << n}
-      names.each {|n| ElClasses[n.to_sym] = self}
+      names.each {|n| elclasses[n.to_sym] = self}
     end
     
     # Returns the list of element names for the element
@@ -218,7 +236,11 @@ module XMLCodec
     # be used for elements that contain only text and no subelements
     def self.elwithvalue
       define_method(:hasvalue?){true}
-      define_method(:initialize){|value| @value = value}
+      self.class_eval do
+        def initialize(value=nil)
+          @value = value
+        end
+      end
       attr_accessor :value
     end
   
@@ -247,17 +269,20 @@ module XMLCodec
     end
     
     # Which level of indentation are we in?
-    def indent_level
-      if not self.instance_variables.index '@indent_level'
-        curr = self
-        level = 0
-        while curr = curr.__parent
-          level +=1
-        end
-        @indent_level = level 
-      end
-      @indent_level
-    end
+    #
+    # This is currently disabled until I get around to implementing proper and 
+    # tested indent support.
+    #def indent_level
+    #  if not self.instance_variables.index '@indent_level'
+    #    curr = self
+    #    level = 0
+    #    while curr = curr.__parent
+    #      level +=1
+    #    end
+    #    @indent_level = level 
+    #  end
+    #  @indent_level
+    #end
     
     # Iterate all of the subelements
     # We copy everything into an array and iterate that because #each doesn't
@@ -303,23 +328,25 @@ module XMLCodec
     # with the whitespace that should precede every line. Extra levels of
     # indentation can be passed so that a caller can calculate the whitespace
     # to indent an element X levels deeper than this one.
-    def indentation(extra=0)
-      INDENT_STR*(indent_level+extra)
-    end
+    #
+    # This is currently disabled until I get around to implementing proper and 
+    # tested indent support.
+    #def indentation(extra=0)
+    #  INDENT_STR*(indent_level+extra)
+    #end
   
     # Gets the class for a certain element name.
     def self.get_element_class(name)
-      cl = ElClasses[name.to_sym]
+      cl = elclasses[name.to_sym]
   	  if not cl
-  		  raise "No class defined for element type: '" + name.to_s + "'"
+  		  raise ElementClassNotFound, "No class defined for element type: '" + name.to_s + "'"
   		end
   		cl
     end
     
     # Gets the possible element names for a certain element.
     def self.get_element_names(name)
-      cl = get_element_class(name)
-      [name.to_s]+cl.get_elnames
+      get_element_class(name).get_elnames
     end
     
     # Method that checks if a given class has subelements. This is usually only
@@ -378,7 +405,7 @@ module XMLCodec
     # Import the XML directly from the text. This call receives the text and the
     # classes that should be used to import the subelements.
     def self.import_xml_text(text)
-      parser = XMLStreamObjectParser.new(ElClasses)
+      parser = XMLStreamObjectParser.new(self)
       parser.parse(text)
       parser.top_element
     end

data/lib/{XMLStreamObjectParser.rb → stream_object_parser.rb}

@@ -1,5 +1,4 @@
 require "rexml/document"
-require "XMLUtils"
 
 module XMLCodec
   # This class is used internally by the parser to store the information about
@@ -62,7 +61,8 @@ module XMLCodec
   # XMLSOParserElement#consume.
   class XMLStreamObjectParser
     # Create a new parser with a listener.
-    def initialize(listener=nil)
+    def initialize(base_element, listener=nil)
+      @base_element = base_element
       @listener = listener
       @children = Hash.new([])
       @currel = 0
@@ -77,7 +77,7 @@ module XMLCodec
     end
 
     def get_elclass(name)
-      XMLCodec::XMLElement.get_element_class(name)
+      @base_element.get_element_class(name)
     end
     
     def curr_element

data/lib/{XMLStreamParser.rb → stream_parser.rb}

@@ -1,5 +1,4 @@
 require "rexml/document"
-require "XMLUtils"
 
 module XMLUtils
   class XMLSParserContents
@@ -15,10 +14,6 @@ module XMLUtils
       add(content)
     end
     
-    def array_from(start)
-      @contents[start..-1]
-    end
-    
     def text_from(start)
       @contents[start..-1].join
     end

data/lib/{XMLSubElements.rb → subelements.rb}

@@ -1,5 +1,3 @@
-require 'XMLUtils'
-
 module XMLCodec
   # A simple element that has only text inside. This is used inside 
   # XMLSubElements to be able to directly add strings to it and have them be 
@@ -38,6 +36,10 @@ module XMLCodec
       start_partial_export(file)
       end_partial_export(file)
     end
+    
+    def elname
+      '__TEXT__'
+    end
   end
   
   # This is the container class used to hold the elements for the xmlsubelements
@@ -51,13 +53,17 @@ module XMLCodec
       @parent = parent
     end
     
-  private
-    # Get the class for a given element name
-    def elclass(name)
-      XMLElement.get_element_class(name)
+  public
+    # Returns the first element in the collection with the given element name
+    def find_first_named(name)
+      self.find {|el| el.elname.to_s == name.to_s}
+    end
+    
+    # Returns the elements in the collection with the given element name
+    def find_all_named(name)
+      self.find_all {|el| el.elname.to_s == name.to_s}
     end
   
-  public
     # Adds a value to the collection. The value may be either a String or a 
     # descendant of XMLElement. If it's a string it's converted into a 
     # XMLTextElement
@@ -84,17 +90,6 @@ module XMLCodec
       @elements.each{|e| e.create_xml(parent)}
     end
     
-    # Import the XML of all the elements
-    def import_xml(xmlelements)
-      xmlelements.each do |xmlel|
-        if xmlel.kind_of? REXML::Text
-          self << xmlel.to_s
-        else
-          self << elclass(xmlel.name.to_sym).import_xml(xmlel)
-        end
-      end
-    end
-    
     # Iterate all the values in the collection
     def each
       @elements.dup.each {|e| yield e}

data/lib/xmlcodec.rb

@@ -1,4 +1,5 @@
-require 'XMLElement'
-require 'XMLUtils'
-require 'XMLStreamObjectParser'
-require 'XMLStreamParser'
+require File.dirname(__FILE__) + '/XMLUtils'
+require File.dirname(__FILE__) + '/element'
+require File.dirname(__FILE__) + '/subelements'
+require File.dirname(__FILE__) + '/stream_object_parser'
+require File.dirname(__FILE__) + '/stream_parser'

data/test/{TestXMLElement.rb → element_test.rb}

@@ -1,7 +1,5 @@
-require 'test/unit'
-require 'xmlcodec'
+require File.dirname(__FILE__) + '/test_helper'
 require 'rexml/document'
-require 'simple_objects'
 
 class TestXMLElement < Test::Unit::TestCase
   def test_xmlsubel
@@ -83,6 +81,50 @@ class TestXMLElement < Test::Unit::TestCase
     assert_equal value, el.subelements[0].value
   end
   
+  # Test using "somelement << addsomething" instead of 
+  # "somelement.subelements << addsomething"
+  def test_xmlsubelements_direct
+    value = 'test'
+    el = SubelElement.new
+    sel = SimpleElement.new(value)
+    
+    el << sel
+    assert_equal(sel, el.subelements[0])
+  end
+  
+  def test_find_first
+    value = 'test'
+    el = SubelElement.new
+    sel = SimpleElement.new(value)
+    
+    el << sel
+    assert_equal(sel, el.find_first_named('abc'))
+    assert_equal(sel, el['abc'])
+  end
+  
+  def test_find_all
+    value = 'test'
+    el = SubelElement.new
+    sel = SimpleElement.new(value)
+    sel2 = SimpleElement.new(value)
+    
+    el << sel
+    el << sel2
+    assert_equal([sel,sel2], el.find_all_named('abc'))
+  end
+  
+  def test_find_all_with_texts
+    value = 'test'
+    el = SubelElement.new
+    sel = SimpleElement.new(value)
+    sel2 = SimpleElement.new(value)
+    
+    el << sel
+    el << 'some text'
+    el << sel2
+    assert_equal([sel,sel2], el.find_all_named('abc'))
+  end
+  
   def test_xmlsubel_mult
     value1 = 'test'
     value2 = 'test2'
@@ -174,4 +216,35 @@ class TestXMLElement < Test::Unit::TestCase
     assert_equal 0, el.subelements.size
     assert_nil el.subelements[0]
   end
+  
+  def test_elwithvalue_methods
+    v = 'Some Value'
+    
+    el = ValueElement.new
+    el.value = v
+    assert_equal v, el.value
+    
+    el = ValueElement.new(v)
+    assert_equal v, el.value
+  end
+  
+  def test_auto_conversion_from_string
+    v = 'Some Value'
+    vparent = ValueParent.new
+    vparent.valueelement = v
+    assert_kind_of ValueElement, vparent.valueelement
+    assert_equal vparent.valueelement.value, v
+  end
+  
+  def test_get_element_class
+    assert_equal SimpleElement, BaseFormat.get_element_class('abc')
+    assert_equal SimpleElement, BaseFormat.get_element_class(:abc)
+    assert_raise ElementClassNotFound do 
+      BaseFormat.get_element_class(:nosuchclass)
+    end
+  end
+  
+  def test_get_element_names
+    assert_equal ['abc'], BaseFormat.get_element_names('abc')
+  end
 end

data/test/multi_format_test.rb

@@ -0,0 +1,68 @@
+require File.dirname(__FILE__) + '/test_helper'
+require 'rexml/document'
+
+class FirstFormat < XMLCodec::XMLElement
+  xmlformat 'First Format'
+end
+
+class FirstRoot < FirstFormat
+  elname "root"
+  xmlsubel :child
+end
+
+class FirstChild < FirstFormat
+  elname "child"
+  xmlattr :value
+end
+
+class SecondFormat < XMLCodec::XMLElement
+  xmlformat 'Second Format'
+end
+
+class SecondRoot < SecondFormat
+  elname "root"
+  xmlsubel :child
+  xmlsubel :child2
+end
+
+class SecondChild < SecondFormat
+  elname "child"
+  elwithvalue
+end
+
+class SecondChild2 < SecondChild
+  elname "child2"
+  xmlattr :value2
+end
+
+# Test what happens when we define two different XML formats with xmlcodec that
+# have clashing element names
+class TestMultiFormat < Test::Unit::TestCase
+  def test_import_first
+    value = 'somevalue'
+    text = '<root><child value="'+value+'"></child></root>'
+    root = FirstFormat.import_xml_text(text)
+    assert_kind_of(FirstRoot, root)
+    assert_kind_of(FirstChild, root.child)
+    assert_equal value, root.child.value
+  end
+
+  def test_import_second
+    value = 'somevalue'
+    text = '<root><child>'+value+'</child></root>'
+    root = SecondFormat.import_xml_text(text)
+    assert_kind_of(SecondRoot, root)
+    assert_kind_of(SecondChild, root.child)
+    assert_equal value, root.child.value
+  end
+  
+  def test_double_inheritance
+    value = 'somevalue'
+    text = '<root><child2 value2="'+value+'">'+value+'</child2></root>'
+    root = SecondFormat.import_xml_text(text)
+    assert_kind_of(SecondRoot, root)
+    assert_kind_of(SecondChild2, root.child2)
+    assert_equal value, root.child2.value
+    assert_equal value, root.child2.value2
+  end
+end

data/test/{TestPartialExport.rb → partial_export_test.rb}

@@ -1,6 +1,4 @@
-require 'test/unit'
-require 'XMLUtils'
-require 'simple_objects'
+require File.dirname(__FILE__) + '/test_helper'
 
 class TestPartialExport < Test::Unit::TestCase
   def validate_well_formed(filename)
@@ -12,23 +10,23 @@ class TestPartialExport < Test::Unit::TestCase
 	end
 
   def test_simple
+    @filename = 'test_partial_export_simple.xml'
     value = "somevalue"
-    filename = 'test_partial_export_simple.xml'
   
-    file = File.open(filename, "w")
+    file = File.open(filepath, "w")
     sel = SimpleElement.new(value)
     sel.partial_export(file)
     file.close
   
-    validate_well_formed(filename)
-    compare_xpath(value, filename, "/abc")
+    validate_well_formed(filepath)
+    compare_xpath(value, filepath, "/abc")
   end
   
   def test_double
     value = 'somevalue'
-    filename = 'test_partial_export_double.xml'
+    @filename = 'test_partial_export_double.xml'
     
-    file = File.open(filename, "w")
+    file = File.open(filepath, "w")
     sel = SimpleElement.new(value)
     el = TestElement.new
     el.abc = sel
@@ -37,15 +35,15 @@ class TestPartialExport < Test::Unit::TestCase
     el.end_partial_export(file)
     file.close
     
-    validate_well_formed(filename)
-    compare_xpath(value, filename, "/subel/abc")
+    validate_well_formed(filepath)
+    compare_xpath(value, filepath, "/subel/abc")
   end
   
   def test_triple
     value = 'somevalue'
-    filename = 'test_partial_export_double.xml'
+    @filename = 'test_partial_export_double.xml'
     
-    file = File.open(filename, "w")
+    file = File.open(filepath, "w")
     sel = SimpleElement.new(value)
     el1 = TestElement.new
     el2 = TestElement.new
@@ -56,30 +54,30 @@ class TestPartialExport < Test::Unit::TestCase
     el1.end_partial_export(file)
     file.close
     
-    validate_well_formed(filename)
-    compare_xpath(value, filename, "/subel/subel/abc")
+    validate_well_formed(filepath)
+    compare_xpath(value, filepath, "/subel/subel/abc")
   end
   
   def test_attr
     value = 'somevalue'
-    filename = 'test_partial_export_double.xml'
+    @filename = 'test_partial_export_double.xml'
     
-    file = File.open(filename, "w")
+    file = File.open(filepath, "w")
     el = TestElement.new
     el.someattr = value
     
     el.partial_export(file)
     file.close
     
-    compare_xpath(value, filename, "/subel/@someattr")
+    compare_xpath(value, filepath, "/subel/@someattr")
   end
   
   def test_mult
     value1 = 'somevalue1'
     value2 = 'somevalue2'
-    filename = 'test_partial_export_mult.xml'
+    @filename = 'test_partial_export_mult.xml'
     
-    file = File.open(filename, "w")
+    file = File.open(filepath, "w")
     sel1 = SimpleElement.new(value1)
     sel2 = SimpleElement.new(value2)
     
@@ -93,17 +91,17 @@ class TestPartialExport < Test::Unit::TestCase
     
     file.close
     
-    validate_well_formed(filename)
-    compare_xpath(value1, filename, "/mult/abc[1]")
-    compare_xpath(value2, filename, "/mult/abc[2]")
+    validate_well_formed(filepath)
+    compare_xpath(value1, filepath, "/mult/abc[1]")
+    compare_xpath(value2, filepath, "/mult/abc[2]")
   end
   
   def test_subelements
     value1 = 'somevalue1'
     value2 = 'somevalue2'
-    filename = 'test_partial_export_subelements.xml'
+    @filename = 'test_partial_export_subelements.xml'
     
-    file = File.open(filename, "w")
+    file = File.open(filepath, "w")
     sel1 = SimpleElement.new(value1)
     sel2 = SimpleElement.new(value2)
     
@@ -117,17 +115,17 @@ class TestPartialExport < Test::Unit::TestCase
     
     file.close
     
-    validate_well_formed(filename)
-    compare_xpath(value1, filename, "/subels/abc[1]")
-    compare_xpath(value2, filename, "/subels/abc[2]")
+    validate_well_formed(filepath)
+    compare_xpath(value1, filepath, "/subels/abc[1]")
+    compare_xpath(value2, filepath, "/subels/abc[2]")
   end
   
   def test_subelements_multiple
     value1 = 'somevalue1'
     value2 = 'somevalue2'
-    filename = 'test_partial_export_subelements2.xml'
+    @filename = 'test_partial_export_subelements2.xml'
     
-    file = File.open(filename, "w")
+    file = File.open(filepath, "w")
     sel1 = SimpleElement.new(value1)
     sel2 = SimpleElement.new(value2)
     
@@ -138,14 +136,14 @@ class TestPartialExport < Test::Unit::TestCase
     
     file.close
     
-    validate_well_formed(filename)
-    compare_xpath(value1, filename, "/subels/abc[1]")
-    compare_xpath(value2, filename, "/subels/abc[2]")
+    validate_well_formed(filepath)
+    compare_xpath(value1, filepath, "/subels/abc[1]")
+    compare_xpath(value2, filepath, "/subels/abc[2]")
   end
   
   def test_recursive
-    filename = 'test_partial_export_recursive.xml'
-    file = File.open(filename, "w")
+    @filename = 'test_partial_export_recursive.xml'
+    file = File.open(filepath, "w")
     
     value = 'somevalue'
   
@@ -167,6 +165,6 @@ class TestPartialExport < Test::Unit::TestCase
     rec1.end_partial_export(file)
     
     file.close
-    validate_well_formed(filename)
+    validate_well_formed(filepath)
   end
 end

data/test/simple_objects.rb

@@ -1,17 +1,20 @@
-require 'XMLElement'
 include XMLCodec
 
-class SimpleElement < XMLElement
+class BaseFormat < XMLElement
+  xmlformat 'Base Format'
+end
+
+class SimpleElement < BaseFormat
   elwithvalue
   elname 'abc'
 end
 
-class SimpleElement2 < XMLElement
+class SimpleElement2 < BaseFormat
   elwithvalue
   elname 'abc1'
 end
 
-class SimpleElementMultName < XMLElement
+class SimpleElementMultName < BaseFormat
   elwithvalue
   elnames 'abc2', 'abc3'
   
@@ -27,7 +30,7 @@ class SimpleElementMultName < XMLElement
   end
 end
 
-class TestElement < XMLElement
+class TestElement < BaseFormat
   elname 'subel'
   xmlsubel :abc
   xmlsubel :abc2
@@ -35,19 +38,29 @@ class TestElement < XMLElement
   xmlattr :someattr
 end
 
-class SubelElement < XMLElement
+class SubelElement < BaseFormat
   elname 'subels'
   xmlsubelements
 end
 
-class SubelMultElement < XMLElement
+class SubelMultElement < BaseFormat
   elname 'mult'
   xmlsubel_mult :abc
   xmlsubel_mult 'abc2' # Use a string and a symbol so that both are checked
 end
 
-class Recursive < XMLElement
+class Recursive < BaseFormat
   elname 'recursive'
   xmlsubel :abc
   xmlsubel_mult :recursive
 end
+
+class ValueParent < BaseFormat
+  elname 'valueparent'
+  xmlsubel 'valueelement'
+end
+
+class ValueElement < BaseFormat
+  elwithvalue
+  elname 'valueelement'
+end

data/test/{TestXMLStreamObjectParser.rb → stream_object_parser_test.rb}

@@ -1,6 +1,4 @@
-require "test/unit"
-require "XMLStreamObjectParser"
-require 'simple_objects.rb'
+require File.dirname(__FILE__) + '/test_helper'
 
 include XMLCodec
 
@@ -44,7 +42,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<abc>'+value+'</abc>'
     
     listener = MyStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     el = listener.abc.get_object
     assert_equal el.value, value
@@ -56,7 +54,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<subel someattr="'+attrvalue+'"><abc>'+value+'</abc></subel>'
     
     listener = MyStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     
     el = listener.abc.get_object
@@ -72,7 +70,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<mult><abc>'+value+'</abc></mult>'
     
     listener = MyStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     
     el = listener.abc.get_object
@@ -85,7 +83,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<subels><abc>'+value+'</abc></subels>'
     
     listener = MyStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     
     el = listener.abc.get_object
@@ -98,7 +96,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<subel><abc>'+value+'</abc></subel>'
     
     listener = MyConsumingStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     
     el = listener.abc.get_object
@@ -112,7 +110,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<subels><abc2>'+value1+'</abc2><abc3>'+value2+'</abc3></subels>'
   
     listener = MyStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     
     el = listener.subels.get_object
@@ -129,7 +127,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<mult><abc2>'+value1+'</abc2><abc3>'+value2+'</abc3></mult>'
   
     listener = MyStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     
     el = listener.mult.get_object
@@ -145,7 +143,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<subel><abc3>'+value+'</abc3></subel>'
   
     listener = MyStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     
     el = listener.subel.get_object
@@ -159,7 +157,7 @@ class TestXMLStreamObjectParser < Test::Unit::TestCase
     file = '<subel><abc>'+value+'</abc></subel>'
     
     listener = MyStreamListener.new
-    parser = XMLStreamObjectParser.new(listener)
+    parser = XMLStreamObjectParser.new(BaseFormat, listener)
     parser.parse(file)
     
     el1 = listener.subel

data/test/{TestXMLStreamParser.rb → stream_parser_test.rb}

@@ -1,12 +1,9 @@
-$:.unshift File.join(File.dirname(__FILE__), "..")
-$-w = true
-
-require 'test/unit'
-require 'XMLStreamParser'
+require File.dirname(__FILE__) + '/test_helper'
 
 class MyXMLStreamListener
   attr_reader :def_id, :def_parent_id
   attr_reader :abc_id, :abc_parent_id
+  attr_reader :abc_content
   
   def el_def(el)
     @def_id, = el.element_id
@@ -17,6 +14,7 @@ class MyXMLStreamListener
   def el_abc(el)
     @abc_id, = el.element_id
     @abc_parent_id = el.parent_id
+    @abc_content = el.content
     el.consume
   end
 end
@@ -42,6 +40,7 @@ class TestXMLStreamParser < Test::Unit::TestCase
     assert_equal(listener.abc_id, listener.def_parent_id)
     assert_equal(0, listener.abc_parent_id)
     assert_equal(1, listener.abc_id)
+    assert_equal(@doc_no_def, listener.abc_content)
     assert(listener.def_id > listener.def_parent_id)
   end
   

data/test/subelements_test.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/test_helper'
+require 'stringio'
+require 'rexml/document'
+class TestXMLTextElement < Test::Unit::TestCase
+  def test_base
+    value = 'Some Value'
+    el = XMLTextElement.new value
+    assert_equal value, el.to_s
+    assert_equal value, el.xml_text
+  end
+  
+  def test_partial_export
+    io = StringIO.new
+    value = 'Some Value'
+    el = XMLTextElement.new value
+    el.partial_export(io)
+    io.pos = 0
+    assert_equal value, io.read
+  end
+  
+  def test_elname
+    el = XMLTextElement.new 'abc'
+    assert_equal '__TEXT__', el.elname
+  end
+  
+  def test_create_xml
+    xmlel = REXML::Element.new 'abc'
+    value = 'Some Value'
+    el = XMLTextElement.new value
+    el.create_xml(xmlel)
+    assert_equal '<abc>'+value+'</abc>', xmlel.to_s
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,11 @@
+require 'test/unit'
+require 'tmpdir'
+require File.dirname(__FILE__) + '/../lib/xmlcodec'
+require File.dirname(__FILE__) + '/simple_objects'
+
+
+class Test::Unit::TestCase
+  def filepath
+    File.join(Dir::tmpdir, @filename)
+  end
+end

data/test/{TestXMLUtils.rb → utils_test.rb}

@@ -1,7 +1,5 @@
-$:.unshift File.join(File.dirname(__FILE__), "..")
-
-require 'test/unit'
-require 'XMLUtils'
+require File.dirname(__FILE__) + '/test_helper'
+require 'tmpdir'
 
 class TestXMLUtils < Test::Unit::TestCase
   def test_create_open_tag
@@ -48,4 +46,22 @@ class TestXMLUtils < Test::Unit::TestCase
     assert_equal result, XMLUtils::get_xpath(path, StringIO.new(xml), opts)
     assert_equal result, XMLUtils::get_xpath(path, REXML::Document.new(xml), opts)
   end
+  
+  def test_count_elements
+    text = '<root><abc/><abc/></root>'
+    filename = File.join(Dir::tmpdir, 'test_count_elements.xml')
+    f = File.open(filename, 'w')
+    f << text
+    f.close
+    assert_equal 2, XMLUtils::count_elements('//abc', filename)
+  end
+  
+  def test_element_exists
+    text = '<root><abc/><abc/></root>'
+    filename = File.join(Dir::tmpdir, 'test_element_exists.xml')
+    f = File.open(filename, 'w')
+    f << text
+    f.close
+    assert XMLUtils::element_exists('//abc', filename)
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: xmlcodec
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
-date: 2006-07-20 00:00:00 +01:00
+  version: 0.1.0
+date: 2006-07-27 00:00:00 +01:00
 summary: Generic Importer/Exporter of XML formats
 require_paths: 
 - lib
@@ -29,17 +29,20 @@ post_install_message:
 authors: 
 - "Pedro C\xC3\xB4rte-Real"
 files: 
-- test/TestXMLStreamParser.rb
-- test/TestXMLElement.rb
-- test/TestPartialExport.rb
-- test/TestXMLUtils.rb
-- test/TestXMLStreamObjectParser.rb
+- test/multi_format_test.rb
+- test/utils_test.rb
+- test/stream_parser_test.rb
+- test/element_test.rb
+- test/partial_export_test.rb
 - test/simple_objects.rb
-- lib/XMLStreamParser.rb
-- lib/XMLElement.rb
-- lib/XMLStreamObjectParser.rb
-- lib/XMLSubElements.rb
+- test/stream_object_parser_test.rb
+- test/test_helper.rb
+- test/subelements_test.rb
+- lib/stream_parser.rb
 - lib/XMLUtils.rb
+- lib/subelements.rb
+- lib/element.rb
+- lib/stream_object_parser.rb
 - lib/xmlcodec.rb
 - README
 - LICENSE