RubyGems - libxml-ruby - Versions diffs - 4.1.1-x64-mingw-ucrt → 5.0.0-x64-mingw-ucrt - Mend

libxml-ruby 4.1.1-x64-mingw-ucrt → 5.0.0-x64-mingw-ucrt

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (58) hide show

checksums.yaml +4 -4
data/HISTORY +22 -0
data/ext/libxml/extconf.rb +67 -61
data/ext/libxml/ruby_libxml.h +43 -44
data/ext/libxml/ruby_xml.c +0 -343
data/ext/libxml/ruby_xml.h +9 -10
data/ext/libxml/ruby_xml_attr_decl.c +154 -153
data/ext/libxml/ruby_xml_attributes.c +276 -275
data/ext/libxml/ruby_xml_attributes.h +2 -0
data/ext/libxml/ruby_xml_document.c +6 -6
data/ext/libxml/ruby_xml_document.h +11 -11
data/ext/libxml/ruby_xml_dtd.c +3 -3
data/ext/libxml/ruby_xml_encoding.h +20 -18
data/ext/libxml/ruby_xml_error.c +9 -6
data/ext/libxml/ruby_xml_error.h +2 -2
data/ext/libxml/ruby_xml_html_parser_context.c +35 -21
data/ext/libxml/ruby_xml_namespace.c +0 -3
data/ext/libxml/ruby_xml_node.c +1394 -1398
data/ext/libxml/ruby_xml_parser.h +1 -1
data/ext/libxml/ruby_xml_parser_context.c +47 -39
data/ext/libxml/ruby_xml_parser_options.c +9 -1
data/ext/libxml/ruby_xml_parser_options.h +1 -1
data/ext/libxml/ruby_xml_reader.c +1244 -1242
data/ext/libxml/ruby_xml_relaxng.c +113 -112
data/ext/libxml/ruby_xml_sax2_handler.c +1 -1
data/ext/libxml/ruby_xml_sax_parser.c +1 -9
data/ext/libxml/ruby_xml_schema.c +422 -420
data/ext/libxml/ruby_xml_schema_attribute.c +108 -107
data/ext/libxml/ruby_xml_schema_element.c +70 -69
data/ext/libxml/ruby_xml_schema_type.c +252 -251
data/ext/libxml/ruby_xml_version.h +5 -5
data/ext/libxml/ruby_xml_writer.c +1138 -1137
data/ext/libxml/ruby_xml_xpath.c +1 -1
data/ext/libxml/ruby_xml_xpath_context.c +2 -2
data/ext/libxml/ruby_xml_xpath_expression.c +81 -81
data/ext/libxml/ruby_xml_xpath_object.c +340 -339
data/lib/3.2/libxml_ruby.so +0 -0
data/lib/3.3/libxml_ruby.so +0 -0
data/lib/libxml/document.rb +13 -13
data/lib/libxml/html_parser.rb +23 -23
data/lib/libxml/parser.rb +26 -24
data/lib/libxml/schema/element.rb +27 -19
data/test/test.rb +5 -0
data/test/test_document_write.rb +1 -4
data/test/test_dtd.rb +1 -4
data/test/test_encoding.rb +1 -4
data/test/test_helper.rb +9 -2
data/test/test_html_parser.rb +162 -162
data/test/test_namespace.rb +1 -3
data/test/test_node.rb +1 -3
data/test/test_node_write.rb +1 -4
data/test/test_parser.rb +26 -17
data/test/test_reader.rb +4 -4
data/test/test_sax_parser.rb +1 -1
data/test/test_schema.rb +237 -231
data/test/test_xml.rb +0 -99
metadata +5 -4
data/lib/3.1/libxml_ruby.so +0 -0

data/test/test_html_parser.rb CHANGED Viewed

@@ -1,162 +1,162 @@
-# encoding: UTF-8
-require_relative './test_helper'
-require 'stringio'
-class HTMLParserTest < Minitest::Test
-  def html_file
-    File.expand_path(File.join(File.dirname(__FILE__), 'model/ruby-lang.html'))
-  end
-  # -----  Sources  ------
-  def test_file
-    xp = LibXML::XML::HTMLParser.file(html_file)
-    assert_instance_of(LibXML::XML::HTMLParser, xp)
-    doc = xp.parse
-    refute_nil(doc)
-  end
-  def test_noexistent_file
-    error = assert_raises(LibXML::XML::Error) do
-      LibXML::XML::HTMLParser.file('i_dont_exist.xml')
-    end
-    assert_equal('Warning: failed to load external entity "i_dont_exist.xml".', error.to_s)
-  end
-  def test_nil_file
-    error = assert_raises(TypeError) do
-      LibXML::XML::HTMLParser.file(nil)
-    end
-    assert_match(/nil into String/, error.to_s)
-  end
-  def test_io
-    File.open(html_file) do |io|
-      xp = LibXML::XML::HTMLParser.io(io)
-      assert_instance_of(LibXML::XML::HTMLParser, xp)
-      doc = xp.parse
-      assert_instance_of(LibXML::XML::Document, doc)
-    end
-  end
-  def test_io_gc
-    # Test that the reader keeps a reference
-    # to the io object
-    file = File.open(html_file)
-    parser = LibXML::XML::HTMLParser.io(file)
-    file = nil
-    GC.start
-    assert(parser.parse)
-  end
-  def test_nil_io
-    error = assert_raises(TypeError) do
-      LibXML::XML::HTMLParser.io(nil)
-    end
-    assert_equal("Must pass in an IO object", error.to_s)
-  end
-  def test_string_io
-    data = File.read(html_file)
-    io = StringIO.new(data)
-    xp = LibXML::XML::HTMLParser.io(io)
-    assert_instance_of(LibXML::XML::HTMLParser, xp)
-    doc = xp.parse
-    assert_instance_of(LibXML::XML::Document, doc)
-  end
-  def test_string
-    str = '<html><body><p>hi</p></body></html>'
-    xp = LibXML::XML::HTMLParser.string(str)
-    assert_instance_of(LibXML::XML::HTMLParser, xp)
-    assert_instance_of(LibXML::XML::HTMLParser, xp)
-    doc = xp.parse
-    assert_instance_of(LibXML::XML::Document, doc)
-  end
-  def test_nil_string
-    error = assert_raises(TypeError) do
-      LibXML::XML::HTMLParser.string(nil)
-    end
-    assert_equal("wrong argument type nil (expected String)", error.to_s)
-  end
-  def test_parse
-    html = <<-EOS
-      <html>
-        <head>
-          <meta name=keywords content=nasty>
-        </head>
-        <body>Hello<br>World</html>
-   EOS
-    parser = LibXML::XML::HTMLParser.string(html, :options => LibXML::XML::HTMLParser::Options::NOBLANKS)
-    doc = parser.parse
-    assert_instance_of LibXML::XML::Document, doc
-    root = doc.root
-    assert_instance_of LibXML::XML::Node, root
-    assert_equal 'html', root.name
-    head = root.child
-    assert_instance_of LibXML::XML::Node, head
-    assert_equal 'head', head.name
-    meta = head.child
-    assert_instance_of LibXML::XML::Node, meta
-    assert_equal 'meta', meta.name
-    assert_equal 'keywords', meta[:name]
-    assert_equal 'nasty', meta[:content]
-    body = head.next
-    assert_instance_of LibXML::XML::Node, body
-    assert_equal 'body', body.name
-    hello = body.child
-    # It appears that some versions of libxml2 add a layer of <p>
-    # cant figure our why or how, so this skips it if there
-    hello = hello.child if hello.name == "p"
-    assert_instance_of LibXML::XML::Node, hello
-    assert_equal 'Hello', hello.content
-    br = hello.next
-    assert_instance_of LibXML::XML::Node, br
-    assert_equal 'br', br.name
-    world = br.next
-    assert_instance_of LibXML::XML::Node, world
-    assert_equal 'World', world.content
-  end
-  def test_no_implied
-    html = "hello world"
-    parser = LibXML::XML::HTMLParser.string(html, :options => LibXML::XML::HTMLParser::Options::NOIMPLIED)
-    doc = parser.parse
-    assert_equal("<p>#{html}</p>", doc.root.to_s)
-  end
-  def test_comment
-    doc = LibXML::XML::HTMLParser.string('<!-- stuff -->', :options => LibXML::XML::HTMLParser::Options::NOIMPLIED |
-                                                                       LibXML::XML::HTMLParser::Options::NOERROR |
-                                                                       LibXML::XML::HTMLParser::Options::NOWARNING |
-                                                                       LibXML::XML::HTMLParser::Options::RECOVER |
-                                                                       LibXML::XML::HTMLParser::Options::NONET)
-    assert(doc)
-  end
-  def test_open_many_files
-    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/ruby-lang.html'))
-    1000.times do
-      LibXML::XML::HTMLParser.file(file).parse
-    end
-  end
-end
+# encoding: UTF-8
+require_relative './test_helper'
+require 'stringio'
+class HTMLParserTest < Minitest::Test
+  def html_file
+    File.expand_path(File.join(File.dirname(__FILE__), 'model/ruby-lang.html'))
+  end
+  # -----  Sources  ------
+  def test_file
+    xp = LibXML::XML::HTMLParser.file(html_file)
+    assert_instance_of(LibXML::XML::HTMLParser, xp)
+    doc = xp.parse
+    refute_nil(doc)
+  end
+  def test_noexistent_file
+    error = assert_raises(LibXML::XML::Error) do
+      LibXML::XML::HTMLParser.file('i_dont_exist.xml')
+    end
+    assert_equal('Warning: failed to load external entity "i_dont_exist.xml".', error.to_s)
+  end
+  def test_nil_file
+    error = assert_raises(TypeError) do
+      LibXML::XML::HTMLParser.file(nil)
+    end
+    assert_match(/nil into String/, error.to_s)
+  end
+  def test_io
+    File.open(html_file) do |io|
+      xp = LibXML::XML::HTMLParser.io(io)
+      assert_instance_of(LibXML::XML::HTMLParser, xp)
+      doc = xp.parse
+      assert_instance_of(LibXML::XML::Document, doc)
+    end
+  end
+  def test_io_gc
+    # Test that the reader keeps a reference
+    # to the io object
+    file = File.open(html_file)
+    parser = LibXML::XML::HTMLParser.io(file)
+    file = nil
+    GC.start
+    assert(parser.parse)
+  end
+  def test_nil_io
+    error = assert_raises(TypeError) do
+      LibXML::XML::HTMLParser.io(nil)
+    end
+    assert_equal("Must pass in an IO object", error.to_s)
+  end
+  def test_string_io
+    data = File.read(html_file)
+    io = StringIO.new(data)
+    xp = LibXML::XML::HTMLParser.io(io)
+    assert_instance_of(LibXML::XML::HTMLParser, xp)
+    doc = xp.parse
+    assert_instance_of(LibXML::XML::Document, doc)
+  end
+  def test_string
+    str = '<html><body><p>hi</p></body></html>'
+    xp = LibXML::XML::HTMLParser.string(str)
+    assert_instance_of(LibXML::XML::HTMLParser, xp)
+    assert_instance_of(LibXML::XML::HTMLParser, xp)
+    doc = xp.parse
+    assert_instance_of(LibXML::XML::Document, doc)
+  end
+  def test_nil_string
+    error = assert_raises(TypeError) do
+      LibXML::XML::HTMLParser.string(nil)
+    end
+    assert_equal("wrong argument type nil (expected String)", error.to_s)
+  end
+  def test_parse
+    html = <<-EOS
+      <html>
+        <head>
+          <meta name=keywords content=nasty>
+        </head>
+        <body>Hello<br>World</html>
+   EOS
+    parser = LibXML::XML::HTMLParser.string(html, :options => LibXML::XML::HTMLParser::Options::NOBLANKS)
+    doc = parser.parse
+    assert_instance_of LibXML::XML::Document, doc
+    root = doc.root
+    assert_instance_of LibXML::XML::Node, root
+    assert_equal 'html', root.name
+    head = root.child
+    assert_instance_of LibXML::XML::Node, head
+    assert_equal 'head', head.name
+    meta = head.child
+    assert_instance_of LibXML::XML::Node, meta
+    assert_equal 'meta', meta.name
+    assert_equal 'keywords', meta[:name]
+    assert_equal 'nasty', meta[:content]
+    body = head.next
+    assert_instance_of LibXML::XML::Node, body
+    assert_equal 'body', body.name
+    hello = body.child
+    # It appears that some versions of libxml2 add a layer of <p>
+    # cant figure our why or how, so this skips it if there
+    hello = hello.child if hello.name == "p"
+    assert_instance_of LibXML::XML::Node, hello
+    assert_equal 'Hello', hello.content
+    br = hello.next
+    assert_instance_of LibXML::XML::Node, br
+    assert_equal 'br', br.name
+    world = br.next
+    assert_instance_of LibXML::XML::Node, world
+    assert_equal 'World', world.content
+  end
+  def test_no_implied
+    html = "hello world"
+    parser = LibXML::XML::HTMLParser.string(html, :options => LibXML::XML::HTMLParser::Options::NOIMPLIED)
+    doc = parser.parse
+    assert_equal("<p>#{html}</p>", doc.root.to_s)
+  end
+  def test_comment
+    doc = LibXML::XML::HTMLParser.string('<!-- stuff -->', :options => LibXML::XML::HTMLParser::Options::NOIMPLIED |
+                                                                       LibXML::XML::HTMLParser::Options::NOERROR |
+                                                                       LibXML::XML::HTMLParser::Options::NOWARNING |
+                                                                       LibXML::XML::HTMLParser::Options::RECOVER |
+                                                                       LibXML::XML::HTMLParser::Options::NONET)
+    assert(doc)
+  end
+  def test_open_many_files
+    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/ruby-lang.html'))
+    1000.times do
+      LibXML::XML::HTMLParser.file(file).parse
+    end
+  end
+end

data/test/test_namespace.rb CHANGED Viewed

@@ -37,9 +37,7 @@ class TestNS < Minitest::Test
   def test_duplicate_ns
     node = LibXML::XML::Node.new('foo')
     LibXML::XML::Namespace.new(node, 'myname', 'http://www.mynamespace.com')
-    assert_raises(LibXML::XML::Error) do
-      LibXML::XML::Namespace.new(node, 'myname', 'http://www.mynamespace.com')
-    end
+    LibXML::XML::Namespace.new(node, 'myname', 'http://www.mynamespace.com')
   end
   def test_eql

data/test/test_node.rb CHANGED Viewed

@@ -7,13 +7,11 @@ class TestNode < Minitest::Test
     @file_name = "model/bands.utf-8.xml"
     # Strip spaces to make testing easier
-    LibXML::XML.default_keep_blanks = false
     file = File.join(File.dirname(__FILE__), @file_name)
-    @doc = LibXML::XML::Document.file(file)
+    @doc = LibXML::XML::Document.file(file, options: LibXML::XML::Parser::Options::NOBLANKS)
   end
   def teardown
-    LibXML::XML.default_keep_blanks = true
     @doc = nil
   end

data/test/test_node_write.rb CHANGED Viewed

@@ -8,7 +8,6 @@ class TestNodeWrite < Minitest::Test
   end
   def teardown
-    LibXML::XML.default_keep_blanks = true
     @doc = nil
   end
@@ -16,10 +15,8 @@ class TestNodeWrite < Minitest::Test
     @encoding = Encoding.find(name)
     @file_name = "model/bands.#{name.downcase}.xml"
-    # Strip spaces to make testing easier
-    LibXML::XML.default_keep_blanks = false
     file = File.join(File.dirname(__FILE__), @file_name)
-    @doc = LibXML::XML::Document.file(file)
+    @doc = LibXML::XML::Document.file(file, options: LibXML::XML::Parser::Options::NOBLANKS)
   end
   def test_to_s_default

data/test/test_parser.rb CHANGED Viewed

@@ -27,7 +27,7 @@ class TestParser < Minitest::Test
       LibXML::XML::Parser.document(nil)
     end
-    assert_equal("Must pass an LibXML::XML::Document object", error.to_s)
+    assert_equal("Must pass an LibXML::XML::Document object", error.message)
   end
   def test_file
@@ -44,7 +44,7 @@ class TestParser < Minitest::Test
       LibXML::XML::Parser.file('i_dont_exist.xml')
     end
-    assert_equal('Warning: failed to load external entity "i_dont_exist.xml".', error.to_s)
+    assert_equal('Warning: failed to load external entity "i_dont_exist.xml".', error.message)
   end
   def test_nil_file
@@ -52,7 +52,7 @@ class TestParser < Minitest::Test
       LibXML::XML::Parser.file(nil)
     end
-    assert_match(/nil into String/, error.to_s)
+    assert_match(/nil into String/, error.message)
   end
   def test_file_encoding
@@ -63,7 +63,11 @@ class TestParser < Minitest::Test
       parser.parse
     end
-    assert(error.to_s.match(/Fatal error: Extra content at the end of the document/))
+    if windows?
+      assert_match(/Fatal error: Opening and ending tag mismatch/, error.message)
+    else
+      assert_match(/Fatal error: Extra content at the end of the document/, error.message)
+    end
     parser = LibXML::XML::Parser.file(file, :encoding => LibXML::XML::Encoding::UTF_8)
     doc = parser.parse
@@ -108,7 +112,7 @@ class TestParser < Minitest::Test
       LibXML::XML::Parser.io(nil)
     end
-    assert_equal("Must pass in an IO object", error.to_s)
+    assert_equal("Must pass in an IO object", error.message)
   end
   def test_string_io
@@ -153,7 +157,7 @@ class TestParser < Minitest::Test
       LibXML::XML::Parser.string(nil)
     end
-    assert_equal("wrong argument type nil (expected String)", error.to_s)
+    assert_equal("wrong argument type nil (expected String)", error.message)
   end
   def test_string_options
@@ -165,9 +169,7 @@ class TestParser < Minitest::Test
       </test>
     EOS
-    LibXML::XML::default_substitute_entities = false
-    # Parse normally
+    # Parse normally - entities won't be substituted
     parser = LibXML::XML::Parser.string(xml)
     doc = parser.parse
     assert_nil(doc.child.base_uri)
@@ -176,13 +178,13 @@ class TestParser < Minitest::Test
     node = doc.find_first('/test/cdata').child
     assert_equal(LibXML::XML::Node::CDATA_SECTION_NODE, node.node_type)
-    # Entities should not be subtituted
+    # Entities should not be substituted
     node = doc.find_first('/test/entity')
     assert_equal('&foo;', node.child.to_s)
     # Parse with options
-    parser = LibXML::XML::Parser.string(xml, :base_uri => 'http://libxml.rubyforge.org',
-                                     :options => LibXML::XML::Parser::Options::NOCDATA | LibXML::XML::Parser::Options::NOENT)
+    parser = LibXML::XML::Parser.string(xml, base_uri: 'http://libxml.rubyforge.org',
+                                             options: LibXML::XML::Parser::Options::NOCDATA | LibXML::XML::Parser::Options::NOENT)
     doc = parser.parse
     assert_equal(doc.child.base_uri, 'http://libxml.rubyforge.org')
@@ -214,7 +216,7 @@ class TestParser < Minitest::Test
     end
     assert_equal("Fatal error: Input is not proper UTF-8, indicate encoding !\nBytes: 0xF6 0x74 0x6C 0x65 at :2.",
-                 error.to_s)
+                 error.message)
     # Parse as ISO_8859_1:
     parser = LibXML::XML::Parser.string(xml, :encoding => LibXML::XML::Encoding::ISO_8859_1)
@@ -283,16 +285,23 @@ class TestParser < Minitest::Test
     refute_nil(error)
     assert_kind_of(LibXML::XML::Error, error)
-    assert_equal("Fatal error: Extra content at the end of the document at :1.", error.message)
+    if windows?
+      assert_equal("Fatal error: Couldn't find end of Start Tag ruby_array line 1 at :1.", error.message)
+      assert_equal(LibXML::XML::Error::GT_REQUIRED, error.code)
+      assert_equal("ruby_array", error.str1)
+      assert_equal(1, error.int1)
+    else
+      assert_equal("Fatal error: Extra content at the end of the document at :1.", error.message)
+      assert_equal(LibXML::XML::Error::DOCUMENT_END, error.code)
+      assert_nil(error.str1)
+      assert_equal(0, error.int1)
+    end
     assert_equal(LibXML::XML::Error::PARSER, error.domain)
-    assert_equal(LibXML::XML::Error::DOCUMENT_END, error.code)
     assert_equal(LibXML::XML::Error::FATAL, error.level)
     assert_nil(error.file)
     assert_equal(1, error.line)
-    assert_nil(error.str1)
     assert_nil(error.str2)
     assert_nil(error.str3)
-    assert_equal(0, error.int1)
     assert_equal(34, error.int2)
     assert_nil(error.node)
   end

data/test/test_reader.rb CHANGED Viewed

@@ -60,9 +60,10 @@ class TestReader < Minitest::Test
   end
   def test_invalid_file
-    assert_raises(LibXML::XML::Error) do
+    error = assert_raises(Errno::ENOENT) do
       LibXML::XML::Reader.file('/does/not/exist')
     end
+    assert_equal("No such file or directory - /does/not/exist", error.message)
   end
   def test_string
@@ -256,7 +257,6 @@ class TestReader < Minitest::Test
   end
   def test_node
-    LibXML::XML.default_line_numbers = true
     reader = LibXML::XML::Reader.file(XML_FILE)
     # first try to get a node
@@ -358,7 +358,7 @@ class TestReader < Minitest::Test
     reader = LibXML::XML::Reader.string(xml, :encoding => LibXML::XML::Encoding::ISO_8859_1)
     reader.read
-    # Encoding is always null for strings, very annoying!
-    assert_equal(reader.encoding, LibXML::XML::Encoding::NONE)
+    encoding = windows? ? LibXML::XML::Encoding::ISO_8859_1 : LibXML::XML::Encoding::NONE
+    assert_equal(reader.encoding, encoding)
   end
 end

data/test/test_sax_parser.rb CHANGED Viewed

@@ -318,7 +318,7 @@ EOS
     error = assert_raises(LibXML::XML::Error) do
       parser.parse
     end
-    assert_equal("Fatal error: xmlParseEntityRef: no name at :5.", error.to_s)
+    assert_match("Fatal error: xmlParseEntityRef: no name at", error.to_s)
     # Check callbacks
     parser.callbacks.result