libxml-ruby 0.3.8.4 → 0.5.0

data/ext/xml/ruby_xml_sax_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.h,v 1.2 2006/04/14 14:45:52 roscopeco Exp $ */
+/* $Id: ruby_xml_sax_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -6,7 +6,9 @@
 #define __RUBY_XML_SAX_PARSER__
 
 extern VALUE cXMLSaxParser;
+extern VALUE mXMLSaxParserCallbacks;
 
+/*
 typedef struct ruby_xml_sax_parser_callbacks {
     VALUE internalSubset;
     VALUE isStandalone;
@@ -36,11 +38,13 @@ typedef struct ruby_xml_sax_parser_callbacks {
     VALUE cdataBlock;
     VALUE externalSubset;  
 } ruby_xml_sax_parser_callbacks;
+*/
 
 typedef struct ruby_xml_sax_parser {
   xmlParserCtxtPtr xpc;
   xmlSAXHandlerPtr xsh;
-  ruby_xml_sax_parser_callbacks *cbp;
+  //ruby_xml_sax_parser_callbacks *cbp;
+  VALUE callbackHandler;
   VALUE filename;
   VALUE str;
 } ruby_xml_sax_parser;

data/ext/xml/ruby_xml_tree.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_tree.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_tree.c 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_tree.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_tree.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_tree.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xinclude.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xinclude.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xinclude.c 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xinclude.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xinclude.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xinclude.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xpath.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath.c,v 1.2.4.1 2006/11/26 12:37:41 roscopeco Exp $ */
+/* $Id: ruby_xml_xpath.c 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -226,7 +226,8 @@ ruby_xml_xpath_find(int argc, VALUE *argv, VALUE class) {
   if (rxxp->xpop->type != XPATH_NODESET)
     return(Qnil);
 
-  return(ruby_xml_node_set_new2(node->xd, xpath,
+  return(ruby_xml_node_set_new2(ruby_xml_document_wrap(cXMLDocument,node->node->doc),
+				xpath,
 				rxxp->xpop->nodesetval));
 #else
   rb_warn("libxml was compiled without XPath support");

data/ext/xml/ruby_xml_xpath.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xpath.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xpath_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath_context.c,v 1.2 2006/02/27 12:55:32 roscopeco Exp $ */
+/* $Id: ruby_xml_xpath_context.c 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -61,10 +61,10 @@ ruby_xml_xpath_context_new2(VALUE xd, xmlXPathContextPtr xxpc) {
 
 VALUE
 ruby_xml_xpath_context_new3(VALUE xd) {
-  ruby_xml_document *rxd;
+  ruby_xml_document_t *rxd;
   xmlXPathContextPtr ctxt;
 
-  Data_Get_Struct(xd, ruby_xml_document, rxd);
+  Data_Get_Struct(xd, ruby_xml_document_t, rxd);
   if (rxd->doc == NULL)
     return(Qnil);
 
@@ -81,7 +81,7 @@ ruby_xml_xpath_context_new4(VALUE rnode) {
   ruby_xml_node *node;
 
   Data_Get_Struct(rnode, ruby_xml_node, node);
-  return(ruby_xml_xpath_context_new3(node->xd));
+  return ruby_xml_xpath_context_new3(ruby_xml_document_wrap(cXMLDocument,node->node->doc));
 }
 
 

data/ext/xml/ruby_xml_xpath_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath_context.h,v 1.2 2006/02/27 12:55:32 roscopeco Exp $ */
+/* $Id: ruby_xml_xpath_context.h 41 2006-02-27 12:55:32Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xpointer.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.c,v 1.1.4.1 2006/11/26 12:37:42 roscopeco Exp $ */
+/* $Id: ruby_xml_xpointer.c 138 2007-08-29 18:00:35Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -22,7 +22,8 @@ ruby_xml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str) {
 
   Data_Get_Struct(rnode, ruby_xml_node, node);
 
-  rxptr_xpth_ctxt = ruby_xml_xpath_context_new(cXMLXPathContext, node->xd,
+  rxptr_xpth_ctxt = ruby_xml_xpath_context_new(cXMLXPathContext,
+					       ruby_xml_document_wrap(cXMLDocument,node->node->doc),
 					       xmlXPtrNewContext(node->node->doc, node->node, NULL));
   if (NIL_P(rxptr_xpth_ctxt))
     return(Qnil);
@@ -32,7 +33,10 @@ ruby_xml_xpointer_point(VALUE class, VALUE rnode, VALUE xptr_str) {
   if (xpath == NULL)
     rb_raise(eXMLXPointerInvalidExpression, "invalid xpointer expression");
 
-  rxxp = ruby_xml_xpath_new(cXMLXPath, node->xd, rxptr_xpth_ctxt, xpath);
+  rxxp = ruby_xml_xpath_new(cXMLXPath,
+			    ruby_xml_document_wrap(cXMLDocument,node->node->doc),
+			    rxptr_xpth_ctxt
+			    , xpath);
   return(rxxp);
 #else
   rb_warn("libxml was compiled without XPointer support");
@@ -78,7 +82,9 @@ ruby_xml_xpointer_range(VALUE class, VALUE rstart, VALUE rend) {
   if (xpath == NULL)
     rb_fatal("You shouldn't be able to have this happen");
 
-  rxxp = ruby_xml_xpath_new(cXMLXPath, start->xd, Qnil, xpath);
+  rxxp = ruby_xml_xpath_new(cXMLXPath,
+			    ruby_xml_document_wrap(cXMLDocument,start->node->doc),
+			    Qnil, xpath);
   return(rxxp);
 #else
   rb_warn("libxml was compiled without XPointer support");

data/ext/xml/ruby_xml_xpointer.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xpointer.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xpointer_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer_context.c,v 1.2.4.1 2006/11/26 12:37:42 roscopeco Exp $ */
+/* $Id: ruby_xml_xpointer_context.c 120 2006-11-26 12:57:56Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_xpointer_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpointer_context.h,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_xpointer_context.h 39 2006-02-21 20:40:16Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/sax_parser_callbacks.inc

@@ -1,65 +1,65 @@
-/* $Id: sax_parser_callbacks.inc,v 1.1.4.1 2006/11/26 12:45:14 roscopeco Exp $ */
+/* $Id: sax_parser_callbacks.inc 120 2006-11-26 12:57:56Z roscopeco $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 /*
  * SAX CALLBACK HANDLERS
  */ 
-static void internal_subset_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void internal_subset_func(ruby_xml_sax_parser *cbp, 
        const char *name,
        const char *extid,
        const char *sysid) {
-  VALUE handler = cbp->internalSubset;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler, callsym, 3, rb_str_new2(name),
+    rb_funcall(handler, cbidOnInternalSubset, 3, rb_str_new2(name),
         rb_str_new2(extid), rb_str_new2(sysid));
   }    
 }
 
-static void is_standalone_func(ruby_xml_sax_parser_callbacks *cbp) {
-  VALUE handler = cbp->isStandalone;
+static void is_standalone_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,0);
+    rb_funcall(handler,cbidOnIsStandalone,0);
   }    
 }
 
-static void has_internal_subset_func(ruby_xml_sax_parser_callbacks *cbp) {
-  VALUE handler = cbp->hasInternalSubset;
+static void has_internal_subset_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,0);
+    rb_funcall(handler,cbidOnHasInternalSubset,0);
   }    
 }
 
-static void has_external_subset_func(ruby_xml_sax_parser_callbacks *cbp) {
-  VALUE handler = cbp->hasExternalSubset;
+static void has_external_subset_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,0);
+    rb_funcall(handler,cbidOnHasExternalSubset,0);
   }    
 }
 
-static void start_document_func(ruby_xml_sax_parser_callbacks *cbp) {
-  VALUE handler = cbp->startDocument;
+static void start_document_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,0);
+    rb_funcall(handler,cbidOnStartDocument,0);
   }    
 }
 
-static void end_document_func(ruby_xml_sax_parser_callbacks *cbp) {
-  VALUE handler = cbp->endDocument;
+static void end_document_func(ruby_xml_sax_parser *cbp) {
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,0);
+    rb_funcall(handler,cbidOnEndDocument,0);
   }    
 }
 
-static void start_element_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void start_element_func(ruby_xml_sax_parser *cbp, 
        const char *name, const char **attrs) {  
-  VALUE handler = cbp->startElement;
+  VALUE handler = cbp->callbackHandler;
   VALUE ahsh = rb_hash_new();
   const char *attr, *value;
   
@@ -71,57 +71,57 @@ static void start_element_func(ruby_xml_sax_parser_callbacks *cbp,
   }    
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,2,rb_str_new2(name),ahsh);
+    rb_funcall(handler,cbidOnStartElement,2,rb_str_new2(name),ahsh);
   }    
 }        
 
-static void end_element_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void end_element_func(ruby_xml_sax_parser *cbp, 
        const char *name) {
-  VALUE handler = cbp->endElement;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,1,rb_str_new2(name));
+    rb_funcall(handler,cbidOnEndElement,1,rb_str_new2(name));
   }    
 }
 
-static void reference_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void reference_func(ruby_xml_sax_parser *cbp, 
        const char *name) {
-  VALUE handler = cbp->reference;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,1,rb_str_new2(name));
+    rb_funcall(handler,cbidOnReference,1,rb_str_new2(name));
   }    
 }
 
-static void characters_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void characters_func(ruby_xml_sax_parser *cbp, 
        const char *chars, int len) {
-  VALUE handler = cbp->characters;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,1,rb_str_new(chars, len));
+    rb_funcall(handler,cbidOnCharacters,1,rb_str_new(chars, len));
   }    
 }
 
-static void processing_instruction_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void processing_instruction_func(ruby_xml_sax_parser *cbp, 
        const char *target, const char *data) {
-  VALUE handler = cbp->processingInstruction;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler, callsym, 2,
+    rb_funcall(handler, cbidOnProcessingInstruction, 2,
         rb_str_new2(target),rb_str_new2(data));
   }    
 }
 
-static void comment_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void comment_func(ruby_xml_sax_parser *cbp, 
        const char *msg) {
-  VALUE handler = cbp->comment;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,1,rb_str_new2(msg));
+    rb_funcall(handler,cbidOnComment,1,rb_str_new2(msg));
   }    
 }
 
-#define FORMAT_AND_CALL() \
+#define FORMAT_AND_CALL(callsym) \
   do { \
     va_list args; \
     char buf[1024]; \
@@ -131,51 +131,52 @@ static void comment_func(ruby_xml_sax_parser_callbacks *cbp,
     va_end(args); \
   } \
   while (0)
-
-static void warning_func(ruby_xml_sax_parser_callbacks *cbp, 
+  
+// TODO these next three should actually be formatting messages.
+static void warning_func(ruby_xml_sax_parser *cbp, 
        const char *msg, ...) {
-  VALUE handler = cbp->xmlParserWarning;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    FORMAT_AND_CALL();
+    FORMAT_AND_CALL(cbidOnXmlParserWarning);
   }    
 }
 
-static void error_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void error_func(ruby_xml_sax_parser *cbp, 
        const char *msg, ...) {
-  VALUE handler = cbp->xmlParserError;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    FORMAT_AND_CALL();
+    FORMAT_AND_CALL(cbidOnXmlParserError);
   }    
 }
 
-static void fatal_error_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void fatal_error_func(ruby_xml_sax_parser *cbp, 
        const char *msg, ...) {
-  VALUE handler = cbp->xmlParserFatalError;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    FORMAT_AND_CALL();
+    FORMAT_AND_CALL(cbidOnXmlParserFatalError);
   }    
 }
 
-static void cdata_block_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void cdata_block_func(ruby_xml_sax_parser *cbp, 
        const char *value, int len) {
-  VALUE handler = cbp->cdataBlock;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler,callsym,1,rb_str_new(value, len));
+    rb_funcall(handler,cbidOnCdataBlock,1,rb_str_new(value, len));
   }    
 }
 
-static void external_subset_func(ruby_xml_sax_parser_callbacks *cbp, 
+static void external_subset_func(ruby_xml_sax_parser *cbp, 
        const char *name,
        const char *extid,
        const char *sysid) {
-  VALUE handler = cbp->externalSubset;
+  VALUE handler = cbp->callbackHandler;
   
   if (handler && handler != Qnil) {
-    rb_funcall(handler, callsym, 3, rb_str_new2(name),
+    rb_funcall(handler, cbidOnExternalSubset, 3, rb_str_new2(name),
         rb_str_new2(extid), rb_str_new2(sysid));
   }    
 }

data/tests/model/rubynet_project

@@ -1,4 +1,4 @@
-# $Id: rubynet_project,v 1.1 2005/12/19 19:53:07 roscopeco Exp $
+# $Id: rubynet_project 26 2005-12-19 19:53:07Z roscopeco $
 
 copyright:	2001-2003, rubynet.org
 description:	Ruby bindings for the libxml2 library.  The API for this

data/tests/model/simple.xml

@@ -0,0 +1,7 @@
+<root>
+<foo>123</foo>
+<bar x='1' y='2'>
+  <fuga>test1</fuga>
+  <fuga>test2</fuga>
+</bar>
+</root>

data/tests/tc_xml_document.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_document.rb,v 1.3 2006/04/17 13:30:20 roscopeco Exp $
+# $Id: tc_xml_document.rb 67 2006-04-17 13:30:22Z roscopeco $
 require 'test/unit'
 require "libxml_test"
 

data/tests/tc_xml_document_write.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_document_write.rb,v 1.3 2006/04/17 13:30:19 roscopeco Exp $
+# $Id: tc_xml_document_write.rb 67 2006-04-17 13:30:22Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_document_write2.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_document_write2.rb,v 1.3 2006/04/17 13:30:18 roscopeco Exp $
+# $Id: tc_xml_document_write2.rb 67 2006-04-17 13:30:22Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_document_write3.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_document_write3.rb,v 1.4 2006/11/20 01:22:08 roscopeco Exp $
+# $Id: tc_xml_document_write3.rb 107 2006-11-20 01:22:08Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_html_parser.rb

@@ -0,0 +1,60 @@
+# $Id: tc_xml_html_parser.rb 111 2006-11-20 01:39:14Z roscopeco $
+require "libxml_test"
+require 'test/unit'
+
+class TC_XML_HTMLParser < Test::Unit::TestCase
+  def setup()
+    @xp = XML::HTMLParser.new()
+    assert_not_nil(@xp)
+    str = '<html><head><meta name=keywords content=nasty></head><body>Hello<br>World</html>'
+    @xp.string = str
+    assert_equal(str, @xp.string)
+  end
+
+  def teardown()
+    @xp = nil
+  end
+
+  def test_libxml_html_parser_parse()
+    doc = @xp.parse
+    
+    assert_instance_of XML::Document, doc
+    
+    root = doc.root
+    assert_instance_of XML::Node, root
+    assert_equal 'html', root.name
+    
+    head = root.child
+    assert_instance_of XML::Node, head
+    assert_equal 'head', head.name
+    
+    meta = head.child
+    assert_instance_of XML::Node, meta
+    assert_equal 'meta', meta.name
+    assert_equal 'keywords', meta[:name]
+    assert_equal 'nasty', meta[:content]
+    
+    body = head.next
+    assert_instance_of XML::Node, body
+    assert_equal 'body', body.name
+    
+    hello = body.child
+    assert_instance_of XML::Node, hello
+    assert_equal 'Hello', hello.content
+    
+    br = hello.next
+    assert_instance_of XML::Node, br
+    assert_equal 'br', br.name
+    
+    world = br.next
+    assert_instance_of XML::Node, world
+    assert_equal 'World', world.content
+  end
+
+  def test_libxml_html_parser_parser_context()
+    doc = @xp.parse
+    assert_instance_of(XML::Document, doc)
+    assert_instance_of(XML::Parser::Context, @xp.parser_context)
+	assert @xp.parser_context.html?
+  end
+end # TC_XML_HTMLParser

data/tests/tc_xml_node.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node.rb,v 1.3 2006/04/17 13:30:19 roscopeco Exp $
+# $Id: tc_xml_node.rb 67 2006-04-17 13:30:22Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_node2.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node2.rb,v 1.3 2006/04/17 13:30:19 roscopeco Exp $
+# $Id: tc_xml_node2.rb 67 2006-04-17 13:30:22Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_node3.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node3.rb,v 1.3 2006/11/20 01:22:08 roscopeco Exp $
+# $Id: tc_xml_node3.rb 107 2006-11-20 01:22:08Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_node4.rb

@@ -1,13 +1,16 @@
-# $Id: tc_xml_node4.rb,v 1.3 2006/05/10 18:02:51 roscopeco Exp $
+# $Id: tc_xml_node4.rb 142 2007-08-29 18:56:22Z danj $
 require "libxml_test"
 require 'test/unit'
 
 class TC_XML_Node4 < Test::Unit::TestCase
   def setup()
     xp = XML::Parser.new()
-    str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
-    assert_equal(str, xp.string = str)
+    @str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
+    assert_equal(@str, xp.string = @str)
     doc = xp.parse
+    xp2=XML::Parser.new()
+    xp2.string=@str
+    @doc2 = xp2.parse
     assert_instance_of(XML::Document, doc)
     assert_instance_of(XML::Node, doc.root)
     @root = doc.root
@@ -20,7 +23,7 @@ class TC_XML_Node4 < Test::Unit::TestCase
   
   def test_xml_node_eql?()
     first1 = @root.child
-    first2 = @root.child
+    first2 = @doc2.root.child
     
     assert_not_equal first1.object_id, first2.object_id
     assert first1.eql?(first2)
@@ -31,7 +34,7 @@ class TC_XML_Node4 < Test::Unit::TestCase
 
   def test_xml_node_hash()
     first1 = @root.child
-    first2 = @root.child
+    first2 = @doc2.root.child
     
     assert_not_equal first1.object_id, first2.object_id
     assert_equal first1.hash, first2.hash

data/tests/tc_xml_node5.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node5.rb,v 1.1 2006/05/10 18:03:57 roscopeco Exp $
+# $Id: tc_xml_node5.rb 78 2006-05-10 18:03:57Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_node6.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node6.rb,v 1.2 2006/05/31 17:26:43 roscopeco Exp $
+# $Id: tc_xml_node6.rb 81 2006-05-31 17:26:43Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_node7.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node7.rb,v 1.2.2.1 2006/11/27 10:32:01 roscopeco Exp $
+# $Id: tc_xml_node7.rb 123 2006-11-27 10:41:14Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_node_set.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node_set.rb,v 1.3 2006/04/17 13:30:19 roscopeco Exp $
+# $Id: tc_xml_node_set.rb 67 2006-04-17 13:30:22Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_node_set2.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node_set2.rb,v 1.3 2006/11/20 01:22:08 roscopeco Exp $
+# $Id: tc_xml_node_set2.rb 107 2006-11-20 01:22:08Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_node_xlink.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_node_xlink.rb,v 1.4 2006/11/20 01:22:08 roscopeco Exp $
+# $Id: tc_xml_node_xlink.rb 107 2006-11-20 01:22:08Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_parser.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_parser.rb,v 1.3 2006/04/17 13:30:19 roscopeco Exp $
+# $Id: tc_xml_parser.rb 124 2006-11-30 17:29:04Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 
@@ -70,6 +70,10 @@ class TC_XML_Parser < Test::Unit::TestCase
 
     XML::Parser::default_keep_blanks = false
     assert(!XML::Parser::default_keep_blanks)
+    
+    # other tests depend on keeping blanks by default,
+    # which is the default default behaviour anyway.
+    XML::Parser::default_keep_blanks = true    
   end
 
   def test_ruby_xml_parser_default_line_numbers()

data/tests/tc_xml_parser2.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_parser2.rb,v 1.3 2006/04/17 13:30:18 roscopeco Exp $
+# $Id: tc_xml_parser2.rb 67 2006-04-17 13:30:22Z roscopeco $
 require "libxml_test"
 require 'test/unit'
 

data/tests/tc_xml_parser3.rb

@@ -1,4 +1,4 @@
-# $Id: tc_xml_parser3.rb,v 1.3 2006/04/17 13:30:18 roscopeco Exp $
+# $Id: tc_xml_parser3.rb 67 2006-04-17 13:30:22Z roscopeco $
 require "libxml_test"
 require 'test/unit'