xmlcodec 0.1.1 → 0.1.2

data/README

@@ -77,5 +77,5 @@ XMLCodec::XMLElement#partial_export.
 
 
 Author:
-  Pedro C�rte-Real
-  <pedrocr@gmail.com>
+  Pedro Côrte-Real
+  <pedro@pedrocr.net>

data/Rakefile

@@ -1,5 +1,5 @@
 PKG_NAME = 'xmlcodec'
-PKG_VERSION = '0.1.1'
+PKG_VERSION = '0.1.2'
 
 require 'rake'
 require 'rake/testtask'
@@ -25,13 +25,13 @@ RDOC_EXTRA_FILES = ['README']
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = "Generic Importer/Exporter of XML formats"
+  s.homepage = "http://github.com/pedrocr/xmlcodec" 
   s.name = PKG_NAME
   s.version = PKG_VERSION
   s.author = 'Pedro Côrte-Real'
-  s.email = 'pedrocr@gmail.com'
+  s.email = 'pedro@pedrocr.net'
   s.requirements << 'none'
   s.require_path = 'lib'
-  s.autorequire = 'rake'
   s.files = PKG_FILES
   s.has_rdoc = true
   s.rdoc_options = RDOC_OPTIONS
@@ -42,8 +42,6 @@ EOF
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_zip = true
-  pkg.need_tar = true
 end
 
 Rake::TestTask.new do |t|

data/test/partial_export_test.rb

@@ -1,107 +1,92 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class TestPartialExport < Test::Unit::TestCase
-  def validate_well_formed(filename)
-		assert(system("rxp", "-xs", filename))
-	end
-
-  def compare_xpath(value, filename, path)
-		assert_equal(value.strip, XMLUtils::select_path(path, filename).strip)
-	end
-
   def test_simple
-    @filename = 'test_partial_export_simple.xml'
     value = "somevalue"
   
-    file = File.open(filepath, "w")
-    sel = SimpleElement.new(value)
-    sel.partial_export(file)
-    file.close
-  
-    validate_well_formed(filepath)
-    compare_xpath(value, filepath, "/abc")
+    with_temp_file do |file|
+      sel = SimpleElement.new(value)
+      sel.partial_export(file)
+    end
+      
+    validate_well_formed
+    compare_xpath(value, "/abc")
   end
   
   def test_double
     value = 'somevalue'
-    @filename = 'test_partial_export_double.xml'
     
-    file = File.open(filepath, "w")
-    sel = SimpleElement.new(value)
-    el = TestElement.new
-    el.abc = sel
-    
-    sel.partial_export(file)
-    el.end_partial_export(file)
-    file.close
-    
-    validate_well_formed(filepath)
-    compare_xpath(value, filepath, "/subel/abc")
+    with_temp_file do |file|
+      sel = SimpleElement.new(value)
+      el = TestElement.new
+      el.abc = sel
+      
+      sel.partial_export(file)
+      el.end_partial_export(file)
+    end
+    
+    validate_well_formed
+    compare_xpath(value, "/subel/abc")
   end
   
   def test_triple
     value = 'somevalue'
-    @filename = 'test_partial_export_double.xml'
-    
-    file = File.open(filepath, "w")
-    sel = SimpleElement.new(value)
-    el1 = TestElement.new
-    el2 = TestElement.new
-    el1.subel = el2
-    el2.abc = sel
     
-    sel.partial_export(file)
-    el1.end_partial_export(file)
-    file.close
-    
-    validate_well_formed(filepath)
-    compare_xpath(value, filepath, "/subel/subel/abc")
+    with_temp_file do |file|
+      sel = SimpleElement.new(value)
+      el1 = TestElement.new
+      el2 = TestElement.new
+      el1.subel = el2
+      el2.abc = sel
+      
+      sel.partial_export(file)
+      el1.end_partial_export(file)
+    end
+    
+    validate_well_formed
+    compare_xpath(value, "/subel/subel/abc")
   end
   
   def test_attr
     value = 'somevalue'
-    @filename = 'test_partial_export_double.xml'
-    
-    file = File.open(filepath, "w")
-    el = TestElement.new
-    el.someattr = value
     
-    el.partial_export(file)
-    file.close
+    with_temp_file do |file|
+      el = TestElement.new
+      el.someattr = value
+
+      el.partial_export(file)
+    end
     
-    compare_xpath(value, filepath, "/subel/@someattr")
+    compare_xpath(value, "/subel/@someattr")
   end
   
   def test_mult
     value1 = 'somevalue1'
     value2 = 'somevalue2'
-    @filename = 'test_partial_export_mult.xml'
-    
-    file = File.open(filepath, "w")
-    sel1 = SimpleElement.new(value1)
-    sel2 = SimpleElement.new(value2)
-    
-    el = SubelMultElement.new
-    el.abc << sel1    
-    sel1.partial_export(file)
-    
-    el.abc << sel2
-    sel2.partial_export(file)
-    el.end_partial_export(file)
-    
-    file.close
     
-    validate_well_formed(filepath)
-    compare_xpath(value1, filepath, "/mult/abc[1]")
-    compare_xpath(value2, filepath, "/mult/abc[2]")
+    with_temp_file do |file|
+      sel1 = SimpleElement.new(value1)
+      sel2 = SimpleElement.new(value2)
+      
+      el = SubelMultElement.new
+      el.abc << sel1    
+      sel1.partial_export(file)
+      
+      el.abc << sel2
+      sel2.partial_export(file)
+      el.end_partial_export(file)
+    end
+    
+    validate_well_formed
+    compare_xpath(value1, "/mult/abc[1]")
+    compare_xpath(value2, "/mult/abc[2]")
   end
   
   def test_subelements
     value1 = 'somevalue1'
     value2 = 'somevalue2'
-    @filename = 'test_partial_export_subelements.xml'
     
-    file = File.open(filepath, "w")
+    with_temp_file do |file|
     sel1 = SimpleElement.new(value1)
     sel2 = SimpleElement.new(value2)
     
@@ -113,58 +98,53 @@ class TestPartialExport < Test::Unit::TestCase
     sel2.partial_export(file)
     el.end_partial_export(file)
     
-    file.close
+    end
     
-    validate_well_formed(filepath)
-    compare_xpath(value1, filepath, "/subels/abc[1]")
-    compare_xpath(value2, filepath, "/subels/abc[2]")
+    validate_well_formed
+    compare_xpath(value1, "/subels/abc[1]")
+    compare_xpath(value2, "/subels/abc[2]")
   end
   
   def test_subelements_multiple
     value1 = 'somevalue1'
     value2 = 'somevalue2'
-    @filename = 'test_partial_export_subelements2.xml'
-    
-    file = File.open(filepath, "w")
-    sel1 = SimpleElement.new(value1)
-    sel2 = SimpleElement.new(value2)
-    
-    el = SubelElement.new
-    el.subelements << sel1
-    el.subelements << sel2
-    el.partial_export(file)
-    
-    file.close
     
-    validate_well_formed(filepath)
-    compare_xpath(value1, filepath, "/subels/abc[1]")
-    compare_xpath(value2, filepath, "/subels/abc[2]")
+    with_temp_file do |file|
+      sel1 = SimpleElement.new(value1)
+      sel2 = SimpleElement.new(value2)
+      
+      el = SubelElement.new
+      el.subelements << sel1
+      el.subelements << sel2
+      el.partial_export(file)
+    end
+    
+    validate_well_formed
+    compare_xpath(value1, "/subels/abc[1]")
+    compare_xpath(value2, "/subels/abc[2]")
   end
   
   def test_recursive
-    @filename = 'test_partial_export_recursive.xml'
-    file = File.open(filepath, "w")
-    
     value = 'somevalue'
-  
-    rec1 = Recursive.new
-    rec1.start_partial_export(file)
-    
-    rec2 = Recursive.new
-    rec1.recursive << rec2
-    rec2.start_partial_export(file)
-    
-    rec3 = Recursive.new
-    rec2.recursive << rec3
-    rec3.start_partial_export(file)
-    
-    sel = SimpleElement.new(value)
-    sel.start_partial_export(file)
-    rec3.abc = sel
-    
-    rec1.end_partial_export(file)
-    
-    file.close
-    validate_well_formed(filepath)
+
+    with_temp_file do |file|
+      rec1 = Recursive.new
+      rec1.start_partial_export(file)
+      
+      rec2 = Recursive.new
+      rec1.recursive << rec2
+      rec2.start_partial_export(file)
+      
+      rec3 = Recursive.new
+      rec2.recursive << rec3
+      rec3.start_partial_export(file)
+      
+      sel = SimpleElement.new(value)
+      sel.start_partial_export(file)
+      rec3.abc = sel
+      
+      rec1.end_partial_export(file)    
+    end
+    validate_well_formed
   end
 end

data/test/test_helper.rb

@@ -5,7 +5,25 @@ require File.dirname(__FILE__) + '/simple_objects'
 
 
 class Test::Unit::TestCase
-  def filepath
-    File.join(Dir::tmpdir, @filename)
+  def with_temp_file
+    callname = Regexp.new("`(.*?)'").match(caller[0])[1]
+    @temp_path = File.join(Dir::tmpdir, callname+".xml")
+    File.open(@temp_path, "w") do |file|
+      yield file
+    end
   end
+
+  def validate_well_formed
+    filename = filename || @temp_path
+    assert(system("xmllint --version > /dev/null 2>&1"), 
+           "xmllint utility not installed"+
+           "(on ubuntu/debian install package libxml2-utils)")      
+		assert(system("xmllint #{filename} >/dev/null"), 
+           "Validation failed for #{filename}")
+	end
+
+  def compare_xpath(value, path)
+    filename = filename || @temp_path
+		assert_equal(value.strip, XMLUtils::select_path(path, filename).strip)
+	end
 end

data/test/utils_test.rb

@@ -16,29 +16,29 @@ class TestXMLUtils < Test::Unit::TestCase
   
   def test_get_xpath
     opts = {}
-    assert_xpath_equal('abc', '//xpto', '<xpto>abc<xpto>')
+    assert_xpath_equal('abc', '//xpto', '<xpto>abc</xpto>')
     
-    assert_xpath_equal('abc', '//xpto', '<xpto>abc<xpto2>foo</xpto2><xpto>')
+    assert_xpath_equal('abc', '//xpto', '<xpto>abc<xpto2>foo</xpto2></xpto>')
     
     opts[:with_attrs] = true
     opts[:recursive] = false
     opts[:multiple] = false
-    assert_xpath_equal('attr1 abc', '//xpto', '<xpto attr1="attr1">abc<xpto2>foo</xpto2><xpto>', opts)
+    assert_xpath_equal('attr1 abc', '//xpto', '<xpto attr1="attr1">abc<xpto2>foo</xpto2></xpto>', opts)
     
     opts[:with_attrs] = false
     opts[:recursive] = true
     opts[:multiple] = false
-    assert_xpath_equal('abc foo', '//xpto', '<xpto>abc<xpto2 attr1="attr1">foo</xpto2><xpto>', opts)
+    assert_xpath_equal('abc foo', '//xpto', '<xpto>abc<xpto2 attr1="attr1">foo</xpto2></xpto>', opts)
     
     opts[:with_attrs] = true
     opts[:recursive] = true
     opts[:multiple] = false
-    assert_xpath_equal('abc attr1 foo', '//xpto', '<xpto>abc<xpto2 attr1="attr1">foo</xpto2><xpto>', opts)
+    assert_xpath_equal('abc attr1 foo', '//xpto', '<xpto>abc<xpto2 attr1="attr1">foo</xpto2></xpto>', opts)
     
     opts[:with_attrs] = false
     opts[:recursive] = false
     opts[:multiple] = true
-    assert_xpath_equal('abc foo', '//xpto', '<xpto>abc<xpto attr1="attr1">foo</xpto><xpto>', opts)
+    assert_xpath_equal('abc foo', '//xpto', '<xpto>abc<xpto attr1="attr1">foo</xpto></xpto>', opts)
   end
   
   def assert_xpath_equal(result, path, xml, opts={})

metadata

@@ -1,65 +1,88 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: xmlcodec
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-09-12 00:00:00 +01:00
-summary: Generic Importer/Exporter of XML formats
-require_paths: 
-- lib
-email: pedrocr@gmail.com
-homepage: 
-rubyforge_project: 
-description: A library that eases the creation of XML importers and exporters for ruby.
-autorequire: rake
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - "Pedro C\xC3\xB4rte-Real"
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2010-09-14 00:00:00 +01:00
+default_executable: 
+dependencies: []
+
+description: |
+  A library that eases the creation of XML importers and exporters for ruby.
+
+email: pedro@pedrocr.net
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
 files: 
-- test/multi_format_test.rb
+- test/partial_export_test.rb
+- test/subelements_test.rb
 - test/utils_test.rb
+- test/test_helper.rb
+- test/multi_format_test.rb
 - test/stream_parser_test.rb
 - test/element_test.rb
-- test/partial_export_test.rb
 - test/simple_objects.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/subelements.rb
+- lib/XMLUtils.rb
 - lib/xmlcodec.rb
+- lib/stream_object_parser.rb
+- lib/stream_parser.rb
 - README
 - LICENSE
 - Rakefile
-test_files: []
+has_rdoc: true
+homepage: http://github.com/pedrocr/xmlcodec
+licenses: []
 
+post_install_message: 
 rdoc_options: 
 - -S
 - -w 2
 - -N
-extra_rdoc_files: 
-- README
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: 
 - none
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.3.7
+signing_key: 
+specification_version: 3
+summary: Generic Importer/Exporter of XML formats
+test_files: []