libxml-ruby 3.0.0 → 3.1.0

data/test/{tc_node_comment.rb → test_node_comment.rb}

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

data/test/{tc_node_copy.rb → test_node_copy.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 # see mailing list archive
 # [libxml-devel] Segmentation fault when add the cloned/copied node
@@ -37,5 +37,4 @@ class TestNodeCopy < Minitest::Test
     end
     assert @div1.to_s =~ /foo/
   end
-
-end # TC_XML_Node_Copy
+end

data/test/{tc_node_edit.rb → test_node_edit.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class TestNodeEdit < Minitest::Test
   def setup
@@ -69,8 +69,7 @@ class TestNodeEdit < Minitest::Test
   def test_remove_node_gc
     xp = XML::Parser.string('<test><num>one</num><num>two</num><num>three</num></test>')
     doc = xp.parse
-    node = doc.root.child.remove!
-    node = nil
+    doc.root.child.remove!
     GC.start
     refute_nil(doc)
   end
@@ -132,7 +131,8 @@ class TestNodeEdit < Minitest::Test
     end
 
     master_doc = documents.shift
-    documents.inject(master_doc) do |master_doc, child_doc|
+
+    documents.each do |child_doc|
       master_body = master_doc.find("//body").first
       child_body = child_doc.find("//body").first
 
@@ -141,7 +141,6 @@ class TestNodeEdit < Minitest::Test
       end
 
       master_body << child_element.copy(true)
-      master_doc
     end
   end
 
@@ -156,4 +155,4 @@ class TestNodeEdit < Minitest::Test
     assert_equal("<test xml:base=\"http://www.rubynet.org/\">\n  <num>one</num>\n  <num>two</num>\n  <num>three</num>\n</test>",
                  @doc.root.to_s)
   end
-end
+end

data/test/{tc_node_pi.rb → test_node_pi.rb}

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
-
-class NodeCommentTest < Minitest::Test
+class NodePiTest < Minitest::Test
   def setup
     xp = XML::Parser.string('<root></root>')
     @doc = xp.parse
@@ -35,5 +34,4 @@ class NodeCommentTest < Minitest::Test
     assert_equal '<root><?mypi mycontent?></root>',
       @root.to_s.gsub(/\n\s*/,'')
   end
-
 end

data/test/{tc_node_text.rb → test_node_text.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class TestTextNode < Minitest::Test
   def test_content
@@ -11,7 +11,7 @@ class TestTextNode < Minitest::Test
 
   def test_invalid_content
     error = assert_raises(TypeError) do
-      node = XML::Node.new_text(nil)
+      XML::Node.new_text(nil)
     end
     assert_equal('wrong argument type nil (expected String)', error.to_s)
   end
@@ -23,7 +23,7 @@ class TestTextNode < Minitest::Test
 	# in CDATA nodes.  Or if you are sanitizing existing HTML documents and want
 	# to preserve the content of any of the text nodes.
 	#
-	def test_output_escaping
+  def test_output_escaping
 		textnoenc = 'if (a < b || c > d) return "e";'
 		text = "if (a &lt; b || c &gt; d) return \"e\";"
  
@@ -45,7 +45,7 @@ class TestTextNode < Minitest::Test
   end
 
 	# Just a sanity check for output escaping.
-	def test_output_escaping_sanity
+  def test_output_escaping_sanity
 		node = XML::Node.new_text('testdata')
     assert_equal 'text', node.name
 		assert node.output_escaping?
@@ -66,5 +66,4 @@ class TestTextNode < Minitest::Test
     assert_equal 'text', node.name
 		assert node.output_escaping?
   end
-
 end

data/test/{tc_node_write.rb → test_node_write.rb}

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

data/test/{tc_node_xlink.rb → test_node_xlink.rb}

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

data/test/{tc_parser.rb → test_parser.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 require 'stringio'
 
 class TestParser < Minitest::Test
@@ -60,7 +60,7 @@ class TestParser < Minitest::Test
     parser = XML::Parser.file(file, :encoding => XML::Encoding::ISO_8859_1)
 
     error = assert_raises(XML::Error) do
-      doc = parser.parse
+      parser.parse
     end
 
     assert(error.to_s.match(/Fatal error: Extra content at the end of the document/))
@@ -210,7 +210,7 @@ class TestParser < Minitest::Test
     parser = XML::Parser.string(xml, :encoding => XML::Encoding::UTF_8)
 
     error = assert_raises(XML::Error) do
-      doc = parser.parse
+      parser.parse
     end
 
     assert_equal("Fatal error: Input is not proper UTF-8, indicate encoding !\nBytes: 0xF6 0x74 0x6C 0x65 at :2.",
@@ -237,7 +237,7 @@ class TestParser < Minitest::Test
     # otherwise an exception will be thrown.
     XML::Error.set_handler {|error|}
 
-    max_fd = if RUBY_PLATFORM.match(/mswin32|mingw/i)
+    max_fd = if RUBY_PLATFORM.match(/mswin32|mswin64|mingw/i)
       500
     else
       Process.getrlimit(Process::RLIMIT_NOFILE)[0] + 1
@@ -251,8 +251,9 @@ class TestParser < Minitest::Test
   end
 
   def test_open_many_files
+    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/atom.xml'))
     1000.times do
-      doc = XML::Parser.file('model/atom.xml').parse
+      XML::Parser.file(file).parse
     end
   end
 
@@ -296,7 +297,7 @@ class TestParser < Minitest::Test
     assert_nil(error.str2)
     assert_nil(error.str3)
     assert_equal(0, error.int1)
-    assert_equal(34, error.int2)
+    assert_equal(20, error.int2)
     assert_nil(error.node)
   end
 

data/test/{tc_parser_context.rb → test_parser_context.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 
 class TestParserContext < Minitest::Test
@@ -100,7 +100,7 @@ class TestParserContext < Minitest::Test
 
   def test_depth
     context = XML::Parser::Context.new
-    assert_instance_of(Fixnum, context.depth)
+    assert_instance_of(Integer, context.depth)
   end
 
   def test_disable_sax
@@ -171,7 +171,7 @@ class TestParserContext < Minitest::Test
 
     # Now check context
     context = xp.context
-    assert_equal(nil, context.data_directory)
+    assert_nil(context.data_directory)
     assert_equal(0, context.depth)
     assert_equal(true, context.disable_sax?)
     assert_equal(false, context.docbook?)
@@ -182,7 +182,7 @@ class TestParserContext < Minitest::Test
     assert_equal(1, context.io_num_streams)
     assert_equal(true, context.keep_blanks?)
     assert_equal(1, context.io_num_streams)
-    assert_equal(nil, context.name_node)
+    assert_nil(context.name_node)
     assert_equal(0, context.name_depth)
     assert_equal(10, context.name_depth_max)
     assert_equal(17, context.num_chars)
@@ -190,10 +190,10 @@ class TestParserContext < Minitest::Test
     assert_equal(1, context.space_depth)
     assert_equal(10, context.space_depth_max)
     assert_equal(false, context.subset_external?)
-    assert_equal(nil, context.subset_external_system_id)
-    assert_equal(nil, context.subset_external_uri)
+    assert_nil(context.subset_external_system_id)
+    assert_nil(context.subset_external_uri)
     assert_equal(false, context.subset_internal?)
-    assert_equal(nil, context.subset_internal_name)
+    assert_nil(context.subset_internal_name)
     assert_equal(false, context.stats?)
     assert_equal(true, context.standalone?)
     assert_equal(false, context.valid)
@@ -201,4 +201,4 @@ class TestParserContext < Minitest::Test
     assert_equal('1.0', context.version)
     assert_equal(false, context.well_formed?)
   end
-end
+end

data/test/{tc_properties.rb → test_properties.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 
 # attributes is deprecated - use attributes instead.

data/test/{tc_reader.rb → test_reader.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 require 'stringio'
 
 class TestReader < Minitest::Test
@@ -142,16 +142,16 @@ class TestReader < Minitest::Test
       assert_equal(reader.get_attribute_ns('id', 'http://www.w3.org/XML/1998/namespace'), 'abc')
       assert_equal(reader.get_attribute('bar'), 'jkl')
 
-      assert_equal(reader.get_attribute_no(12), nil)
-      assert_equal(reader.get_attribute('baz'), nil)
-      assert_equal(reader.get_attribute_ns('baz', 'http://ruby/namespace'), nil)
+      assert_nil(reader.get_attribute_no(12))
+      assert_nil(reader.get_attribute('baz'))
+      assert_nil(reader.get_attribute_ns('baz', 'http://ruby/namespace'))
   end
 
   def test_value
     parser = XML::Reader.string("<foo><bar>1</bar><bar>2</bar><bar>3</bar></foo>")
     assert(parser.read)
     assert_equal('foo', parser.name)
-    assert_equal(nil, parser.value)
+    assert_nil(parser.value)
     3.times do |i|
       assert(parser.read)
       assert_equal(XML::Reader::TYPE_ELEMENT, parser.node_type)
@@ -171,22 +171,11 @@ class TestReader < Minitest::Test
 
     # Read a node
     node = reader.expand
+    refute_nil(node.doc)
     assert_equal('feed', node.name)
     assert_equal(::Encoding::UTF_8, node.name.encoding) if defined?(::Encoding)
   end
 
-  def test_expand_doc
-    reader = XML::Reader.file(XML_FILE)
-    reader.read.to_s
-    reader.read
-
-    # Read a node
-    node = reader.expand
-
-    # Try to access the document
-    refute_nil(node.doc)
-  end
-
   def test_expand_find
     reader = XML::Reader.file(XML_FILE)
     reader.read.to_s
@@ -231,6 +220,27 @@ class TestReader < Minitest::Test
     assert_equal('feed', node.name)
   end
 
+  def test_expand_incorrectly_use_returned_node
+    file = File.join(File.dirname(__FILE__), 'model/cwm_1_0.xml')
+    reader = XML::Reader.file(file)
+
+    nodes = Array.new
+    while reader.read
+      node = reader.expand
+      refute_nil(node)
+      refute_nil(node.doc)
+
+      # NOTE - DO NOT do this in real code, these nodes are invalid after the next read. This *will* cause
+      # a segmentation fault next time the garbage collector runs.  The reason is the parent node will be
+      # called in the mark phase, but its underlying xml node will be gone.  Same goes for calling children,
+      # attributes, etc.  You must let go of the expanded node *before* calling xml reader again and
+      # call the garbage collector to be safe.
+      #refute_nil(node.parent)
+      nodes << node
+    end
+    assert(true)
+  end
+
   def test_mode
     reader = XML::Reader.string('<xml/>')
     assert_equal(XML::Reader::MODE_INITIAL, reader.read_state)
@@ -241,7 +251,7 @@ class TestReader < Minitest::Test
   def test_bytes_consumed
     reader = XML::Reader.file(XML_FILE)
     reader.read
-    assert_equal(428, reader.byte_consumed)
+    assert_equal(416, reader.byte_consumed)
   end
 
   def test_node
@@ -329,7 +339,7 @@ class TestReader < Minitest::Test
 
     reader = XML::Reader.string(xml)
     error = assert_raises(XML::Error) do
-      node = reader.read
+      reader.read
     end
 
     assert_equal("Fatal error: Input is not proper UTF-8, indicate encoding !\nBytes: 0xF6 0x74 0x6C 0x65 at :2.",
@@ -355,4 +365,4 @@ class TestReader < Minitest::Test
     # Encoding is always null for strings, very annoying!
     assert_equal(reader.encoding, XML::Encoding::NONE)
   end
-end
+end

data/test/{tc_relaxng.rb → test_relaxng.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 
 class TestRelaxNG < Minitest::Test
@@ -15,7 +15,7 @@ class TestRelaxNG < Minitest::Test
   
   def relaxng
     document = XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.rng'))
-    relaxng = XML::RelaxNG.document(document)
+    XML::RelaxNG.document(document)
   end
 
   def test_from_doc

data/test/{tc_sax_parser.rb → test_sax_parser.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 require 'stringio'
 
 class DocTypeCallback
@@ -243,7 +243,7 @@ EOS
     parser.callbacks = TestCaseCallbacks.new
 
     error = assert_raises(XML::Error) do
-      doc = parser.parse
+      parser.parse
     end
 
     # Check callbacks
@@ -314,6 +314,6 @@ EOS
     assert_equal("Fatal error: xmlParseEntityRef: no name at :5.", error.to_s)
 
     # Check callbacks
-    result = parser.callbacks.result
+    parser.callbacks.result
   end
 end

data/test/{tc_schema.rb → test_schema.rb}

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require './test_helper'
+require File.expand_path('../test_helper', __FILE__)
 
 class TestSchema < Minitest::Test
   def setup
@@ -90,7 +90,6 @@ class TestSchema < Minitest::Test
 
 
   # Schema meta-data tests
-
   def test_elements
     assert_instance_of(Hash, schema.elements)
     assert_equal(1, schema.elements.length)
@@ -103,11 +102,22 @@ class TestSchema < Minitest::Test
     assert_instance_of(XML::Schema::Type, schema.types['shiporder'])
   end
 
+  def test_imported_types
+    assert_instance_of(Hash, schema.imported_types)
+    assert_equal(1, schema.imported_types.length)
+    assert_instance_of(XML::Schema::Type, schema.types['shiporder'])
+  end
+
+  def test_namespaces
+    assert_instance_of(Array, schema.namespaces)
+    assert_equal(1, schema.namespaces.length)
+  end
+
   def test_schema_type
     type = schema.types['shiporder']
 
     assert_equal('shiporder', type.name)
-    assert_equal(nil, type.namespace)
+    assert_nil(type.namespace)
     assert_equal("Shiporder type documentation", type.annotation)
     assert_instance_of(XML::Node, type.node)
     assert_equal(XML::Schema::Types::XML_SCHEMA_TYPE_COMPLEX, type.kind)
@@ -123,17 +133,14 @@ class TestSchema < Minitest::Test
     element = schema.types['shiporder'].elements['orderperson']
 
     assert_equal('orderperson', element.name)
-    assert_equal(nil, element.namespace)
+    assert_nil(element.namespace)
     assert_equal("orderperson element documentation", element.annotation)
-    assert_equal(1, element.min_occurs)
-    assert_equal(1, element.max_occurs)
-
 
     element = schema.types['shiporder'].elements['item']
-    assert_equal(Float::INFINITY, element.max_occurs)
+    assert_equal('item', element.name)
 
     element = schema.types['shiporder'].elements['item'].type.elements['note']
-    assert_equal(0, element.min_occurs)
+    assert_equal('note', element.name)
     assert_equal('string', element.type.name)
   end
 
@@ -149,7 +156,7 @@ class TestSchema < Minitest::Test
     attribute = schema.types['shiporder'].attributes.first
 
     assert_equal("orderid", attribute.name)
-    assert_equal(nil, attribute.namespace)
+    assert_nil(attribute.namespace)
     assert_equal(1, attribute.occurs)
     assert_equal('string', attribute.type.name)
 
@@ -158,4 +165,4 @@ class TestSchema < Minitest::Test
     assert_equal('1', attribute.default)
     assert_equal('integer', attribute.type.name)
   end
-end
+end