libxml-ruby 0.5.2.0 → 0.5.3

data/ext/{xml → libxml}/ruby_xml_html_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_html_parser.h 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_html_parser.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_node.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.c 192 2007-10-05 15:13:17Z danj $ */
+/* $Id: ruby_xml_node.c 235 2007-12-11 20:28:30Z danj $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -326,12 +326,20 @@ ruby_xml_node_child_set_aux(VALUE self, VALUE rnode, int do_raise) {
   Data_Get_Struct(rnode, ruby_xml_node, cnode);
   
   chld = cnode->node;
+  /* Since an add operation may destroy a textnode by merging, we need to work
+   * with a copy, so that the ruby instance is not left with a dangling reference
+   */
+  if ( chld->type == XML_TEXT_NODE ) {
+    chld = xmlCopyNode(chld,1);
+    copied=1;
+  }
 
   if ( chld->parent != NULL || chld->doc != NULL ) {
-    chld=xmlCopyNode(chld,1);
-    copied=1;
+    /* raise before copying if applicable */
     if ( do_raise == 1 )
       rb_raise(rb_eRuntimeError, "implicit copy not legal for child= or <<");
+    chld=xmlCopyNode(chld,1);
+    copied=1;
   }
 
   ret = xmlAddChild(pnode->node, chld);
@@ -339,10 +347,13 @@ ruby_xml_node_child_set_aux(VALUE self, VALUE rnode, int do_raise) {
     if ( copied == 1 )
       xmlFreeNode(chld);
     rb_raise(eXMLNodeFailedModify, "unable to add a child to the document");
+  } else if ( ret==chld ) {
+    /* child was added whole to parent and we need to return it as a new object */
+    return ruby_xml_node2_wrap(cXMLNode,chld);
   }
-    
-  // wish I could return a new wrapped chld, but ruby only returns the rhs
-  return ruby_xml_node2_wrap(cXMLNode,chld);
+  /* else */
+  /* If it was a text node, then ret should be parent->last, so we will just return ret. */
+  return ruby_xml_node2_wrap(cXMLNode,ret);
 }
 
 /*
@@ -2210,6 +2221,35 @@ ruby_xml_node_copy(VALUE self, VALUE deep) {
   return obj;
 }
 
+ /*
+ * call-seq: 
+ *    XML::Node.new_text(content = nil) => node
+ * 
+ * Create a new text node, optionally setting
+ * the node's content.
+ * 
+ */
+VALUE
+ruby_xml_node_new_text(VALUE class, VALUE text)
+{
+  VALUE obj;
+  xmlNodePtr xnode;
+  
+  if ( NIL_P(text) )
+    return Qnil;
+
+  if (TYPE(text) != T_STRING )
+    rb_raise(rb_eTypeError, "requires string argument");
+  
+  xnode=xmlNewText((xmlChar*)STR2CSTR(text));
+  if ( xnode == NULL )
+    return Qnil;
+  
+  obj=ruby_xml_node2_wrap(class,xnode);
+  rb_obj_call_init(obj,0,NULL);
+  return obj;
+}
+
 void
 ruby_xml_node_registerNode(xmlNodePtr node)
 {
@@ -2263,6 +2303,7 @@ ruby_init_xml_node(void) {
   rb_define_singleton_method(cXMLNode, "new", ruby_xml_node2_new_string_bc, -1);
   rb_define_singleton_method(cXMLNode, "new_cdata", ruby_xml_node_new_cdata, -1);
   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");
   

data/ext/{xml → libxml}/ruby_xml_node.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.h 189 2007-09-26 15:04:47Z danj $ */
+/* $Id: ruby_xml_node.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_node_set.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.c 192 2007-10-05 15:13:17Z danj $ */
+/* $Id: ruby_xml_node_set.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_node_set.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node_set.h 183 2007-09-21 14:09:52Z danj $ */
+/* $Id: ruby_xml_node_set.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_ns.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.c 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_ns.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_ns.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_ns.h 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_ns.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser.c 192 2007-10-05 15:13:17Z danj $ */
+/* $Id: ruby_xml_parser.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -435,7 +435,7 @@ ruby_xml_parser_default_keep_blanks_set(VALUE class, VALUE bool) {
  */
 VALUE
 ruby_xml_parser_default_load_external_dtd_get(VALUE class) {
-  if (xmlSubstituteEntitiesDefaultValue)
+  if (xmlLoadExtDtdDefaultValue)
     return(Qtrue);
   else
     return(Qfalse);
@@ -1214,6 +1214,8 @@ ruby_xml_parser_str_set(VALUE self, VALUE str) {
 
   Data_Get_Struct(rxp->ctxt, ruby_xml_parser_context, rxpc);
   rxpc->ctxt = xmlCreateMemoryParserCtxt(StringValuePtr(data->str), RSTRING_LEN(data->str));
+  if ( rxpc->ctxt == NULL )
+    rb_raise(eXMLParserParseError,"Cannot initialize parser with given string (maybe empty?)");
 
   return(data->str);
 }
@@ -1359,9 +1361,9 @@ ruby_init_parser(void) {
   rb_define_singleton_method(cXMLParser, "default_keep_blanks=",
 			     ruby_xml_parser_default_keep_blanks_set, 1);
   rb_define_singleton_method(cXMLParser, "default_load_external_dtd",
-			     ruby_xml_parser_default_load_external_dtd_set, 0);
+			     ruby_xml_parser_default_load_external_dtd_get, 0);
   rb_define_singleton_method(cXMLParser, "default_load_external_dtd=",
-			     ruby_xml_parser_default_load_external_dtd_get, 1);
+			     ruby_xml_parser_default_load_external_dtd_set, 1);
   rb_define_singleton_method(cXMLParser, "default_line_numbers",
 			     ruby_xml_parser_default_line_numbers_get, 0);
   rb_define_singleton_method(cXMLParser, "default_line_numbers=",

data/ext/{xml → libxml}/ruby_xml_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser.h 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_parser.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_parser_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.c 189 2007-09-26 15:04:47Z danj $ */
+/* $Id: ruby_xml_parser_context.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_parser_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_parser_context.h 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_parser_context.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_reader.c

@@ -686,6 +686,9 @@ ruby_xml_reader_expand(VALUE self)
   if (NIL_P(node))
     return Qnil;
 
+  if ( node->doc != NULL )
+    ruby_xml_document_wrap2(node->doc);
+
   return ruby_xml_node2_wrap(cXMLNode, node);
 }
 

data/ext/{xml → libxml}/ruby_xml_sax_parser.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.c 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_sax_parser.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_sax_parser.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_sax_parser.h 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_sax_parser.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_tree.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_tree.c 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_tree.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_tree.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_tree.h 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_tree.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_xinclude.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xinclude.c 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_xinclude.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_xinclude.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xinclude.h 134 2007-08-29 17:30:19Z danj $ */
+/* $Id: ruby_xml_xinclude.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_xpath.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath.c 192 2007-10-05 15:13:17Z danj $ */
+/* $Id: ruby_xml_xpath.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -76,9 +76,9 @@ ruby_xml_xpath_register_namespaces(VALUE nslist, VALUE xxpc, int level) {
     }
     else {
       // tuples of prefix/uri
-      if (RARRAY(RARRAY(nslist)->ptr[i])->len == 2) {
-	rprefix = RARRAY(RARRAY(nslist)->ptr[i])->ptr[0];
-	ruri = RARRAY(RARRAY(nslist)->ptr[i])->ptr[1];
+      if (RARRAY(nslist)->len == 2) {
+	rprefix = RARRAY(nslist)->ptr[0];
+	ruri = RARRAY(nslist)->ptr[1];
 	ruby_xml_xpath_context_register_namespace(xxpc, rprefix, ruri);
       } else {
 	rb_raise(rb_eArgError, "nested array must be an array of strings, prefix and href/uri");
@@ -173,6 +173,9 @@ ruby_xml_xpath_find(VALUE class, VALUE anode, VALUE xpath_expr, VALUE nslist) {
 	     "Invalid XPath expression (expr does not compile)");
   }
   xxpop=xmlXPathCompiledEval(comp, ctxt);
+  if ( xxpop == NULL )
+    return Qnil;
+
 #define ALT
 #ifdef ALT
   rxpop = ruby_xml_xpath_object_wrap(xxpop);

data/ext/{xml → libxml}/ruby_xml_xpath.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath.h 190 2007-09-28 17:13:52Z danj $ */
+/* $Id: ruby_xml_xpath.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_xpath_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath_context.c 188 2007-09-24 01:43:21Z danj $ */
+/* $Id: ruby_xml_xpath_context.c 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_xpath_context.h

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath_context.h 188 2007-09-24 01:43:21Z danj $ */
+/* $Id: ruby_xml_xpath_context.h 225 2007-12-07 04:58:09Z transami $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/{xml → libxml}/ruby_xml_xpath_object.c

@@ -18,7 +18,7 @@ ruby_xml_xpath_object_mark(xmlXPathObjectPtr xpop)
   void * xnp;
   int i;
 
-  if ( xpop->type == XPATH_NODESET ) {
+  if ( xpop->type == XPATH_NODESET && xpop->nodesetval != NULL ) {
     for (i=0; i<xpop->nodesetval->nodeNr; i++) {
       xnp=xpop->nodesetval->nodeTab[i]->_private;
       if (xnp != NULL)
@@ -36,13 +36,35 @@ ruby_xml_xpath_object_free(xmlXPathObjectPtr xpop)
 VALUE
 ruby_xml_xpath_object_wrap(xmlXPathObjectPtr xpop)
 {
+  VALUE rval;
+
   if ( xpop==NULL )
     return Qnil;
 
-  return Data_Wrap_Struct(cXMLXPathObject,
-			  ruby_xml_xpath_object_mark,
-			  ruby_xml_xpath_object_free,
-			  xpop);
+  switch(xpop->type) {
+  case XPATH_NODESET:
+    return Data_Wrap_Struct(cXMLXPathObject,
+			    ruby_xml_xpath_object_mark,
+			    ruby_xml_xpath_object_free,
+			    xpop);
+    break;
+  case XPATH_BOOLEAN:
+    if (xpop->boolval != 0)
+      rval=Qtrue;
+    else
+      rval=Qfalse;
+    break;
+  case XPATH_NUMBER:
+    rval=rb_float_new(xpop->floatval);
+    break;
+  case XPATH_STRING:
+    rval=rb_str_new2(xpop->stringval);
+    break;
+  default:
+    rval=Qnil;
+  }
+  xmlXPathFreeObject(xpop);
+  return rval;
 }
 
 /*
@@ -112,6 +134,26 @@ ruby_xml_xpath_object_empty_q(VALUE self) {
   return ( xpop->nodesetval == NULL || xpop->nodesetval->nodeNr <= 0 ) ? Qtrue : Qfalse;
 }
 
+static VALUE
+ruby_xml_xpath_object_tabref(xmlXPathObjectPtr xpop, int apos) {
+
+  if (apos < 0 )
+    apos=xpop->nodesetval->nodeNr+apos;
+
+  if (apos < 0 || apos+1 > xpop->nodesetval->nodeNr )
+    return Qnil;
+
+  switch(xpop->nodesetval->nodeTab[apos]->type) {
+  case XML_ATTRIBUTE_NODE:
+    return ruby_xml_attr_wrap(cXMLAttr,
+			      (xmlAttrPtr)xpop->nodesetval->nodeTab[apos]);
+    break;
+  default:
+    return ruby_xml_node2_wrap(cXMLNode,
+			       xpop->nodesetval->nodeTab[apos]);
+  }
+}
+
 /*
  * call-seq:
  *    xpath_object.each { |node| ... } => self
@@ -123,7 +165,6 @@ ruby_xml_xpath_object_each(VALUE self)
 {
   xmlXPathObjectPtr xpop;
   int i;
-  VALUE nodeobj;
 
   if ( ruby_xml_xpath_object_empty_q(self) == Qtrue )
     return Qnil;
@@ -131,16 +172,7 @@ ruby_xml_xpath_object_each(VALUE self)
   Data_Get_Struct(self,xmlXPathObject,xpop);
 
   for (i = 0; i < xpop->nodesetval->nodeNr; i++) {
-    switch(xpop->nodesetval->nodeTab[i]->type) {
-    case XML_ATTRIBUTE_NODE:
-      nodeobj = ruby_xml_attr_wrap(cXMLAttr,
-				   (xmlAttrPtr)xpop->nodesetval->nodeTab[i]);
-      break;
-    default:
-      nodeobj = ruby_xml_node2_wrap(cXMLNode, xpop->nodesetval->nodeTab[i]);
-    }
-
-    rb_yield(nodeobj);
+    rb_yield(ruby_xml_xpath_object_tabref(xpop,i));
   }
   return(self);
 }
@@ -153,26 +185,26 @@ ruby_xml_xpath_object_each(VALUE self)
  */
 VALUE
 ruby_xml_xpath_object_first(VALUE self) {
-  VALUE nodeobj;
-
-  xmlXPathObjectPtr xpop;
+  if ( ruby_xml_xpath_object_empty_q(self) == Qtrue )
+    return Qnil;
+  
+  return ruby_xml_xpath_object_tabref((xmlXPathObjectPtr)DATA_PTR(self),0);
+}
 
+/*
+ * call-seq:
+ * xpath_object[i] => node
+ *
+ * array index into set of nodes
+ */
+VALUE
+ruby_xml_xpath_object_aref(VALUE self, VALUE aref) {
   if ( ruby_xml_xpath_object_empty_q(self) == Qtrue )
     return Qnil;
 
-  Data_Get_Struct(self,xmlXPathObject,xpop);
-  
-  switch(xpop->nodesetval->nodeTab[0]->type) {
-  case XML_ATTRIBUTE_NODE:
-    nodeobj = ruby_xml_attr_wrap(cXMLAttr,
-				 (xmlAttrPtr)xpop->nodesetval->nodeTab[0]);
-    break;
-  default:
-    nodeobj = ruby_xml_node2_wrap(cXMLNode,
-				  xpop->nodesetval->nodeTab[0]);
-  }
-  
-  return(nodeobj);
+  return ruby_xml_xpath_object_tabref(
+				      (xmlXPathObjectPtr)DATA_PTR(self),
+				      NUM2INT(aref));
 }
 
 /*
@@ -235,6 +267,7 @@ ruby_init_xml_xpath_object(void) {
   rb_define_method(cXMLXPathObject, "length", ruby_xml_xpath_object_length, 0);
   rb_define_method(cXMLXPathObject, "size", ruby_xml_xpath_object_length, 0);
   rb_define_method(cXMLXPathObject, "to_a", ruby_xml_xpath_object_to_a, 0);
+  rb_define_method(cXMLXPathObject, "[]", ruby_xml_xpath_object_aref, 1);
 
   rb_define_method(cXMLXPathObject, "string", ruby_xml_xpath_object_string, 0);