libxml-ruby 3.0.0 → 3.1.0

data/test/{tc_attr.rb → test_attr.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class AttrNodeTest < Minitest::Test
   def setup

data/test/{tc_attr_decl.rb → test_attr_decl.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class AttrDeclTest < Minitest::Test
   def setup

data/test/{tc_attributes.rb → test_attributes.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class AttributesTest < Minitest::Test
   def setup

data/test/{tc_canonicalize.rb → test_canonicalize.rb}

@@ -1,23 +1,27 @@
 # encoding: UTF-8
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class TestCanonicalize < Minitest::Test
+  def path(file)
+    File.join(File.dirname(__FILE__), file)
+  end
+  
   # (www.w3.org) 3.1 PIs, Comments, and Outside of Document Element
   # http://www.w3.org/TR/xml-c14n#Example-OutsideDoc
   def test_canonicalize_with_w3c_c14n_3_1
-    given_doc = XML::Document.file('c14n/given/example-1.xml')
+    given_doc = XML::Document.file(self.path('c14n/given/example-1.xml'))
 
     # With Comments
-    expected_with_comments = IO.read('c14n/result/with-comments/example-1')
+    expected_with_comments = IO.read(self.path('c14n/result/with-comments/example-1'))
     assert_equal(expected_with_comments, given_doc.canonicalize(:comments => true))
 
     # Without Comments
-    expected_without_comments = IO.read('c14n/result/without-comments/example-1')
+    expected_without_comments = IO.read(self.path('c14n/result/without-comments/example-1'))
     assert_equal(expected_without_comments, given_doc.canonicalize)
     assert_equal(expected_without_comments, given_doc.canonicalize(:comments => false))
 
     # Without Comments (XML_C14N_1_1)
-    expected_1_1_without_comments = IO.read('c14n/result/1-1-without-comments/example-1')
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-1'))
     mode = XML::Document::XML_C14N_1_1
     assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
   end#test_canonicalize_with_w3c_c14n_3_1
@@ -26,11 +30,11 @@ class TestCanonicalize < Minitest::Test
   # (www.w3.org) 3.2 Whitespace in Document Content
   # http://www.w3.org/TR/xml-c14n#Example-WhitespaceInContent
   def test_canonicalize_with_w3c_c14n_3_2
-    given_doc = XML::Document.file('c14n/given/example-2.xml')
-    expected = IO.read('c14n/result/without-comments/example-2')
+    given_doc = XML::Document.file(self.path('c14n/given/example-2.xml'))
+    expected = IO.read(self.path('c14n/result/without-comments/example-2'))
     assert_equal(expected, given_doc.canonicalize)
 
-    expected_1_1_without_comments = IO.read('c14n/result/1-1-without-comments/example-2')
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-2'))
     mode = XML::Document::XML_C14N_1_1
     assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
   end
@@ -41,11 +45,11 @@ class TestCanonicalize < Minitest::Test
   #   - Embedded DTD not parsed out of XML, therefore default attributes are
   #     not applied to canonicalization.
   def test_canonicalize_with_w3c_c14n_3_3
-    given_doc = XML::Document.file('c14n/given/example-3.xml')
-    expected = IO.read('c14n/result/without-comments/example-3')
+    given_doc = XML::Document.file(self.path('c14n/given/example-3.xml'))
+    expected = IO.read(self.path('c14n/result/without-comments/example-3'))
     assert_equal(expected, given_doc.canonicalize)
 
-    expected_1_1_without_comments = IO.read('c14n/result/1-1-without-comments/example-3')
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-3'))
     mode = XML::Document::XML_C14N_1_1
     assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
   end
@@ -53,11 +57,11 @@ class TestCanonicalize < Minitest::Test
   # (www.w3.org) 3.4 Character Modifications and Character References
   # http://www.w3.org/TR/xml-c14n#Example-Chars
   def test_canonicalize_with_w3c_c14n_3_4
-    given_doc = XML::Document.file('c14n/given/example-4.xml')
-    expected = IO.read('c14n/result/without-comments/example-4')
+    given_doc = XML::Document.file(self.path('c14n/given/example-4.xml'))
+    expected = IO.read(self.path('c14n/result/without-comments/example-4'))
     assert_equal(expected, given_doc.canonicalize)
 
-    expected_1_1_without_comments = IO.read('c14n/result/1-1-without-comments/example-4')
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-4'))
     mode = XML::Document::XML_C14N_1_1
     assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
   end
@@ -67,20 +71,20 @@ class TestCanonicalize < Minitest::Test
   # (2012-02-20) Failing likely due to a logic error
   #   - libxml2(c14n.c:1788) XML_ENTITY_REF_NODE is invalid node for parsing.
   def test_canonicalize_with_w3c_c14n_3_5
-    given_doc = XML::Document.file('c14n/given/example-5.xml')
+    #given_doc = XML::Document.file(self.path('c14n/given/example-5.xml'))
 
     # With Comments
-    expected_with_comments = IO.read('c14n/result/with-comments/example-5')
+    #expected_with_comments = IO.read(self.path('c14n/result/with-comments/example-5'))
 
     # TODO - CANNOT COMPLETE TEST unless libxml2 supports additional node types.
     #assert_equal(expected_with_comments, given_doc.canonicalize(:comments => true))
 
     # Without Comments
-    expected_without_comments = IO.read('c14n/result/without-comments/example-5')
+    #expected_without_comments = IO.read(self.path('c14n/result/without-comments/example-5'))
     # TODO - CANNOT COMPLETE TEST unless libxml2 supports additional node types.
     #assert_equal(expected_without_comments, given_doc.canonicalize(:comments => false))
-    expected_1_1_without_comments = IO.read('c14n/result/1-1-without-comments/example-5')
-    mode = XML::Document::XML_C14N_1_1
+    #expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-5'))
+    #mode = XML::Document::XML_C14N_1_1
 
     # TODO - CANNOT COMPLETE TEST unless libxml2 supports additional node types.
     #assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
@@ -89,18 +93,18 @@ class TestCanonicalize < Minitest::Test
   # (www.w3.org) 3.6 UTF-8 Encoding
   # http://www.w3.org/TR/xml-c14n#Example-UTF8
   def test_canonicalize_with_w3c_c14n_3_6
-    given_doc = XML::Document.file('c14n/given/example-6.xml')
+    given_doc = XML::Document.file(self.path('c14n/given/example-6.xml'))
     if defined?(Encoding)
-      expected = IO.read('c14n/result/without-comments/example-6', :encoding => Encoding::UTF_8)
+      expected = IO.read(self.path('c14n/result/without-comments/example-6'), :encoding => Encoding::UTF_8)
     else
-      expected = IO.read('c14n/result/without-comments/example-6')
+      expected = IO.read(self.path('c14n/result/without-comments/example-6'))
     end
     assert_equal(expected, given_doc.canonicalize)
 
     if defined?(Encoding)
-      expected_1_1_without_comments = IO.read('c14n/result/1-1-without-comments/example-6', :encoding => Encoding::UTF_8)
+      expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-6'), :encoding => Encoding::UTF_8)
     else
-      expected_1_1_without_comments = IO.read('c14n/result/1-1-without-comments/example-6')
+      expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-6'))
     end
     mode = XML::Document::XML_C14N_1_1
     assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
@@ -110,13 +114,13 @@ class TestCanonicalize < Minitest::Test
   # http://www.w3.org/TR/xml-c14n#Example-DocSubsets
   def test_canonicalize_with_w3c_c14n_3_7
     # Non Canonicalized Document
-    given_doc = XML::Document.file('c14n/given/example-7.xml')
-    expected = IO.read('c14n/result/without-comments/example-7')
+    # given_doc = XML::Document.file(self.path('c14n/given/example-7.xml'))
+    #expected = IO.read(self.path('c14n/result/without-comments/example-7'))
 
-    e1_node = given_doc.find_first('ietf:e1', 'ietf:http://www.ietf.org')
+    # e1_node = given_doc.find_first('ietf:e1', 'ietf:http://www.ietf.org')
 
     # Select current node, all child nodes, all attributes and namespace nodes
-    subdoc_nodes = e1_node.find("(.//.|.//@id|namespace::*)")
+    #subdoc_nodes = e1_node.find("(.//.|.//@id|namespace::*)")
 
     # TODO - This fails because the namespace nodes aren't taken into account
     # assert_equal(expected, given_doc.canonicalize(:nodes => subdoc_nodes))

data/test/{tc_document.rb → test_document.rb}

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class TestDocument < Minitest::Test
   def setup
@@ -26,7 +26,7 @@ class TestDocument < Minitest::Test
     set = @doc.find('/ruby_array/fixnum')
     assert_instance_of(XML::XPath::Object, set)
     assert_raises(NoMethodError) {
-      xpt = set.xpath
+      set.xpath
     }
   end
 
@@ -84,7 +84,7 @@ class TestDocument < Minitest::Test
 		assert(!doc.xhtml?)
     XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, doc, true
 		assert(doc.xhtml?)
-	end
+  end
 
   def test_document_root
     doc1 = LibXML::XML::Document.string("<one/>")

data/test/{tc_document_write.rb → test_document_write.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 require 'tmpdir'
 
 class TestDocumentWrite < Minitest::Test

data/test/{tc_dtd.rb → test_dtd.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 
 class TestDtd < Minitest::Test
@@ -42,7 +42,7 @@ class TestDtd < Minitest::Test
 		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
-	end
+  end
 
   def test_external_subset
     xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil
@@ -56,7 +56,7 @@ class TestDtd < Minitest::Test
 		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
-	end
+  end
 
   def test_valid
     assert(@doc.validate(dtd))
@@ -106,18 +106,18 @@ class TestDtd < Minitest::Test
     end
 
     XML.default_load_external_dtd = false
-    doc = XML::Parser.string(xml).parse
+    XML::Parser.string(xml).parse
     assert_equal(0, errors.length)
 
     errors.clear
     XML.default_load_external_dtd = true
-    doc = XML::Parser.string(xml).parse
+    XML::Parser.string(xml).parse
     assert_equal(1, errors.length)
     assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
                  errors[0].to_s)
 
     errors = Array.new
-    doc = XML::Parser.string(xml, :options => XML::Parser::Options::DTDLOAD).parse
+    XML::Parser.string(xml, :options => XML::Parser::Options::DTDLOAD).parse
     assert_equal(1, errors.length)
     assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
                  errors[0].to_s)

data/test/{tc_encoding.rb → test_encoding.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 # Code  UTF8        Latin1      Hex
 # m      109          109        6D
@@ -21,9 +21,14 @@ require './test_helper'
 
 class TestEncoding < Minitest::Test
   def setup
+    @original_encoding = Encoding.default_internal
     Encoding.default_internal = nil
   end
 
+  def teardown
+    Encoding.default_internal = @original_encoding
+  end
+
   def file_for_encoding(encoding)
     file_name = "model/bands.#{encoding.name.downcase}.xml"
     File.join(File.dirname(__FILE__), file_name)
@@ -55,7 +60,6 @@ class TestEncoding < Minitest::Test
   end
 
   def test_no_internal_encoding_iso_8859_1
-    Encoding.default_internal = nil
     load_encoding(Encoding::ISO_8859_1)
     node = @doc.root.children.first
 
@@ -93,7 +97,6 @@ class TestEncoding < Minitest::Test
   end
 
   def test_no_internal_encoding_utf_8
-    Encoding.default_internal = nil
     load_encoding(Encoding::UTF_8)
     node = @doc.root.children.first
 

data/test/{tc_encoding_sax.rb → test_encoding_sax.rb}

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class SaxEncodingCallbacks
   attr_reader :encoding

data/test/{tc_error.rb → test_error.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 require 'stringio'
 
 class TestError < Minitest::Test

data/test/test_helper.rb

@@ -12,5 +12,3 @@ $LOAD_PATH << ext
 
 require 'xml'
 require 'minitest/autorun'
-#require 'minitest/reporters'
-#MiniTest::Reporters.use!

data/test/{tc_html_parser.rb → test_html_parser.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 require 'stringio'
 
 class HTMLParserTest < Minitest::Test
@@ -154,8 +154,9 @@ class HTMLParserTest < Minitest::Test
   end
 
   def test_open_many_files
+    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/ruby-lang.html'))
     1000.times do
-      doc = XML::HTMLParser.file('model/ruby-lang.html').parse
+      XML::HTMLParser.file(file).parse
     end
   end
 end

data/test/{tc_html_parser_context.rb → test_html_parser_context.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 
 class TestHtmlParserContext < Minitest::Test

data/test/{tc_namespace.rb → test_namespace.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 
 class TestNS < Minitest::Test
@@ -23,7 +23,7 @@ class TestNS < Minitest::Test
   def test_create_default_ns
     node = XML::Node.new('foo')
     ns = XML::Namespace.new(node, nil, 'http://www.mynamespace.com')
-    assert_equal(ns.prefix, nil)
+    assert_nil(ns.prefix)
     assert_equal(ns.href, 'http://www.mynamespace.com')
   end
 
@@ -44,7 +44,6 @@ class TestNS < Minitest::Test
 
   def test_eql
     node = XML::Node.new('Envelope')
-    ns = XML::Namespace.new(node, 'soap', 'http://schemas.xmlsoap.org/soap/envelope/')
 
     assert(node.namespaces.namespace.eql?(node.namespaces.namespace))
   end
@@ -58,4 +57,4 @@ class TestNS < Minitest::Test
 
     assert(ns1 == ns2)
   end
-end
+end

data/test/{tc_namespaces.rb → test_namespaces.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 
 class TestNamespaces < Minitest::Test
@@ -98,7 +98,7 @@ class TestNamespaces < Minitest::Test
 
     namespace = namespaces[0]
     assert_instance_of(XML::Namespace, namespace)
-    assert_equal(nil, namespace.prefix)
+    assert_nil(namespace.prefix)
     assert_equal('http://services.somewhere.com', namespace.href)
 
     namespace = namespaces[1]
@@ -122,15 +122,6 @@ class TestNamespaces < Minitest::Test
     assert_equal('http://www.w3.org/2001/XMLSchema-instance', namespace.href)
   end
 
-  def test_namespaces
-    node = @doc.find_first('//ns1:IdAndName',
-                           :ns1 => 'http://domain.somewhere.com')
-
-    node.namespaces.each do |namespace|
-      assert_instance_of(XML::Namespace, namespace)
-    end
-  end
-
   def test_namespace_definitions
     ns_defs = @doc.root.namespaces.definitions
     assert_equal(3, ns_defs.size)
@@ -157,7 +148,7 @@ class TestNamespaces < Minitest::Test
 
     namespace = ns_defs[0]
     assert_instance_of(XML::Namespace, namespace)
-    assert_equal(nil, namespace.prefix)
+    assert_nil(namespace.prefix)
     assert_equal('http://services.somewhere.com', namespace.href)
   end
 
@@ -178,7 +169,7 @@ class TestNamespaces < Minitest::Test
     namespace = node.namespaces.find_by_prefix(nil)
 
     assert_instance_of(XML::Namespace, namespace)
-    assert_equal(nil, namespace.prefix)
+    assert_nil(namespace.prefix)
     assert_equal('http://services.somewhere.com', namespace.href)
   end
 
@@ -206,4 +197,4 @@ class TestNamespaces < Minitest::Test
     node = doc.root.find_first('/soap:Envelope')
     refute_nil(node)
   end
-end
+end

data/test/{tc_node.rb → test_node.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class TestNode < Minitest::Test
   def setup
@@ -84,7 +84,7 @@ class TestNode < Minitest::Test
     end
   end
 
-   def test_equality
+  def test_equality
     node_a = @doc.find_first('*[@country]')
     node_b = @doc.root.child
 

data/test/{tc_node_cdata.rb → test_node_cdata.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class CDataCommentTest < Minitest::Test
   def setup