libxml-ruby 2.9.0 → 3.0.0

data/ext/libxml/ruby_xml_writer.h

@@ -1,10 +1,10 @@
-#ifndef __RXML_WRITER__
-#define __RXML_WRITER__
-
-#ifdef LIBXML_WRITER_ENABLED
-#include <libxml/xmlwriter.h>
-#endif
-
-extern VALUE cXMLWriter;
-void rxml_init_writer(void);
-#endif
+#ifndef __RXML_WRITER__
+#define __RXML_WRITER__
+
+#ifdef LIBXML_WRITER_ENABLED
+#include <libxml/xmlwriter.h>
+#endif
+
+extern VALUE cXMLWriter;
+void rxml_init_writer(void);
+#endif

data/ext/libxml/ruby_xml_xinclude.c

@@ -1,16 +1,16 @@
-#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.
- */
-
-void rxml_init_xinclude(void)
-{
-  cXMLXInclude = rb_define_class_under(mXML, "XInclude", rb_cObject);
-}
+#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.
+ */
+
+void rxml_init_xinclude(void)
+{
+  cXMLXInclude = rb_define_class_under(mXML, "XInclude", rb_cObject);
+}

data/ext/libxml/ruby_xml_xinclude.h

@@ -1,11 +1,11 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_XINCLUDE__
-#define __RXML_XINCLUDE__
-
-extern VALUE cXMLXInclude;
-extern VALUE eXMLXIncludeError;
-
-void rxml_init_xinclude(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_XINCLUDE__
+#define __RXML_XINCLUDE__
+
+extern VALUE cXMLXInclude;
+extern VALUE eXMLXIncludeError;
+
+void rxml_init_xinclude(void);
+
+#endif

data/ext/libxml/ruby_xml_xpath.c

@@ -74,17 +74,17 @@
  *  ['ns0:http://services.somewhere.com', 'ns1:http://domain.somewhere.com'])
 */
 
-
 #include "ruby_libxml.h"
 
 VALUE mXPath;
 
-VALUE
-rxml_xpath_to_value(xmlXPathContextPtr xctxt, xmlXPathObjectPtr xobject) {
+VALUE rxml_xpath_to_value(xmlXPathContextPtr xctxt, xmlXPathObjectPtr xobject)
+{
   VALUE result;
   int type;
 
-  if (xobject == NULL) {
+  if (xobject == NULL)
+  {
     /* xmlLastError is different than xctxt->lastError.  Use
      xmlLastError since it has the message set while xctxt->lastError
      does not. */
@@ -92,7 +92,8 @@ rxml_xpath_to_value(xmlXPathContextPtr xctxt, xmlXPathObjectPtr xobject) {
     rxml_raise(xerror);
   }
 
-  switch (type = xobject->type) {
+  switch (type = xobject->type)
+  {
     case XPATH_NODESET:
       result = rxml_xpath_object_wrap(xctxt->doc, xobject);
       break;
@@ -118,44 +119,49 @@ rxml_xpath_to_value(xmlXPathContextPtr xctxt, xmlXPathObjectPtr xobject) {
   return result;
 }
 
-xmlXPathObjectPtr
-rxml_xpath_from_value(VALUE value) {
+xmlXPathObjectPtr rxml_xpath_from_value(VALUE value)
+{
   xmlXPathObjectPtr result = NULL;
 
-  switch (TYPE(value)) {
-    case T_TRUE:
-    case T_FALSE:
-      result = xmlXPathNewBoolean(RTEST(value));
-      break;
-    case T_FIXNUM:
-    case T_FLOAT:
-      result = xmlXPathNewFloat(NUM2DBL(value));
-      break;
-    case T_STRING:
-      result = xmlXPathWrapString(xmlStrdup((const xmlChar *)StringValuePtr(value)));
-      break;
-    case T_NIL:
-      result = xmlXPathNewNodeSet(NULL);
-      break;
-    case T_ARRAY: {
-      long i, j;
-      result = xmlXPathNewNodeSet(NULL);
+  switch (TYPE(value))
+  {
+  case T_TRUE:
+  case T_FALSE:
+    result = xmlXPathNewBoolean(RTEST(value));
+    break;
+  case T_FIXNUM:
+  case T_FLOAT:
+    result = xmlXPathNewFloat(NUM2DBL(value));
+    break;
+  case T_STRING:
+    result = xmlXPathWrapString(xmlStrdup((const xmlChar *)StringValuePtr(value)));
+    break;
+  case T_NIL:
+    result = xmlXPathNewNodeSet(NULL);
+    break;
+  case T_ARRAY:
+  {
+    long i, j;
+    result = xmlXPathNewNodeSet(NULL);
 
-      for (i = RARRAY_LEN(value); i > 0; i--) {
-        xmlXPathObjectPtr obj = rxml_xpath_from_value(rb_ary_shift(value));
+    for (i = RARRAY_LEN(value); i > 0; i--)
+    {
+      xmlXPathObjectPtr obj = rxml_xpath_from_value(rb_ary_shift(value));
 
-        if ((obj->nodesetval != NULL) && (obj->nodesetval->nodeNr != 0)) {
-          for (j = 0; j < obj->nodesetval->nodeNr; j++) {
-            xmlXPathNodeSetAdd(result->nodesetval, obj->nodesetval->nodeTab[j]);
-          }
+      if ((obj->nodesetval != NULL) && (obj->nodesetval->nodeNr != 0))
+      {
+        for (j = 0; j < obj->nodesetval->nodeNr; j++)
+        {
+          xmlXPathNodeSetAdd(result->nodesetval, obj->nodesetval->nodeTab[j]);
         }
       }
-      break;
     }
-    default:
-      rb_raise(rb_eTypeError,
-        "can't convert object of type %s to XPath object", rb_obj_classname(value)
-      );
+    break;
+  }
+  default:
+    rb_raise(rb_eTypeError,
+      "can't convert object of type %s to XPath object", rb_obj_classname(value)
+    );
   }
 
   return result;

data/ext/libxml/ruby_xml_xpath.h

@@ -1,13 +1,13 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_XPATH__
-#define __RXML_XPATH__
-
-extern VALUE mXPath;
-
-void rxml_init_xpath(void);
-
-VALUE rxml_xpath_to_value(xmlXPathContextPtr, xmlXPathObjectPtr);
-xmlXPathObjectPtr rxml_xpath_from_value(VALUE);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_XPATH__
+#define __RXML_XPATH__
+
+extern VALUE mXPath;
+
+void rxml_init_xpath(void);
+
+VALUE rxml_xpath_to_value(xmlXPathContextPtr, xmlXPathObjectPtr);
+xmlXPathObjectPtr rxml_xpath_from_value(VALUE);
+
+#endif

data/ext/libxml/ruby_xml_xpath_context.c

@@ -33,7 +33,7 @@ static void rxml_xpath_context_free(xmlXPathContextPtr ctxt)
 
 static void rxml_xpath_context_mark(xmlXPathContextPtr ctxt)
 {
-  VALUE value = rxml_lookup_doc(ctxt->doc);
+  VALUE value = (VALUE)ctxt->doc->_private;
   rb_gc_mark(value);
 }
 

data/ext/libxml/ruby_xml_xpath_context.h

@@ -1,9 +1,9 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_XPATH_CONTEXT__
-#define __RXML_XPATH_CONTEXT__
-
-extern VALUE cXMLXPathContext;
-void rxml_init_xpath_context(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_XPATH_CONTEXT__
+#define __RXML_XPATH_CONTEXT__
+
+extern VALUE cXMLXPathContext;
+void rxml_init_xpath_context(void);
+
+#endif

data/ext/libxml/ruby_xml_xpath_expression.c

@@ -1,81 +1,81 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_xpath.h"
-#include "ruby_xml_xpath_expression.h"
-
-/*
- * Document-class: LibXML::XML::XPath::Expression
- *
- * The XML::XPath::Expression class is used to compile
- * XPath expressions so they can be parsed only once
- * but reused multiple times.
- *
- *  doc = XML::Document.string(IO.read('some xml file'))
- *  expr = XPath::Expression.new('//first')
- *  doc.root.each do |node|
- *   result = node.find(expr) # many, many, many times
- *   # ...
- *  end
- */
-
-VALUE cXMLXPathExpression;
-
-static void rxml_xpath_expression_free(xmlXPathCompExprPtr expr)
-{
-  xmlXPathFreeCompExpr(expr);
-}
-
-static VALUE rxml_xpath_expression_alloc(VALUE klass)
-{
-  return Data_Wrap_Struct(cXMLXPathExpression, NULL,
-      rxml_xpath_expression_free, NULL);
-}
-
-/* call-seq:
- *    XPath::Expression.compile(expression) -> XPath::Expression
- *
- * Compiles an XPatch expression. This improves performance
- * when an XPath expression is called multiple times.
- *
- *  doc = XML::Document.string('<header><first>hi</first></header>')
- *  expr = XPath::Expression.new('//first')
- *  nodes = doc.find(expr)
- */
-static VALUE rxml_xpath_expression_compile(VALUE klass, VALUE expression)
-{
-  VALUE args[] = {expression};
-  return rb_class_new_instance(1, args, cXMLXPathExpression);
-}
-
-/* call-seq:
- *    XPath::Expression.new(expression) -> XPath::Expression
- *
- * Compiles an XPatch expression. This improves performance
- * when an XPath expression is called multiple times.
- *
- *  doc = XML::Document.string('<header><first>hi</first></header>')
- *  expr = XPath::Expression.new('//first')
- *  nodes = doc.find(expr)
- */
-static VALUE rxml_xpath_expression_initialize(VALUE self, VALUE expression)
-{
-  xmlXPathCompExprPtr compexpr = xmlXPathCompile((const xmlChar*)StringValueCStr(expression));
-
-  if (compexpr == NULL)
-  {
-    xmlErrorPtr xerror = xmlGetLastError();
-    rxml_raise(xerror);
-  }
-
-  DATA_PTR( self) = compexpr;
-  return self;
-}
-
-void rxml_init_xpath_expression(void)
-{
-  cXMLXPathExpression = rb_define_class_under(mXPath, "Expression", rb_cObject);
-  rb_define_alloc_func(cXMLXPathExpression, rxml_xpath_expression_alloc);
-  rb_define_singleton_method(cXMLXPathExpression, "compile", rxml_xpath_expression_compile, 1);
-  rb_define_method(cXMLXPathExpression, "initialize", rxml_xpath_expression_initialize, 1);
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xpath.h"
+#include "ruby_xml_xpath_expression.h"
+
+/*
+ * Document-class: LibXML::XML::XPath::Expression
+ *
+ * The XML::XPath::Expression class is used to compile
+ * XPath expressions so they can be parsed only once
+ * but reused multiple times.
+ *
+ *  doc = XML::Document.string(IO.read('some xml file'))
+ *  expr = XPath::Expression.new('//first')
+ *  doc.root.each do |node|
+ *   result = node.find(expr) # many, many, many times
+ *   # ...
+ *  end
+ */
+
+VALUE cXMLXPathExpression;
+
+static void rxml_xpath_expression_free(xmlXPathCompExprPtr expr)
+{
+  xmlXPathFreeCompExpr(expr);
+}
+
+static VALUE rxml_xpath_expression_alloc(VALUE klass)
+{
+  return Data_Wrap_Struct(cXMLXPathExpression, NULL,
+      rxml_xpath_expression_free, NULL);
+}
+
+/* call-seq:
+ *    XPath::Expression.compile(expression) -> XPath::Expression
+ *
+ * Compiles an XPatch expression. This improves performance
+ * when an XPath expression is called multiple times.
+ *
+ *  doc = XML::Document.string('<header><first>hi</first></header>')
+ *  expr = XPath::Expression.new('//first')
+ *  nodes = doc.find(expr)
+ */
+static VALUE rxml_xpath_expression_compile(VALUE klass, VALUE expression)
+{
+  VALUE args[] = {expression};
+  return rb_class_new_instance(1, args, cXMLXPathExpression);
+}
+
+/* call-seq:
+ *    XPath::Expression.new(expression) -> XPath::Expression
+ *
+ * Compiles an XPatch expression. This improves performance
+ * when an XPath expression is called multiple times.
+ *
+ *  doc = XML::Document.string('<header><first>hi</first></header>')
+ *  expr = XPath::Expression.new('//first')
+ *  nodes = doc.find(expr)
+ */
+static VALUE rxml_xpath_expression_initialize(VALUE self, VALUE expression)
+{
+  xmlXPathCompExprPtr compexpr = xmlXPathCompile((const xmlChar*)StringValueCStr(expression));
+
+  if (compexpr == NULL)
+  {
+    xmlErrorPtr xerror = xmlGetLastError();
+    rxml_raise(xerror);
+  }
+
+  DATA_PTR( self) = compexpr;
+  return self;
+}
+
+void rxml_init_xpath_expression(void)
+{
+  cXMLXPathExpression = rb_define_class_under(mXPath, "Expression", rb_cObject);
+  rb_define_alloc_func(cXMLXPathExpression, rxml_xpath_expression_alloc);
+  rb_define_singleton_method(cXMLXPathExpression, "compile", rxml_xpath_expression_compile, 1);
+  rb_define_method(cXMLXPathExpression, "initialize", rxml_xpath_expression_initialize, 1);
+}

data/ext/libxml/ruby_xml_xpath_expression.h

@@ -1,10 +1,10 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_XPATH_EXPRESSION__
-#define __RXML_XPATH_EXPRESSION__
-
-extern VALUE cXMLXPathExpression;
-
-void rxml_init_xpath_expression(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_XPATH_EXPRESSION__
+#define __RXML_XPATH_EXPRESSION__
+
+extern VALUE cXMLXPathExpression;
+
+void rxml_init_xpath_expression(void);
+
+#endif

data/ext/libxml/ruby_xml_xpath_object.c

@@ -50,7 +50,7 @@ static void rxml_xpath_namespace_free(xmlNsPtr xns)
 
 static void rxml_xpath_object_mark(rxml_xpath_object *rxpop)
 {
-  VALUE doc = rxml_lookup_doc(rxpop->xdoc);
+  VALUE doc = (VALUE)rxpop->xdoc->_private;
   rb_gc_mark(doc);
   rb_gc_mark(rxpop->nsnodes);
 }
@@ -59,6 +59,7 @@ VALUE rxml_xpath_object_wrap(xmlDocPtr xdoc, xmlXPathObjectPtr xpop)
 {
   int i;
   rxml_xpath_object *rxpop = ALLOC(rxml_xpath_object);
+
   /* Make sure Ruby's GC can find the array in the stack */
   VALUE nsnodes = rb_ary_new();
   rxpop->xdoc =xdoc;
@@ -67,7 +68,7 @@ VALUE rxml_xpath_object_wrap(xmlDocPtr xdoc, xmlXPathObjectPtr xpop)
   /* Find all the extra namespace nodes and wrap them. */
   if (xpop->nodesetval && xpop->nodesetval->nodeNr)
   {
-    for (i = 0;i < xpop->nodesetval->nodeNr; i++)
+    for (i = 0; i < xpop->nodesetval->nodeNr; i++)
     {
       xmlNodePtr xnode = xpop->nodesetval->nodeTab[i];
       if (xnode != NULL && xnode->type == XML_NAMESPACE_DECL)
@@ -332,4 +333,6 @@ void rxml_init_xpath_object(void)
   rb_define_method(cXMLXPathObject, "[]", rxml_xpath_object_aref, 1);
   rb_define_method(cXMLXPathObject, "string", rxml_xpath_object_string, 0);
   rb_define_method(cXMLXPathObject, "debug", rxml_xpath_object_debug, 0);
+  rb_define_alias(cXMLXPathObject, "size", "length");
+
 }