libxml-ruby 0.6.0-x86-mswin32-60 → 0.7.0-x86-mswin32-60

data/ext/libxml/ruby_xml_schema.h

@@ -1,16 +1,16 @@
-#ifndef __RUBY_XML_SCHEMA__
-#define __RUBY_XML_SCHEMA__
-
-#include <libxml/schemasInternals.h>
-#include <libxml/xmlschemas.h>
-
-extern VALUE cXMLSchema;
-
-typedef struct rxp_schema {
-  xmlSchemaPtr schema;   /* Schema interface */
-} ruby_xml_schema;
-
-void  ruby_init_xml_schema(void);
-void  ruby_schema_free(ruby_xml_schema *rxs);
-#endif
-
+#ifndef __RUBY_XML_SCHEMA__
+#define __RUBY_XML_SCHEMA__
+
+#include <libxml/schemasInternals.h>
+#include <libxml/xmlschemas.h>
+
+extern VALUE cXMLSchema;
+
+typedef struct rxp_schema {
+  xmlSchemaPtr schema;   /* Schema interface */
+} ruby_xml_schema;
+
+void  ruby_init_xml_schema(void);
+void  ruby_schema_free(ruby_xml_schema *rxs);
+#endif
+

data/ext/libxml/ruby_xml_state.c

@@ -3,111 +3,50 @@
 #include "ruby_libxml.h"
 
 VALUE cXMLState;
-static VALUE weak_holder;
-static int id_inst;
+VALUE LIBXML_STATE = Qnil;
 
-ID id_state;
-
-#undef DEBUG
+static int dummy = 0;
 
 void
-ruby_xml_state_free(int * dummy) {
-  if ( dummy==NULL ) return;
+ruby_xml_state_free(int dummy) {
   xmlCleanupParser();
-  ruby_xfree(dummy);
-  dummy=NULL;
-  weak_holder=Qnil;
-  rb_ivar_set(cXMLState,id_state,Qnil);
-}
-
-void
-ruby_xml_state_mark(void * a) {
-#ifdef DEBUG
-  fprintf(stderr,"marked 0x%x\n",NUM2INT(rb_ivar_get(cXMLState,id_state)));
-#endif
+  LIBXML_STATE = Qnil;
 }
 
 VALUE
-ruby_xml_state_object() {
-  VALUE obj,id;
-  int *dummy;
-
-  id=rb_ivar_get(cXMLState,id_state);
-  if (NIL_P(id)) {
-    obj = Data_Make_Struct(cXMLState, int,
-			   ruby_xml_state_mark,
-			   ruby_xml_state_free,
-			   dummy);
-    rb_ivar_set(cXMLState,id_state,id=rb_obj_id(obj));
-    *dummy=0;
-    weak_holder=obj;
-    return obj;
-  }
-
-#ifdef DEBUG
-  fprintf(stderr,"getting 0x%x\n",NUM2INT(id));
-#endif
-  return weak_holder;
-
-  return rb_funcall(rb_const_get(rb_cModule,rb_intern("ObjectSpace")),
-		    rb_intern("_id2ref"),
-		    1,
-		    id);
-}
-
-VALUE
-ruby_xml_state_object_find_aux(VALUE id) {
-  return rb_funcall(rb_const_get(rb_cModule,rb_intern("ObjectSpace")),
-	            rb_intern("_id2ref"),
-	            1, id);
-}
-
-
-static VALUE
-find_failed() {
-  return Qnil;
-}
-
-VALUE
-ruby_xml_state_object_find(VALUE id) {
-  return rb_rescue(ruby_xml_state_object_find_aux, id, find_failed, 0);
-}
-/*
- * This will establish a use and mark it or mark an existing use.
- * should be called by parser.mark and document.mark
- */
-void
-ruby_xml_state_marker(void) {
-  ruby_xml_state_object();
-  rb_gc_mark(weak_holder);
-}
-
-VALUE
-ruby_xml_state_used_p(VALUE klass)
-{
-  return rb_ivar_get(cXMLState,id_state);
-}
-
-VALUE
-ruby_xml_state_use(VALUE klass)
-{
-  return ruby_xml_state_object();
-}
-
-// Rdoc needs to know 
-#ifdef RDOC_NEVER_DEFINED
-  mXML = rb_define_module("XML");
-#endif
-
+ruby_xml_state_alloc() {
+  #ifdef DEBUG
+  fprintf(stderr, "Allocating state");
+  #endif
+  
+  xmlInitParser();
+  
+  return Data_Wrap_Struct(cXMLState,
+			  NULL, ruby_xml_state_free,
+			  &dummy);
+}
+
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mXML = rb_define_module("XML");
+#endif
 
 void
 ruby_init_state(void) {	
+  VALUE rb_mSingleton;
   cXMLState = rb_define_class_under(mXML, "State", rb_cObject);
-
-  rb_define_singleton_method(cXMLState, "used?",
-			     ruby_xml_state_used_p, 0);
-  rb_define_singleton_method(cXMLState, "use",
-			     ruby_xml_state_use, 0);
-
-  rb_ivar_set(cXMLState, id_state=rb_intern("@stateid"), Qnil);
+  
+  /* Mixin singleton so only one xml state object can be created. */
+  rb_require("singleton");
+  rb_mSingleton = rb_const_get(rb_cObject, rb_intern("Singleton"));
+  rb_include_module(cXMLState, rb_mSingleton);
+
+  rb_define_alloc_func(cXMLState, ruby_xml_state_alloc);
+
+  /* Create one instance of the state object that is used
+     to initalize and cleanup libxml. Then register it with
+     the garbage collector so its not freed until the process
+     exists.*/
+  LIBXML_STATE = rb_class_new_instance(0, NULL, cXMLState);
+  rb_global_variable(&LIBXML_STATE);  
 }

data/ext/libxml/ruby_xml_state.h

@@ -4,9 +4,8 @@
 #define __RUBY_XML_STATE__
 
 extern VALUE cXMLState;
+extern VALUE LIBXML_STATE;
 
-void ruby_init_state(void);
-void ruby_xml_state_marker(void);
-VALUE ruby_xml_state_object_find(VALUE id);
+void ruby_init_state(void);
 
 #endif

data/ext/libxml/ruby_xml_tree.h

@@ -1,12 +1,12 @@
-/* $Id: ruby_xml_tree.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_TREE__
-#define __RUBY_XML_TREE__
-
-extern VALUE cXMLTree;
-
-void ruby_init_xml_tree(void);
-
-#endif
+/* $Id: ruby_xml_tree.h 39 2006-02-21 20:40:16Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_TREE__
+#define __RUBY_XML_TREE__
+
+extern VALUE cXMLTree;
+
+void ruby_init_xml_tree(void);
+
+#endif

data/ext/libxml/ruby_xml_xinclude.h

@@ -1,13 +1,13 @@
-/* $Id: ruby_xml_xinclude.h 39 2006-02-21 20:40:16Z roscopeco $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_XINCLUDE__
-#define __RUBY_XML_XINCLUDE__
-
-extern VALUE cXMLXInclude;
-extern VALUE eXMLXIncludeError;
-
-void ruby_init_xml_xinclude(void);
-
-#endif
+/* $Id: ruby_xml_xinclude.h 39 2006-02-21 20:40:16Z roscopeco $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_XINCLUDE__
+#define __RUBY_XML_XINCLUDE__
+
+extern VALUE cXMLXInclude;
+extern VALUE eXMLXIncludeError;
+
+void ruby_init_xml_xinclude(void);
+
+#endif

data/ext/libxml/ruby_xml_xpath.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_xpath.c 351 2008-07-09 19:55:21Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -8,16 +8,54 @@
 /*
  * Document-class: XML::XPath
  * 
- * Includes Enumerable.
- */
+ * The XML::XPath class is used to query XML documents. It is used
+ * via the XML::Document#find method.
+ *
+ *  document.find('/foo')
+ *
+ * === Working With Namespaces
+ * Finding namespaced elements and attributes can be tricky.  
+ * Lets work through some examples using the following xml document:
+ *
+ *  <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+ *    <soap:Body>
+ *      <getManufacturerNamesResponse xmlns="http://services.somewhere.com">
+ *        <IDAndNameList xmlns="http://services.somewhere.com">
+ *          <ns1:IdAndName xmlns:ns1="http://domain.somewhere.com"/>
+ *        </IDAndNameList>
+ *      </getManufacturerNamesResponse>
+ *  </soap:Envelope>
+ *
+ *  # Since the soap namespace is defined on the root 
+ *  # node we can directly use it.
+ *  doc.find('/soap:Envelope')
+ *
+ *  # Since the ns1 namespace is not defined on the root node
+ *  # we have to first register it with the xpath engine.
+ *  doc.find('//ns1:IdAndName', 
+             'ns1:http://domain.somewhere.com')
+ *             
+ *  # Since the getManufacturerNamesResponse element uses a default 
+ *  # namespace we first have to give it a prefix and register
+ *  # it with the xpath engine.
+ *  doc.find('//ns:getManufacturerNamesResponse', 
+ *            'ns:http://services.somewhere.com')
+ *
+ *  # Here is an example showing a complex namespace aware
+ *  # xpath expression.
+ *  doc.find('/soap:Envelope/soap:Body/ns0:getManufacturerNamesResponse/ns0:IDAndNameList/ns1:IdAndName', 
+             ['ns0:http://services.somewhere.com', 'ns1:http://domain.somewhere.com'])
+*/
+
 VALUE cXMLXPath;
 VALUE eXMLXPathInvalidPath;
 
 #ifdef LIBXML_XPATH_ENABLED
 
+
 /*
  * call-seq:
- *    xpath.debug => (true|false)
+ *    xpath.debug -> (true|false)
  * 
  * Dump libxml debugging information to stdout.
  * Requires Libxml be compiled with debugging enabled.
@@ -51,7 +89,7 @@ ruby_xml_xpath_register_namespaces(VALUE nslist, VALUE xxpc, int level) {
   char *cp;
   long i;
   VALUE rprefix, ruri;
-  ruby_xml_ns *rxns;
+  xmlNsPtr xns;
 
   /* Need to loop through the 2nd argument and iterate through the
    * list of namespaces that we want to allow */
@@ -87,9 +125,9 @@ ruby_xml_xpath_register_namespaces(VALUE nslist, VALUE xxpc, int level) {
     break;
   default:
     if (rb_obj_is_kind_of(nslist, cXMLNS) == Qtrue) {
-      Data_Get_Struct(nslist, ruby_xml_ns, rxns);
-      rprefix = rb_str_new2((const char*)rxns->ns->prefix);
-      ruri = rb_str_new2((const char*)rxns->ns->href);
+      Data_Get_Struct(nslist, xmlNs, xns);
+      rprefix = rb_str_new2((const char*)xns->prefix);
+      ruri = rb_str_new2((const char*)xns->href);
       ruby_xml_xpath_context_register_namespace(xxpc, rprefix, ruri);
     } else
       rb_raise(rb_eArgError, "Invalid argument type, only accept string, array of strings, or an array of arrays");
@@ -97,7 +135,7 @@ ruby_xml_xpath_register_namespaces(VALUE nslist, VALUE xxpc, int level) {
 }
 /*
  * call-seq:
- *    XML::XPath.find(path, namespaces = [any]) => xpath
+ *    XML::XPath.find(path, namespaces = [any]) -> xpath
  * 
  * Find nodes matching the specified xpath (and optionally any of the
  * supplied namespaces) and return as an XML::Node::Set.
@@ -118,7 +156,7 @@ ruby_xml_xpath_find(VALUE class, VALUE anode, VALUE xpath_expr, VALUE nslist) {
 #ifdef LIBXML_XPATH_ENABLED
   xmlXPathCompExprPtr comp;
   xmlXPathObjectPtr xxpop;
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
   xmlXPathContextPtr ctxt;
   ruby_xml_document_t *rdocp;
   VALUE rnode, xxpc;
@@ -134,10 +172,10 @@ ruby_xml_xpath_find(VALUE class, VALUE anode, VALUE xpath_expr, VALUE nslist) {
 #ifdef DEBUG
     fprintf(stderr,"rnode 0x%x 0x%x\n",rnode,xmlDocGetRootElement(rdocp->doc)->_private);
 #endif
-    Data_Get_Struct(rnode, ruby_xml_node, node);
+    Data_Get_Struct(rnode, xmlNode, xnode);
   } else if ( rb_obj_is_kind_of(anode, cXMLNode) == Qtrue) {
     xxpc = ruby_xml_xpath_context_new(anode);
-    Data_Get_Struct(anode, ruby_xml_node, node);
+    Data_Get_Struct(anode, xmlNode, xnode);
   } else
     rb_raise(rb_eTypeError, "arg 1 must be XML::Document or XML::Node within a document %s", rb_obj_as_string(anode));
   
@@ -146,14 +184,14 @@ ruby_xml_xpath_find(VALUE class, VALUE anode, VALUE xpath_expr, VALUE nslist) {
 
   Data_Get_Struct(xxpc,xmlXPathContext,ctxt);
   // XXX Is this legal? Set a subtree to apply xpath?
-  ctxt->node = node->node;
+  ctxt->node = xnode;
 
   // XXX is setting ->namespaces used?
-  if (node->node->type == XML_DOCUMENT_NODE) {
-    ctxt->namespaces = xmlGetNsList(node->node->doc,
-				    xmlDocGetRootElement(node->node->doc));
+  if (xnode->type == XML_DOCUMENT_NODE) {
+    ctxt->namespaces = xmlGetNsList(xnode->doc,
+				    xmlDocGetRootElement(xnode->doc));
   } else {
-    ctxt->namespaces = xmlGetNsList(node->node->doc, node->node);
+    ctxt->namespaces = xmlGetNsList(xnode->doc, xnode);
   }
 
   ctxt->nsNr = 0;
@@ -173,7 +211,8 @@ ruby_xml_xpath_find(VALUE class, VALUE anode, VALUE xpath_expr, VALUE nslist) {
   }
   xxpop=xmlXPathCompiledEval(comp, ctxt);
   if ( xxpop == NULL )
-    return Qnil;
+    rb_raise(eXMLXPathInvalidPath,
+	     "Invalid XPath expression (expr could not be evaluated)");
 
   rxpop = ruby_xml_xpath_object_wrap(xxpop);
 

data/ext/libxml/ruby_xml_xpath.h

@@ -1,23 +1,23 @@
-/* $Id: ruby_xml_xpath.h 207 2007-11-14 07:51:46Z danj $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_XPATH__
-#define __RUBY_XML_XPATH__
-
-extern VALUE cXMLXPath;
-extern VALUE eXMLXPathInvalidPath;
-
-typedef struct ruby_xml_xpath {
-  VALUE xd;
-  VALUE ctxt;
-  xmlXPathObjectPtr xpop;
-} ruby_xml_xpath;
-
-void ruby_xml_xpath_free(ruby_xml_xpath *rxxp);
-VALUE ruby_xml_xpath_find(VALUE class, VALUE anode, VALUE xpath_expr, VALUE nslist);
-VALUE ruby_xml_xpath_find2(VALUE anode, VALUE xpath_expr, VALUE nslist);
-
-void ruby_init_xml_xpath(void);
-
-#endif
+/* $Id: ruby_xml_xpath.h 207 2007-11-14 07:51:46Z danj $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_XPATH__
+#define __RUBY_XML_XPATH__
+
+extern VALUE cXMLXPath;
+extern VALUE eXMLXPathInvalidPath;
+
+typedef struct ruby_xml_xpath {
+  VALUE xd;
+  VALUE ctxt;
+  xmlXPathObjectPtr xpop;
+} ruby_xml_xpath;
+
+void ruby_xml_xpath_free(ruby_xml_xpath *rxxp);
+VALUE ruby_xml_xpath_find(VALUE class, VALUE anode, VALUE xpath_expr, VALUE nslist);
+VALUE ruby_xml_xpath_find2(VALUE anode, VALUE xpath_expr, VALUE nslist);
+
+void ruby_init_xml_xpath(void);
+
+#endif

data/ext/libxml/ruby_xml_xpath_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath_context.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_xpath_context.c 351 2008-07-09 19:55:21Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -9,7 +9,7 @@ VALUE cXMLXPathContext;
 
 /*
  * call-seq:
- *    context.doc => document
+ *    context.doc -> document
  * 
  * Obtain the XML::Document associated with this XPath.
  */
@@ -25,6 +25,10 @@ ruby_xml_xpath_context_doc_get(VALUE self) {
 void
 ruby_xml_xpath_context_free(xmlXPathContextPtr ctxt) {
   if (ctxt != NULL) {
+    if (ctxt->namespaces != NULL) {
+      xmlFree(ctxt->namespaces);
+      ctxt->namespaces = NULL;
+    }  
     xmlXPathFreeContext(ctxt);
     ctxt = NULL;
   }
@@ -51,7 +55,7 @@ ruby_xml_xpath_context_wrap(xmlXPathContextPtr ctxt) {
 VALUE
 ruby_xml_xpath_context_new(VALUE anode) {
   ruby_xml_document_t *rxd;
-  ruby_xml_node *node;
+  xmlNodePtr xnode;
   xmlXPathContextPtr ctxt;
   
   if (rb_obj_is_kind_of(anode,cXMLDocument) == Qtrue ) {
@@ -62,11 +66,11 @@ ruby_xml_xpath_context_new(VALUE anode) {
     if (ctxt == NULL) return(Qnil);
 
   } else if (rb_obj_is_kind_of(anode,cXMLNode) == Qtrue ) {
-    Data_Get_Struct(anode, ruby_xml_node, node);
-    if (node->node->doc == NULL)
+    Data_Get_Struct(anode, xmlNode, xnode);
+    if (xnode->doc == NULL)
       rb_raise(rb_eTypeError,"Supplied node must be part of a document");
 
-    ctxt = xmlXPathNewContext(node->node->doc);
+    ctxt = xmlXPathNewContext(xnode->doc);
     if (ctxt == NULL) return(Qnil);
 
   } else {
@@ -79,7 +83,7 @@ ruby_xml_xpath_context_new(VALUE anode) {
 
 /*
  * call-seq:
- *    context.register_namespace(prefix, uri) => (true|false)
+ *    context.register_namespace(prefix, uri) -> (true|false)
  * 
  * Register the specified namespace URI with the specified prefix
  * in this context.