libxml-ruby 0.9.2 → 0.9.3

data/ext/libxml/ruby_xml_sax_parser.h

@@ -1,20 +1,12 @@
-/* $Id: ruby_xml_sax_parser.h 544 2008-11-16 09:50:27Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_XML_SAX_PARSER__
-#define __RUBY_XML_SAX_PARSER__
-
-extern VALUE cXMLSaxParser;
-
-typedef struct ruby_xml_sax_parser {
-  xmlParserCtxtPtr xpc;
-  xmlSAXHandlerPtr xsh;
-  VALUE callbackHandler;
-  VALUE filename;
-  VALUE str;
-} ruby_xml_sax_parser;
-
-void ruby_init_xml_sax_parser(void);
-
-#endif
+/* $Id: ruby_xml_sax_parser.h 616 2008-11-22 09:25:12Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __rxml_SAX_PARSER__
+#define __rxml_SAX_PARSER__
+
+extern VALUE cXMLSaxParser;
+
+void ruby_init_xml_sax_parser(void);
+
+#endif

data/ext/libxml/ruby_xml_schema.c

@@ -39,39 +39,28 @@ VALUE cXMLSchema;
 #endif
 
 static void
-ruby_xml_schema_mark(ruby_xml_schema *rxschema) {
-  return;
-}
-
-void
-ruby_xml_schema_free(ruby_xml_schema *rxschema) {
-  if (rxschema->schema != NULL) {
-    xmlSchemaFree(rxschema->schema);
-    rxschema->schema = NULL;
-  }
-
-  ruby_xfree(rxschema);
+rxml_schema_free(xmlSchemaPtr xschema) {
+  xmlSchemaFree(xschema);
 }
 
 /*
  * call-seq:
- *    XML::Schema.new(schema_uri) -> schema
+ *    XML::Schema.initialize(schema_uri) -> schema
  * 
  * Create a new schema from the specified URI.
  */
-VALUE
-ruby_xml_schema_init_from_uri(VALUE class, VALUE uri) {
-  xmlSchemaParserCtxtPtr parser;
-  ruby_xml_schema *schema;
+static VALUE
+rxml_schema_init_from_uri(VALUE class, VALUE uri) {
+  xmlSchemaParserCtxtPtr xparser;
+  xmlSchemaPtr xschema;
 
   Check_Type(uri, T_STRING);
 
-  parser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
-  schema = ALLOC(ruby_xml_schema);
-  schema->schema = xmlSchemaParse(parser);
-  xmlSchemaFreeParserCtxt(parser);
-
-  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
+  xparser = xmlSchemaNewParserCtxt(StringValuePtr(uri));
+  xschema = xmlSchemaParse(xparser);
+  xmlSchemaFreeParserCtxt(xparser);
+  
+  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
 }
 
 /*
@@ -80,20 +69,19 @@ ruby_xml_schema_init_from_uri(VALUE class, VALUE uri) {
  * 
  * Create a new schema from the specified document.
  */
-VALUE
-ruby_xml_schema_init_from_document(VALUE class, VALUE document) {
+static VALUE
+rxml_schema_init_from_document(VALUE class, VALUE document) {
   xmlDocPtr xdoc;
-  ruby_xml_schema *schema;
-  xmlSchemaParserCtxtPtr parser;
+  xmlSchemaPtr xschema;
+  xmlSchemaParserCtxtPtr xparser;
 
   Data_Get_Struct(document, xmlDoc, xdoc);
 
-  parser = xmlSchemaNewDocParserCtxt(xdoc);
-  schema = ALLOC(ruby_xml_schema);
-  schema->schema = xmlSchemaParse(parser);
-  xmlSchemaFreeParserCtxt(parser);
+  xparser = xmlSchemaNewDocParserCtxt(xdoc);
+  xschema = xmlSchemaParse(xparser);
+  xmlSchemaFreeParserCtxt(xparser);
 
-  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, schema);
+  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
 }
 
 /*
@@ -102,19 +90,18 @@ ruby_xml_schema_init_from_document(VALUE class, VALUE document) {
  * 
  * Create a new schema using the specified string.
  */
-VALUE
-ruby_xml_schema_init_from_string(VALUE self, VALUE schema_str) {
-  xmlSchemaParserCtxtPtr  parser;
-  ruby_xml_schema *rxschema;
+static VALUE
+rxml_schema_init_from_string(VALUE self, VALUE schema_str) {
+  xmlSchemaParserCtxtPtr  xparser;
+  xmlSchemaPtr xschema;
 
   Check_Type(schema_str, T_STRING);
 
-  parser = xmlSchemaNewMemParserCtxt(StringValuePtr(schema_str), strlen(StringValuePtr(schema_str)));
-  rxschema = ALLOC(ruby_xml_schema);
-  rxschema->schema = xmlSchemaParse(parser);
-  xmlSchemaFreeParserCtxt(parser);
+  xparser = xmlSchemaNewMemParserCtxt(StringValuePtr(schema_str), strlen(StringValuePtr(schema_str)));
+  xschema = xmlSchemaParse(xparser);
+  xmlSchemaFreeParserCtxt(xparser);
 
-  return Data_Wrap_Struct(cXMLSchema, ruby_xml_schema_mark, ruby_xml_schema_free, rxschema);
+  return Data_Wrap_Struct(cXMLSchema, NULL, rxml_schema_free, xschema);
 }
   
 /* TODO what is this patch doing here?
@@ -167,8 +154,8 @@ ruby_xml_schema_init_from_string(VALUE self, VALUE schema_str) {
 
 void  ruby_init_xml_schema(void) {
   cXMLSchema = rb_define_class_under(mXML, "Schema", rb_cObject);
-  rb_define_singleton_method(cXMLSchema, "new",         ruby_xml_schema_init_from_uri, 1);
-  rb_define_singleton_method(cXMLSchema, "from_string", ruby_xml_schema_init_from_string, 1);
-  rb_define_singleton_method(cXMLSchema, "document",    ruby_xml_schema_init_from_document, 1);
+  rb_define_singleton_method(cXMLSchema, "new",         rxml_schema_init_from_uri, 1);
+  rb_define_singleton_method(cXMLSchema, "from_string", rxml_schema_init_from_string, 1);
+  rb_define_singleton_method(cXMLSchema, "document",    rxml_schema_init_from_document, 1);
 }
 

data/ext/libxml/ruby_xml_schema.h

@@ -1,16 +1,11 @@
-#ifndef __RUBY_XML_SCHEMA__
-#define __RUBY_XML_SCHEMA__
+#ifndef __rxml_SCHEMA__
+#define __rxml_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

@@ -7,14 +7,14 @@ VALUE LIBXML_STATE = Qnil;
 
 static int dummy = 0;
 
-void
-ruby_xml_state_free(int dummy) {
+static void
+rxml_state_free(int dummy) {
   xmlCleanupParser();
   LIBXML_STATE = Qnil;
 }
 
-VALUE
-ruby_xml_state_alloc(VALUE klass) {
+static VALUE
+rxml_state_alloc(VALUE klass) {
   #ifdef DEBUG
   fprintf(stderr, "Allocating state");
   #endif
@@ -22,7 +22,7 @@ ruby_xml_state_alloc(VALUE klass) {
   xmlInitParser();
   
   return Data_Wrap_Struct(cXMLState,
-			  NULL, ruby_xml_state_free,
+			  NULL, rxml_state_free,
 			  &dummy);
 }
 
@@ -42,7 +42,7 @@ ruby_init_state(void) {
   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_define_alloc_func(cXMLState, rxml_state_alloc);
 
   /* Create one instance of the state object that is used
      to initalize and cleanup libxml. Then register it with

data/ext/libxml/ruby_xml_state.h

@@ -1,7 +1,7 @@
 /* $Id$ */
 
-#ifndef __RUBY_XML_STATE__
-#define __RUBY_XML_STATE__
+#ifndef __rxml_STATE__
+#define __rxml_STATE__
 
 extern VALUE cXMLState;
 extern VALUE LIBXML_STATE;

data/ext/libxml/ruby_xml_xinclude.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xinclude.c 566 2008-11-18 06:53:36Z cfis $ */
+/* $Id: rxml_xinclude.c 566 2008-11-18 06:53:36Z cfis $ */
 
 #include "ruby_libxml.h"
 #include "ruby_xml_xinclude.h"

data/ext/libxml/ruby_xml_xinclude.h

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_xinclude.h 39 2006-02-21 20:40:16Z roscopeco $ */
+/* $Id: ruby_xml_xinclude.h 612 2008-11-21 08:01:29Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __RUBY_XML_XINCLUDE__
-#define __RUBY_XML_XINCLUDE__
+#ifndef __rxml_XINCLUDE__
+#define __rxml_XINCLUDE__
 
 extern VALUE cXMLXInclude;
 extern VALUE eXMLXIncludeError;

data/ext/libxml/ruby_xml_xpath.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath.c 566 2008-11-18 06:53:36Z cfis $ */
+/* $Id: rxml_xpath.c 566 2008-11-18 06:53:36Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 

data/ext/libxml/ruby_xml_xpath.h

@@ -1,21 +1,12 @@
-/* $Id: ruby_xml_xpath.h 528 2008-11-15 23:43:48Z cfis $ */
+/* $Id: ruby_xml_xpath.h 614 2008-11-22 08:04:39Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __RUBY_XML_XPATH__
-#define __RUBY_XML_XPATH__
+#ifndef __rxml_XPATH__
+#define __rxml_XPATH__
 
 extern VALUE mXPath;
 
-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);
-
 void ruby_init_xml_xpath(void);
 
 #endif

data/ext/libxml/ruby_xml_xpath_context.c

@@ -1,294 +1,293 @@
-/* $Id: ruby_xml_xpath_context.c 600 2008-11-19 07:39:29Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xpath_context.h"
-#include "ruby_xml_xpath_expression.h"
-#include <st.h>
-
-
-/*
- * Document-class: LibXML::XML::XPath::Context
- * 
- * The XML::XPath::Context class is used to evaluate XPath
- * expressions.  Generally, you should not directly use this class,
- * but instead use the XML::Document#find and XML::Node#find methods.
- *
- *  doc = XML::Document.string('<header>content</header>')
- *  context = XPath::Context.new(doc)
- *  context.node = doc.root  
- *  context.register_namespaces_from_node(doc.root)
- *  nodes = context.find('/header')
- */
-
-VALUE cXMLXPathContext;
-
-void
-ruby_xml_xpath_context_free(xmlXPathContextPtr ctxt) {
-  xmlXPathFreeContext(ctxt);
-}
-
-
-VALUE
-ruby_xml_xpath_context_alloc(VALUE klass) {
-  return Data_Wrap_Struct(cXMLXPathContext,
-			  NULL,
-			  ruby_xml_xpath_context_free,
-			  NULL);
-}
-
-/* call-seq:
- *    XPath::Context.new(node) -> XPath::Context
- * 
- * Creates a new XPath context for the specified document.  The
- * context can then be used to evaluate an XPath expression.
- *
- *  doc = XML::Document.string('<header><first>hi</first></header>')
- *  context = XPath::Context.new(doc)
- *  nodes = XPath::Object.new('//first', context)
- *  nodes.length == 1
- */
-VALUE
-ruby_xml_xpath_context_initialize(VALUE self, VALUE node) {
-  xmlDocPtr xdoc;
-  VALUE document;
-  #ifndef LIBXML_XPATH_ENABLED
-  rb_raise(rb_eTypeError, "libxml was not compiled with XPath support.");
-  #endif
-
-  if (rb_obj_is_kind_of(node, cXMLNode) == Qtrue)
-  {
-    document = rb_funcall(node, rb_intern("doc"), 0);
-    if NIL_P(document)
-      rb_raise(rb_eTypeError, "Supplied node must belong to a document.");
-  }
-  else if (rb_obj_is_kind_of(node, cXMLDocument) == Qtrue)
-  {
-    document = node;
-  }
-  else
-  {
-    rb_raise(rb_eTypeError, "Supplied argument must be a document or node.");
-  }
-  
-  Data_Get_Struct(document, xmlDoc, xdoc);
-  DATA_PTR(self) = xmlXPathNewContext(xdoc);
-  
-  /* Save the doc as an attribute, this will expose it to Ruby's GC. */
-  rb_iv_set(self, "@doc", document);    
-
-  return self;
-}
-
-
-/*
- * call-seq:
- *    context.register_namespace(prefix, uri) -> (true|false)
- * 
- * Register the specified namespace URI with the specified prefix
- * in this context.
- 
- *   context.register_namespace('xi', 'http://www.w3.org/2001/XInclude')
- */
-VALUE
-ruby_xml_xpath_context_register_namespace(VALUE self, VALUE prefix, VALUE uri) {
-  xmlXPathContextPtr ctxt;
-
-  Data_Get_Struct(self, xmlXPathContext, ctxt);
-  if (xmlXPathRegisterNs(ctxt, 
-                         (xmlChar*)StringValuePtr(prefix), 
-                         (xmlChar*)StringValuePtr(uri))
-      == 0) {
-    return(Qtrue);
-  } else {
-    /* Should raise an exception, IMHO (whose?, why shouldnt it? -danj)*/
-    rb_warning("register namespace failed");
-    return(Qfalse);
-  }
-}
-
-/* call-seq:
- *    context.register_namespaces_from_node(node) -> self
- * 
- * Helper method to read in namespaces defined on a node.
- *
- *  doc = XML::Document.string('<header><first>hi</first></header>')
- *  context = XPath::Context.new(doc)
- *  context.register_namespaces_from_node(doc.root)
- */
-VALUE
-ruby_xml_xpath_context_register_namespaces_from_node(VALUE self, VALUE node) {
-  xmlXPathContextPtr xctxt;
-  xmlNodePtr xnode;
-  xmlNsPtr *xnsArr;
-
-  Data_Get_Struct(self, xmlXPathContext, xctxt);
-  
-  if (rb_obj_is_kind_of(node, cXMLDocument) == Qtrue)
-  {
-    xmlDocPtr xdoc;
-    Data_Get_Struct(node, xmlDoc, xdoc);
-    xnode = xmlDocGetRootElement(xdoc);
-  }
-  else if (rb_obj_is_kind_of(node, cXMLNode) == Qtrue)
-  {
-    Data_Get_Struct(node, xmlNode, xnode);
-  }
-  else
-  {
-    rb_raise(rb_eTypeError, "The first argument must be a document or node.");
-  } 
-  
-  xnsArr = xmlGetNsList(xnode->doc, xnode);
-  
-  if (xnsArr)
-  {
-    xmlNsPtr xns = *xnsArr;
-    
-    while (xns) {
-      /* If there is no prefix, then this is the default namespace.
-         Skip it for now. */
-      if (xns->prefix)
-      {
-        VALUE prefix = rb_str_new2(xns->prefix);
-        VALUE uri = rb_str_new2(xns->href);
-        ruby_xml_xpath_context_register_namespace(self, prefix, uri);
-      }
-      xns = xns->next;
-    }
-    xmlFree(xnsArr);
-  }
-    
-  return self;
-}
-
-static int
-iterate_ns_hash(st_data_t prefix, st_data_t uri, st_data_t self)
-{
-  ruby_xml_xpath_context_register_namespace(self, prefix, uri);
-  return ST_CONTINUE;
-}
-
-
-/*
- * call-seq:
- *    context.register_namespaces(["prefix:uri"]) -> self
- * 
- * Register the specified namespaces in this context.
- *
- *   context.register_namespaces('xi:http://www.w3.org/2001/XInclude')
- *   context.register_namespaces(['xlink:http://www.w3.org/1999/xlink',
- *                                'xi:http://www.w3.org/2001/XInclude')
- *   context.register_namespaces('xlink' => 'http://www.w3.org/1999/xlink',
- *                                  'xi' => 'http://www.w3.org/2001/XInclude')
- */
-VALUE
-ruby_xml_xpath_context_register_namespaces(VALUE self, VALUE nslist) {
-  char *cp;
-  long i;
-  VALUE rprefix, ruri;
-
-  /* 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(self, rprefix, ruri);
-    break;
-  case T_ARRAY:
-    for (i = 0; i < RARRAY(nslist)->len; i++) {
-      ruby_xml_xpath_context_register_namespaces(self, RARRAY(nslist)->ptr[i]);
-    }
-    break;
-  case T_HASH:
-    st_foreach(RHASH(nslist)->tbl, iterate_ns_hash, self);
-    break;
-  default:
-    rb_raise(rb_eArgError, "Invalid argument type, only accept string, array of strings, or an array of arrays");
-  }
-  return self;
-}
-
-/*
- * call-seq:
- *    context.node = node
- * 
- * Set the current node used by the XPath engine
- 
- *  doc = XML::Document.string('<header><first>hi</first></header>')
- *  context.node = doc.root.first
- */
-VALUE
-ruby_xml_xpath_context_node_set(VALUE self, VALUE node) {
-  xmlXPathContextPtr xctxt;
-  xmlNodePtr xnode;
-  
-  Data_Get_Struct(self, xmlXPathContext, xctxt);
-  Data_Get_Struct(node, xmlNode, xnode);
-  xctxt->node = xnode;
-  return node;
-}
-
-/*
- * call-seq:
- *    context.find("xpath") -> XML::XPath::Object
- * 
- * Find nodes matching the specified XPath expression
- */
-VALUE
-ruby_xml_xpath_context_find(VALUE self, VALUE xpath_expr) {
-  xmlXPathContextPtr xctxt;
-  xmlXPathObjectPtr xobject;
-  xmlXPathCompExprPtr xcompexpr;
-  VALUE result;
-
-  Data_Get_Struct(self, xmlXPathContext, xctxt);
-
-  if (TYPE(xpath_expr) == T_STRING) {
-    VALUE expression = rb_check_string_type(xpath_expr);
-	  xobject = xmlXPathEval((xmlChar*)StringValueCStr(expression), xctxt);  
-  }
-  else if (rb_obj_is_kind_of(xpath_expr, cXMLXPathExpression)) {
-	  Data_Get_Struct(xpath_expr, xmlXPathCompExpr, xcompexpr);
-	  xobject = xmlXPathCompiledEval(xcompexpr, xctxt);	
-  }
-  else {
-	  rb_raise(rb_eTypeError, "Argument should be an intance of a String or XPath::Expression");
-  }  
-  
-  if (xobject == NULL)
-  {
-    /* xmlLastError is different than xctxt->lastError.  Use 
-       xmlLastError since it has the message set while xctxt->lastError
-       does not. */
-    xmlErrorPtr xerror = xmlGetLastError();
-    ruby_xml_raise(xerror);
-  }
-    
-  result = ruby_xml_xpath_object_wrap(xobject);
-  rb_iv_set(result, "@context", self);
-  return result;  
-}
-
-
-void
-ruby_init_xml_xpath_context(void) {
-  cXMLXPathContext = rb_define_class_under(mXPath, "Context", rb_cObject);
-  rb_define_alloc_func(cXMLXPathContext, ruby_xml_xpath_context_alloc);
-  rb_define_attr(cXMLXPathContext, "doc", 1, 0);
-  rb_define_method(cXMLXPathContext, "initialize", ruby_xml_xpath_context_initialize, 1);
-  rb_define_method(cXMLXPathContext, "register_namespaces", ruby_xml_xpath_context_register_namespaces, 1);
-  rb_define_method(cXMLXPathContext, "register_namespaces_from_node", ruby_xml_xpath_context_register_namespaces_from_node, 1);
-  rb_define_method(cXMLXPathContext, "register_namespace", ruby_xml_xpath_context_register_namespace, 2);
-  rb_define_method(cXMLXPathContext, "node=", ruby_xml_xpath_context_node_set, 1);
-  rb_define_method(cXMLXPathContext, "find", ruby_xml_xpath_context_find, 1);
-}
+/* $Id: ruby_xml_xpath_context.c 612 2008-11-21 08:01:29Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xpath_context.h"
+#include "ruby_xml_xpath_expression.h"
+#include <st.h>
+
+
+/*
+ * Document-class: LibXML::XML::XPath::Context
+ * 
+ * The XML::XPath::Context class is used to evaluate XPath
+ * expressions.  Generally, you should not directly use this class,
+ * but instead use the XML::Document#find and XML::Node#find methods.
+ *
+ *  doc = XML::Document.string('<header>content</header>')
+ *  context = XPath::Context.new(doc)
+ *  context.node = doc.root  
+ *  context.register_namespaces_from_node(doc.root)
+ *  nodes = context.find('/header')
+ */
+
+VALUE cXMLXPathContext;
+
+static void
+rxml_xpath_context_free(xmlXPathContextPtr ctxt) {
+  xmlXPathFreeContext(ctxt);
+}
+
+
+static VALUE
+rxml_xpath_context_alloc(VALUE klass) {
+  return Data_Wrap_Struct(cXMLXPathContext,
+			  NULL,
+			  rxml_xpath_context_free,
+			  NULL);
+}
+
+/* call-seq:
+ *    XPath::Context.new(node) -> XPath::Context
+ * 
+ * Creates a new XPath context for the specified document.  The
+ * context can then be used to evaluate an XPath expression.
+ *
+ *  doc = XML::Document.string('<header><first>hi</first></header>')
+ *  context = XPath::Context.new(doc)
+ *  nodes = XPath::Object.new('//first', context)
+ *  nodes.length == 1
+ */
+static VALUE
+rxml_xpath_context_initialize(VALUE self, VALUE node) {
+  xmlDocPtr xdoc;
+  VALUE document;
+  #ifndef LIBXML_XPATH_ENABLED
+  rb_raise(rb_eTypeError, "libxml was not compiled with XPath support.");
+  #endif
+
+  if (rb_obj_is_kind_of(node, cXMLNode) == Qtrue)
+  {
+    document = rb_funcall(node, rb_intern("doc"), 0);
+    if NIL_P(document)
+      rb_raise(rb_eTypeError, "Supplied node must belong to a document.");
+  }
+  else if (rb_obj_is_kind_of(node, cXMLDocument) == Qtrue)
+  {
+    document = node;
+  }
+  else
+  {
+    rb_raise(rb_eTypeError, "Supplied argument must be a document or node.");
+  }
+  
+  Data_Get_Struct(document, xmlDoc, xdoc);
+  DATA_PTR(self) = xmlXPathNewContext(xdoc);
+  
+  /* Save the doc as an attribute, this will expose it to Ruby's GC. */
+  rb_iv_set(self, "@doc", document);    
+
+  return self;
+}
+
+
+/*
+ * call-seq:
+ *    context.register_namespace(prefix, uri) -> (true|false)
+ * 
+ * Register the specified namespace URI with the specified prefix
+ * in this context.
+ 
+ *   context.register_namespace('xi', 'http://www.w3.org/2001/XInclude')
+ */
+static VALUE
+rxml_xpath_context_register_namespace(VALUE self, VALUE prefix, VALUE uri) {
+  xmlXPathContextPtr ctxt;
+
+  Data_Get_Struct(self, xmlXPathContext, ctxt);
+  if (xmlXPathRegisterNs(ctxt, 
+                         (xmlChar*)StringValuePtr(prefix), 
+                         (xmlChar*)StringValuePtr(uri))
+      == 0) {
+    return(Qtrue);
+  } else {
+    /* Should raise an exception, IMHO (whose?, why shouldnt it? -danj)*/
+    rb_warning("register namespace failed");
+    return(Qfalse);
+  }
+}
+
+/* call-seq:
+ *    context.register_namespaces_from_node(node) -> self
+ * 
+ * Helper method to read in namespaces defined on a node.
+ *
+ *  doc = XML::Document.string('<header><first>hi</first></header>')
+ *  context = XPath::Context.new(doc)
+ *  context.register_namespaces_from_node(doc.root)
+ */
+static VALUE
+rxml_xpath_context_register_namespaces_from_node(VALUE self, VALUE node) {
+  xmlXPathContextPtr xctxt;
+  xmlNodePtr xnode;
+  xmlNsPtr *xnsArr;
+
+  Data_Get_Struct(self, xmlXPathContext, xctxt);
+  
+  if (rb_obj_is_kind_of(node, cXMLDocument) == Qtrue)
+  {
+    xmlDocPtr xdoc;
+    Data_Get_Struct(node, xmlDoc, xdoc);
+    xnode = xmlDocGetRootElement(xdoc);
+  }
+  else if (rb_obj_is_kind_of(node, cXMLNode) == Qtrue)
+  {
+    Data_Get_Struct(node, xmlNode, xnode);
+  }
+  else
+  {
+    rb_raise(rb_eTypeError, "The first argument must be a document or node.");
+  } 
+  
+  xnsArr = xmlGetNsList(xnode->doc, xnode);
+  
+  if (xnsArr)
+  {
+    xmlNsPtr xns = *xnsArr;
+    
+    while (xns) {
+      /* If there is no prefix, then this is the default namespace.
+         Skip it for now. */
+      if (xns->prefix)
+      {
+        VALUE prefix = rb_str_new2(xns->prefix);
+        VALUE uri = rb_str_new2(xns->href);
+        rxml_xpath_context_register_namespace(self, prefix, uri);
+      }
+      xns = xns->next;
+    }
+    xmlFree(xnsArr);
+  }
+    
+  return self;
+}
+
+static int
+iterate_ns_hash(st_data_t prefix, st_data_t uri, st_data_t self)
+{
+  rxml_xpath_context_register_namespace(self, prefix, uri);
+  return ST_CONTINUE;
+}
+
+
+/*
+ * call-seq:
+ *    context.register_namespaces(["prefix:uri"]) -> self
+ * 
+ * Register the specified namespaces in this context.
+ *
+ *   context.register_namespaces('xi:http://www.w3.org/2001/XInclude')
+ *   context.register_namespaces(['xlink:http://www.w3.org/1999/xlink',
+ *                                'xi:http://www.w3.org/2001/XInclude')
+ *   context.register_namespaces('xlink' => 'http://www.w3.org/1999/xlink',
+ *                                  'xi' => 'http://www.w3.org/2001/XInclude')
+ */
+static VALUE
+rxml_xpath_context_register_namespaces(VALUE self, VALUE nslist) {
+  char *cp;
+  long i;
+  VALUE rprefix, ruri;
+
+  /* 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 */
+    rxml_xpath_context_register_namespace(self, rprefix, ruri);
+    break;
+  case T_ARRAY:
+    for (i = 0; i < RARRAY(nslist)->len; i++) {
+      rxml_xpath_context_register_namespaces(self, RARRAY(nslist)->ptr[i]);
+    }
+    break;
+  case T_HASH:
+    st_foreach(RHASH(nslist)->tbl, iterate_ns_hash, self);
+    break;
+  default:
+    rb_raise(rb_eArgError, "Invalid argument type, only accept string, array of strings, or an array of arrays");
+  }
+  return self;
+}
+
+/*
+ * call-seq:
+ *    context.node = node
+ * 
+ * Set the current node used by the XPath engine
+ 
+ *  doc = XML::Document.string('<header><first>hi</first></header>')
+ *  context.node = doc.root.first
+ */
+static VALUE
+rxml_xpath_context_node_set(VALUE self, VALUE node) {
+  xmlXPathContextPtr xctxt;
+  xmlNodePtr xnode;
+  
+  Data_Get_Struct(self, xmlXPathContext, xctxt);
+  Data_Get_Struct(node, xmlNode, xnode);
+  xctxt->node = xnode;
+  return node;
+}
+
+/*
+ * call-seq:
+ *    context.find("xpath") -> XML::XPath::Object
+ * 
+ * Find nodes matching the specified XPath expression
+ */
+static VALUE
+rxml_xpath_context_find(VALUE self, VALUE xpath_expr) {
+  xmlXPathContextPtr xctxt;
+  xmlXPathObjectPtr xobject;
+  xmlXPathCompExprPtr xcompexpr;
+  VALUE result;
+
+  Data_Get_Struct(self, xmlXPathContext, xctxt);
+
+  if (TYPE(xpath_expr) == T_STRING) {
+    VALUE expression = rb_check_string_type(xpath_expr);
+	  xobject = xmlXPathEval((xmlChar*)StringValueCStr(expression), xctxt);  
+  }
+  else if (rb_obj_is_kind_of(xpath_expr, cXMLXPathExpression)) {
+	  Data_Get_Struct(xpath_expr, xmlXPathCompExpr, xcompexpr);
+	  xobject = xmlXPathCompiledEval(xcompexpr, xctxt);	
+  }
+  else {
+	  rb_raise(rb_eTypeError, "Argument should be an intance of a String or XPath::Expression");
+  }  
+  
+  if (xobject == NULL)
+  {
+    /* xmlLastError is different than xctxt->lastError.  Use 
+       xmlLastError since it has the message set while xctxt->lastError
+       does not. */
+    xmlErrorPtr xerror = xmlGetLastError();
+    rxml_raise(xerror);
+  }
+    
+  result = rxml_xpath_object_wrap(xobject);
+  rb_iv_set(result, "@context", self);
+  return result;  
+}
+
+void
+ruby_init_xml_xpath_context(void) {
+  cXMLXPathContext = rb_define_class_under(mXPath, "Context", rb_cObject);
+  rb_define_alloc_func(cXMLXPathContext, rxml_xpath_context_alloc);
+  rb_define_attr(cXMLXPathContext, "doc", 1, 0);
+  rb_define_method(cXMLXPathContext, "initialize", rxml_xpath_context_initialize, 1);
+  rb_define_method(cXMLXPathContext, "register_namespaces", rxml_xpath_context_register_namespaces, 1);
+  rb_define_method(cXMLXPathContext, "register_namespaces_from_node", rxml_xpath_context_register_namespaces_from_node, 1);
+  rb_define_method(cXMLXPathContext, "register_namespace", rxml_xpath_context_register_namespace, 2);
+  rb_define_method(cXMLXPathContext, "node=", rxml_xpath_context_node_set, 1);
+  rb_define_method(cXMLXPathContext, "find", rxml_xpath_context_find, 1);
+}