libxml-ruby 0.7.0 → 0.8.0

data/ext/libxml/ruby_xml_attributes.h

@@ -1,17 +1,17 @@
-/* $Id: ruby_xml_attributes.h 282 2008-07-01 06:44:30Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_ATTRIBUTES__
-#define __RUBY_XML_ATTRIBUTES__
-
-extern VALUE cXMLAttributesibutes;
-
-void ruby_init_xml_attributes(void);
-VALUE ruby_xml_attributes_new(xmlNodePtr xnode);
-
-VALUE ruby_xml_attributes_attribute_get(VALUE self, VALUE name);
-VALUE ruby_xml_attributes_attribute_set(VALUE self, VALUE name, VALUE value);
-
-
-#endif
+/* $Id: ruby_xml_attributes.h 282 2008-07-01 06:44:30Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_ATTRIBUTES__
+#define __RUBY_XML_ATTRIBUTES__
+
+extern VALUE cXMLAttributesibutes;
+
+void ruby_init_xml_attributes(void);
+VALUE ruby_xml_attributes_new(xmlNodePtr xnode);
+
+VALUE ruby_xml_attributes_attribute_get(VALUE self, VALUE name);
+VALUE ruby_xml_attributes_attribute_set(VALUE self, VALUE name, VALUE value);
+
+
+#endif

data/ext/libxml/ruby_xml_document.c

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_document.c 359 2008-07-09 20:24:21Z cfis $ */
+/* $Id: ruby_xml_document.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 /*
-* Document-class: XML::Document
+* Document-class: LibXML::XML::Document
 *
 * Reads or writes an XML document:
 *
@@ -404,43 +404,6 @@ ruby_xml_document_filename_get(VALUE self) {
 }
 
 
-/*
- * call-seq:
- *    document.find(xpath_expr, [namespace]) -> XML::Node::Set
- * 
- * Find nodes matching the specified xpath expression, optionally
- * using the specified namespace. Returns an XML::Node::Set.  For
- * more information about working with namespaces, please refer
- * to the XML::XPath documentation.
- *
- * IMPORTANT - The returned XML::Node::Set must be freed before
- * its associated document.  In a running Ruby program this will
- * happen automatically via Ruby's mark and sweep garbage collector.
- * However, if the program exits, Ruby does not guarantee the order
- * in which objects are freed
- * (see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/17700).
- * As a result, the associated document may be freed before the node
- * list, which will cause a segmentation fault.
- *
- * To avoid this, use the following (non-ruby like) coding style:
- *
- *  nodes = doc.find('/header')
- *  nodes.each do |node|
- *    ... do stuff ...
- *  end
- *
- *  nodes = nil
- *  GC.start
- */
-VALUE
-ruby_xml_document_find(int argc, VALUE *argv, VALUE self) {
-  if (argc > 2 || argc < 1)
-    rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
-
-  return(ruby_xml_xpath_find2(self,argv[0],(argc==2)?argv[1]:Qnil));
-}
-
-
 void
 ruby_xml_document_free(ruby_xml_document_t *rxd) {
   void *data;
@@ -755,40 +718,48 @@ ruby_xml_document_root_set(VALUE self, VALUE node) {
 
 /*
  * call-seq:
- *    document.save(format = false)
+ *    document.save(filename, format = false) -> int
  * 
  * Save this document to the file given by filename, 
  * optionally formatting the output.
+ 
+ * Parameters:
+ *  filename: The filename or URL of the new document
+ *  format: Specifies whether formatting spaces should be added.
+ *  returns: The number of bytes written or -1 in case of error. 
  */
 VALUE
 ruby_xml_document_save(int argc, VALUE *argv, VALUE self) {
   ruby_xml_document_t *rxd;
   const char *filename;
-  int format, len;
+  int format = 0;
+  int len;
 
-  format = 0;
-  switch (argc) {
-  case 1:
-    break;
-  case 2:
-    if (TYPE(argv[1]) == T_TRUE)
-      format = 1;
-    else if (TYPE(argv[1]) == T_FALSE)
-      format = 0;
-    else
-      rb_raise(rb_eTypeError, "wrong type of argument, must be bool");
-    break;
-  default:
-    rb_raise(rb_eArgError, "wrong number of arguments (0 or 1)");
-  }
+  if (argc <1 || argc > 2)
+    rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
 
   Check_Type(argv[0], T_STRING);
   filename = StringValuePtr(argv[0]);
+  
+  if (argc == 2)
+  {
+    switch (TYPE(argv[1])) {
+      case T_TRUE:
+        format = 1;
+        break;
+      case T_FALSE:
+        format = 0;
+        break;
+      default:
+        rb_raise(rb_eArgError, "The second parameter (format) must be true or false");
+    }
+  }
 
   Data_Get_Struct(self, ruby_xml_document_t, rxd);
   len = xmlSaveFormatFileEnc(filename, rxd->doc, (const char*)rxd->doc->encoding, format);
+  
   if (len == -1)
-    rb_fatal("Unable to write out file");
+    rb_raise(rb_eIOError, "Could not write document");
   else
     return(INT2NUM(len));
 }
@@ -1077,7 +1048,8 @@ ruby_xml_document_reader(VALUE self)
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void
@@ -1101,7 +1073,6 @@ ruby_init_xml_document(void) {
   rb_define_method(cXMLDocument, "encoding", ruby_xml_document_encoding_get, 0);
   rb_define_method(cXMLDocument, "encoding=", ruby_xml_document_encoding_set, 1);
   rb_define_method(cXMLDocument, "filename", ruby_xml_document_filename_get, 0);
-  rb_define_method(cXMLDocument, "find", ruby_xml_document_find, -1);
   rb_define_method(cXMLDocument, "format_dump", ruby_xml_document_format_dump, -1);
   rb_define_method(cXMLDocument, "last", ruby_xml_document_last_get, 0);
   rb_define_method(cXMLDocument, "last?", ruby_xml_document_last_q, 0);

data/ext/libxml/ruby_xml_document.h

@@ -1,27 +1,27 @@
-/* $Id: ruby_xml_document.h 304 2008-07-02 17:42:41Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_DOCUMENT__
-#define __RUBY_XML_DOCUMENT__
-
-extern VALUE cXMLDocument;
-
-typedef struct rxp_document {
-  xmlDocPtr doc;   /* Tree/DOM interface */
-  int data_type;   /* The data type referenced by *data */
-  void *data;      /* Pointer to an external structure of options */
-} ruby_xml_document_t;
-
-VALUE ruby_xml_document_filename_get(VALUE self);
-VALUE ruby_xml_document_new_native(VALUE class, VALUE xmlver);
-void  ruby_xml_document_free(ruby_xml_document_t *rxd);
-VALUE ruby_xml_document_root_get(VALUE self);
-void  ruby_init_xml_document(void);
-
-#if defined(_WIN32)
-__declspec(dllexport) 
-#endif
-VALUE ruby_xml_document_wrap(xmlDocPtr xnode);
-
-#endif
+/* $Id: ruby_xml_document.h 304 2008-07-02 17:42:41Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_DOCUMENT__
+#define __RUBY_XML_DOCUMENT__
+
+extern VALUE cXMLDocument;
+
+typedef struct rxp_document {
+  xmlDocPtr doc;   /* Tree/DOM interface */
+  int data_type;   /* The data type referenced by *data */
+  void *data;      /* Pointer to an external structure of options */
+} ruby_xml_document_t;
+
+VALUE ruby_xml_document_filename_get(VALUE self);
+VALUE ruby_xml_document_new_native(VALUE class, VALUE xmlver);
+void  ruby_xml_document_free(ruby_xml_document_t *rxd);
+VALUE ruby_xml_document_root_get(VALUE self);
+void  ruby_init_xml_document(void);
+
+#if defined(_WIN32)
+__declspec(dllexport) 
+#endif
+VALUE ruby_xml_document_wrap(xmlDocPtr xnode);
+
+#endif

data/ext/libxml/ruby_xml_dtd.c

@@ -156,7 +156,8 @@ SV * parse_string(CLASS, str, ...)
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void

data/ext/libxml/ruby_xml_dtd.h

@@ -1,17 +1,17 @@
-#ifndef __RUBY_XML_DTD__
-#define __RUBY_XML_DTD__
-
-extern VALUE cXMLDtd;
-
-typedef struct rxp_dtd {
-  xmlDtdPtr dtd;   /* DTD interface */
-  //int data_type;   /* The data type referenced by *data */
-  //void *data;      /* Pointer to an external structure of options */
-  //int is_ptr;      /* Determines if this object owns its data or points to it someplace else */
-  //VALUE xmlver;    /* T_STRING with the xml version */
-} ruby_xml_dtd;
-
-void  ruby_init_xml_dtd(void);
-void  ruby_dtd_free(ruby_xml_dtd *rxdtd);
-
-#endif
+#ifndef __RUBY_XML_DTD__
+#define __RUBY_XML_DTD__
+
+extern VALUE cXMLDtd;
+
+typedef struct rxp_dtd {
+  xmlDtdPtr dtd;   /* DTD interface */
+  //int data_type;   /* The data type referenced by *data */
+  //void *data;      /* Pointer to an external structure of options */
+  //int is_ptr;      /* Determines if this object owns its data or points to it someplace else */
+  //VALUE xmlver;    /* T_STRING with the xml version */
+} ruby_xml_dtd;
+
+void  ruby_init_xml_dtd(void);
+void  ruby_dtd_free(ruby_xml_dtd *rxdtd);
+
+#endif

data/ext/libxml/ruby_xml_html_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_html_parser.c 339 2008-07-09 08:36:26Z cfis $ */
+/* $Id: ruby_xml_html_parser.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -424,7 +424,8 @@ ruby_xml_html_parser_str_set(VALUE self, VALUE str) {
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void

data/ext/libxml/ruby_xml_html_parser.h

@@ -1,29 +1,29 @@
-/* $Id: ruby_xml_html_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_HTML_PARSER__
-#define __RUBY_XML_HTML_PARSER__
-
-extern int ruby_xml_html_parser_count;
-extern VALUE cXMLHTMLParser;
-
-typedef struct ruby_xml_html_parser {
-  VALUE ctxt;
-  int parsed;
-  void *data;
-  int data_type;
-} ruby_xml_html_parser;
-
-/*
- * VALUE ruby_xml_html_parser_filename_get(VALUE self);
-VALUE ruby_xml_html_parser_filename_set(VALUE self, VALUE filename);
-VALUE ruby_xml_html_parser_new(VALUE class);
-*/
-VALUE ruby_xml_html_parser_parse(VALUE self);
-VALUE ruby_xml_html_parser_str_get(VALUE self);
-VALUE ruby_xml_html_parser_str_set(VALUE self, VALUE str);
-
-void ruby_init_html_parser(void);
-
-#endif
+/* $Id: ruby_xml_html_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_HTML_PARSER__
+#define __RUBY_XML_HTML_PARSER__
+
+extern int ruby_xml_html_parser_count;
+extern VALUE cXMLHTMLParser;
+
+typedef struct ruby_xml_html_parser {
+  VALUE ctxt;
+  int parsed;
+  void *data;
+  int data_type;
+} ruby_xml_html_parser;
+
+/*
+ * VALUE ruby_xml_html_parser_filename_get(VALUE self);
+VALUE ruby_xml_html_parser_filename_set(VALUE self, VALUE filename);
+VALUE ruby_xml_html_parser_new(VALUE class);
+*/
+VALUE ruby_xml_html_parser_parse(VALUE self);
+VALUE ruby_xml_html_parser_str_get(VALUE self);
+VALUE ruby_xml_html_parser_str_set(VALUE self, VALUE str);
+
+void ruby_init_html_parser(void);
+
+#endif

data/ext/libxml/ruby_xml_input_cbg.c

@@ -149,7 +149,8 @@ input_callbacks_remove_scheme (VALUE self, VALUE scheme_name) {
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void

data/ext/libxml/ruby_xml_input_cbg.h

@@ -1,20 +1,20 @@
-#ifndef _INPUT_CBG_
-#define _INPUT_CBG_
-
-void ruby_init_input_callbacks(void);
-
-typedef struct ic_doc_context {
-    char *buffer;
-    char *bpos;
-    int remaining;
-} ic_doc_context;
-
-typedef struct ic_scheme {
-    char *scheme_name;
-    VALUE class;
-    int name_len;
-
-    struct ic_scheme *next_scheme;
-} ic_scheme;
-
-#endif
+#ifndef _INPUT_CBG_
+#define _INPUT_CBG_
+
+void ruby_init_input_callbacks(void);
+
+typedef struct ic_doc_context {
+    char *buffer;
+    char *bpos;
+    int remaining;
+} ic_doc_context;
+
+typedef struct ic_scheme {
+    char *scheme_name;
+    VALUE class;
+    int name_len;
+
+    struct ic_scheme *next_scheme;
+} ic_scheme;
+
+#endif

data/ext/libxml/ruby_xml_node.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.c 351 2008-07-09 19:55:21Z cfis $ */
+/* $Id: ruby_xml_node.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -35,7 +35,6 @@ ruby_xml_node_attribute_q(VALUE self) {
     return(Qfalse);
 }
 
-
 /*
  * call-seq:
  *    node.attribute_decl? -> (true|false)
@@ -206,92 +205,23 @@ ruby_xml_node_content_stripped_get(VALUE self) {
 
 /*
  * call-seq:
- *    node.child -> node
+ *    node.first -> XML::Node
  * 
- * Obtain this node's first child node, if any.
+ * Returns this node's first child node if any.
  */
 VALUE
-ruby_xml_node_child_get(VALUE self) {
+ruby_xml_node_first_get(VALUE self) {
   xmlNodePtr xnode;
-  xmlNodePtr tmp;
 
   Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (xnode->type) {
-  case XML_ELEMENT_NODE:
-  case XML_ENTITY_REF_NODE:
-  case XML_ENTITY_NODE:
-  case XML_PI_NODE:
-  case XML_COMMENT_NODE:
-  case XML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-  case XML_HTML_DOCUMENT_NODE:
-  case XML_DTD_NODE:
-    tmp = xnode->children;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      tmp = attr->children;
-      break;
-    }
-  default:
-    tmp = NULL;
-    break;
-  }
-
-  if (tmp == NULL)
-    return(Qnil);
+  if (xnode->children)
+    return(ruby_xml_node2_wrap(cXMLNode, xnode->children));
   else
-    return(ruby_xml_node2_wrap(cXMLNode, tmp));
+    return(Qnil);
 }
 
 
-/*
- * call-seq:
- *    node.child? -> (true|false)
- * 
- * Determine whether this node has at least one child.
- */
-VALUE
-ruby_xml_node_child_q(VALUE self) {
-  xmlNodePtr xnode;
-  xmlNodePtr node;
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  node = NULL;
-  switch (xnode->type) {
-  case XML_ELEMENT_NODE:
-  case XML_ENTITY_REF_NODE:
-  case XML_ENTITY_NODE:
-  case XML_PI_NODE:
-  case XML_COMMENT_NODE:
-  case XML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-  case XML_HTML_DOCUMENT_NODE:
-  case XML_DTD_NODE:
-    node = xnode->children;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      node = attr->children;
-      break;
-    }
-  default:
-    node = NULL;
-  }
-
-  if (node == NULL)
-    return(Qfalse);
-  else
-    return(Qtrue);
-}
-
 /*
  * underlying for child_set and child_add, difference being
  * former raises on implicit copy, latter does not.
@@ -335,7 +265,7 @@ ruby_xml_node_child_set(VALUE self, VALUE rnode) {
 
 /*
  * call-seq:
- *    node << ("string" | node) -> node
+ *    node << ("string" | node) -> XML::Node
  * 
  * Add the specified string or XML::Node to this node's
  * content.
@@ -538,6 +468,31 @@ ruby_xml_node_debug_dump(VALUE self) {
   return(Qtrue);
 }
 
+/*
+ * call-seq:
+ *    node.each -> XML::Node
+ * 
+ * Iterates over all of this node's children, including text 
+ * nodes, element nodes, etc.  If you wish to iterate
+ * only over child elements, use XML::Node#each_element.
+ *
+ *  doc = XML::Document.new('model/books.xml')
+ *  doc.root.each {|node| puts node}
+ */
+VALUE
+ruby_xml_node_each(VALUE self) {
+  xmlNodePtr xnode;
+  xmlNodePtr xchild;
+  Data_Get_Struct(self, xmlNode, xnode);
+
+  xchild = xnode->children;
+  
+  while (xchild) {
+    rb_yield(ruby_xml_node2_wrap(cXMLNode, xchild));
+    xchild = xchild->next;
+  }
+  return Qnil;
+}
 
 /*
  * call-seq:
@@ -637,43 +592,25 @@ ruby_xml_node_eql_q(VALUE self, VALUE other) {
   {
     return Qtrue;
   }
+  else if NIL_P(other)
+  {
+    return Qfalse;
+  }
   else      
   {
-    VALUE self_xml = ruby_xml_node_to_s(self);
-    VALUE other_xml = ruby_xml_node_to_s(other);
+    VALUE self_xml;
+    VALUE other_xml;
+    
+    if (rb_obj_is_kind_of(other, cXMLNode) == Qfalse)
+      rb_raise(rb_eTypeError, "Nodes can only be compared against other nodes");
+    
+    self_xml = ruby_xml_node_to_s(self);
+    other_xml = ruby_xml_node_to_s(other);
     return(rb_funcall(self_xml, rb_intern("=="), 1, other_xml));
   }    
 }
 
 
-/*
- * call-seq:
- *    node.find(xpath_expr, namespace = [any]) -> nodeset
- * 
- * Find nodes matching the specified xpath expression, optionally
- * using the specified namespaces. Returns an XML::Node::Set.
- */
-VALUE
-ruby_xml_node_find(int argc, VALUE *argv, VALUE self) {
-  if (argc > 2 || argc < 1)
-    rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
-
-  return(ruby_xml_xpath_find2(self,argv[0],(argc==2)?argv[1]:Qnil));
-}
-
-/*
- * call-seq:
- *    node.find_first(xpath_expr, namespace = [any]) -> nodeset
- *
- * Find the first node matching the specified xpath expression, optionally
- * using the specified namespaces. Returns an XML::Node.
- */
-VALUE
-ruby_xml_node_find_first(int argc, VALUE *argv, VALUE self) {
-  return ruby_xml_xpath_object_first(ruby_xml_node_find(argc, argv, self));
-}
-
-
 /*
  * call-seq:
  *    node.fragment? -> (true|false)
@@ -709,7 +646,7 @@ ruby_xml_node_html_doc_q(VALUE self) {
 
 /*
  * call-seq:
- *    XML::Node.new_cdata(content = nil) -> node
+ *    XML::Node.new_cdata(content = nil) -> XML::Node
  * 
  * Create a new #CDATA node, optionally setting
  * the node's content.
@@ -745,7 +682,7 @@ ruby_xml_node_new_cdata(int argc, VALUE *argv, VALUE class) {
 
 /*
  * call-seq:
- *    XML::Node.new_comment(content = nil) -> node
+ *    XML::Node.new_comment(content = nil) -> XML::Node
  * 
  * Create a new comment node, optionally setting
  * the node's content.
@@ -829,92 +766,22 @@ ruby_xml_node_lang_set(VALUE self, VALUE lang) {
 
 /*
  * call-seq:
- *    node.last -> node
+ *    node.last -> XML::Node
  * 
  * Obtain the last child node of this node, if any.
  */
 VALUE
 ruby_xml_node_last_get(VALUE self) {
   xmlNodePtr xnode;
-  xmlNodePtr node;
-
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  switch (xnode->type) {
-  case XML_ELEMENT_NODE:
-  case XML_ENTITY_REF_NODE:
-  case XML_ENTITY_NODE:
-  case XML_PI_NODE:
-  case XML_COMMENT_NODE:
-  case XML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-  case XML_HTML_DOCUMENT_NODE:
-  case XML_DTD_NODE:
-    node = xnode->last;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      node = attr->last;
-    }
-  default:
-    node = NULL;
-    break;
-  }
-
-  if (node == NULL)
-    return(Qnil);
-  else
-    return(ruby_xml_node2_wrap(cXMLNode, node));
-}
-
-
-/*
- * call-seq:
- *    node.last? -> (true|false)
- * 
- * Determine whether this node has a last child node.
- */
-VALUE
-ruby_xml_node_last_q(VALUE self) {
-  xmlNodePtr xnode;
-  xmlNodePtr node;
 
   Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (xnode->type) {
-  case XML_ELEMENT_NODE:
-  case XML_ENTITY_REF_NODE:
-  case XML_ENTITY_NODE:
-  case XML_PI_NODE:
-  case XML_COMMENT_NODE:
-  case XML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-  case XML_HTML_DOCUMENT_NODE:
-  case XML_DTD_NODE:
-    node = xnode->last;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      node = attr->last;
-    }
-  default:
-    node = NULL;
-    break;
-  }
-
-  if (node == NULL)
-    return(Qfalse);
+  if (xnode->last)
+    return(ruby_xml_node2_wrap(cXMLNode, xnode->last));
   else
-    return(Qtrue);
+    return(Qnil);
 }
 
-
 /*
  * call-seq:
  *    node.line_num -> num
@@ -1340,8 +1207,8 @@ ruby_xml_node2_new_string(VALUE class, VALUE ns, VALUE name, VALUE val)
 }
 /*
  * call-seq:
- *    XML::Node.new(name, content = nil) -> node
- *    XML::Node.new_element(name, content = nil) -> node
+ *    XML::Node.new(name, content = nil) -> XML::Node
+ *    XML::Node.new_element(name, content = nil) -> XML::Node
  * 
  * Create a new element node with the specified name, optionally setting
  * the node's content.
@@ -1369,90 +1236,20 @@ ruby_xml_node2_new_string_bc(int argc, VALUE *argv, VALUE class)
 
 /*
  * call-seq:
- *    node.next -> node
+ *    node.next -> XML::Node
  * 
  * Obtain the next sibling node, if any.
  */
 VALUE
 ruby_xml_node_next_get(VALUE self) {
   xmlNodePtr xnode;
-  xmlNodePtr node;
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  switch (xnode->type) {
-  case XML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-  case XML_HTML_DOCUMENT_NODE:
-    node = NULL;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      node = (xmlNodePtr) attr->next;
-      break;
-    }
-  case XML_NAMESPACE_DECL:
-    {
-      xmlNsPtr ns = (xmlNsPtr) xnode;
-      node = (xmlNodePtr) ns->next;
-      break;
-    }
-  default:
-    node = xnode->next;
-    break;
-  }
-
-  if (node == NULL) {
-    return(Qnil);
-  } else {
-    return(ruby_xml_node2_wrap(cXMLNode, node));
-  }
-}
 
-
-/*
- * call-seq:
- *    node.next? -> (true|false)
- * 
- * Determine whether this node has a next sibling.
- */
-VALUE
-ruby_xml_node_next_q(VALUE self) {
-  xmlNodePtr xnode;
-  xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (xnode->type) {
-  case XML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-  case XML_HTML_DOCUMENT_NODE:
-    node = NULL;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      node = (xmlNodePtr) attr->next;
-      break;
-    }
-  case XML_NAMESPACE_DECL:
-    {
-      xmlNsPtr ns = (xmlNsPtr) xnode;
-      node = (xmlNodePtr) ns->next;
-      break;
-    }
-  default:
-    node = xnode->next;
-    break;
-  }
-
-  if (node == NULL)
-    return(Qfalse);
+  if (xnode->next)
+    return(ruby_xml_node2_wrap(cXMLNode, xnode->next));
   else
-    return(Qtrue);
+    return(Qnil);
 }
 
 
@@ -1551,89 +1348,20 @@ ruby_xml_node_ns_def_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.parent -> node
+ *    node.parent -> XML::Node
  * 
  * Obtain this node's parent node, if any.
  */
 VALUE
 ruby_xml_node_parent_get(VALUE self) {
   xmlNodePtr xnode;
-  xmlNodePtr node;
 
   Data_Get_Struct(self, xmlNode, xnode);
 
-  switch (xnode->type) {
-  case XML_DOCUMENT_NODE:
-  case XML_HTML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-    node = NULL;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      node = attr->parent;
-    }
-  case XML_ENTITY_DECL:
-  case XML_NAMESPACE_DECL:
-  case XML_XINCLUDE_START:
-  case XML_XINCLUDE_END:
-    node = NULL;
-    break;
-  default:
-    node = xnode->parent;
-    break;
-  }
-
-  if (node == NULL)
-    return(Qnil);
+  if (xnode->parent)
+    return(ruby_xml_node2_wrap(cXMLNode, xnode->parent));
   else
-    return(ruby_xml_node2_wrap(cXMLNode, node));
-}
-
-
-/*
- * call-seq:
- *    node.parent? -> (true|false)
- * 
- * Determine whether this node has a parent node.
- */
-VALUE
-ruby_xml_node_parent_q(VALUE self) {
-  xmlNodePtr xnode;
-  xmlNodePtr node;
-
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  switch (xnode->type) {
-  case XML_DOCUMENT_NODE:
-  case XML_HTML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-    node = NULL;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      node = attr->parent;
-    }
-  case XML_ENTITY_DECL:
-  case XML_NAMESPACE_DECL:
-  case XML_XINCLUDE_START:
-  case XML_XINCLUDE_END:
-    node = NULL;
-    break;
-  default:
-    node = xnode->parent;
-    break;
-  }
-
-  if (node == NULL)
-    return(Qfalse);
-  else
-    return(Qtrue);
+    return(Qnil);
 }
 
 
@@ -1677,7 +1405,7 @@ ruby_xml_node_pi_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.pointer -> node_set
+ *    node.pointer -> XML::Node_set
  * 
  * Evaluates an XPointer expression relative to this node.
  */
@@ -1689,7 +1417,7 @@ ruby_xml_node_pointer(VALUE self, VALUE xptr_str) {
 
 /*
  * call-seq:
- *    node.prev -> node
+ *    node.prev -> XML::Node
  * 
  * Obtain the previous sibling, if any.
  */
@@ -1726,46 +1454,6 @@ ruby_xml_node_prev_get(VALUE self) {
 }
 
 
-/*
- * call-seq:
- *    node.prev? -> (true|false)
- * 
- * Determines whether this node has a previous sibling node.
- */
-VALUE
-ruby_xml_node_prev_q(VALUE self) {
-  xmlNodePtr xnode;
-  xmlNodePtr node;
-
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  switch (xnode->type) {
-  case XML_DOCUMENT_NODE:
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-#endif
-  case XML_HTML_DOCUMENT_NODE:
-  case XML_NAMESPACE_DECL:
-    node = NULL;
-    break;
-  case XML_ATTRIBUTE_NODE:
-    {
-      xmlAttrPtr attr = (xmlAttrPtr) xnode;
-      node = (xmlNodePtr) attr->prev;
-    }
-    break;
-  default:
-    node = xnode->prev;
-    break;
-  }
-
-  if (node == NULL)
-    return(Qfalse);
-  else
-    return(Qtrue);
-}
-
-
 /*
  * call-seq:
  *    node.prev = node
@@ -1904,7 +1592,7 @@ ruby_xml_node_search_ns(VALUE self, VALUE ns) {
 
 /*
  * call-seq:
- *    node.sibling(node) -> node
+ *    node.sibling(node) -> XML::Node
  * 
  * Add the specified node as a sibling of this node.
  */
@@ -2020,69 +1708,6 @@ ruby_xml_node_type(VALUE self) {
 }
 
 
-/*
- * call-seq:
- *    node.type_name -> num
- * 
- * Obtain this node's type name.
- */
-VALUE
-ruby_xml_node_type_name(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-
-  switch(xnode->type) {
-  case XML_ELEMENT_NODE:
-    return(rb_str_new2("element"));
-  case XML_ATTRIBUTE_NODE:
-    return(rb_str_new2("attribute"));
-  case XML_TEXT_NODE:
-    return(rb_str_new2("text"));
-  case XML_CDATA_SECTION_NODE:
-    return(rb_str_new2("cdata"));
-  case XML_ENTITY_REF_NODE:
-    return(rb_str_new2("entity_ref"));
-  case XML_ENTITY_NODE:
-    return(rb_str_new2("entity"));
-  case XML_PI_NODE:
-    return(rb_str_new2("pi"));
-  case XML_COMMENT_NODE:
-    return(rb_str_new2("comment"));
-  case XML_DOCUMENT_NODE:
-    return(rb_str_new2("document_xml"));
-  case XML_DOCUMENT_TYPE_NODE:
-    return(rb_str_new2("doctype"));
-  case XML_DOCUMENT_FRAG_NODE:
-    return(rb_str_new2("fragment"));
-  case XML_NOTATION_NODE:
-    return(rb_str_new2("notation"));
-  case XML_HTML_DOCUMENT_NODE:
-    return(rb_str_new2("document_html"));
-  case XML_DTD_NODE:
-    return(rb_str_new2("dtd"));
-  case XML_ELEMENT_DECL:
-    return(rb_str_new2("elem_decl"));
-  case XML_ATTRIBUTE_DECL:
-    return(rb_str_new2("attribute_decl"));
-  case XML_ENTITY_DECL:
-    return(rb_str_new2("entity_decl"));
-  case XML_NAMESPACE_DECL:
-    return(rb_str_new2("namespace"));
-  case XML_XINCLUDE_START:
-    return(rb_str_new2("xinclude_start"));
-  case XML_XINCLUDE_END:
-    return(rb_str_new2("xinclude_end"));
-#ifdef LIBXML_DOCB_ENABLED
-  case XML_DOCB_DOCUMENT_NODE:
-    return(rb_str_new2("document_docbook"));
-#endif
-  default:
-    rb_raise(eXMLNodeUnknownType, "Unknown node type: %n", xnode->type);
-    return(Qfalse);
-  }
-}
-
-
 /*
  * call-seq:
  *    node.xinclude_end? -> num
@@ -2119,9 +1744,13 @@ ruby_xml_node_xinclude_start_q(VALUE self) {
 
 /*
  * call-seq:
- *    node.copy -> node
+ *    node.copy -> XML::Node
  * 
- * Create a copy of this node.
+ * Creates a copy of this node.  To create a 
+ * shallow copy set the deep parameter to false.
+ * To create a deep copy set the deep parameter
+ * to true. 
+ *
  */
 VALUE
 ruby_xml_node_copy(VALUE self, VALUE deep) {
@@ -2140,7 +1769,7 @@ ruby_xml_node_copy(VALUE self, VALUE deep) {
 
  /*
  * call-seq: 
- *    XML::Node.new_text(content = nil) -> node
+ *    XML::Node.new_text(content = nil) -> XML::Node
  * 
  * Create a new text node, optionally setting
  * the node's content.
@@ -2185,13 +1814,12 @@ ruby_xml_node_deregisterNode(xmlNodePtr xnode)
 
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
 #endif
 
 void
 ruby_init_xml_node(void) {
-  VALUE singleton;
-
   xmlRegisterNodeDefault(ruby_xml_node_registerNode);
   xmlDeregisterNodeDefault(ruby_xml_node_deregisterNode);
 
@@ -2200,8 +1828,6 @@ ruby_init_xml_node(void) {
   eXMLNodeFailedModify = rb_define_class_under(cXMLNode, "FailedModify", eXMLError);
   eXMLNodeUnknownType = rb_define_class_under(cXMLNode, "UnknownType", eXMLError);
   
-  singleton = rb_singleton_class(cXMLNode);
-
   rb_define_const(cXMLNode, "SPACE_DEFAULT", INT2NUM(0));
   rb_define_const(cXMLNode, "SPACE_PRESERVE", INT2NUM(1));
   rb_define_const(cXMLNode, "SPACE_NOT_INHERIT", INT2NUM(-1));
@@ -2216,6 +1842,34 @@ ruby_init_xml_node(void) {
   rb_define_const(cXMLNode, "XLINK_TYPE_EXTENDED_SET", INT2NUM(3));
   rb_define_const(cXMLNode, "XLINK_TYPE_NONE", INT2NUM(0));
   rb_define_const(cXMLNode, "XLINK_TYPE_SIMPLE", INT2NUM(1));
+  
+  rb_define_const(cXMLNode, "ELEMENT_NODE", INT2FIX(XML_ELEMENT_NODE));
+  rb_define_const(cXMLNode, "ATTRIBUTE_NODE", INT2FIX(XML_ATTRIBUTE_NODE));
+  rb_define_const(cXMLNode, "TEXT_NODE", INT2FIX(XML_TEXT_NODE));
+  rb_define_const(cXMLNode, "CDATA_SECTION_NODE", INT2FIX(XML_CDATA_SECTION_NODE));
+  rb_define_const(cXMLNode, "ENTITY_REF_NODE", INT2FIX(XML_ENTITY_REF_NODE));
+  rb_define_const(cXMLNode, "ENTITY_NODE", INT2FIX(XML_ENTITY_NODE));
+  rb_define_const(cXMLNode, "PI_NODE", INT2FIX(XML_PI_NODE));
+  rb_define_const(cXMLNode, "COMMENT_NODE", INT2FIX(XML_COMMENT_NODE));
+  rb_define_const(cXMLNode, "DOCUMENT_NODE", INT2FIX(XML_DOCUMENT_NODE));
+  rb_define_const(cXMLNode, "DOCUMENT_TYPE_NODE", INT2FIX(XML_DOCUMENT_TYPE_NODE));
+  rb_define_const(cXMLNode, "DOCUMENT_FRAG_NODE", INT2FIX(XML_DOCUMENT_FRAG_NODE));
+  rb_define_const(cXMLNode, "NOTATION_NODE", INT2FIX(XML_NOTATION_NODE));
+  rb_define_const(cXMLNode, "HTML_DOCUMENT_NODE", INT2FIX(XML_HTML_DOCUMENT_NODE));
+  rb_define_const(cXMLNode, "DTD_NODE", INT2FIX(XML_DTD_NODE));
+  rb_define_const(cXMLNode, "ELEMENT_DECL", INT2FIX(XML_ELEMENT_DECL));
+  rb_define_const(cXMLNode, "ATTRIBUTE_DECL", INT2FIX(XML_ATTRIBUTE_DECL));
+  rb_define_const(cXMLNode, "ENTITY_DECL", INT2FIX(XML_ENTITY_DECL));
+  rb_define_const(cXMLNode, "NAMESPACE_DECL", INT2FIX(XML_NAMESPACE_DECL));
+  rb_define_const(cXMLNode, "XINCLUDE_START", INT2FIX(XML_XINCLUDE_START));
+  rb_define_const(cXMLNode, "XINCLUDE_END", INT2FIX(XML_XINCLUDE_END));
+
+#ifdef LIBXML_DOCB_ENABLED
+  rb_define_const(cXMLNode, "DOCB_DOCUMENT_NODE", INT2FIX(XML_DOCB_DOCUMENT_NODE));
+#else
+  rb_define_const(cXMLNode, "DOCB_DOCUMENT_NODE", Qnil);
+#endif
+  
 
   rb_define_singleton_method(cXMLNode, "new2", ruby_xml_node2_new_native, 2);
   rb_define_singleton_method(cXMLNode, "new", ruby_xml_node2_new_string_bc, -1);
@@ -2223,11 +1877,27 @@ ruby_init_xml_node(void) {
   rb_define_singleton_method(cXMLNode, "new_comment", ruby_xml_node_new_comment, -1); 
   rb_define_singleton_method(cXMLNode, "new_text", ruby_xml_node_new_text, 1); 
   
-  rb_define_alias(singleton, "new_element", "new");
-  
-  rb_define_method(cXMLNode, "<<", ruby_xml_node_content_add, 1);
+  /* Traversal */
+  rb_include_module(cXMLNode, rb_mEnumerable);
   rb_define_method(cXMLNode, "[]", ruby_xml_node_property_get, 1);
+  rb_define_method(cXMLNode, "each", ruby_xml_node_each, 0);
+  rb_define_method(cXMLNode, "first", ruby_xml_node_first_get, 0);
+  rb_define_method(cXMLNode, "last", ruby_xml_node_last_get, 0);
+  rb_define_method(cXMLNode, "next", ruby_xml_node_next_get, 0);
+  rb_define_method(cXMLNode, "parent", ruby_xml_node_parent_get, 0);
+  rb_define_method(cXMLNode, "prev", ruby_xml_node_prev_get, 0);
+
+  /* Modification */
+  rb_define_method(cXMLNode, "<<", ruby_xml_node_content_add, 1);
   rb_define_method(cXMLNode, "[]=", ruby_xml_node_property_set, 2);
+  rb_define_method(cXMLNode, "child_add", ruby_xml_node_child_add, 1);
+  rb_define_method(cXMLNode, "child=", ruby_xml_node_child_set, 1);
+  rb_define_method(cXMLNode, "sibling=", ruby_xml_node_sibling_set, 1);
+  rb_define_method(cXMLNode, "next=", ruby_xml_node_next_set, 1);
+  rb_define_method(cXMLNode, "prev=", ruby_xml_node_prev_set, 1);
+
+ 
+  /* Rest of the node api */
   rb_define_method(cXMLNode, "attribute?", ruby_xml_node_attribute_q, 0);
   rb_define_method(cXMLNode, "attribute_decl?", ruby_xml_node_attribute_decl_q, 0);
   rb_define_method(cXMLNode, "attributes", ruby_xml_node_attributes_get, 0);
@@ -2238,12 +1908,6 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "cdata?", ruby_xml_node_cdata_q, 0);
   rb_define_method(cXMLNode, "comment?", ruby_xml_node_comment_q, 0);
   rb_define_method(cXMLNode, "copy", ruby_xml_node_copy, 1);
-  rb_define_method(cXMLNode, "child", ruby_xml_node_child_get, 0);
-  rb_define_method(cXMLNode, "child?", ruby_xml_node_child_q, 0);
-  rb_define_method(cXMLNode, "child=", ruby_xml_node_child_set, 1);
-  rb_define_method(cXMLNode, "child_add", ruby_xml_node_child_add, 1);
-  rb_define_method(cXMLNode, "children", ruby_xml_node_child_get, 0);
-  rb_define_method(cXMLNode, "children?", ruby_xml_node_child_q, 0);
   rb_define_method(cXMLNode, "content", ruby_xml_node_content_get, 0);
   rb_define_method(cXMLNode, "content=", ruby_xml_node_content_set, 1);
   rb_define_method(cXMLNode, "content_stripped", ruby_xml_node_content_stripped_get, 0);
@@ -2260,14 +1924,10 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "entity?", ruby_xml_node_entity_q, 0);
   rb_define_method(cXMLNode, "entity_ref?", ruby_xml_node_entity_ref_q, 0);
   rb_define_method(cXMLNode, "eql?", ruby_xml_node_eql_q, 1);
-  rb_define_method(cXMLNode, "find", ruby_xml_node_find, -1);
-  rb_define_method(cXMLNode, "find_first", ruby_xml_node_find_first, -1);
   rb_define_method(cXMLNode, "fragment?", ruby_xml_node_fragment_q, 0);
   rb_define_method(cXMLNode, "html_doc?", ruby_xml_node_html_doc_q, 0);
   rb_define_method(cXMLNode, "lang", ruby_xml_node_lang_get, 0);
   rb_define_method(cXMLNode, "lang=", ruby_xml_node_lang_set, 1);
-  rb_define_method(cXMLNode, "last", ruby_xml_node_last_get, 0);
-  rb_define_method(cXMLNode, "last?", ruby_xml_node_last_q, 0);
   rb_define_method(cXMLNode, "line_num", ruby_xml_node_line_num, 0);
   rb_define_method(cXMLNode, "name", ruby_xml_node_name_get, 0);
   rb_define_method(cXMLNode, "name=", ruby_xml_node_name_set, 1);
@@ -2275,28 +1935,18 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "namespace_node", ruby_xml_node_namespace_get_node, 0);
   rb_define_method(cXMLNode, "namespace?", ruby_xml_node_namespace_q, 0);  
   rb_define_method(cXMLNode, "namespace=", ruby_xml_node_namespace_set, -1);  
-  rb_define_method(cXMLNode, "next", ruby_xml_node_next_get, 0);
-  rb_define_method(cXMLNode, "next?", ruby_xml_node_next_q, 0);
-  rb_define_method(cXMLNode, "next=", ruby_xml_node_next_set, 1);
   rb_define_method(cXMLNode, "node_type", ruby_xml_node_type, 0);
-  rb_define_method(cXMLNode, "node_type_name", ruby_xml_node_type_name, 0);
   rb_define_method(cXMLNode, "notation?", ruby_xml_node_notation_q, 0);
   rb_define_method(cXMLNode, "ns", ruby_xml_node_namespace_get, 0);
   rb_define_method(cXMLNode, "ns?", ruby_xml_node_ns_q, 0);
   rb_define_method(cXMLNode, "ns_def", ruby_xml_node_ns_def_get, 0);
   rb_define_method(cXMLNode, "ns_def?", ruby_xml_node_ns_def_q, 0);
-  rb_define_method(cXMLNode, "parent", ruby_xml_node_parent_get, 0);
-  rb_define_method(cXMLNode, "parent?", ruby_xml_node_parent_q, 0);
   rb_define_method(cXMLNode, "path", ruby_xml_node_path, 0);
   rb_define_method(cXMLNode, "pi?", ruby_xml_node_pi_q, 0);
   rb_define_method(cXMLNode, "pointer", ruby_xml_node_pointer, 1);
-  rb_define_method(cXMLNode, "prev", ruby_xml_node_prev_get, 0);
-  rb_define_method(cXMLNode, "prev?", ruby_xml_node_prev_q, 0);
-  rb_define_method(cXMLNode, "prev=", ruby_xml_node_prev_set, 1);
   rb_define_method(cXMLNode, "remove!", ruby_xml_node_remove_ex, 0);
   rb_define_method(cXMLNode, "search_ns", ruby_xml_node_search_ns, 1);
   rb_define_method(cXMLNode, "search_href", ruby_xml_node_search_href, 1);
-  rb_define_method(cXMLNode, "sibling=", ruby_xml_node_sibling_set, 1);
   rb_define_method(cXMLNode, "space_preserve", ruby_xml_node_space_preserve_get, 0);
   rb_define_method(cXMLNode, "space_preserve=", ruby_xml_node_space_preserve_set, 1);
   rb_define_method(cXMLNode, "text?", ruby_xml_node_text_q, 0);
@@ -2309,4 +1959,11 @@ ruby_init_xml_node(void) {
   
   rb_define_alias(cXMLNode, "==", "eql?");
   rb_define_alias(cXMLNode, "properties?", "attributes?");
+  
+  /* :nodoc: */
+  {
+    VALUE singleton;
+    singleton = rb_singleton_class(cXMLNode);
+    rb_define_alias(singleton, "new_element", "new");
+  }
 }