libxml-ruby 0.7.0 → 0.8.0

data/ext/libxml/ruby_xml_schema.c

@@ -3,6 +3,12 @@
 
 VALUE cXMLSchema;
 
+// Rdoc needs to know 
+#ifdef RDOC_NEVER_DEFINED
+  mLibXML = rb_define_module("LibXML");
+  mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
 static void
 ruby_xml_schema_mark(ruby_xml_schema *rxschema) {
   return;

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

@@ -14,21 +14,22 @@ ruby_xml_state_free(int dummy) {
 }
 
 VALUE
-ruby_xml_state_alloc() {
+ruby_xml_state_alloc(VALUE klass) {
   #ifdef DEBUG
   fprintf(stderr, "Allocating state");
   #endif
   
-  xmlInitParser();
+  xmlInitParser();
   
   return Data_Wrap_Struct(cXMLState,
 			  NULL, ruby_xml_state_free,
 			  &dummy);
 }
 
-// Rdoc needs to know 
+// 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
@@ -37,16 +38,16 @@ ruby_init_state(void) {
   cXMLState = rb_define_class_under(mXML, "State", rb_cObject);
   
   /* 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);
-
+  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);  
+  LIBXML_STATE = rb_class_new_instance(0, NULL, cXMLState);
+  rb_global_variable(&LIBXML_STATE);  
 }

data/ext/libxml/ruby_xml_state.h

@@ -6,6 +6,6 @@
 extern VALUE cXMLState;
 extern VALUE LIBXML_STATE;
 
-void ruby_init_state(void);
+void ruby_init_state(void);
 
 #endif

data/ext/libxml/ruby_xml_xinclude.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xinclude.c 300 2008-07-01 19:14:15Z cfis $ */
+/* $Id: ruby_xml_xinclude.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -10,7 +10,8 @@ VALUE eXMLXIncludeError;
 
 // 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_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,19 +1,32 @@
-/* $Id: ruby_xml_xpath.c 351 2008-07-09 19:55:21Z cfis $ */
+/* $Id: ruby_xml_xpath.c 461 2008-07-15 21:35:56Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
 #include "ruby_libxml.h"
 #include "ruby_xml_xpath.h"
+#include "ruby_xml_xpath_context.h"
 
 /*
- * Document-class: XML::XPath
+ * Document-class: LibXML::XML::XPath
  * 
- * The XML::XPath class is used to query XML documents. It is used
- * via the XML::Document#find method.
+ * The XML::XPath module is used to query XML documents. It is 
+ * usually accessed via the XML::Document#find or 
+ * XML::Node#find methods.  For example:
+ *
+ *  document.find('/foo', namespaces) -> XML::XPath::Object
+ *
+ * The optional namespaces parameter can be a string, array or
+ * hash table.
+ *
+ *   document.find('/foo', 'xlink:http://www.w3.org/1999/xlink')
+ *   document.find('/foo', ['xlink:http://www.w3.org/1999/xlink',
+ *                          'xi:http://www.w3.org/2001/XInclude')
+ *   document.find('/foo', 'xlink' => 'http://www.w3.org/1999/xlink',
+ *                             'xi' => 'http://www.w3.org/2001/XInclude')
  *
- *  document.find('/foo')
  *
  * === Working With Namespaces
+ *
  * Finding namespaced elements and attributes can be tricky.  
  * Lets work through some examples using the following xml document:
  *
@@ -33,7 +46,7 @@
  *  # 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')
+ *           'ns1:http://domain.somewhere.com')
  *             
  *  # Since the getManufacturerNamesResponse element uses a default 
  *  # namespace we first have to give it a prefix and register
@@ -47,236 +60,30 @@
              ['ns0:http://services.somewhere.com', 'ns1:http://domain.somewhere.com'])
 */
 
-VALUE cXMLXPath;
+VALUE mXPath;
 VALUE eXMLXPathInvalidPath;
 
-#ifdef LIBXML_XPATH_ENABLED
-
-
-/*
- * call-seq:
- *    xpath.debug -> (true|false)
- * 
- * Dump libxml debugging information to stdout.
- * Requires Libxml be compiled with debugging enabled.
- */
-VALUE
-ruby_xml_xpath_debug(VALUE self) {
-#ifdef LIBXML_DEBUG_ENABLED
-  ruby_xml_xpath *rxxp;
-  Data_Get_Struct(self, ruby_xml_xpath, rxxp);
-
-  if (rxxp->xpop != NULL) {
-    xmlXPathDebugDumpObject(stdout, rxxp->xpop, 0);
-    return(Qtrue);
-  } else {
-    return(Qfalse);
-  }
-#else
-  rb_warn("libxml does not have debugging turned on");
-  return(Qfalse);
-#endif
-}
-
-///////////////////////////////////////////////////
-// TODO xpath_find is throwing TypeError:
-//
-//    TypeError: can't convert nil into String
-//
-// When given a namespace when non exist.
-void
-ruby_xml_xpath_register_namespaces(VALUE nslist, VALUE xxpc, int level) {
-  char *cp;
-  long i;
-  VALUE rprefix, ruri;
-  xmlNsPtr xns;
-
-  /* Need to loop through the 2nd argument and iterate through the
-   * list of namespaces that we want to allow */
-  switch (TYPE(nslist)) {
-  case T_STRING:
-    cp = strchr(StringValuePtr(nslist), (int)':');
-    if (cp == NULL) {
-      rprefix = nslist;
-      ruri = Qnil;
-    } else {
-      rprefix = rb_str_new(StringValuePtr(nslist), (int)((long)cp - (long)StringValuePtr(nslist)));
-      ruri = rb_str_new2(&cp[1]);
-    }
-    /* Should test the results of this */
-    ruby_xml_xpath_context_register_namespace(xxpc, rprefix, ruri);
-    break;
-  case T_ARRAY:
-    if ( level == 0 ) {
-      for (i = 0; i < RARRAY(nslist)->len; i++) {
-	ruby_xml_xpath_register_namespaces(RARRAY(nslist)->ptr[i],xxpc,1);
-      }
-    }
-    else {
-      // tuples of prefix/uri
-      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");
-      }
-    }
-    break;
-  default:
-    if (rb_obj_is_kind_of(nslist, cXMLNS) == Qtrue) {
-      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");
-  }
-}
-/*
- * call-seq:
- *    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.
- * 
- * The optional namespaces argument may take one of
- * two forms:
- * 
- * * A string in the form of: "prefix:uri", or
- * * An array of:
- *   * strings in the form like above
- *   * arrays in the form of ['prefix','uri']
- * 
- * If not specified, matching nodes from any namespace
- * will be included.
- */
-VALUE
-ruby_xml_xpath_find(VALUE class, VALUE anode, VALUE xpath_expr, VALUE nslist) {
-#ifdef LIBXML_XPATH_ENABLED
-  xmlXPathCompExprPtr comp;
-  xmlXPathObjectPtr xxpop;
-  xmlNodePtr xnode;
-  xmlXPathContextPtr ctxt;
-  ruby_xml_document_t *rdocp;
-  VALUE rnode, xxpc;
-  VALUE rxpop;
-
-  if (rb_obj_is_kind_of(anode, cXMLDocument) == Qtrue) {
-    xxpc = ruby_xml_xpath_context_new(anode);
-    Data_Get_Struct(anode, ruby_xml_document_t, rdocp);
-#ifdef DEBUG
-    fprintf(stderr,"rdocp=0x%x root=0x%x\n",rdocp,xmlDocGetRootElement(rdocp->doc));
-#endif
-    rnode=ruby_xml_node2_wrap(cXMLNode,xmlDocGetRootElement(rdocp->doc));
-#ifdef DEBUG
-    fprintf(stderr,"rnode 0x%x 0x%x\n",rnode,xmlDocGetRootElement(rdocp->doc)->_private);
-#endif
-    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, 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));
-  
-  if (NIL_P(xxpc))
-    return(Qnil);
-
-  Data_Get_Struct(xxpc,xmlXPathContext,ctxt);
-  // XXX Is this legal? Set a subtree to apply xpath?
-  ctxt->node = xnode;
-
-  // XXX is setting ->namespaces used?
-  if (xnode->type == XML_DOCUMENT_NODE) {
-    ctxt->namespaces = xmlGetNsList(xnode->doc,
-				    xmlDocGetRootElement(xnode->doc));
-  } else {
-    ctxt->namespaces = xmlGetNsList(xnode->doc, xnode);
-  }
-
-  ctxt->nsNr = 0;
-  if (ctxt->namespaces != NULL) {
-    while (ctxt->namespaces[ctxt->nsNr] != NULL)
-      ctxt->nsNr++;
-  }
-
-  if ( ! NIL_P(nslist) )
-    ruby_xml_xpath_register_namespaces(nslist,xxpc,0);
-
-  comp = xmlXPathCompile((xmlChar*)StringValuePtr(xpath_expr));
-
-  if (comp == NULL) {
-    rb_raise(eXMLXPathInvalidPath,
-	     "Invalid XPath expression (expr does not compile)");
-  }
-  xxpop=xmlXPathCompiledEval(comp, ctxt);
-  if ( xxpop == NULL )
-    rb_raise(eXMLXPathInvalidPath,
-	     "Invalid XPath expression (expr could not be evaluated)");
-
-  rxpop = ruby_xml_xpath_object_wrap(xxpop);
-
-#ifdef NODE_DEBUG
-  fprintf(stderr,"xpo 0x%x class=%s\n",
-	  rxpop,
-	  rb_class2name(rb_obj_class(rxpop)));
-#endif
-
-  xmlXPathFreeCompExpr(comp);
-
-  if (rxpop == Qnil)
-    rb_raise(eXMLXPathInvalidPath,
-	     "Invalid XPath expression for this document");
-
-  return rxpop;
-#else
-  rb_warn("libxml was compiled without XPath support");
-  return(Qfalse);
-#endif
-}
-
-
-VALUE
-ruby_xml_xpath_findva(int argc, VALUE *argv, VALUE class) {
-  if ( argc < 2 || argc > 3 )
-    rb_raise(rb_eArgError, "wrong number of arguments (1 or 2)");
-
-  return ruby_xml_xpath_find(class,argv[0],argv[1],(argc==3)?argv[2]:Qnil);
-}
-
-VALUE
-ruby_xml_xpath_find2(VALUE anode, VALUE xpath_expr, VALUE nslist) {
-  return ruby_xml_xpath_find(cXMLXPath, anode, xpath_expr, nslist);
-}
-
 // 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_xpath(void) {
-  cXMLXPath = rb_define_class_under(mXML, "XPath", rb_cObject);
-  rb_include_module(cXMLNode, rb_const_get(rb_cObject, rb_intern("Enumerable")));
-
-  eXMLXPathInvalidPath = rb_define_class_under(cXMLXPath, "InvalidPath", eXMLError);
-
-  rb_define_const(cXMLXPath, "UNDEFINED", INT2NUM(XPATH_UNDEFINED));
-  rb_define_const(cXMLXPath, "NODESET", INT2NUM(XPATH_NODESET));
-  rb_define_const(cXMLXPath, "BOOLEAN", INT2NUM(XPATH_BOOLEAN));
-  rb_define_const(cXMLXPath, "NUMBER", INT2NUM(XPATH_NUMBER));
-  rb_define_const(cXMLXPath, "STRING", INT2NUM(XPATH_STRING));
-  rb_define_const(cXMLXPath, "POINT", INT2NUM(XPATH_POINT));
-  rb_define_const(cXMLXPath, "RANGE", INT2NUM(XPATH_RANGE));
-  rb_define_const(cXMLXPath, "LOCATIONSET", INT2NUM(XPATH_LOCATIONSET));
-  rb_define_const(cXMLXPath, "USERS", INT2NUM(XPATH_USERS));
-  rb_define_const(cXMLXPath, "XSLT_TREE", INT2NUM(XPATH_XSLT_TREE));
-
-  rb_define_singleton_method(cXMLXPath, "find", ruby_xml_xpath_findva, -1);
-
-  rb_define_method(cXMLXPath, "debug", ruby_xml_xpath_debug, 0);
+  mXPath = rb_define_module_under(mXML, "XPath");
+  eXMLXPathInvalidPath = rb_define_class_under(mXPath, "InvalidPath", eXMLError);
+
+  rb_define_const(mXPath, "UNDEFINED", INT2NUM(XPATH_UNDEFINED));
+  rb_define_const(mXPath, "NODESET", INT2NUM(XPATH_NODESET));
+  rb_define_const(mXPath, "BOOLEAN", INT2NUM(XPATH_BOOLEAN));
+  rb_define_const(mXPath, "NUMBER", INT2NUM(XPATH_NUMBER));
+  rb_define_const(mXPath, "STRING", INT2NUM(XPATH_STRING));
+  rb_define_const(mXPath, "POINT", INT2NUM(XPATH_POINT));
+  rb_define_const(mXPath, "RANGE", INT2NUM(XPATH_RANGE));
+  rb_define_const(mXPath, "LOCATIONSET", INT2NUM(XPATH_LOCATIONSET));
+  rb_define_const(mXPath, "USERS", INT2NUM(XPATH_USERS));
+  rb_define_const(mXPath, "XSLT_TREE", INT2NUM(XPATH_XSLT_TREE));
 
   ruby_init_xml_xpath_object();
 }
-
-#endif /* ifdef LIBXML_XPATH_ENABLED */