libxml-ruby 0.9.5-x86-mswin32-60 → 0.9.6-x86-mswin32-60

data/ext/libxml/ruby_xml_schema.h

@@ -1,5 +1,5 @@
-#ifndef __rxml_SCHEMA__
-#define __rxml_SCHEMA__
+#ifndef __RXML_SCHEMA__
+#define __RXML_SCHEMA__
 
 #include <libxml/schemasInternals.h>
 #include <libxml/xmlschemas.h>

data/ext/libxml/ruby_xml_state.h

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

data/ext/libxml/ruby_xml_xinclude.c

@@ -1,24 +1,24 @@
-/* $Id: ruby_xml_xinclude.c 650 2008-11-30 03:40:22Z cfis $ */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xinclude.h"
-
-VALUE cXMLXInclude;
-
-/*
- * Document-class: LibXML::XML::XInclude
- *
- * The ruby bindings do not currently expose libxml's
- * XInclude fuctionality.
- */
-
-// Rdoc needs to know
-#ifdef RDOC_NEVER_DEFINED
-mLibXML = rb_define_module("LibXML");
-mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void ruby_init_xml_xinclude(void)
-{
-  cXMLXInclude = rb_define_class_under(mXML, "XInclude", rb_cObject);
-}
+/* $Id: ruby_xml_xinclude.c 650 2008-11-30 03:40:22Z cfis $ */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xinclude.h"
+
+VALUE cXMLXInclude;
+
+/*
+ * Document-class: LibXML::XML::XInclude
+ *
+ * The ruby bindings do not currently expose libxml's
+ * XInclude fuctionality.
+ */
+
+// Rdoc needs to know
+#ifdef RDOC_NEVER_DEFINED
+mLibXML = rb_define_module("LibXML");
+mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void ruby_init_xml_xinclude(void)
+{
+  cXMLXInclude = rb_define_class_under(mXML, "XInclude", rb_cObject);
+}

data/ext/libxml/ruby_xml_xinclude.h

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_xinclude.h 612 2008-11-21 08:01:29Z cfis $ */
+/* $Id: ruby_xml_xinclude.h 666 2008-12-07 00:16:50Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_XINCLUDE__
-#define __rxml_XINCLUDE__
+#ifndef __RXML_XINCLUDE__
+#define __RXML_XINCLUDE__
 
 extern VALUE cXMLXInclude;
 extern VALUE eXMLXIncludeError;

data/ext/libxml/ruby_xml_xpath.c

@@ -1,108 +1,108 @@
-/* $Id: ruby_xml_xpath.c 650 2008-11-30 03:40:22Z 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: LibXML::XML::XPath
- *
- * 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')
- *
- *
- * === Working With Default Namespaces
- *
- * Finding namespaced elements and attributes can be tricky.
- * Lets work through an example of a document with a default
- * namespace:
- *
- *  <?xml version="1.0" encoding="utf-8"?>
- *  <feed xmlns="http://www.w3.org/2005/Atom">
- *    <title type="text">Phil Bogle's Contacts</title>
- *  </feed>
- *
- * To find nodes you must define the atom namespace for
- * libxml.  One way to do this is:
- *
- *   node = doc.find('atom:title', 'atom:http://www.w3.org/2005/Atom')
- *
- * Alternatively, you can register the default namespace like this:
- *
- *   doc.root.register_default_namespace('atom')
- *   node = doc.find('atom:title')
- *
- * === More Complex Namespace Examples
- *
- * Lets work through some more complex 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 mXPath;
-
-// Rdoc needs to know
-#ifdef RDOC_NEVER_DEFINED
-mLibXML = rb_define_module("LibXML");
-mXML = rb_define_module_under(mLibXML, "XML");
-#endif
-
-void ruby_init_xml_xpath(void)
-{
-  mXPath = rb_define_module_under(mXML, "XPath");
-
-  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();
-}
+/* $Id: ruby_xml_xpath.c 666 2008-12-07 00:16:50Z 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: LibXML::XML::XPath
+ *
+ * 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')
+ *
+ *
+ * === Working With Default Namespaces
+ *
+ * Finding namespaced elements and attributes can be tricky.
+ * Lets work through an example of a document with a default
+ * namespace:
+ *
+ *  <?xml version="1.0" encoding="utf-8"?>
+ *  <feed xmlns="http://www.w3.org/2005/Atom">
+ *    <title type="text">Phil Bogle's Contacts</title>
+ *  </feed>
+ *
+ * To find nodes you must define the atom namespace for
+ * libxml.  One way to do this is:
+ *
+ *   node = doc.find('atom:title', 'atom:http://www.w3.org/2005/Atom')
+ *
+ * Alternatively, you can register the default namespace like this:
+ *
+ *   doc.root.namespaces.default_prefix = 'atom'
+ *   node = doc.find('atom:title')
+ *
+ * === More Complex Namespace Examples
+ *
+ * Lets work through some more complex 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 mXPath;
+
+// Rdoc needs to know
+#ifdef RDOC_NEVER_DEFINED
+mLibXML = rb_define_module("LibXML");
+mXML = rb_define_module_under(mLibXML, "XML");
+#endif
+
+void ruby_init_xml_xpath(void)
+{
+  mXPath = rb_define_module_under(mXML, "XPath");
+
+  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();
+}

data/ext/libxml/ruby_xml_xpath.h

@@ -1,9 +1,9 @@
-/* $Id: ruby_xml_xpath.h 614 2008-11-22 08:04:39Z cfis $ */
+/* $Id: ruby_xml_xpath.h 666 2008-12-07 00:16:50Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
-#ifndef __rxml_XPATH__
-#define __rxml_XPATH__
+#ifndef __RXML_XPATH__
+#define __RXML_XPATH__
 
 extern VALUE mXPath;
 

data/ext/libxml/ruby_xml_xpath_context.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_xpath_context.c 650 2008-11-30 03:40:22Z cfis $ */
+/* $Id: ruby_xml_xpath_context.c 673 2008-12-08 06:33:23Z cfis $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -48,32 +48,29 @@ 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.");
-}
+    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);
+  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);
+  /* Save the doc as an attribute, this will expose it to Ruby's GC. */
+  rb_iv_set(self, "@doc", document);
 
-return self;
+  return self;
 }
 
 /*
@@ -85,12 +82,14 @@ return self;
 
  *   context.register_namespace('xi', 'http://www.w3.org/2001/XInclude')
  */
-static VALUE rxml_xpath_context_register_namespace(VALUE self, VALUE prefix,
-    VALUE uri)
+static VALUE rxml_xpath_context_register_namespace(VALUE self, VALUE prefix, VALUE uri)
 {
   xmlXPathContextPtr ctxt;
-
   Data_Get_Struct(self, xmlXPathContext, ctxt);
+
+  /* Prefix could be a symbol. */
+  prefix = rb_obj_as_string(prefix);
+  
   if (xmlXPathRegisterNs(ctxt, (xmlChar*) StringValuePtr(prefix),
       (xmlChar*) StringValuePtr(uri)) == 0)
   {
@@ -149,8 +148,8 @@ static VALUE rxml_xpath_context_register_namespaces_from_node(VALUE self,
        Skip it for now. */
       if (xns->prefix)
       {
-        VALUE prefix = rb_str_new2(xns->prefix);
-        VALUE uri = rb_str_new2(xns->href);
+        VALUE prefix = rb_str_new2((const char*)xns->prefix);
+        VALUE uri = rb_str_new2((const char*)xns->href);
         rxml_xpath_context_register_namespace(self, prefix, uri);
       }
       xns = xns->next;
@@ -171,7 +170,9 @@ static int iterate_ns_hash(st_data_t prefix, st_data_t uri, st_data_t self)
  * call-seq:
  *    context.register_namespaces(["prefix:uri"]) -> self
  *
- * Register the specified namespaces in this context.
+ * Register the specified namespaces in this context.  There are
+ * three different forms that libxml accepts.  These include
+ * a string, an array of strings, or a hash table:
  *
  *   context.register_namespaces('xi:http://www.w3.org/2001/XInclude')
  *   context.register_namespaces(['xlink:http://www.w3.org/1999/xlink',
@@ -212,7 +213,7 @@ static VALUE rxml_xpath_context_register_namespaces(VALUE self, VALUE nslist)
     }
     break;
   case T_HASH:
-    st_foreach(RHASH(nslist)->tbl, iterate_ns_hash, self);
+    st_foreach(RHASH_TBL(nslist), iterate_ns_hash, self);
     break;
   default:
     rb_raise(
@@ -287,19 +288,67 @@ static VALUE rxml_xpath_context_find(VALUE self, VALUE xpath_expr)
   return result;
 }
 
+
+/*
+ * call-seq:
+ *    context.enable_cache(size = nil)
+ *
+ * Enables an XPath::Context's built-in cache.  If the cache is
+ * enabled then XPath objects will be cached internally for reuse.
+ * The size parameter controls sets the maximum number of XPath objects 
+ * that will be cached per XPath object type (node-set, string, number,
+ * boolean, and misc objects).  Set size to nil to use the default
+ * cache size of 100.
+ */
+static VALUE
+rxml_xpath_context_enable_cache(int argc,  VALUE *argv, VALUE self)
+{
+  xmlXPathContextPtr xctxt;
+  VALUE size;
+  int value = -1;
+
+  Data_Get_Struct(self, xmlXPathContext, xctxt);
+
+  if (rb_scan_args(argc, argv, "01", &size) == 1)
+  {
+	  value = NUM2INT(size);
+  }
+
+  if (xmlXPathContextSetCache(xctxt, 1, value, 0) == -1)
+    rxml_raise(&xmlLastError);
+
+  return self;
+}
+
+/*
+ * call-seq:
+ *    context.disable_cache
+ * 
+ * Disables an XPath::Context's built-in cache.
+ */
+static VALUE
+rxml_xpath_context_disable_cache(VALUE self) {
+  xmlXPathContextPtr xctxt;
+  Data_Get_Struct(self, xmlXPathContext, xctxt);
+
+  if (xmlXPathContextSetCache(xctxt, 0, 0, 0) == -1)
+    rxml_raise(&xmlLastError);
+
+  return self;
+}
+
+
 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, "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);
+  rb_define_method(cXMLXPathContext, "enable_cache", rxml_xpath_context_enable_cache, -1);
+  rb_define_method(cXMLXPathContext, "disable_cache", rxml_xpath_context_disable_cache, 0);
 }