libxml-ruby 2.0.2 → 2.0.3

data/ext/libxml/ruby_xml_schema.c

@@ -99,61 +99,10 @@ static VALUE rxml_schema_init_from_string(VALUE self, VALUE schema_str)
   return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
 }
 
-/* TODO what is this patch doing here?
-
- xmlSchemaParserCtxtPtr  parser;
- xmlSchemaPtr            sptr;
- xmlSchemaValidCtxtPtr   vptr;
- +	int                     is_invalid;
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &source) == FAILURE) {
- return;
- @@ -598,26 +598,24 @@
- convert_to_string_ex(&source);
- parser = xmlSchemaNewParserCtxt(Z_STRVAL_P(source));
- sptr = xmlSchemaParse(parser);
- break;
- case SCHEMA_BLOB:
- convert_to_string_ex(&source);
- parser = xmlSchemaNewMemParserCtxt(Z_STRVAL_P(source), Z_STRLEN_P(source));
- sptr = xmlSchemaParse(parser);
- break;
- }
-
- vptr = xmlSchemaNewValidCtxt(sptr);
- +	is_invalid = xmlSchemaValidateDoc(vptr, (xmlDocPtr) sxe->document->ptr);
- xmlSchemaFree(sptr);
- xmlSchemaFreeValidCtxt(vptr);
- xmlSchemaFreeParserCtxt(parser);
-
- -	if (is_valid) {
- -		RETURN_TRUE;
- -	} else {
- +	if (is_invalid) {
- RETURN_FALSE;
- +	} else {
- +		RETURN_TRUE;
- }
- }
- }}}
- @@ -695,7 +693,7 @@
- {
- if (!strcmp(method, "xsearch")) {
- simplexml_ce_xpath_search(INTERNAL_FUNCTION_PARAM_PASSTHRU);
- -#ifdef xmlSchemaParserCtxtPtr
- +#ifdef LIBXML_SCHEMAS_ENABLED
- } else if (!strcmp(method, "validate_schema_file")) {
- simplexml_ce_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, SCHEMA_FILE);
- } else if (!strcmp(method, "validate_schema_buffer")) {
- */
-
 void rxml_init_schema(void)
 {
   cXMLSchema = rb_define_class_under(mXML, "Schema", rb_cObject);
   rb_define_singleton_method(cXMLSchema, "new", rxml_schema_init_from_uri, 1);
-  rb_define_singleton_method(cXMLSchema, "from_string",
-      rxml_schema_init_from_string, 1);
-  rb_define_singleton_method(cXMLSchema, "document",
-      rxml_schema_init_from_document, 1);
+  rb_define_singleton_method(cXMLSchema, "from_string", rxml_schema_init_from_string, 1);
+  rb_define_singleton_method(cXMLSchema, "document", rxml_schema_init_from_document, 1);
 }
-

data/ext/libxml/ruby_xml_version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "2.0.2"
-#define RUBY_LIBXML_VERNUM   202
+#define RUBY_LIBXML_VERSION  "2.0.3"
+#define RUBY_LIBXML_VERNUM   203
 #define RUBY_LIBXML_VER_MAJ   2
 #define RUBY_LIBXML_VER_MIN   0
-#define RUBY_LIBXML_VER_MIC   2
+#define RUBY_LIBXML_VER_MIC   3
 #define RUBY_LIBXML_VER_PATCH 0

data/test/tc_document.rb

@@ -1,10 +1,7 @@
 # encoding: UTF-8
-
 require './test_helper'
-
 require 'test/unit'
 
-
 class TestDocument < Test::Unit::TestCase
   def setup
     xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
@@ -34,6 +31,22 @@ class TestDocument < Test::Unit::TestCase
     }
   end
 
+  def test_canonicalize
+    doc = XML::Parser.string(<<-EOS).parse
+      <?xml-stylesheet href="doc.xsl" type="text/xsl"?>
+      <doc>Hello, world!<!-- Comment 1 --></doc>
+    EOS
+
+    expected = "<?xml-stylesheet href=\"doc.xsl\" type=\"text/xsl\"?>\n<doc>Hello, world!</doc>"
+    assert_equal(expected, doc.canonicalize)
+
+    expected = "<?xml-stylesheet href=\"doc.xsl\" type=\"text/xsl\"?>\n<doc>Hello, world!<!-- Comment 1 --></doc>"
+    assert_equal(expected, doc.canonicalize(true))
+
+    expected = "<?xml-stylesheet href=\"doc.xsl\" type=\"text/xsl\"?>\n<doc>Hello, world!</doc>"
+    assert_equal(expected, doc.canonicalize(false))
+  end
+
   def test_compression
     if XML.enabled_zlib?
       0.upto(9) do |i|
@@ -105,15 +118,39 @@ class TestDocument < Test::Unit::TestCase
 		assert(doc.xhtml?)
 	end
 
+  def test_document_root
+    doc1 = LibXML::XML::Document.string("<one/>")
+    doc2 = LibXML::XML::Document.string("<two/>")
+
+    error = assert_raise(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.",
+                 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 = XML::Parser.string('<nums><one></one></nums>').parse
     doc2 = XML::Parser.string('<nums><two></two></nums>').parse
 
     node = doc1.root.child
 
+    error = assert_raise(XML::Error) do
+      doc2.root << node
+    end
+    assert_equal(" Nodes belong to different documents.  You must first import the node by calling XML::Document.import.",
+                 error.to_s)
+
     doc2.root << doc2.import(node)
 
-    assert_equal("<nums>\n  <two/>\n  <one/>\n</nums>",
-                 doc2.root.to_s)
+    assert_equal("<nums><two/><one/></nums>",
+                 doc2.root.to_s(:indent => false))
   end
-end
+end

data/test/tc_document_write.rb

@@ -94,7 +94,7 @@ class TestDocumentWrite < Test::Unit::TestCase
       assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\366tley_cr\374e country=\"us\">M\366tley Cr\374e is an American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
                    @doc.to_s(:encoding => XML::Encoding::ISO_8859_1))
     end
-    
+
     # Invalid encoding
     error = assert_raise(ArgumentError) do
       @doc.to_s(:encoding => -9999)
@@ -180,6 +180,20 @@ class TestDocumentWrite < Test::Unit::TestCase
     File.delete(temp_filename)
   end
 
+  def test_thread_set_root
+    # Previously a segmentation fault occurred when running libxml in
+    # background threads.
+    thread = Thread.new do
+      100000.times do |i|
+        document = LibXML::XML::Document.new
+        node = LibXML::XML::Node.new('test')
+        document.root = node
+      end
+    end
+    thread.join
+    assert(true)
+  end
+
   # --- Debug ---
   def test_debug
     assert(@doc.debug)

data/test/tc_error.rb

@@ -5,8 +5,16 @@ require 'test/unit'
 require 'stringio'
 
 class TestError < Test::Unit::TestCase
+  def test_error_codes
+    assert_equal(4, XML::Error::DTD)
+    assert_equal(4, XML::Error.const_get('DTD'))
+
+    assert_equal(4, XML::Error::DOCUMENT_EMPTY)
+    assert_equal(4, XML::Error.const_get('DOCUMENT_EMPTY'))
+  end
+
   def test_invalid_handler
-    assert_raises(RuntimeError) do
+    assert_raise(RuntimeError) do
       XML::Error.set_handler
     end
   end
@@ -18,15 +26,18 @@ class TestError < Test::Unit::TestCase
     end
 
     # Raise the error
-    XML::Reader.new('<foo').read
+    error = assert_raise(XML::Error) do
+      XML::Reader.string('<foo').read
+    end
+    assert_equal(exception, error)
 
     # Check the handler worked
     assert_not_nil(exception)
     assert_kind_of(XML::Error, exception)
     assert_equal("Fatal error: Couldn't find end of Start Tag foo at :1.", exception.message)
-    assert_equal(XML::Error::XML_FROM_PARSER, exception.domain)
-    assert_equal(XML::Error::XML_ERR_GT_REQUIRED, exception.code)
-    assert_equal(XML::Error::XML_ERR_FATAL, exception.level)
+    assert_equal(XML::Error::PARSER, exception.domain)
+    assert_equal(XML::Error::GT_REQUIRED, exception.code)
+    assert_equal(XML::Error::FATAL, exception.level)
     assert_nil(exception.file)
     assert_equal(1, exception.line)
     assert_equal('foo', exception.str1)
@@ -44,7 +55,7 @@ class TestError < Test::Unit::TestCase
     end
 
     XML::Error.reset_handler
-    reader = XML::Reader.new('<foo')
+    XML::Reader.string('<foo')
     assert_nil(exception)
   end
 
@@ -87,9 +98,9 @@ class TestError < Test::Unit::TestCase
 
     assert_instance_of(XML::Error, exception)
     assert_equal("Fatal error: Opening and ending tag mismatch: foo line 1 and foz at :1.", exception.message)
-    assert_equal(XML::Error::XML_FROM_PARSER, exception.domain)
-    assert_equal(XML::Error::XML_ERR_TAG_NAME_MISMATCH, exception.code)
-    assert_equal(XML::Error::XML_ERR_FATAL, exception.level)
+    assert_equal(XML::Error::PARSER, exception.domain)
+    assert_equal(XML::Error::TAG_NAME_MISMATCH, exception.code)
+    assert_equal(XML::Error::FATAL, exception.level)
     assert_nil(exception.file)
     assert_equal(1, exception.line)
   end
@@ -98,14 +109,14 @@ class TestError < Test::Unit::TestCase
     doc = XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
 
     exception = assert_raise(XML::Error) do
-      elements = doc.find('/foo[bar=test')
+      doc.find('/foo[bar=test')
     end
 
     assert_instance_of(XML::Error, exception)
-    assert_equal("Error: Invalid predicate at :0.", exception.message)
-    assert_equal(XML::Error::XML_FROM_XPATH, exception.domain)
-    assert_equal(XML::Error::XML_XPATH_INVALID_PREDICATE_ERROR, exception.code)
-    assert_equal(XML::Error::XML_ERR_ERROR, exception.level)
+    assert_equal("Error: Invalid predicate.", exception.message)
+    assert_equal(XML::Error::XPATH, exception.domain)
+    assert_equal(XML::Error::XPATH_INVALID_PREDICATE_ERROR, exception.code)
+    assert_equal(XML::Error::ERROR, exception.level)
     assert_nil(exception.file)
     assert_nil(nil)
   end
@@ -113,26 +124,27 @@ class TestError < Test::Unit::TestCase
   def test_double_parse
     XML::Parser.register_error_handler(lambda {|msg| nil })
     parser = XML::Parser.string("<test>something</test>")
-    doc = parser.parse
+    parser.parse
 
-    error = assert_raise(RuntimeError) do
+    error = assert_raise(XML::Error) do
       # Try parsing a second time
       parser.parse
     end
 
-    assert_equal("You cannot parse a data source twice", error.to_s)
+    assert_equal("Fatal error: Document is empty at :1.", error.to_s)
   end
 
   def test_libxml_parser_empty_string
     xp = XML::Parser.new
 
-    assert_raise(TypeError) do
+    error = assert_raise(TypeError) do
       xp.string = nil
     end
+    assert_equal('wrong argument type nil (expected String)', error.to_s)
 
-    xp.string = ''
-    assert_raise(XML::Error) do
-      xp.parse
+    error = assert_raise(ArgumentError) do
+      xp.string = ''
     end
+    assert_equal('Must specify a string with one or more characters', error.to_s)
   end
 end

data/test/tc_node.rb

@@ -255,4 +255,15 @@ class TestNode < Test::Unit::TestCase
     node.space_preserve = true
     assert_equal XML::Node::SPACE_PRESERVE, node.space_preserve
   end
+
+  def test_empty
+    text = '<name> </name>'
+    doc = XML::Parser.string(text).parse
+
+    node = doc.root
+    assert(!node.empty?)
+    
+    text_node = node.first
+    assert(text_node.empty?)
+  end
 end

data/test/tc_node_edit.rb

@@ -67,6 +67,21 @@ class TestNodeEdit < Test::Unit::TestCase
                  @doc.root.to_s.gsub(/\n\s*/,''))
   end
 
+  def test_freed_node
+    root = XML::Node.new("root")
+
+    a = XML::Node.new("a")
+    root << a
+
+    a.parent.remove!
+
+    # Node a has now been freed from under us
+    error = assert_raise(RuntimeError) do
+      a.to_s
+    end
+    assert_equal('This node has already been freed.', error.to_s)
+  end
+
   def test_remove_node_gc
     xp = XML::Parser.string('<test><num>one</num><num>two</num><num>three</num></test>')
     doc = xp.parse
@@ -92,7 +107,7 @@ class TestNodeEdit < Test::Unit::TestCase
     node = @doc.root.first.remove!
     assert_not_nil(node)
 
-    # Add it to the end of the documnet
+    # Add it to the end of the document
     @doc.root.last.next = node
 
     assert_equal('<test><num>two</num><num>three</num><num>one</num></test>',
@@ -109,6 +124,7 @@ class TestNodeEdit < Test::Unit::TestCase
   end
 
   def test_wrong_doc
+    puts 333333
     doc1 = XML::Parser.string('<nums><one></one></nums>').parse
     doc2 = XML::Parser.string('<nums><two></two></nums>').parse
 
@@ -118,11 +134,11 @@ class TestNodeEdit < Test::Unit::TestCase
       doc2.root << node
     end
 
-    assert_equal(' Nodes belong to different documents.  You must first import the by calling XML::Document.import.',
+    GC.start
+    assert_equal(' Nodes belong to different documents.  You must first import the node by calling XML::Document.import.',
                  error.to_s)
   end
 
-
   # This test is to verify that an earlier reported bug has been fixed
   def test_merge
     documents = []

data/test/tc_parser.rb

@@ -15,7 +15,7 @@ class TestParser < Test::Unit::TestCase
     GC.start
   end
       
-  # -----  Sources  -------8
+  # -----  Sources  -------
   def test_document
     file = File.expand_path(File.join(File.dirname(__FILE__), 'model/bands.utf-8.xml'))
     parser = XML::Parser.file(file)
@@ -128,6 +128,21 @@ class TestParser < Test::Unit::TestCase
     assert_instance_of(XML::Parser::Context, parser.context)
   end
 
+  def test_string_io_thread
+    thread = Thread.new do
+      data = File.read(File.join(File.dirname(__FILE__), 'model/rubynet.xml'))
+      string_io = StringIO.new(data)
+      parser = XML::Parser.io(string_io)
+
+      doc = parser.parse
+      assert_instance_of(XML::Document, doc)
+      assert_instance_of(XML::Parser::Context, parser.context)
+    end
+
+    thread.join
+    assert(true)
+  end
+  
   def test_string
     str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
 

data/test/tc_reader.rb

@@ -164,11 +164,19 @@ class TestReader < Test::Unit::TestCase
 
   def test_expand
     reader = XML::Reader.file(XML_FILE)
+    reader.read.to_s
     reader.read
+
+    # Read a node
     node = reader.expand
-    assert_nil(node.doc)
-    reader.close
-    GC.start
+    assert_equal('feed', node.name)
+    assert_equal(::Encoding::UTF_8, node.name.encoding) if defined?(::Encoding)
+
+    # Try to access the document
+    error = assert_raise(XML::Error) do
+      assert_not_nil(node.doc)
+    end
+    assert_equal(" Document is not accessible to Ruby (hint - did you call Reader#expand?).", error.to_s)
   end
 
   def test_mode

data/test/tc_sax_parser.rb

@@ -201,7 +201,7 @@ class TestSaxParser < Test::Unit::TestCase
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Results SYSTEM "results.dtd">
 <Results>
-  <a>a1</a>
+<a>a1</a>
 </Results>
 EOS
     parser = XML::SaxParser.string(xml)
@@ -273,4 +273,48 @@ EOS
     assert_equal(1, error.int2)
     assert_nil(error.node)
   end
+
+  def test_parse_seg_fail
+    xml = <<-EOS
+      <?xml version="1.0" encoding="ISO-8859-1" ?>
+      <Products>
+        <Product>
+          <ProductDescription>
+            AQUALIA THERMAL Lichte cr├иme - Versterkende & kalmerende 24 u hydraterende verzorging<br />
+            Huid wordt continu gehydrateerd, intens versterkt en gekalmeerd.<br />
+            Hypoallergeen. Geschikt voor de gevoelige huid.<br />
+            <br />
+            01.EFFECTIVITEIT<br />
+            Intensief gehydrateerd, de huid voelt gekalmeerd. Ze voelt de hele dag soepel en fluweelzacht aan, zonder een trekkerig gevoel. De huid is elastischer, soepeler en stralender. Doeltreffendheid getest onder dermatologisch toezicht. <br />
+            <br />
+            02.GEBRUIK<br />
+            's Morgens en/ of 's avonds aanbrengen. <br />
+            <br />
+            03.ACTIEVE INGREDIENTEN<br />
+            Technologische innovatie: 24 u continue cellulaire vochtnevel. Voor de 1ste keer worden Thermaal Bronwater van Vichy, rijk aan zeldzame mineralen en Actief HyaluronineтДв verwerkt in microcapsules, die deze vervolgens verspreiden in de cellen. <br />
+            <br />
+            04.TEXTUUR<br />
+            De lichte cr├иme is verfrissend en trekt makkelijk in. Niet vet en niet kleverig. Zonder 'maskereffect'. <br />
+            <br />
+            05.GEUR<br />
+            Geparfumeerd <br />
+            <br />
+            06.INHOUD<br />
+            40 ml tube <br />
+          </ProductDescription>
+        </Product>
+      </Products>
+    EOS
+
+    parser = XML::SaxParser.string(xml)
+    parser.callbacks = TestCaseCallbacks.new
+
+    error = assert_raise(XML::Error) do
+      parser.parse
+    end
+    assert_equal("Fatal error: xmlParseEntityRef: no name at :5.", error.to_s)
+
+    # Check callbacks
+    result = parser.callbacks.result
+  end
 end