libxml-ruby 0.5.1.0 → 0.5.2.0

data/ext/xml/libxml.c

@@ -1,4 +1,4 @@
-/* $Id: libxml.c 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: libxml.c 189 2007-09-26 15:04:47Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -66,6 +66,7 @@ Init_libxml_so(void) {
 
   rb_define_const(mXML, "XML_NAMESPACE", rb_str_new2((const char*)XML_XML_NAMESPACE));
 
+  ruby_init_state();
   ruby_init_parser();  
   ruby_init_xml_parser_context();
   ruby_init_xml_attr();

data/ext/xml/libxml.h

@@ -6,11 +6,11 @@
 /* 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  "0.5.1.0"
-#define RUBY_LIBXML_VERNUM   510
+#define RUBY_LIBXML_VERSION  "0.5.2.0"
+#define RUBY_LIBXML_VERNUM   520
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   5
-#define RUBY_LIBXML_VER_MIC   1
+#define RUBY_LIBXML_VER_MIC   2
 #define RUBY_LIBXML_VER_PATCH 0
 
 #include <ruby.h>
@@ -64,6 +64,7 @@ typedef struct rx_xpath_data {
   VALUE ctxt;
 } rx_xpath_data;
 
+#include "ruby_xml_state.h"
 #include "ruby_xml_attr.h"
 #include "ruby_xml_document.h"
 #include "ruby_xml_node.h"
@@ -76,6 +77,7 @@ typedef struct rx_xpath_data {
 #include "ruby_xml_xinclude.h"
 #include "ruby_xml_xpath.h"
 #include "ruby_xml_xpath_context.h"
+#include "ruby_xml_xpath_object.h"
 #include "ruby_xml_xpointer.h"
 #include "ruby_xml_xpointer_context.h"
 #include "ruby_xml_input_cbg.h"

data/ext/xml/libxml.rb

@@ -1,4 +1,4 @@
-# $Id: libxml.rb 120 2006-11-26 12:57:56Z roscopeco $ 
+# $Id: libxml.rb 134 2007-08-29 17:30:19Z danj $ 
 # Please see the LICENSE file for copyright and distribution information 
 require 'xml/libxml_so'
 

data/ext/xml/ruby_xml_attr.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_attr.c 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_attr.c 189 2007-09-26 15:04:47Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -8,25 +8,28 @@
 VALUE cXMLAttr;
 
 void ruby_xml_attr_free(ruby_xml_attr_t *rx) {
-  if (rx->attr == NULL ) return;
+  if (rx == NULL ) return;
 
-  if (rx->attr->parent == NULL && rx->attr->doc == NULL ) {
+  if (rx->attr != NULL ) {
+    rx->attr->_private=NULL;
+    if (rx->attr->parent == NULL && rx->attr->doc == NULL ) {
 #ifdef NODE_DEBUG
-    fprintf(stderr,"free rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)rxn->node,(long)rxn->node->_private);
+      fprintf(stderr,"free rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)rxn->node,(long)rxn->node->_private);
 #endif
-    rx->attr->_private=NULL;
-    xmlFreeProp(rx->attr);
+      xmlFreeProp(rx->attr);
+    }
+
+    rx->attr=NULL;
   }
 
-  rx->attr=NULL;
-  //  fprintf(stderr,"%0x ",(long)rxn);
   free(rx);
 }
 
 void
 ruby_xml_attr_mark(ruby_xml_attr_t *rx) {
   xmlNodePtr node;
-  if (rx->attr == NULL ) return;
+  if ( rx == NULL ) return;
+  if ( rx->attr == NULL ) return;
 
   if (rx->attr->_private == NULL ) {
     rb_warning("XmlAttr is not bound! (%s:%d)",
@@ -34,30 +37,7 @@ ruby_xml_attr_mark(ruby_xml_attr_t *rx) {
     return;
   }
 
-  if (rx->attr->doc != NULL ) {
-    if (rx->attr->doc->_private == NULL )
-      rb_warning("XmlAttr Doc is not bound! (%s:%d)",
-		 __FILE__,__LINE__);
-    else {
-      rb_gc_mark((VALUE)rx->attr->doc->_private);
-#ifdef NODE_DEBUG
-      fprintf(stderr,"mark rx=0x%x xn=0x%x o=0x%x\n",(long)rx,(long)rx->attr,(long)rx->attr->_private);
-#endif
-    }
-  } else if (rx->attr->parent != NULL ) {
-    if (rx->attr->parent->_private == NULL )
-      rb_warning("XmlAttr Parent is not bound! (%s:%d)",
-		 __FILE__,__LINE__);
-    node=rx->attr->parent;
-    while (node->parent != NULL )
-      node=node->parent;
-    if (node->_private != NULL) {
-      rb_gc_mark((VALUE)node->_private);
-#ifdef NODE_DEBUG
-      fprintf(stderr,"mark rx=0x%x xn=0x%x o=0x%x\n",(long)0,(long)node,(long)node->_private);
-#endif
-    }
-  }
+  ruby_xml_node_mark_common(rx->attr);
 }
 
 VALUE

data/ext/xml/ruby_xml_document.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_document.c 140 2007-08-29 18:28:40Z danj $ */
+/* $Id: ruby_xml_document.c 190 2007-09-28 17:13:52Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -393,19 +393,10 @@ ruby_xml_document_filename_get(VALUE self) {
  */
 VALUE
 ruby_xml_document_find(int argc, VALUE *argv, VALUE self) {
-  int i, vargc;
-  VALUE *vargv;
-
   if (argc > 2 || argc < 1)
     rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
 
-  vargc = argc + 1;
-  vargv = ALLOC_N(VALUE, vargc + 1);
-  vargv[0] = ruby_xml_document_root_get(self);
-  for (i = 0; i<argc; i++)
-    vargv[i + 1] = argv[i];
-
-  return(ruby_xml_xpath_find2(vargc, vargv));
+  return(ruby_xml_xpath_find2(self,argv[0],(argc==2)?argv[1]:Qnil));
 }
 
 
@@ -415,14 +406,12 @@ ruby_xml_document_free(ruby_xml_document_t *rxd) {
 
   if (rxd->doc == NULL) return;
   rxd->doc->_private=NULL;
+#ifdef NODE_DEBUG
+  fprintf(stderr,"ruby_xml_document_free 0x%x/0x%x\n",rxd,rxd->doc);
+#endif
   xmlFreeDoc(rxd->doc);
-  ruby_xml_parser_count--;
   rxd->doc = NULL;
 
-  // All this should be replaced by VALUE objects that GC can work
-  if (ruby_xml_parser_count == 0)
-    xmlCleanupParser();
-
   switch(rxd->data_type) {
   case RUBY_LIBXML_SRC_TYPE_NULL:
     break;
@@ -449,6 +438,7 @@ void
 ruby_xml_document_mark(ruby_xml_document_t *rxd) {
   // will mark parsers and source types
   // I do not thing doc->parent has anything useful in it.
+  ruby_xml_state_marker();
 }
 
 /*
@@ -523,12 +513,6 @@ ruby_xml_document_wrap(VALUE class, xmlDocPtr xnode) {
   if (xnode->_private != NULL)
     return (VALUE)xnode->_private;
 
-  /*
-   * XXX This is bad and needs to be replaced with
-   * something that interacts with the GC. I did not do all this
-   * to have reference counting still around. -danj
-   */
-  ruby_xml_parser_count++;
   obj=Data_Make_Struct(class,ruby_xml_document_t,
 		       ruby_xml_document_mark,
 		       ruby_xml_document_free,rx);
@@ -543,6 +527,11 @@ ruby_xml_document_wrap(VALUE class, xmlDocPtr xnode) {
   return obj;
 }
 
+VALUE
+ruby_xml_document_wrap2(xmlDocPtr xnode) {
+  return ruby_xml_document_wrap(cXMLDocument,xnode);
+}
+
 VALUE
 ruby_xml_document_new_native(VALUE class, VALUE xmlver) {
   xmlDocPtr rx;

data/ext/xml/ruby_xml_document.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_document.h 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_document.h 188 2007-09-24 01:43:21Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -16,6 +16,7 @@ typedef struct rxp_document {
 VALUE ruby_xml_document_filename_get(VALUE self);
 VALUE ruby_xml_document_new_native(VALUE class, VALUE xmlver);
 VALUE ruby_xml_document_wrap(VALUE class, xmlDocPtr xnode);
+VALUE ruby_xml_document_wrap2(xmlDocPtr xnode);
 void  ruby_xml_document_free(ruby_xml_document_t *rxd);
 VALUE ruby_xml_document_root_get(VALUE self);
 void  ruby_init_xml_document(void);

data/ext/xml/ruby_xml_html_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_html_parser.c 138 2007-08-29 18:00:35Z danj $ */
+/* $Id: ruby_xml_html_parser.c 189 2007-09-26 15:04:47Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -80,10 +80,6 @@ void
 ruby_xml_html_parser_free(ruby_xml_html_parser *rxp) {
   void *data;
 
-  ruby_xml_parser_count--;
-  if (ruby_xml_parser_count == 0)
-    xmlCleanupParser();  
-
   switch(rxp->data_type) {
   case RUBY_LIBXML_SRC_TYPE_NULL:
     break;
@@ -187,6 +183,8 @@ ruby_xml_html_parser_mark(ruby_xml_html_parser *rxp) {
   if (rxp == NULL) return;
   if (!NIL_P(rxp->ctxt)) rb_gc_mark(rxp->ctxt);
 
+  ruby_xml_state_marker();
+
   switch(rxp->data_type) {
   case RUBY_LIBXML_SRC_TYPE_NULL:
     break;
@@ -218,7 +216,6 @@ VALUE
 ruby_xml_html_parser_new(VALUE class) {
   ruby_xml_html_parser *rxp;
 
-  ruby_xml_parser_count++;
   rxp = ALLOC(ruby_xml_html_parser);
   rxp->ctxt = Qnil;
   rxp->data_type = RUBY_LIBXML_SRC_TYPE_NULL;

data/ext/xml/ruby_xml_html_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_html_parser.h 111 2006-11-20 01:39:14Z roscopeco $ */
+/* $Id: ruby_xml_html_parser.h 134 2007-08-29 17:30:19Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/xml/ruby_xml_node.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.c 167 2007-09-05 12:47:54Z danj $ */
+/* $Id: ruby_xml_node.c 192 2007-10-05 15:13:17Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -309,16 +309,12 @@ ruby_xml_node_child_q(VALUE self) {
     return(Qtrue);
 }
 
-
-// TODO Fixes below should be applied to sibling, prev, etc ?
 /*
- * call-seq:
- *    node.child = node
- * 
- * Set a child node for this node.
+ * underlying for child_set and child_add, difference being
+ * former raises on implicit copy, latter does not.
  */
 VALUE
-ruby_xml_node_child_set(VALUE self, VALUE rnode) {
+ruby_xml_node_child_set_aux(VALUE self, VALUE rnode, int do_raise) {
   ruby_xml_node *cnode, *pnode;
   xmlNodePtr chld, ret;
   int copied=0;
@@ -334,7 +330,8 @@ ruby_xml_node_child_set(VALUE self, VALUE rnode) {
   if ( chld->parent != NULL || chld->doc != NULL ) {
     chld=xmlCopyNode(chld,1);
     copied=1;
-    rb_warning("implicit copy of %s",chld->name);
+    if ( do_raise == 1 )
+      rb_raise(rb_eRuntimeError, "implicit copy not legal for child= or <<");
   }
 
   ret = xmlAddChild(pnode->node, chld);
@@ -348,6 +345,28 @@ ruby_xml_node_child_set(VALUE self, VALUE rnode) {
   return ruby_xml_node2_wrap(cXMLNode,chld);
 }
 
+/*
+ * call-seq:
+ *    node.child = node
+ * 
+ * Set a child node for this node. Also called for <<
+ */
+VALUE
+ruby_xml_node_child_set(VALUE self, VALUE rnode) {
+  return ruby_xml_node_child_set_aux(self,rnode,1);
+}
+
+/*
+ * call-seq:
+ *    node.child_add(node)
+ * 
+ * Set a child node for this node.
+ */
+VALUE
+ruby_xml_node_child_add(VALUE self, VALUE rnode) {
+  return ruby_xml_node_child_set_aux(self,rnode,0);
+}
+
 /*
  * call-seq:
  *    node.doc => document
@@ -628,19 +647,10 @@ ruby_xml_node_eql_q(VALUE self, VALUE other) {
  */
 VALUE
 ruby_xml_node_find(int argc, VALUE *argv, VALUE self) {
-  int i, vargc;
-  VALUE *vargv;
-
   if (argc > 2 || argc < 1)
     rb_raise(rb_eArgError, "wrong number of arguments (need 1 or 2)");
 
-  vargc = argc + 1;
-  vargv = ALLOC_N(VALUE, vargc + 1);
-  vargv[0] = self;
-  for (i = 0; i<argc; i++)
-    vargv[i + 1] = argv[i];
-
-  return(ruby_xml_xpath_find2(vargc, vargv));
+  return(ruby_xml_xpath_find2(self,argv[0],(argc==2)?argv[1]:Qnil));
 }
 
 /*
@@ -652,23 +662,7 @@ ruby_xml_node_find(int argc, VALUE *argv, VALUE self) {
  */
 VALUE
 ruby_xml_node_find_first(int argc, VALUE *argv, VALUE self) {
-  VALUE ns = ruby_xml_node_find(argc, argv, self);
-  ruby_xml_node_set *rxnset;
-  VALUE nodeobj;
-
-  Data_Get_Struct(ns, ruby_xml_node_set, rxnset);
-  if (rxnset->node_set == NULL || rxnset->node_set->nodeNr < 1)
-    return(Qnil);
-
-  switch(rxnset->node_set->nodeTab[0]->type) {
-    case XML_ATTRIBUTE_NODE:
-      nodeobj = ruby_xml_attr_wrap(cXMLAttr, (xmlAttrPtr)rxnset->node_set->nodeTab[0]);
-      break;
-    default:
-      nodeobj = ruby_xml_node2_wrap(cXMLNode, rxnset->node_set->nodeTab[0]);
-  }
-
-  return(nodeobj);
+  return ruby_xml_xpath_object_first(ruby_xml_node_find(argc, argv, self));
 }
 
 
@@ -1246,21 +1240,51 @@ ruby_xml_node_namespace_q(VALUE self) {
 void
 ruby_xml_node2_free(ruby_xml_node *rxn) {
 
-  if (rxn->node == NULL ) return;
+  if (rxn == NULL ) return;
+
+  if (rxn->node != NULL ) {
+    rxn->node->_private=NULL;
 
-  if (rxn->node->parent == NULL && rxn->node->doc == NULL ) {
+    if ( rxn->node->doc==NULL && rxn->node->parent==NULL ) {
 #ifdef NODE_DEBUG
-    fprintf(stderr,"free rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)rxn->node,(long)rxn->node->_private);
+      fprintf(stderr,"ruby_xml_node2_free free rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)rxn->node,(long)rxn->node->_private);
 #endif
-    rxn->node->_private=NULL;
-    xmlFreeNode(rxn->node);
+      xmlFreeNode(rxn->node);
+    }
+    
+    rxn->node=NULL;
   }
 
-  rxn->node=NULL;
-  //  fprintf(stderr,"%0x ",(long)rxn);
   free(rxn);
 }
 
+void
+ruby_xml_node_mark_common(xmlNodePtr node) {
+  if (node->parent == NULL ) {
+#ifdef NODE_DEBUG
+    fprintf(stderr,"mark no parent r=0x%x *n=0x%x\n",rxn,node);
+#endif
+  } else if ( node->doc != NULL ) {
+    if (node->doc->_private == NULL) {
+      rb_bug("XmlNode Doc is not bound! (%s:%d)",
+	     __FILE__,__LINE__);
+    }
+    rb_gc_mark((VALUE)node->doc->_private);
+  } else {
+    while (node->parent != NULL )
+      node=node->parent;
+    if (node->_private == NULL )
+      rb_warning("XmlNode Root Parent is not bound! (%s:%d)",
+		 __FILE__,__LINE__);
+    else {
+#ifdef NODE_DEBUG
+      fprintf(stderr,"mark rxn=0x%x xn=0x%x o=0x%x doc=0x%x\n",(long)rxn,(long)node,(long)node->_private,node->doc);
+#endif
+      rb_gc_mark((VALUE)node->_private);
+    }
+  }
+}
+
 void
 ruby_xml_node2_mark(ruby_xml_node *rxn) {
   xmlNodePtr node;
@@ -1272,30 +1296,7 @@ ruby_xml_node2_mark(ruby_xml_node *rxn) {
     return;
   }
 
-  if (rxn->node->doc != NULL ) {
-    if (rxn->node->doc->_private == NULL )
-      rb_warning("XmlNode Doc is not bound! (%s:%d)",
-		 __FILE__,__LINE__);
-    else {
-      rb_gc_mark((VALUE)rxn->node->doc->_private);
-#ifdef NODE_DEBUG
-      fprintf(stderr,"mark rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)rxn->node,(long)rxn->node->_private);
-#endif
-    }
-  } else if (rxn->node->parent != NULL ) {
-    if (rxn->node->parent->_private == NULL )
-      rb_warning("XmlNode Parent is not bound! (%s:%d)",
-		 __FILE__,__LINE__);
-    node=rxn->node;
-    while (node->parent != NULL )
-      node=node->parent;
-    if (node->_private != NULL) {
-      rb_gc_mark((VALUE)node->_private);
-#ifdef NODE_DEBUG
-      fprintf(stderr,"mark rxn=0x%x xn=0x%x o=0x%x\n",(long)0,(long)node,(long)node->_private);
-#endif
-    }
-  }
+  ruby_xml_node_mark_common(rxn->node);
 }
 
 VALUE
@@ -1305,8 +1306,13 @@ ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode)
   ruby_xml_node *rxn;
 
   // This node is already wrapped
-  if (xnode->_private != NULL)
+  if (xnode->_private != NULL) {
+#ifdef NODE_DEBUG
+    Data_Get_Struct((VALUE)xnode->_private,ruby_xml_node,rxn);
+    fprintf(stderr,"re-wrap rn=0x%x n*=0x%x\n",(long)rxn,(long)xnode);
+#endif
     return (VALUE)xnode->_private;
+  }
 
   obj=Data_Make_Struct(class,ruby_xml_node,ruby_xml_node2_mark,
 		       ruby_xml_node2_free,rxn);
@@ -1314,7 +1320,8 @@ ruby_xml_node2_wrap(VALUE class, xmlNodePtr xnode)
   rxn->node=xnode;
   xnode->_private=(void*)obj;
 #ifdef NODE_DEBUG
-  fprintf(stderr,"wrap rxn=0x%x xn=0x%x o=0x%x\n",(long)rxn,(long)xnode,(long)obj);
+  fprintf(stderr,"wrap rn=0x%x n*=0x%x d*=0x%x\n",
+	  (long)rxn,(long)xnode,xnode->doc);
 #endif
   return obj;
 }
@@ -2209,6 +2216,15 @@ ruby_xml_node_registerNode(xmlNodePtr node)
   node->_private=NULL;
 }
 
+void
+ruby_xml_node_deregisterNode(xmlNodePtr node)
+{
+  ruby_xml_node *rxn;
+  if ( node->_private==NULL ) return;
+  Data_Get_Struct(node->_private, ruby_xml_node, rxn);
+  rxn->node=NULL;
+}
+
 // Rdoc needs to know 
 #ifdef RDOC_NEVER_DEFINED
   mXML = rb_define_module("XML");
@@ -2219,6 +2235,7 @@ ruby_init_xml_node(void) {
   VALUE singleton;
 
   xmlRegisterNodeDefault(ruby_xml_node_registerNode);
+  xmlDeregisterNodeDefault(ruby_xml_node_deregisterNode);
 
   cXMLNode = rb_define_class_under(mXML, "Node", rb_cObject);
   eXMLNodeSetNamespace = rb_define_class_under(cXMLNode, "SetNamespace", eXMLError);
@@ -2263,7 +2280,7 @@ ruby_init_xml_node(void) {
   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_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);