libxml-ruby 4.1.2 → 5.0.0

data/test/test_parser.rb

@@ -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

@@ -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

@@ -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

data/test/test_xml.rb

@@ -9,21 +9,6 @@ class TestXml < Minitest::Test
     assert(LibXML::XML.check_lib_versions)
   end
 
-  def test_debug_entities
-    original = LibXML::XML.debug_entities
-
-    LibXML::XML.debug_entities = false
-    refute(LibXML::XML.debug_entities)
-
-    LibXML::XML.debug_entities = true
-    assert(LibXML::XML.debug_entities)
-
-    LibXML::XML.debug_entities = false
-    refute(LibXML::XML.debug_entities)
-
-    LibXML::XML.debug_entities = original
-  end
-
   def test_default_compression
     return unless LibXML::XML.default_compression
 
@@ -52,52 +37,6 @@ class TestXml < Minitest::Test
     LibXML::XML.default_compression = original
   end
 
-  def test_default_keep_blanks
-    original = LibXML::XML.default_keep_blanks
-
-    LibXML::XML.default_keep_blanks = false
-    refute(LibXML::XML.default_keep_blanks)
-    assert_equal(LibXML::XML::Parser::Options::NOBLANKS, LibXML::XML.default_options)
-
-    LibXML::XML.default_keep_blanks = true
-    assert(LibXML::XML.default_keep_blanks)
-    assert_equal(0, LibXML::XML.default_options)
-
-    LibXML::XML.default_keep_blanks = original
-  end
-
-  def test_default_line_numbers
-    original = LibXML::XML.default_line_numbers
-
-    LibXML::XML.default_line_numbers = false
-    refute(LibXML::XML.default_line_numbers)
-
-    LibXML::XML.default_line_numbers = true
-    assert(LibXML::XML.default_line_numbers)
-
-    LibXML::XML.default_line_numbers = false
-    refute(LibXML::XML.default_line_numbers)
-
-    LibXML::XML.default_line_numbers = original
-  end
-
-  def test_default_substitute_entities
-    original = LibXML::XML.default_substitute_entities
-
-    LibXML::XML.default_substitute_entities = false
-    refute(LibXML::XML.default_substitute_entities)
-    assert_equal(0, LibXML::XML.default_options)
-
-    LibXML::XML.default_substitute_entities = true
-    assert(LibXML::XML.default_substitute_entities)
-    assert_equal(LibXML::XML::Parser::Options::NOENT, LibXML::XML.default_options)
-
-    LibXML::XML.default_substitute_entities = false
-    refute(LibXML::XML.default_substitute_entities)
-
-    LibXML::XML.default_substitute_entities = original
-  end
-
   def test_default_tree_indent_string
     original = LibXML::XML.default_tree_indent_string
 
@@ -116,40 +55,6 @@ class TestXml < Minitest::Test
     LibXML::XML.default_tree_indent_string = original
   end
 
-  def test_default_validity_checking
-    original = LibXML::XML.default_validity_checking
-
-    LibXML::XML.default_validity_checking = false
-    refute(LibXML::XML.default_validity_checking)
-    assert_equal(0, LibXML::XML.default_options)
-
-    LibXML::XML.default_validity_checking = true
-    assert(LibXML::XML.default_validity_checking)
-    assert_equal(LibXML::XML::Parser::Options::DTDVALID, LibXML::XML.default_options)
-
-    LibXML::XML.default_validity_checking = false
-    refute(LibXML::XML.default_validity_checking)
-
-    LibXML::XML.default_validity_checking = original
-  end
-
-  def test_default_warnings
-    original = LibXML::XML.default_warnings
-
-    LibXML::XML.default_warnings = false
-    refute(LibXML::XML.default_warnings)
-    assert_equal(LibXML::XML::Parser::Options::NOWARNING, LibXML::XML.default_options)
-
-    LibXML::XML.default_warnings = true
-    assert(LibXML::XML.default_warnings)
-    assert_equal(0, LibXML::XML.default_options)
-
-    LibXML::XML.default_warnings = false
-    refute(LibXML::XML.default_warnings)
-
-    LibXML::XML.default_warnings = original
-  end
-
   def test_enabled_automata
     assert(LibXML::XML.enabled_automata?)
   end
@@ -249,10 +154,6 @@ class TestXml < Minitest::Test
     assert_instance_of(Integer, LibXML::XML::VERNUM)
   end
 
-  def test_default_options
-    assert_equal(0, LibXML::XML.default_options)
-  end
-
   def test_default_save_no_empty_tags
     original = LibXML::XML.default_save_no_empty_tags
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Ross Bamform
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
+date: 2024-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -216,6 +216,7 @@ files:
 - test/model/shiporder_import.xsd
 - test/model/soap.xml
 - test/model/xinclude.xml
+- test/test.rb
 - test/test_attr.rb
 - test/test_attr_decl.rb
 - test/test_attributes.rb
@@ -274,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ruby Bindings for LibXML2