libxml-ruby 5.0.5 → 6.0.0

data/test/test_xinclude.rb

@@ -1,20 +1,20 @@
-# encoding: UTF-8
-
-require_relative './test_helper'
-
-class TestXInclude < Minitest::Test
-  def setup
-    @doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/xinclude.xml'))
-    assert_instance_of(LibXML::XML::Document, @doc)
-  end
-
-  def teardown
-    @doc = nil
-  end
-
-  def test_ruby_xml_xinclude
-    assert_equal(1, @doc.xinclude)
-    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
+# encoding: UTF-8
+
+require_relative './test_helper'
+
+class TestXInclude < Minitest::Test
+  def setup
+    @doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/xinclude.xml'))
+    assert_instance_of(LibXML::XML::Document, @doc)
+  end
+
+  def teardown
+    @doc = nil
+  end
+
+  def test_ruby_xml_xinclude
+    assert_equal(1, @doc.xinclude)
+    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/test_xml.rb

@@ -72,11 +72,7 @@ class TestXml < Minitest::Test
   end
 
   def test_enabled_docbook
-    if windows?
-      refute(LibXML::XML.enabled_docbook?)
-    else
-      assert(LibXML::XML.enabled_docbook?)
-    end
+    LibXML::XML.enabled_docbook?
   end
 
   def test_enabled_ftp
@@ -88,7 +84,7 @@ class TestXml < Minitest::Test
   end
 
   def test_enabled_http
-    assert(LibXML::XML.enabled_http?)
+    LibXML::XML.enabled_http?
   end
 
   def test_enabled_html
@@ -117,7 +113,7 @@ class TestXml < Minitest::Test
   end
 
   def test_enabled_unicode
-    assert(LibXML::XML.enabled_unicode?)
+    LibXML::XML.enabled_unicode?
   end
 
   def test_enabled_xinclude

data/test/test_xpath.rb

@@ -1,244 +1,244 @@
-# encoding: UTF-8
-
-require_relative './test_helper'
-require 'tempfile'
-
-class TestXPath < Minitest::Test
-  def setup
-    @doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
-  end
-  
-  def teardown
-    @doc = nil
-  end
-  
-  def test_doc_find
-    nodes = @doc.find('/soap:Envelope')
-    assert_instance_of(LibXML::XML::XPath::Object, nodes)
-    assert_equal(1, nodes.length)
-    assert_equal(nodes.xpath_type, LibXML::XML::XPath::NODESET)
-  end
-
-  def test_doc_find_first
-    node = @doc.find_first('/soap:Envelope/soap:Body')
-    assert_instance_of(LibXML::XML::Node, node)
-  end
-
-  def test_ns
-    nodes = @doc.find('//ns1:IdAndName', 'ns1:http://domain.somewhere.com')
-    assert_equal(3, nodes.length)
-  end
-
-  def test_ns_gc
-    _stress = GC.stress
-    GC.stress = true
-
-    doc = LibXML::XML::Document.string('<foo xmlns="http://bar.com" />')
-    node = doc.root
-    # This line segfaults on prior versions of libxml-ruby
-    node.find("namespace::*")
-
-    GC.stress = _stress
-  end
-
-  def test_ns_array
-    nodes = @doc.find('//ns1:IdAndName', ['ns1:http://domain.somewhere.com'])
-    assert_equal(3, nodes.length)
-  end
-
-  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
-
-  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)
-    assert_equal('IDAndNameList', nodes[1].name)
-
-    # Get getManufacturerNamesResponse node
-    nodes = @doc.find('//ns:getManufacturerNamesResponse', 'ns:http://services.somewhere.com')
-    assert_equal(1, nodes.length)
-
-    # Get IdAndName node
-    nodes = @doc.find('/soap:Envelope/soap:Body/ns0:getManufacturerNamesResponse/ns0:IDAndNameList/ns1:IdAndName',
-                      ['ns0:http://services.somewhere.com', 'ns1:http://domain.somewhere.com'])
-    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
-    LibXML::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')
-    assert_equal(1, nodes.length)
-    assert_equal('encodingStyle', nodes.first.name)
-    assert_equal('http://www.w3.org/2001/12/soap-encoding', nodes.first.value)
-  end
-
-  def test_register_default_ns
-    doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/atom.xml'))
-
-    # No namespace has been yet defined
-    assert_raises(LibXML::XML::Error) do
-      doc.find("atom:title")
-    end
-
-    node = doc.find('atom:title', 'atom:http://www.w3.org/2005/Atom')
-    refute_nil(node)
-
-    # Register namespace
-    doc.root.namespaces.default_prefix = 'atom'
-    node = doc.find("atom:title")
-    refute_nil(node)
-  end
-
-  def test_node_find
-    nodes = @doc.find('//ns1:IdAndName', 'ns1:http://domain.somewhere.com')
-    node = nodes.first
-
-    # Since we are searching on the node, don't have to register namespace
-    nodes = node.find('ns1:name')
-    assert_equal(1, nodes.length)
-		refute_equal(nodes.first.object_id, nodes.last.object_id)
-    assert_equal('name', nodes.first.name)
-    assert_equal('man1', nodes.first.content)
-  end
-
-  def test_node_find_first
-    node = @doc.find_first('//ns1:IdAndName', 'ns1:http://domain.somewhere.com')
-
-    # Since we are searching on the node, don't have to register namespace
-    node = node.find_first('ns1:name')
-    assert_equal('name', node.name)
-    assert_equal('man1', node.content)
-  end
-
-  def test_node_no_doc
-    node = LibXML::XML::Node.new('header', 'some content')
-    assert_raises(TypeError) do
-      node = node.find_first('/header')
-    end
-  end
-
-  def test_memory
-    # This sometimes causes a segmentation fault because
-    # an xml document is sometimes freed before the
-    # xpath_object used to query it.  When the xpath_object
-    # is free, it iterates over its results which are pointers
-    # to the document's nodes. A segmentation fault then happens.
-
-    1000.times do
-      doc = LibXML::XML::Document.new('1.0')
-      doc.root = LibXML::XML::Node.new("header")
-
-      1000.times do
-        doc.root << LibXML::XML::Node.new("footer")
-      end
-
-      doc.find('/header/footer')
-    end
-  end
-
-  # Test that document doesn't get freed before nodes
-  def test_xpath_free
-    doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
-    nodes = doc.find('//*')
-    GC.start
-    assert_equal('Envelope', nodes.first.name)
-  end
-
-  def test_xpath_namespace_nodes
-    doc = LibXML::XML::Document.string('<feed xmlns="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"><entry/></feed>')
-    nodes = doc.find('//atom:entry|namespace::*', :atom => "http://www.w3.org/2005/Atom")
-    assert_equal(4, nodes.length)
-
-    node = nodes[0]
-    assert_equal(LibXML::XML::Node::ELEMENT_NODE, node.node_type)
-
-    node = nodes[1]
-    assert_equal(LibXML::XML::Node::NAMESPACE_DECL, node.node_type)
-
-    node = nodes[2]
-    assert_equal(LibXML::XML::Node::NAMESPACE_DECL, node.node_type)
-
-    node = nodes[3]
-    assert_equal(LibXML::XML::Node::NAMESPACE_DECL, node.node_type)
-  end
-
-	# Test to make sure we don't get nil on empty results.
-	# This is also to test that we don't segfault due to our C code getting a NULL pointer
-	# and not handling it properly.
-	def test_xpath_empty_result
-    doc = LibXML::XML::Document.string('<html><body><p>Welcome to XHTML land!</p></body></html>')
-		nodes = doc.find("//object/param[translate(@name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = 'wmode']")
-		refute_nil nodes
-	end
-
-  def test_invalid_expression
-    xml = LibXML::XML::Document.string('<a></a>')
-
-    # Using the expression twice used to cause a Segmentation Fault
-    error = assert_raises(LibXML::XML::Error) do
-      xml.find('//a/')
-    end
-    assert_equal("Error: Invalid expression.", error.to_s)
-
-    # Try again - this used to cause a Segmentation Fault
-    error = assert_raises(LibXML::XML::Error) do
-      xml.find('//a/')
-    end
-    assert_equal("Error: Invalid expression.", error.to_s)
-  end
-
-  def test_find_cdata
-    doc = LibXML::XML::Document.string('<root>hi there <![CDATA[ mycdata ]]> bye!</root>')
-
-    nodes = doc.find('/root/text()')
-    assert_equal(3, nodes.length)
-    assert_equal(nodes[0].node_type, LibXML::XML::Node::TEXT_NODE)
-    assert_equal(nodes[0].content, 'hi there ')
-
-    assert_equal(nodes[1].node_type, LibXML::XML::Node::CDATA_SECTION_NODE)
-    assert_equal(nodes[1].content, ' mycdata ')
-
-    assert_equal(nodes[2].node_type, LibXML::XML::Node::TEXT_NODE)
-    assert_equal(nodes[2].content, ' bye!')
-  end
-
-  def test_find_comment
-    doc = LibXML::XML::Document.string('<root>hi there <!-- my comment --> bye!</root>')
-
-    nodes = doc.find('//comment()')
-    assert_equal(1, nodes.length)
-    assert_equal(nodes[0].content, ' my comment ')
-  end
-end
+# encoding: UTF-8
+
+require_relative './test_helper'
+require 'tempfile'
+
+class TestXPath < Minitest::Test
+  def setup
+    @doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
+  end
+  
+  def teardown
+    @doc = nil
+  end
+  
+  def test_doc_find
+    nodes = @doc.find('/soap:Envelope')
+    assert_instance_of(LibXML::XML::XPath::Object, nodes)
+    assert_equal(1, nodes.length)
+    assert_equal(nodes.xpath_type, LibXML::XML::XPath::NODESET)
+  end
+
+  def test_doc_find_first
+    node = @doc.find_first('/soap:Envelope/soap:Body')
+    assert_instance_of(LibXML::XML::Node, node)
+  end
+
+  def test_ns
+    nodes = @doc.find('//ns1:IdAndName', 'ns1:http://domain.somewhere.com')
+    assert_equal(3, nodes.length)
+  end
+
+  def test_ns_gc
+    _stress = GC.stress
+    GC.stress = true
+
+    doc = LibXML::XML::Document.string('<foo xmlns="http://bar.com" />')
+    node = doc.root
+    # This line segfaults on prior versions of libxml-ruby
+    node.find("namespace::*")
+
+    GC.stress = _stress
+  end
+
+  def test_ns_array
+    nodes = @doc.find('//ns1:IdAndName', ['ns1:http://domain.somewhere.com'])
+    assert_equal(3, nodes.length)
+  end
+
+  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
+
+  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)
+    assert_equal('IDAndNameList', nodes[1].name)
+
+    # Get getManufacturerNamesResponse node
+    nodes = @doc.find('//ns:getManufacturerNamesResponse', 'ns:http://services.somewhere.com')
+    assert_equal(1, nodes.length)
+
+    # Get IdAndName node
+    nodes = @doc.find('/soap:Envelope/soap:Body/ns0:getManufacturerNamesResponse/ns0:IDAndNameList/ns1:IdAndName',
+                      ['ns0:http://services.somewhere.com', 'ns1:http://domain.somewhere.com'])
+    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
+    LibXML::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')
+    assert_equal(1, nodes.length)
+    assert_equal('encodingStyle', nodes.first.name)
+    assert_equal('http://www.w3.org/2001/12/soap-encoding', nodes.first.value)
+  end
+
+  def test_register_default_ns
+    doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/atom.xml'))
+
+    # No namespace has been yet defined
+    assert_raises(LibXML::XML::Error) do
+      doc.find("atom:title")
+    end
+
+    node = doc.find('atom:title', 'atom:http://www.w3.org/2005/Atom')
+    refute_nil(node)
+
+    # Register namespace
+    doc.root.namespaces.default_prefix = 'atom'
+    node = doc.find("atom:title")
+    refute_nil(node)
+  end
+
+  def test_node_find
+    nodes = @doc.find('//ns1:IdAndName', 'ns1:http://domain.somewhere.com')
+    node = nodes.first
+
+    # Since we are searching on the node, don't have to register namespace
+    nodes = node.find('ns1:name')
+    assert_equal(1, nodes.length)
+		refute_equal(nodes.first.object_id, nodes.last.object_id)
+    assert_equal('name', nodes.first.name)
+    assert_equal('man1', nodes.first.content)
+  end
+
+  def test_node_find_first
+    node = @doc.find_first('//ns1:IdAndName', 'ns1:http://domain.somewhere.com')
+
+    # Since we are searching on the node, don't have to register namespace
+    node = node.find_first('ns1:name')
+    assert_equal('name', node.name)
+    assert_equal('man1', node.content)
+  end
+
+  def test_node_no_doc
+    node = LibXML::XML::Node.new('header', 'some content')
+    assert_raises(TypeError) do
+      node = node.find_first('/header')
+    end
+  end
+
+  def test_memory
+    # This sometimes causes a segmentation fault because
+    # an xml document is sometimes freed before the
+    # xpath_object used to query it.  When the xpath_object
+    # is free, it iterates over its results which are pointers
+    # to the document's nodes. A segmentation fault then happens.
+
+    1000.times do
+      doc = LibXML::XML::Document.new('1.0')
+      doc.root = LibXML::XML::Node.new("header")
+
+      1000.times do
+        doc.root << LibXML::XML::Node.new("footer")
+      end
+
+      doc.find('/header/footer')
+    end
+  end
+
+  # Test that document doesn't get freed before nodes
+  def test_xpath_free
+    doc = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
+    nodes = doc.find('//*')
+    GC.start
+    assert_equal('Envelope', nodes.first.name)
+  end
+
+  def test_xpath_namespace_nodes
+    doc = LibXML::XML::Document.string('<feed xmlns="http://www.w3.org/2005/Atom" xmlns:xhtml="http://www.w3.org/1999/xhtml"><entry/></feed>')
+    nodes = doc.find('//atom:entry|namespace::*', :atom => "http://www.w3.org/2005/Atom")
+    assert_equal(4, nodes.length)
+
+    node = nodes[0]
+    assert_equal(LibXML::XML::Node::ELEMENT_NODE, node.node_type)
+
+    node = nodes[1]
+    assert_equal(LibXML::XML::Node::NAMESPACE_DECL, node.node_type)
+
+    node = nodes[2]
+    assert_equal(LibXML::XML::Node::NAMESPACE_DECL, node.node_type)
+
+    node = nodes[3]
+    assert_equal(LibXML::XML::Node::NAMESPACE_DECL, node.node_type)
+  end
+
+	# Test to make sure we don't get nil on empty results.
+	# This is also to test that we don't segfault due to our C code getting a NULL pointer
+	# and not handling it properly.
+	def test_xpath_empty_result
+    doc = LibXML::XML::Document.string('<html><body><p>Welcome to XHTML land!</p></body></html>')
+		nodes = doc.find("//object/param[translate(@name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = 'wmode']")
+		refute_nil nodes
+	end
+
+  def test_invalid_expression
+    xml = LibXML::XML::Document.string('<a></a>')
+
+    # Using the expression twice used to cause a Segmentation Fault
+    error = assert_raises(LibXML::XML::Error) do
+      xml.find('//a/')
+    end
+    assert_equal("Error: Invalid expression.", error.to_s)
+
+    # Try again - this used to cause a Segmentation Fault
+    error = assert_raises(LibXML::XML::Error) do
+      xml.find('//a/')
+    end
+    assert_equal("Error: Invalid expression.", error.to_s)
+  end
+
+  def test_find_cdata
+    doc = LibXML::XML::Document.string('<root>hi there <![CDATA[ mycdata ]]> bye!</root>')
+
+    nodes = doc.find('/root/text()')
+    assert_equal(3, nodes.length)
+    assert_equal(nodes[0].node_type, LibXML::XML::Node::TEXT_NODE)
+    assert_equal(nodes[0].content, 'hi there ')
+
+    assert_equal(nodes[1].node_type, LibXML::XML::Node::CDATA_SECTION_NODE)
+    assert_equal(nodes[1].content, ' mycdata ')
+
+    assert_equal(nodes[2].node_type, LibXML::XML::Node::TEXT_NODE)
+    assert_equal(nodes[2].content, ' bye!')
+  end
+
+  def test_find_comment
+    doc = LibXML::XML::Document.string('<root>hi there <!-- my comment --> bye!</root>')
+
+    nodes = doc.find('//comment()')
+    assert_equal(1, nodes.length)
+    assert_equal(nodes[0].content, ' my comment ')
+  end
+end