libxml-ruby 0.9.5 → 0.9.6

data/test/tc_node.rb

@@ -1,45 +1,52 @@
-require "xml"
+require 'xml'
 require 'test/unit'
 
 class TestNode < Test::Unit::TestCase
   def setup
-    xp = XML::Parser.new()
-    str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
-    assert_equal(str, xp.string = str)
-    @doc = xp.parse
+    # Strip spaces to make testing easier
+    XML.default_keep_blanks = false
+    file = File.join(File.dirname(__FILE__), 'model/bands.xml')
+    @doc = XML::Document.file(file)
   end
   
   def teardown
+    XML.default_keep_blanks = true
     @doc = nil
   end
   
   def nodes
-    @doc.find('/ruby_array/fixnum')
+    # Find all nodes with a country attributes
+    @doc.find('*[@country]')
   end
 
   def test_doc_class
     assert_instance_of(XML::Document, @doc)
   end
-  
+
   def test_root_class
     assert_instance_of(XML::Node, @doc.root)
   end
-  
+
   def test_node_class
     for n in nodes
       assert_instance_of(XML::Node, n)
     end
   end
 
-  def test_find_class
-    set = @doc.find('/ruby_array/fixnum')
-    assert_instance_of(XML::XPath::Object, set)
+  def test_context
+    node = @doc.root
+    context = node.context
+    assert_instance_of(XML::XPath::Context, context)
+  end
+
+  def test_find
+    assert_instance_of(XML::XPath::Object, self.nodes)
   end
 
   def test_node_child_get
     assert_instance_of(TrueClass, @doc.root.child?)
     assert_instance_of(XML::Node, @doc.root.child)
-    assert_equal('fixnum', @doc.root.child.name)
+    assert_equal("m\303\266tley_cr\303\274e", @doc.root.child.name)
   end
 
   def test_node_doc
@@ -48,9 +55,9 @@ class TestNode < Test::Unit::TestCase
     end
   end
 
-  def test_node_type_name
-    assert_equal('element', nodes[0].node_type_name)
-    assert_equal('element', nodes[1].node_type_name)
+  def test_name
+    assert_equal("m\303\266tley_cr\303\274e", nodes[0].name)
+    assert_equal("iron_maiden", nodes[1].name)
   end
 
   def test_node_find
@@ -59,49 +66,50 @@ class TestNode < Test::Unit::TestCase
       assert_instance_of(XML::Node, node)
     end
   end
-  
+
   def test_equality
-    node_a = @doc.find('/ruby_array/fixnum').first
+    node_a = @doc.find_first('*[@country]')
     node_b = @doc.root.child
+
     assert(node_a == node_b)
     assert(node_a.eql?(node_b))
     assert(node_a.equal?(node_b))
-    
-    xp2 = XML::Parser.new()
-    xp2.string = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
-    doc2 = xp2.parse
 
-    node_a2 = doc2.find('/ruby_array/fixnum').first
-    
+    file = File.join(File.dirname(__FILE__), 'model/bands.xml')
+    doc2 = XML::Document.file(file)
+
+    node_a2 = doc2.find_first('*[@country]')
+
     assert(node_a.to_s == node_a2.to_s)
     assert(node_a == node_a2)
     assert(node_a.eql?(node_a2))
     assert(!node_a.equal?(node_a2))
   end
-      
+
   def test_equality_nil
     node = @doc.root
     assert(node != nil)
   end
-  
+
   def test_equality_wrong_type
     node = @doc.root
-    
+
     assert_raises(TypeError) do
       assert(node != 'abc')
     end
   end
 
-  def test_content()
-    assert_equal('onetwo', @doc.root.content)
-    
+  def test_content
+    assert_equal("An American heavy metal band formed in Los Angeles, California in 1981.British heavy metal band formed in 1975.",
+                 @doc.root.content)
+
     first = @doc.root.child
-    assert_equal('one', first.content)
-    assert_equal('two', first.next.content)
+    assert_equal('An American heavy metal band formed in Los Angeles, California in 1981.', first.content)
+    assert_equal('British heavy metal band formed in 1975.', first.next.content)
   end
-  
+
   def test_base
     doc = XML::Parser.string('<person />').parse
     assert_nil(doc.root.base)
   end
-end
+end

data/test/tc_node_copy.rb

@@ -5,7 +5,7 @@ require 'test/unit'
 # [libxml-devel] Segmentation fault when add the cloned/copied node
 # 2007/11/27 20:51
 
-class TC_XML_Node_Copy < Test::Unit::TestCase
+class TestNodeCopy < Test::Unit::TestCase
   def setup
     str = <<-STR
       <html><body>

data/test/tc_node_edit.rb

@@ -106,4 +106,10 @@ class TestNodeEdit < Test::Unit::TestCase
     assert_equal('<foo><bar/>bars contents</foo>',
                  node.to_s)
   end
+
+  def test_set_base
+    @doc.root.base = 'http://www.rubynet.org/'
+    assert_equal("<test xml:base=\"http://www.rubynet.org/\">\n  <num>one</num>\n  <num>two</num>\n  <num>three</num>\n</test>",
+                 @doc.root.to_s)
+  end
 end

data/test/tc_node_write.rb

@@ -0,0 +1,76 @@
+require 'xml'
+require 'test/unit'
+
+class TestNodeWrite < Test::Unit::TestCase
+  def setup
+    # Strip spaces to make testing easier
+    XML.default_keep_blanks = false
+    file = File.join(File.dirname(__FILE__), 'model/bands.xml')
+    @doc = XML::Document.file(file)
+  end
+  
+  def teardown
+    XML.default_keep_blanks = true
+    @doc = nil
+  end
+  
+  def test_to_s_default
+    # Default to_s has indentation
+    node = @doc.root
+    assert_equal("<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>",
+                 node.to_s)
+  end
+
+  def test_to_s_no_global_indentation
+    # No indentation due to global setting
+    node = @doc.root
+    XML.indent_tree_output = false
+    assert_equal("<bands genre=\"metal\">\n<m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n<iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>",
+                 node.to_s)
+  ensure
+    XML.indent_tree_output = true
+  end
+
+  def test_to_s_no_indentation
+    # No indentation due to local setting
+    node = @doc.root
+    assert_equal("<bands genre=\"metal\"><m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e><iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden></bands>",
+                 node.to_s(:indent => false))
+  end
+
+  def test_to_s_level
+    # No indentation due to local setting
+    node = @doc.root
+    assert_equal("<bands genre=\"metal\">\n    <m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n    <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n  </bands>",
+                 node.to_s(:level => 1))
+  end
+
+  def test_to_s_encoding
+    # Test encodings
+    node = @doc.root
+
+    # UTF8:
+    # ö - c3 b6 in hex, \303\266 in octal
+    # ü - c3 bc in hex, \303\274 in octal
+    assert_equal("<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>",
+                 node.to_s(:encoding => XML::Input::UTF_8))
+
+    # ISO_8859_1:
+    # ö - f6 in hex, \366 in octal
+    # ü - fc in hex, \374 in octal
+    assert_equal("<bands genre=\"metal\">\n  <m\366tley_cr\374e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>",
+                 node.to_s(:encoding => XML::Input::ISO_8859_1))
+
+
+    # Invalid encoding
+    error = assert_raise(ArgumentError) do
+      node.to_s(:encoding => -9999)
+    end
+    assert_equal('Unknown encoding.', error.to_s)
+  end
+
+  # --- Debug ---
+  def test_debug
+    assert(@doc.root.debug)
+  end
+end

data/test/tc_xinclude.rb

@@ -12,15 +12,8 @@ class TestXInclude < Test::Unit::TestCase
   end
 
   def test_ruby_xml_xinclude
-    expected = <<-EOS
-<?xml version="1.0"?>
-<document xmlns:xi="http://www.w3.org/2001/XInclude">
-  <p>This libxml2 binding has the following project information:
-   <code>This is some text to include in an xml file via XInclude.</code></p>
-</document>
-EOS
-
     assert_equal(1, @doc.xinclude)
-    assert_equal(expected, @doc.to_s)    
+    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<document xmlns:xi=\"http://www.w3.org/2001/XInclude\">\n  <p>This libxml2 binding has the following project information:\n   <code>This is some text to include in an xml file via XInclude.</code></p>\n</document>\n",
+                 @doc.to_s)
   end
 end

data/test/tc_xpath.rb

@@ -34,14 +34,16 @@ class TestXPath < Test::Unit::TestCase
     assert_equal(3, nodes.length)
   end
 
-  def test_default_ns
-    # Pull all nodes with http://services.somewhere.com namespace
+  def test_default_ns1
+    # Find all nodes with http://services.somewhere.com namespace
     nodes = @doc.find('//*[namespace-uri()="http://services.somewhere.com"]')
     assert_equal(2, nodes.length)
     assert_equal('getManufacturerNamesResponse', nodes[0].name)
     assert_equal('IDAndNameList', nodes[1].name)
+  end
 
-    # Pull all nodes with http://services.somewhere.com namespace
+  def test_default_ns2
+    # Find all nodes with http://services.somewhere.com namespace
     nodes = @doc.find('//ns:*', 'ns:http://services.somewhere.com')
     assert_equal(2, nodes.length)
     assert_equal('getManufacturerNamesResponse', nodes[0].name)
@@ -57,6 +59,31 @@ class TestXPath < Test::Unit::TestCase
     assert_equal(3, nodes.length)
   end
 
+  def test_default_ns3
+    # Find all nodes with http://services.somewhere.com namespace
+    nodes = @doc.find('//ns:*', 'ns' => 'http://services.somewhere.com')
+    assert_equal(2, nodes.length)
+    assert_equal('getManufacturerNamesResponse', nodes[0].name)
+    assert_equal('IDAndNameList', nodes[1].name)
+  end
+
+  def test_default_ns4
+    # Find all nodes with http://services.somewhere.com namespace
+    nodes = @doc.find('//ns:*', :ns => 'http://services.somewhere.com')
+    assert_equal(2, nodes.length)
+    assert_equal('getManufacturerNamesResponse', nodes[0].name)
+    assert_equal('IDAndNameList', nodes[1].name)
+  end
+
+  def test_default_ns5
+    # Find all nodes with http://services.somewhere.com namespace
+    XML::Namespace.new(@doc.root, 'ns', 'http://services.somewhere.com')
+    nodes = @doc.find('//ns:*')
+    assert_equal(2, nodes.length)
+    assert_equal('getManufacturerNamesResponse', nodes[0].name)
+    assert_equal('IDAndNameList', nodes[1].name)
+  end
+
   def test_attribute_ns
     # Pull all nodes with http://services.somewhere.com namespace
     nodes = @doc.find('@soap:encodingStyle')
@@ -77,7 +104,7 @@ class TestXPath < Test::Unit::TestCase
     assert_not_nil(node)
 
     # Register namespace
-    doc.root.register_default_namespace('atom')
+    doc.root.namespaces.default_prefix = 'atom'
     node = doc.find("atom:title")
     assert_not_nil(node)
   end
@@ -109,12 +136,6 @@ class TestXPath < Test::Unit::TestCase
     end
   end
 
-  # This causes a segmentation fault on Windows for some reason
-  #def test_nodes_debug
-   # nodes = @doc.find('//ns1:IdAndName', 'ns1:http://domain.somewhere.com')
-    #nodes.debug
-  # end
-
   def test_memory
     # This sometimes causes a segmentation fault because
     # an xml document is sometimes freed before the
@@ -141,4 +162,10 @@ class TestXPath < Test::Unit::TestCase
     GC.start
     assert_equal('Envelope', nodes.first.name)
   end
-end
+
+  # --- Debug ---
+  #def test_debug
+  #  nodes = @doc.find('//ns1:IdAndName', 'ns1:http://domain.somewhere.com')
+  #  assert(nodes.debug)
+  #end
+end

data/test/test_suite.rb

@@ -5,6 +5,8 @@ require 'tc_document_write'
 require 'tc_dtd'
 require 'tc_input'
 require 'tc_html_parser'
+require 'tc_namespaces'
+require 'tc_namespace'
 require 'tc_node'
 require 'tc_node_attr'
 require 'tc_node_cdata'
@@ -12,8 +14,8 @@ require 'tc_node_comment'
 require 'tc_node_copy'
 require 'tc_node_edit'
 require 'tc_node_text'
+require 'tc_node_write'
 require 'tc_node_xlink'
-require 'tc_ns'
 require 'tc_parser'
 require 'tc_parser_context'
 require 'tc_reader'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Charlie Savage
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-29 00:00:00 -07:00
+date: 2008-12-07 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -62,10 +62,12 @@ files:
 - ext/libxml/ruby_xml_input.h
 - ext/libxml/ruby_xml_input_cbg.c
 - ext/libxml/ruby_xml_input_cbg.h
+- ext/libxml/ruby_xml_namespace.c
+- ext/libxml/ruby_xml_namespace.h
+- ext/libxml/ruby_xml_namespaces.c
+- ext/libxml/ruby_xml_namespaces.h
 - ext/libxml/ruby_xml_node.c
 - ext/libxml/ruby_xml_node.h
-- ext/libxml/ruby_xml_ns.c
-- ext/libxml/ruby_xml_ns.h
 - ext/libxml/ruby_xml_parser.c
 - ext/libxml/ruby_xml_parser.h
 - ext/libxml/ruby_xml_parser_context.c
@@ -105,7 +107,10 @@ files:
 - lib/libxml/error.rb
 - lib/libxml/hpricot.rb
 - lib/libxml/html_parser.rb
+- lib/libxml/namespace.rb
+- lib/libxml/namespaces.rb
 - lib/libxml/node.rb
+- lib/libxml/ns.rb
 - lib/libxml/parser.rb
 - lib/libxml/parser_context.rb
 - lib/libxml/parser_options.rb
@@ -120,8 +125,6 @@ files:
 - lib/xml/libxml.rb
 - lib/xml.rb
 - test/etc_doc_to_s.rb
-- test/ets_copy_bug.rb
-- test/ets_copy_bug3.rb
 - test/ets_doc_file.rb
 - test/ets_doc_to_s.rb
 - test/ets_gpx.rb
@@ -130,8 +133,8 @@ files:
 - test/ets_tsr.rb
 - test/model
 - test/model/atom.xml
+- test/model/bands.xml
 - test/model/books.xml
-- test/model/default_validation_bug.rb
 - test/model/merge_bug_data.xml
 - test/model/ruby-lang.html
 - test/model/rubynet.xml
@@ -152,6 +155,8 @@ files:
 - test/tc_error.rb
 - test/tc_html_parser.rb
 - test/tc_input.rb
+- test/tc_namespace.rb
+- test/tc_namespaces.rb
 - test/tc_node.rb
 - test/tc_node_attr.rb
 - test/tc_node_cdata.rb
@@ -159,8 +164,8 @@ files:
 - test/tc_node_copy.rb
 - test/tc_node_edit.rb
 - test/tc_node_text.rb
+- test/tc_node_write.rb
 - test/tc_node_xlink.rb
-- test/tc_ns.rb
 - test/tc_parser.rb
 - test/tc_parser_context.rb
 - test/tc_properties.rb
@@ -213,6 +218,8 @@ test_files:
 - test/tc_error.rb
 - test/tc_html_parser.rb
 - test/tc_input.rb
+- test/tc_namespace.rb
+- test/tc_namespaces.rb
 - test/tc_node.rb
 - test/tc_node_attr.rb
 - test/tc_node_cdata.rb
@@ -220,8 +227,8 @@ test_files:
 - test/tc_node_copy.rb
 - test/tc_node_edit.rb
 - test/tc_node_text.rb
+- test/tc_node_write.rb
 - test/tc_node_xlink.rb
-- test/tc_ns.rb
 - test/tc_parser.rb
 - test/tc_parser_context.rb
 - test/tc_properties.rb