libxml-ruby 2.7.0 → 2.9.0

data/libxml-ruby.gemspec

@@ -1,44 +1,47 @@
-# encoding: utf-8
-
-# Determine the current version of the software
-version = File.read('ext/libxml/ruby_xml_version.h').match(/\s*RUBY_LIBXML_VERSION\s*['"](\d.+)['"]/)[1]
-
-Gem::Specification.new do |spec|
-  spec.name        = 'libxml-ruby'
-  spec.version     = version
-  spec.homepage    = 'http://xml4r.github.com/libxml-ruby'
-  spec.summary     = 'Ruby Bindings for LibXML2'
-  spec.description = <<-EOS
-    The Libxml-Ruby project provides Ruby language bindings for the GNOME
-    Libxml2 XML toolkit. It is free software, released under the MIT License.
-    Libxml-ruby's primary advantage over REXML is performance - if speed
-    is your need, these are good libraries to consider, as demonstrated
-    by the informal benchmark below.
-  EOS
-  spec.authors = ['Ross Bamform', 'Wai-Sun Chia', 'Sean Chittenden',
-                  'Dan Janwoski', 'Anurag Priyam', 'Charlie Savage',
-                  'Ryan Johnson']
-  spec.platform = Gem::Platform::RUBY
-  spec.bindir = "bin"
-  spec.extensions = ["ext/libxml/extconf.rb"]
-  spec.files = Dir.glob(['HISTORY',
-                         'LICENSE',
-                         'libxml-ruby.gemspec',
-                         'MANIFEST',
-                         'Rakefile',
-                         'README.rdoc',
-                         'setup.rb',
-                         'ext/libxml/*.def',
-                         'ext/libxml/*.h',
-                         'ext/libxml/*.c',
-                         'ext/libxml/*.rb',
-                         'ext/vc/*.sln',
-                         'ext/vc/*.vcprojx',
-                         'lib/**/*.rb',
-                         'script/**/*',
-                         'test/**/*'])
-  spec.test_files = Dir.glob("test/tc_*.rb")
-  spec.required_ruby_version = '>= 1.8.6'
-  spec.date = DateTime.now
-  spec.add_development_dependency('hanna_guado')
-end
+# encoding: utf-8
+
+# Determine the current version of the software
+version = File.read('ext/libxml/ruby_xml_version.h').match(/\s*RUBY_LIBXML_VERSION\s*['"](\d.+)['"]/)[1]
+
+Gem::Specification.new do |spec|
+  spec.name        = 'libxml-ruby'
+  spec.version     = version
+  spec.homepage    = 'http://xml4r.github.com/libxml-ruby'
+  spec.summary     = 'Ruby Bindings for LibXML2'
+  spec.description = <<-EOS
+    The Libxml-Ruby project provides Ruby language bindings for the GNOME
+    Libxml2 XML toolkit. It is free software, released under the MIT License.
+    Libxml-ruby's primary advantage over REXML is performance - if speed
+    is your need, these are good libraries to consider, as demonstrated
+    by the informal benchmark below.
+  EOS
+  spec.authors = ['Ross Bamform', 'Wai-Sun Chia', 'Sean Chittenden',
+                  'Dan Janwoski', 'Anurag Priyam', 'Charlie Savage',
+                  'Ryan Johnson']
+  spec.platform = Gem::Platform::RUBY
+  spec.bindir = 'bin'
+  spec.extensions = ['ext/libxml/extconf.rb']
+  spec.files = Dir.glob(['HISTORY',
+                         'LICENSE',
+                         'libxml-ruby.gemspec',
+                         'MANIFEST',
+                         'Rakefile',
+                         'README.rdoc',
+                         'setup.rb',
+                         'ext/libxml/*.def',
+                         'ext/libxml/*.h',
+                         'ext/libxml/*.c',
+                         'ext/libxml/*.rb',
+                         'ext/vc/*.sln',
+                         'ext/vc/*.vcprojx',
+                         'lib/**/*.rb',
+                         'script/**/*',
+                         'test/**/*'])
+  spec.test_files = Dir.glob('test/tc_*.rb')
+  spec.required_ruby_version = '>= 1.8.6'
+  spec.date = DateTime.now
+  spec.add_development_dependency('hanna_guado')
+  spec.add_development_dependency('rake-compiler')
+  spec.add_development_dependency('minitest')
+  spec.license = 'MIT'
+end

data/test/tc_attr.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class AttrNodeTest < Test::Unit::TestCase
+class AttrNodeTest < Minitest::Test
   def setup
     xp = XML::Parser.string(<<-EOS)
     <CityModel
@@ -27,7 +26,6 @@ class AttrNodeTest < Test::Unit::TestCase
   
   def teardown
     @doc = nil
-    GC.start
   end
   
   def city_member
@@ -35,7 +33,7 @@ class AttrNodeTest < Test::Unit::TestCase
   end
 
   def test_doc
-    assert_not_nil(@doc)
+    refute_nil(@doc)
     assert_equal(XML::Encoding::NONE, @doc.encoding)
   end
 
@@ -84,7 +82,7 @@ class AttrNodeTest < Test::Unit::TestCase
 
   def test_set_nil
     attribute = city_member.attributes.get_attribute('name')
-    assert_raise(TypeError) do
+    assert_raises(TypeError) do
       attribute.value = nil
     end
   end
@@ -134,7 +132,7 @@ class AttrNodeTest < Test::Unit::TestCase
     assert_equal(5, attributes.length)
 
     attribute = attributes.get_attribute('name')
-    assert_not_nil(attribute.parent)
+    refute_nil(attribute.parent)
     assert(attribute.parent?)
 
     attribute.remove!
@@ -177,7 +175,7 @@ class AttrNodeTest < Test::Unit::TestCase
   def test_no_attributes
     element = @doc.find('/city:CityModel/city:type').first
 
-    assert_not_nil(element.attributes)
+    refute_nil(element.attributes)
     assert_equal(0, element.attributes.length)
   end
 end

data/test/tc_attr_decl.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class AttrDeclTest < Test::Unit::TestCase
+class AttrDeclTest < Minitest::Test
   def setup
     xp = XML::Parser.string(<<-EOS)
 	<!DOCTYPE test [
@@ -28,7 +27,7 @@ class AttrDeclTest < Test::Unit::TestCase
     # Get a element with an access attribute
     elem = @doc.find_first('/root/property[@name="readonly"]')
     assert_equal(2, elem.attributes.length)
-    assert_not_nil(elem['access'])
+    refute_nil(elem['access'])
 
     # Get a element node without a access attribute
     elem = @doc.find_first('/root/property[@name="readwrite"]')
@@ -42,7 +41,7 @@ class AttrDeclTest < Test::Unit::TestCase
 
     # Get the attr_decl
     attr = elem.attributes.get_attribute('access')
-    assert_not_nil(attr)
+    refute_nil(attr)
     assert_equal(XML::Node::ATTRIBUTE_NODE, attr.node_type)
     assert_equal('attribute', attr.node_type_name)
 
@@ -56,7 +55,7 @@ class AttrDeclTest < Test::Unit::TestCase
 
     # Get the attr_decl
     attr_decl = elem.attributes.get_attribute('access')
-    assert_not_nil(attr_decl)
+    refute_nil(attr_decl)
     assert_equal(XML::Node::ATTRIBUTE_DECL, attr_decl.node_type)
     assert_equal('attribute declaration', attr_decl.node_type_name)
 
@@ -69,7 +68,7 @@ class AttrDeclTest < Test::Unit::TestCase
     elem = @doc.find_first('/root/property[@name="readwrite"]')
     attr_decl = elem.attributes.get_attribute('access')
 
-    assert_not_nil(attr_decl)
+    refute_nil(attr_decl)
     assert_equal(XML::Node::ATTRIBUTE_DECL, attr_decl.node_type)
     assert_equal('attribute declaration', attr_decl.node_type_name)
   end

data/test/tc_attributes.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class AttributesTest < Test::Unit::TestCase
+class AttributesTest < Minitest::Test
   def setup
     xp = XML::Parser.string(<<-EOS)
     <CityModel name="value"

data/test/tc_canonicalize.rb

@@ -1,8 +1,7 @@
 # encoding: UTF-8
 require './test_helper'
-require 'test/unit'
 
-class TestCanonicalize < Test::Unit::TestCase
+class TestCanonicalize < Minitest::Test
   # (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

data/test/tc_deprecated_require.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require 'xml/libxml'
-require 'test/unit'
 
-class TestDeprecatedRequire < Test::Unit::TestCase
+class TestDeprecatedRequire < Minitest::Test
   def test_basic
     xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
     assert_instance_of(XML::Parser, xp)

data/test/tc_document.rb

@@ -1,8 +1,7 @@
 # encoding: UTF-8
 require './test_helper'
-require 'test/unit'
 
-class TestDocument < Test::Unit::TestCase
+class TestDocument < Minitest::Test
   def setup
     xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
     assert_instance_of(XML::Parser, xp)
@@ -26,7 +25,7 @@ class TestDocument < Test::Unit::TestCase
   def test_find
     set = @doc.find('/ruby_array/fixnum')
     assert_instance_of(XML::XPath::Object, set)
-    assert_raise(NoMethodError) {
+    assert_raises(NoMethodError) {
       xpt = set.xpath
     }
   end
@@ -91,7 +90,7 @@ class TestDocument < Test::Unit::TestCase
     doc1 = LibXML::XML::Document.string("<one/>")
     doc2 = LibXML::XML::Document.string("<two/>")
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       doc1.root = doc2.root
     end
     assert_equal(" Nodes belong to different documents.  You must first import the node by calling XML::Document.import.",
@@ -111,7 +110,7 @@ class TestDocument < Test::Unit::TestCase
 
     node = doc1.root.child
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       doc2.root << node
     end
 

data/test/tc_document_write.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 require 'tmpdir'
-require 'test/unit'
 
-class TestDocumentWrite < Test::Unit::TestCase
+class TestDocumentWrite < Minitest::Test
   def setup
     @file_name = "model/bands.utf-8.xml"
 
@@ -91,7 +90,7 @@ class TestDocumentWrite < Test::Unit::TestCase
     end
 
     # Invalid encoding
-    error = assert_raise(ArgumentError) do
+    error = assert_raises(ArgumentError) do
       @doc.to_s(:encoding => -9999)
     end
     assert_equal('Unknown encoding value: -9999', error.to_s)

data/test/tc_dtd.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class TestDtd < Test::Unit::TestCase
+class TestDtd < Minitest::Test
   def setup
     xp = XML::Parser.string(<<-EOS)
       <root>
@@ -71,12 +70,12 @@ class TestDtd < Test::Unit::TestCase
     new_node = XML::Node.new('invalid', 'this will mess up validation')
     @doc.root << new_node
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       @doc.validate(dtd)
     end
 
     # Check the error worked
-    assert_not_nil(error)
+    refute_nil(error)
     assert_kind_of(XML::Error, error)
     assert_equal("Error: No declaration for element invalid.", error.message)
     assert_equal(XML::Error::VALID, error.domain)
@@ -89,7 +88,7 @@ class TestDtd < Test::Unit::TestCase
     assert_nil(error.str3)
     assert_equal(0, error.int1)
     assert_equal(0, error.int2)
-    assert_not_nil(error.node)
+    refute_nil(error.node)
     assert_equal('invalid', error.node.name)
   end
 

data/test/tc_encoding.rb

@@ -1,126 +1,126 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-# Code  UTF8        Latin1      Hex
-# m      109          109        6D
-# ö      195 182      246        C3 B6 / F6
-# t      116          116        74
-# l      108          108        6C
-# e      101          101        65
-# y      121          121        79
-# _       95           95        5F
-# c       99           99        63
-# r      114          114        72
-# ü      195 188      252        C3 BC / FC
-# e      101          101        65
-
-# See:
-#  http://en.wikipedia.org/wiki/ISO/IEC_8859-1
-#  http://en.wikipedia.org/wiki/List_of_Unicode_characters
-
-class TestEncoding < Test::Unit::TestCase
-  def setup
-    Encoding.default_internal = nil
-  end
-
-  def file_for_encoding(encoding)
-    file_name = "model/bands.#{encoding.name.downcase}.xml"
-    File.join(File.dirname(__FILE__), file_name)
-  end
-
-  def load_encoding(encoding)
-    @encoding = encoding
-    file = file_for_encoding(encoding)
-
-    # Strip spaces to make testing easier
-    XML.default_keep_blanks = false
-    @doc = XML::Document.file(file)
-  end
-
-  def test_encoding
-    doc = XML::Document.new
-    assert_equal(XML::Encoding::NONE, doc.encoding)
-    assert_equal(Encoding::ASCII_8BIT, doc.rb_encoding) if defined?(Encoding)
-
-    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/bands.xml'))
-    doc = XML::Document.file(file)
-    assert_equal(XML::Encoding::UTF_8, doc.encoding)
-    assert_equal(Encoding::UTF_8, doc.rb_encoding) if defined?(Encoding)
-
-    doc.encoding = XML::Encoding::ISO_8859_1
-    assert_equal(XML::Encoding::ISO_8859_1, doc.encoding)
-    assert_equal(Encoding::ISO8859_1, doc.rb_encoding) if defined?(Encoding)
-  end
-
-  def test_no_internal_encoding_iso_8859_1
-    Encoding.default_internal = nil
-    load_encoding(Encoding::ISO_8859_1)
-    node = @doc.root.children.first
-
-    name = node.name
-    assert_equal(Encoding::UTF_8, name.encoding)
-    assert_equal("m\u00F6tley_cr\u00FCe", name)
-    assert_equal("109 195 182 116 108 101 121 95 99 114 195 188 101",
-                 name.bytes.to_a.join(" "))
-    assert_equal("M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.",
-                 node.content)
-
-    name = name.encode(Encoding::ISO_8859_1)
-    assert_equal(Encoding::ISO_8859_1, name.encoding)
-    assert_equal("m\xF6tley_cr\xFCe".force_encoding(Encoding::ISO_8859_1), name)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-    assert_equal("M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.".force_encoding(Encoding::ISO_8859_1),
-                node.content.encode(Encoding::ISO_8859_1))
-  end
-
-  def test_internal_encoding_iso_8859_1
-    Encoding.default_internal = Encoding::ISO_8859_1
-    load_encoding(Encoding::ISO_8859_1)
-    node = @doc.root.children.first
-
-    name = node.name
-    assert_equal(Encoding::ISO_8859_1, name.encoding)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-    assert_equal("m\xF6tley_cr\xFCe".force_encoding(Encoding::ISO_8859_1), name)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-    assert_equal("M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.".force_encoding(Encoding::ISO_8859_1),
-                node.content.encode(Encoding::ISO_8859_1))
-  end
-
-  def test_no_internal_encoding_utf_8
-    Encoding.default_internal = nil
-    load_encoding(Encoding::UTF_8)
-    node = @doc.root.children.first
-
-    name = node.name
-    assert_equal(@encoding, name.encoding)
-    assert_equal("109 195 182 116 108 101 121 95 99 114 195 188 101",
-                 name.bytes.to_a.join(" "))
-
-    name = name.encode(Encoding::ISO_8859_1)
-    assert_equal(Encoding::ISO_8859_1, name.encoding)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-  end
-
-  def test_internal_encoding_utf_8
-    Encoding.default_internal = Encoding::ISO_8859_1
-    load_encoding(Encoding::UTF_8)
-    node = @doc.root.children.first
-
-    name = node.name
-    assert_equal(Encoding::ISO_8859_1, name.encoding)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-  end
-
-  def test_encoding_conversions
-    assert_equal("UTF-8", XML::Encoding.to_s(XML::Encoding::UTF_8))
-    assert_equal(XML::Encoding::UTF_8, XML::Encoding.from_s("UTF-8"))
-  end
-end
+# encoding: UTF-8
+
+require './test_helper'
+
+# Code  UTF8        Latin1      Hex
+# m      109          109        6D
+# ö      195 182      246        C3 B6 / F6
+# t      116          116        74
+# l      108          108        6C
+# e      101          101        65
+# y      121          121        79
+# _       95           95        5F
+# c       99           99        63
+# r      114          114        72
+# ü      195 188      252        C3 BC / FC
+# e      101          101        65
+
+# See:
+#  http://en.wikipedia.org/wiki/ISO/IEC_8859-1
+#  http://en.wikipedia.org/wiki/List_of_Unicode_characters
+
+class TestEncoding < Minitest::Test
+  def setup
+    Encoding.default_internal = nil
+  end
+
+  def file_for_encoding(encoding)
+    file_name = "model/bands.#{encoding.name.downcase}.xml"
+    File.join(File.dirname(__FILE__), file_name)
+  end
+
+  def load_encoding(encoding)
+    @encoding = encoding
+    file = file_for_encoding(encoding)
+
+    # Strip spaces to make testing easier
+    XML.default_keep_blanks = false
+    @doc = XML::Document.file(file)
+    XML.default_keep_blanks = true
+  end
+
+  def test_encoding
+    doc = XML::Document.new
+    assert_equal(XML::Encoding::NONE, doc.encoding)
+    assert_equal(Encoding::ASCII_8BIT, doc.rb_encoding) if defined?(Encoding)
+
+    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/bands.xml'))
+    doc = XML::Document.file(file)
+    assert_equal(XML::Encoding::UTF_8, doc.encoding)
+    assert_equal(Encoding::UTF_8, doc.rb_encoding) if defined?(Encoding)
+
+    doc.encoding = XML::Encoding::ISO_8859_1
+    assert_equal(XML::Encoding::ISO_8859_1, doc.encoding)
+    assert_equal(Encoding::ISO8859_1, doc.rb_encoding) if defined?(Encoding)
+  end
+
+  def test_no_internal_encoding_iso_8859_1
+    Encoding.default_internal = nil
+    load_encoding(Encoding::ISO_8859_1)
+    node = @doc.root.children.first
+
+    name = node.name
+    assert_equal(Encoding::UTF_8, name.encoding)
+    assert_equal("m\u00F6tley_cr\u00FCe", name)
+    assert_equal("109 195 182 116 108 101 121 95 99 114 195 188 101",
+                 name.bytes.to_a.join(" "))
+    assert_equal("M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.",
+                 node.content)
+
+    name = name.encode(Encoding::ISO_8859_1)
+    assert_equal(Encoding::ISO_8859_1, name.encoding)
+    assert_equal("m\xF6tley_cr\xFCe".force_encoding(Encoding::ISO_8859_1), name)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+    assert_equal("M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.".force_encoding(Encoding::ISO_8859_1),
+                node.content.encode(Encoding::ISO_8859_1))
+  end
+
+  def test_internal_encoding_iso_8859_1
+    Encoding.default_internal = Encoding::ISO_8859_1
+    load_encoding(Encoding::ISO_8859_1)
+    node = @doc.root.children.first
+
+    name = node.name
+    assert_equal(Encoding::ISO_8859_1, name.encoding)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+    assert_equal("m\xF6tley_cr\xFCe".force_encoding(Encoding::ISO_8859_1), name)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+    assert_equal("M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.".force_encoding(Encoding::ISO_8859_1),
+                node.content.encode(Encoding::ISO_8859_1))
+  end
+
+  def test_no_internal_encoding_utf_8
+    Encoding.default_internal = nil
+    load_encoding(Encoding::UTF_8)
+    node = @doc.root.children.first
+
+    name = node.name
+    assert_equal(@encoding, name.encoding)
+    assert_equal("109 195 182 116 108 101 121 95 99 114 195 188 101",
+                 name.bytes.to_a.join(" "))
+
+    name = name.encode(Encoding::ISO_8859_1)
+    assert_equal(Encoding::ISO_8859_1, name.encoding)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+  end
+
+  def test_internal_encoding_utf_8
+    Encoding.default_internal = Encoding::ISO_8859_1
+    load_encoding(Encoding::UTF_8)
+    node = @doc.root.children.first
+
+    name = node.name
+    assert_equal(Encoding::ISO_8859_1, name.encoding)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+  end
+
+  def test_encoding_conversions
+    assert_equal("UTF-8", XML::Encoding.to_s(XML::Encoding::UTF_8))
+    assert_equal(XML::Encoding::UTF_8, XML::Encoding.from_s("UTF-8"))
+  end
+end

data/test/tc_encoding_sax.rb

@@ -1,12 +1,13 @@
 # encoding: UTF-8
 require './test_helper'
-require 'test/unit'
 
 class SaxEncodingCallbacks
   attr_reader :encoding
-  include Test::Unit::Assertions
+  attr_accessor :assertions
+  include Minitest::Assertions
 
   def initialize
+    @assertions = 0
     @encoding = Encoding::UTF_8
   end
 
@@ -90,7 +91,7 @@ class SaxEncodingCallbacks
   end
 end
 
-class TestEncodingSax < Test::Unit::TestCase
+class TestEncodingSax < Minitest::Test
   def setup
     Encoding.default_internal = nil
   end