libxml-ruby 3.2.0 → 3.2.1

data/test/test.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Name>François</Name>

data/test/test_document.rb

@@ -13,115 +13,115 @@ class TestDocument < Minitest::Test
     @doc = nil
   end
 
-  # def test_klass
-  #   assert_instance_of(LibXML::XML::Document, @doc)
-  # end
-  #
-  # def test_context
-  #   context = @doc.context
-  #   assert_instance_of(LibXML::XML::XPath::Context, context)
-  # end
-  #
-  # def test_find
-  #   set = @doc.find('/ruby_array/fixnum')
-  #   assert_instance_of(LibXML::XML::XPath::Object, set)
-  #   assert_raises(NoMethodError) {
-  #     set.xpath
-  #   }
-  # end
-  #
-  # def test_compression
-  #   if LibXML::XML.enabled_zlib?
-  #     0.upto(9) do |i|
-  #       assert_equal(i, @doc.compression = i)
-  #       assert_equal(i, @doc.compression)
-  #     end
-  #
-  #     9.downto(0) do |i|
-  #       assert_equal(i, @doc.compression = i)
-  #       assert_equal(i, @doc.compression)
-  #     end
-  #
-  #     10.upto(20) do |i|
-  #       # assert_equal(9, @doc.compression = i)
-  #       assert_equal(i, @doc.compression = i) # This works around a bug in Ruby 1.8
-  #       assert_equal(9, @doc.compression)
-  #     end
-  #
-  #     -1.downto(-10) do |i|
-  #       # assert_equal(0, @doc.compression = i)
-  #       assert_equal(i, @doc.compression = i) # FIXME This bug should get fixed ASAP
-  #       assert_equal(0, @doc.compression)
-  #     end
-  #   end
-  # end
-  #
-  # def test_version
-  #   assert_equal('1.0', @doc.version)
-  #
-  #   doc = LibXML::XML::Document.new('6.9')
-  #   assert_equal('6.9', doc.version)
-  # end
-  #
-  # def test_write_root
-  #   @doc.root = LibXML::XML::Node.new('rubynet')
-  #   assert_instance_of(LibXML::XML::Node, @doc.root)
-  #   assert_instance_of(LibXML::XML::Document, @doc.root.doc)
-  #   assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<rubynet/>\n",
-  #                @doc.to_s(:indent => false))
-  # end
-  #
-  # def test_doc_node_type
-  #   assert_equal(LibXML::XML::Node::DOCUMENT_NODE, LibXML::XML::Document.new.node_type)
-  # end
-  #
-  # def test_doc_node_type_name
-  #   assert_equal('document_xml', LibXML::XML::Document.new.node_type_name)
-  # end
-  #
-  # def test_xhtml
-	# 	doc = LibXML::XML::Document.new
-	# 	assert(!doc.xhtml?)
-  #   LibXML::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
-  #
-  # def test_document_root
-  #   doc1 = LibXML::XML::Document.string("<one/>")
-  #   doc2 = LibXML::XML::Document.string("<two/>")
-  #
-  #   error = assert_raises(LibXML::XML::Error) do
-  #     doc1.root = doc2.root
-  #   end
-  #   assert_equal(" Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import.",
-  #                error.to_s)
-  #
-  #   doc2.root << doc2.import(doc1.root)
-  #   assert_equal('<one/>', doc1.root.to_s)
-  #   assert_equal('<two><one/></two>', doc2.root.to_s(:indent => false))
-  #
-  #   assert(!doc1.root.equal?(doc2.root))
-  #   assert(doc1.root.doc != doc2.root.doc)
-  # end
-  #
-  # def test_import_node
-  #   doc1 = LibXML::XML::Parser.string('<nums><one></one></nums>').parse
-  #   doc2 = LibXML::XML::Parser.string('<nums><two></two></nums>').parse
-  #
-  #   node = doc1.root.child
-  #
-  #   error = assert_raises(LibXML::XML::Error) do
-  #     doc2.root << node
-  #   end
-  #
-  #   assert_equal(" Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import.",
-  #                error.to_s)
-  #
-  #   doc2.root << doc2.import(node)
-  #
-  #   assert_equal("<nums><two/><one/></nums>",
-  #                doc2.root.to_s(:indent => false))
-  # end
+  def test_klass
+    assert_instance_of(LibXML::XML::Document, @doc)
+  end
+
+  def test_context
+    context = @doc.context
+    assert_instance_of(LibXML::XML::XPath::Context, context)
+  end
+
+  def test_find
+    set = @doc.find('/ruby_array/fixnum')
+    assert_instance_of(LibXML::XML::XPath::Object, set)
+    assert_raises(NoMethodError) {
+      set.xpath
+    }
+  end
+
+  def test_compression
+    if LibXML::XML.enabled_zlib?
+      0.upto(9) do |i|
+        assert_equal(i, @doc.compression = i)
+        assert_equal(i, @doc.compression)
+      end
+
+      9.downto(0) do |i|
+        assert_equal(i, @doc.compression = i)
+        assert_equal(i, @doc.compression)
+      end
+
+      10.upto(20) do |i|
+        # assert_equal(9, @doc.compression = i)
+        assert_equal(i, @doc.compression = i) # This works around a bug in Ruby 1.8
+        assert_equal(9, @doc.compression)
+      end
+
+      -1.downto(-10) do |i|
+        # assert_equal(0, @doc.compression = i)
+        assert_equal(i, @doc.compression = i) # FIXME This bug should get fixed ASAP
+        assert_equal(0, @doc.compression)
+      end
+    end
+  end
+
+  def test_version
+    assert_equal('1.0', @doc.version)
+
+    doc = LibXML::XML::Document.new('6.9')
+    assert_equal('6.9', doc.version)
+  end
+
+  def test_write_root
+    @doc.root = LibXML::XML::Node.new('rubynet')
+    assert_instance_of(LibXML::XML::Node, @doc.root)
+    assert_instance_of(LibXML::XML::Document, @doc.root.doc)
+    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<rubynet/>\n",
+                 @doc.to_s(:indent => false))
+  end
+
+  def test_doc_node_type
+    assert_equal(LibXML::XML::Node::DOCUMENT_NODE, LibXML::XML::Document.new.node_type)
+  end
+
+  def test_doc_node_type_name
+    assert_equal('document_xml', LibXML::XML::Document.new.node_type_name)
+  end
+
+  def test_xhtml
+		doc = LibXML::XML::Document.new
+		assert(!doc.xhtml?)
+    LibXML::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
+
+  def test_document_root
+    doc1 = LibXML::XML::Document.string("<one/>")
+    doc2 = LibXML::XML::Document.string("<two/>")
+
+    error = assert_raises(LibXML::XML::Error) do
+      doc1.root = doc2.root
+    end
+    assert_equal(" Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import.",
+                 error.to_s)
+
+    doc2.root << doc2.import(doc1.root)
+    assert_equal('<one/>', doc1.root.to_s)
+    assert_equal('<two><one/></two>', doc2.root.to_s(:indent => false))
+
+    assert(!doc1.root.equal?(doc2.root))
+    assert(doc1.root.doc != doc2.root.doc)
+  end
+
+  def test_import_node
+    doc1 = LibXML::XML::Parser.string('<nums><one></one></nums>').parse
+    doc2 = LibXML::XML::Parser.string('<nums><two></two></nums>').parse
+
+    node = doc1.root.child
+
+    error = assert_raises(LibXML::XML::Error) do
+      doc2.root << node
+    end
+
+    assert_equal(" Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import.",
+                 error.to_s)
+
+    doc2.root << doc2.import(node)
+
+    assert_equal("<nums><two/><one/></nums>",
+                 doc2.root.to_s(:indent => false))
+  end
 
   def test_nonet
     xml_string = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'

data/test/test_parser_context.rb

@@ -137,8 +137,8 @@ class TestParserContext < Minitest::Test
     context = LibXML::XML::Parser::Context.new
     assert(!context.replace_entities?)
 
-#    context.options = 1
- #   assert(context.replace_entities?)
+    context.options = LibXML::XML::Parser::Options::NOENT
+    assert(context.replace_entities?)
 
     context.options = 0
     assert(!context.replace_entities?)

data/test/test_writer.rb

@@ -16,25 +16,48 @@ class TestWriter < Minitest::Test
 
   def test_empty_doc
     writer = LibXML::XML::Writer.string
-    document writer
+    document(writer)
     assert_equal(writer.result.strip!, '<?xml version="1.0"?>')
 
     writer = LibXML::XML::Writer.string
-    document writer, { :encoding => LibXML::XML::Encoding::ISO_8859_1 }
+    document(writer, :encoding => LibXML::XML::Encoding::ISO_8859_1)
     assert_equal(writer.result.strip!, '<?xml version="1.0" encoding="ISO-8859-1"?>')
 
     writer = LibXML::XML::Writer.string
-    document writer, { :standalone => 1 }
+    document(writer, :standalone => 1)
     assert_equal(writer.result.strip!, '<?xml version="1.0" standalone="yes"?>')
 
     writer = LibXML::XML::Writer.string
-    document writer, { :standalone => 1, :encoding => LibXML::XML::Encoding::ISO_8859_1, :foo => :bar }
+    document(writer, :standalone => 1, :encoding => LibXML::XML::Encoding::ISO_8859_1, :foo => :bar)
     assert_equal(writer.result.strip!, '<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>')
   end
 
+  def test_file_encoding
+    value = "François".encode(Encoding::UTF_8)
+
+    File.open('test.xml', 'wb', encoding: 'UTF-8') do |file|
+      writer = LibXML::XML::Writer::io(file)
+      document(writer, encoding: LibXML::XML::Encoding::UTF_8) do
+        writer.write_element('Name', value)
+      end
+    end
+  end
+
+  def test_io_encoding
+    value = "François".encode(Encoding::UTF_8)
+    expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<Name>François</Name>".encode(Encoding::UTF_8)
+
+    io = StringIO.new
+    writer = LibXML::XML::Writer::io(io)
+    document(writer, encoding: LibXML::XML::Encoding::UTF_8) do
+      writer.write_element('Name', value)
+    end
+    assert_equal(expected, io.string.strip)
+  end
+
   def test_single_root
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root'
     end
 
@@ -45,7 +68,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<?php echo \"foo\";?>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_pi('php'))
       assert(writer.write_string('echo "foo";'))
       assert(writer.end_pi)
@@ -53,7 +76,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_pi('php', 'echo "foo";'))
     end
     assert_equal(writer.result.strip!, expected)
@@ -63,7 +86,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<!--foo-->"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_comment)
       assert(writer.write_string 'foo')
       assert(writer.end_comment)
@@ -71,7 +94,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_comment 'foo')
     end
     assert_equal(writer.result.strip!, expected)
@@ -81,7 +104,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<root><![CDATA[<?php echo $foo; ?>]]></root>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         assert(writer.start_cdata)
         assert(writer.write_string '<?php echo $foo; ?>')
@@ -91,7 +114,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         assert(writer.write_cdata '<?php echo $foo; ?>')
       end
@@ -101,13 +124,13 @@ class TestWriter < Minitest::Test
 
   def test_write_empty_elements
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_element 'foo')
     end
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<foo/>")
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
     end
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<" + XSL_PREFIX + ":stylesheet xmlns:xsl=\"" + XSL_URI + "\"/>")
@@ -117,7 +140,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<abc>123<def>456<ghi>789</ghi>cueillir des cerises</def>nous irons au bois</abc>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_element 'abc')
         assert(writer.write_string '123')
         assert(writer.start_element 'def')
@@ -133,7 +156,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_element 'abc')
         assert(writer.write_string '123')
         assert(writer.start_element 'def')
@@ -157,7 +180,7 @@ class TestWriter < Minitest::Test
       "</xsl:stylesheet>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
         assert(writer.start_element_ns XSL_PREFIX, 'attribute-set')
           assert(writer.start_element_ns XSL_PREFIX, 'attribute')
@@ -172,7 +195,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.start_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
         assert(writer.start_element_ns XSL_PREFIX, 'attribute-set')
           assert(writer.write_element_ns XSL_PREFIX, 'attribute', nil, '20px')
@@ -185,7 +208,7 @@ class TestWriter < Minitest::Test
 
   def test_attribute
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         element writer, 'child' do
           assert(writer.start_attribute 'foo')
@@ -197,7 +220,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<root><child foo=\"bar\"/></root>")
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         element writer, 'child' do
           assert(writer.write_attribute 'abc', 'def')
@@ -212,7 +235,7 @@ class TestWriter < Minitest::Test
     expected = "<?xml version=\"1.0\"?>\n<root><link xlink:href=\"abc\" xhtml:class=\"def\"/></root>"
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         element writer, 'link' do
           assert(writer.write_attribute_ns 'xlink', 'href', nil, 'abc')
@@ -223,7 +246,7 @@ class TestWriter < Minitest::Test
     assert_equal(writer.result.strip!, expected)
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       element writer, 'root' do
         element writer, 'link' do
           assert(writer.start_attribute_ns 'xlink', 'href')
@@ -242,7 +265,7 @@ class TestWriter < Minitest::Test
     if LibXML::XML::Writer.method_defined? :set_quote_char
       writer = LibXML::XML::Writer.string
       writer.set_quote_char "'"
-      document writer do
+      document(writer) do
         element writer, 'root' do
           assert(writer.start_attribute 'abc')
           assert(writer.write_string 'def')
@@ -257,7 +280,7 @@ class TestWriter < Minitest::Test
     if LibXML::XML::Writer.method_defined? :set_indent
       writer = LibXML::XML::Writer.string
       assert(writer.set_indent true)
-      document writer do
+      document(writer) do
         element writer, 'root' do
           element writer, 'child' do
             assert(writer.start_attribute 'abc')
@@ -275,7 +298,7 @@ class TestWriter < Minitest::Test
       writer = LibXML::XML::Writer.string
       assert(writer.set_indent true)
       assert(writer.set_indent_string ' ' * 4)
-      document writer do
+      document(writer) do
         element writer, 'root' do
           element writer, 'child' do
             assert(writer.start_attribute 'abc')
@@ -395,7 +418,7 @@ class TestWriter < Minitest::Test
     iso = 'éloïse'.encode 'ISO-8859-1'
 
     writer = LibXML::XML::Writer.string
-    document writer do
+    document(writer) do
       assert(writer.write_element iso)
     end
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<éloïse/>")