libxml-ruby 4.1.2 → 6.0.0

data/ext/libxml/ruby_xml_io.c

@@ -1,47 +1,49 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include <ruby/io.h>
-
-static ID READ_METHOD;
-static ID WRITE_METHOD;
-
-/* This method is called by libxml when it wants to read
- more data from a stream. We go with the duck typing
- solution to support StringIO objects. */
-int rxml_read_callback(void *context, char *buffer, int len)
-{
-  VALUE io = (VALUE) context;
-  VALUE string = rb_funcall(io, READ_METHOD, 1, INT2NUM(len));
-  size_t size;
-
-  if (string == Qnil)
-    return 0;
-
-  size = RSTRING_LEN(string);
-  memcpy(buffer, StringValuePtr(string), size);
-
-  return (int)size;
-}
-
-int rxml_write_callback(VALUE io, const char *buffer, int len)
-{
-    if (rb_io_check_io(io) == Qnil)
-    {
-        // Could be StringIO
-        VALUE written, string;
-        string = rb_external_str_new_with_enc(buffer, (long)strlen(buffer), rb_enc_get(io));
-        written = rb_funcall(io, WRITE_METHOD, 1, string);
-        return NUM2INT(written);
-    }
-    else
-    {
-        return (int)rb_io_bufwrite(io, buffer, (size_t)len);
-    }
-}
-
-void rxml_init_io(void)
-{
-  READ_METHOD = rb_intern("read");
-  WRITE_METHOD = rb_intern("write");
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include <ruby/io.h>
+
+static ID READ_METHOD;
+static ID WRITE_METHOD;
+
+/* This method is called by libxml when it wants to read
+ more data from a stream. We go with the duck typing
+ solution to support StringIO objects. */
+int rxml_read_callback(void *context, char *buffer, int len)
+{
+  VALUE io = (VALUE) context;
+  VALUE string = rb_funcall(io, READ_METHOD, 1, INT2NUM(len));
+  size_t size;
+
+  if (string == Qnil)
+    return 0;
+
+  size = RSTRING_LEN(string);
+  if (size > (size_t)len)
+    size = (size_t)len;
+  memcpy(buffer, StringValuePtr(string), size);
+
+  return (int)size;
+}
+
+int rxml_write_callback(VALUE io, const char *buffer, int len)
+{
+    if (rb_io_check_io(io) == Qnil)
+    {
+        // Could be StringIO
+        VALUE written, string;
+        string = rb_external_str_new_with_enc(buffer, (long)len, rb_enc_get(io));
+        written = rb_funcall(io, WRITE_METHOD, 1, string);
+        return NUM2INT(written);
+    }
+    else
+    {
+        return (int)rb_io_bufwrite(io, buffer, (size_t)len);
+    }
+}
+
+void rxml_init_io(void)
+{
+  READ_METHOD = rb_intern("read");
+  WRITE_METHOD = rb_intern("write");
+}

data/ext/libxml/ruby_xml_io.h

@@ -1,10 +1,10 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_IO__
-#define __RXML_IO__
-
-int rxml_read_callback(void *context, char *buffer, int len);
-int rxml_write_callback(VALUE io, const char *buffer, int len);
-void rxml_init_io(void);
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_IO__
+#define __RXML_IO__
+
+int rxml_read_callback(void *context, char *buffer, int len);
+int rxml_write_callback(VALUE io, const char *buffer, int len);
+void rxml_init_io(void);
+
+#endif

data/ext/libxml/ruby_xml_namespace.c

@@ -1,154 +1,159 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#include "ruby_libxml.h"
-#include "ruby_xml_namespace.h"
-
-VALUE cXMLNamespace;
-
-/* Document-class: LibXML::XML::Namespace
- *
- * The Namespace class represents an XML namespace.
- * To add a namespace to a node, create a new instance
- * of this class.  Note that this does *not* assign the
- * node to the namespace. To do that see the 
- * XML::Namespaces#namespace method.
- *
- * Usage:
- *
- *   node = XML::Node.new('<Envelope>')
- *   XML::Namespace.new(node, 'soap', 'http://schemas.xmlsoap.org/soap/envelope/')
- *   assert_equal("<Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"/>", node.to_s)
- *   assert_nil(node.namespaces.namespace)
- */
-
-/* Namespaces are owned and freed by their nodes.  Thus, its easier for the
-   ruby bindings to not manage attribute memory management. */
-
-static VALUE rxml_namespace_alloc(VALUE klass)
-{
-  return Data_Wrap_Struct(klass, NULL, NULL, NULL);
-}
-
-VALUE rxml_namespace_wrap(xmlNsPtr xns)
-{
-  return Data_Wrap_Struct(cXMLNamespace, NULL, NULL, xns);
-}
-
-
-/*
- * call-seq:
- *    initialize(node, "prefix", "href") -> XML::Namespace
- *
- * Create a new namespace and adds it to the specified node.
- * Note this does *not* assign the node to the namespace.
- * To do that see the XML::Namespaces#namespace method.
- */
-static VALUE rxml_namespace_initialize(VALUE self, VALUE node, VALUE prefix,
-    VALUE href)
-{
-  xmlNodePtr xnode;
-  xmlChar *xmlPrefix;
-  xmlNsPtr xns;
-
-  Check_Type(node, T_DATA);
-  Data_Get_Struct(node, xmlNode, xnode);
-  xmlResetLastError();
-
-  /* Prefix can be null - that means its the default namespace */
-  xmlPrefix = NIL_P(prefix) ? NULL : (xmlChar *)StringValuePtr(prefix);
-  xns = xmlNewNs(xnode, (xmlChar*) StringValuePtr(href), xmlPrefix);
-
-  if (!xns)
-    rxml_raise(&xmlLastError);
-
-  DATA_PTR(self) = xns;
-  return self;
-}
-
-/*
- * call-seq:
- *    ns.href -> "href"
- *
- * Usage:
- *
- *   doc = XML::Document.string('<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/>')
- *   ns = doc.root.namespaces.find_by_href('http://schemas.xmlsoap.org/soap/envelope/')
- *   assert_equal('http://schemas.xmlsoap.org/soap/envelope/', ns.href)
- */
-static VALUE rxml_namespace_href_get(VALUE self)
-{
-  xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  if (xns->href == NULL)
-    return Qnil;
-  else
-    return rxml_new_cstr( xns->href, NULL);
-}
-
-/*
- * call-seq:
- *    ns.node_type -> num
- *
- * Obtain this namespace's type identifier.
- */
-static VALUE rxml_namespace_node_type(VALUE self)
-{
-  xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  return INT2NUM(xns->type);
-}
-
-/*
- * call-seq:
- *    ns.prefix -> "prefix"
- *
- * Obtain the namespace's prefix.
- *
- * Usage:
- *
- *   doc = XML::Document.string('<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/>')
- *   ns = doc.root.namespaces.find_by_href('http://schemas.xmlsoap.org/soap/envelope/')
- *   assert_equal('soap', ns.prefix)
- */
-static VALUE rxml_namespace_prefix_get(VALUE self)
-{
-  xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  if (xns->prefix == NULL)
-    return Qnil;
-  else
-    return rxml_new_cstr( xns->prefix, NULL);
-}
-
-/*
- * call-seq:
- *    ns.next -> XML::Namespace
- *
- * Obtain the next namespace.
- *
- * Usage:
- *
- *   doc = XML::Document.string('<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/>')
- *   ns = doc.root.namespaces.find_by_href('http://schemas.xmlsoap.org/soap/envelope/')
- *   assert_nil(ns.next)
- */
-static VALUE rxml_namespace_next(VALUE self)
-{
-  xmlNsPtr xns;
-  Data_Get_Struct(self, xmlNs, xns);
-  if (xns == NULL || xns->next == NULL)
-    return (Qnil);
-  else
-    return rxml_namespace_wrap(xns->next);
-}
-
-void rxml_init_namespace(void)
-{
-  cXMLNamespace = rb_define_class_under(mXML, "Namespace", rb_cObject);
-  rb_define_alloc_func(cXMLNamespace, rxml_namespace_alloc);
-  rb_define_method(cXMLNamespace, "initialize", rxml_namespace_initialize, 3);
-  rb_define_method(cXMLNamespace, "href", rxml_namespace_href_get, 0);
-  rb_define_method(cXMLNamespace, "next", rxml_namespace_next, 0);
-  rb_define_method(cXMLNamespace, "node_type", rxml_namespace_node_type, 0);
-  rb_define_method(cXMLNamespace, "prefix", rxml_namespace_prefix_get, 0);
-}
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_namespace.h"
+
+VALUE cXMLNamespace;
+
+const rb_data_type_t rxml_namespace_type = {
+  "libxml/namespace",
+  {NULL, NULL, NULL},
+};
+
+/* Document-class: LibXML::XML::Namespace
+ *
+ * The Namespace class represents an XML namespace.
+ * To add a namespace to a node, create a new instance
+ * of this class.  Note that this does *not* assign the
+ * node to the namespace. To do that see the 
+ * XML::Namespaces#namespace method.
+ *
+ * Usage:
+ *
+ *   node = XML::Node.new('<Envelope>')
+ *   XML::Namespace.new(node, 'soap', 'http://schemas.xmlsoap.org/soap/envelope/')
+ *   assert_equal("<Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"/>", node.to_s)
+ *   assert_nil(node.namespaces.namespace)
+ */
+
+/* Namespaces are owned and freed by their nodes.  Thus, its easier for the
+   ruby bindings to not manage attribute memory management. */
+
+static VALUE rxml_namespace_alloc(VALUE klass)
+{
+  return TypedData_Wrap_Struct(klass, &rxml_namespace_type, NULL);
+}
+
+VALUE rxml_namespace_wrap(xmlNsPtr xns)
+{
+  return TypedData_Wrap_Struct(cXMLNamespace, &rxml_namespace_type, xns);
+}
+
+
+/*
+ * call-seq:
+ *    initialize(node, "prefix", "href") -> XML::Namespace
+ *
+ * Create a new namespace and adds it to the specified node.
+ * Note this does *not* assign the node to the namespace.
+ * To do that see the XML::Namespaces#namespace method.
+ */
+static VALUE rxml_namespace_initialize(VALUE self, VALUE node, VALUE prefix,
+    VALUE href)
+{
+  xmlNodePtr xnode;
+  xmlChar *xmlPrefix;
+  xmlNsPtr xns;
+
+  TypedData_Get_Struct(node, xmlNode, &rxml_node_data_type, xnode);
+  xmlResetLastError();
+
+  /* Prefix can be null - that means its the default namespace */
+  xmlPrefix = NIL_P(prefix) ? NULL : (xmlChar *)StringValuePtr(prefix);
+  xns = xmlNewNs(xnode, (xmlChar*) StringValuePtr(href), xmlPrefix);
+
+  RTYPEDDATA_DATA(self) = xns;
+  return self;
+}
+
+/*
+ * call-seq:
+ *    ns.href -> "href"
+ *
+ * Usage:
+ *
+ *   doc = XML::Document.string('<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/>')
+ *   ns = doc.root.namespaces.find_by_href('http://schemas.xmlsoap.org/soap/envelope/')
+ *   assert_equal('http://schemas.xmlsoap.org/soap/envelope/', ns.href)
+ */
+static VALUE rxml_namespace_href_get(VALUE self)
+{
+  xmlNsPtr xns;
+  TypedData_Get_Struct(self, xmlNs, &rxml_namespace_type, xns);
+  if (xns->href == NULL)
+    return Qnil;
+  else
+    return rxml_new_cstr( xns->href, NULL);
+}
+
+/*
+ * call-seq:
+ *    ns.node_type -> num
+ *
+ * Obtain this namespace's type identifier.
+ */
+static VALUE rxml_namespace_node_type(VALUE self)
+{
+  xmlNsPtr xns;
+  TypedData_Get_Struct(self, xmlNs, &rxml_namespace_type, xns);
+  return INT2NUM(xns->type);
+}
+
+/*
+ * call-seq:
+ *    ns.prefix -> "prefix"
+ *
+ * Obtain the namespace's prefix.
+ *
+ * Usage:
+ *
+ *   doc = XML::Document.string('<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/>')
+ *   ns = doc.root.namespaces.find_by_href('http://schemas.xmlsoap.org/soap/envelope/')
+ *   assert_equal('soap', ns.prefix)
+ */
+static VALUE rxml_namespace_prefix_get(VALUE self)
+{
+  xmlNsPtr xns;
+  TypedData_Get_Struct(self, xmlNs, &rxml_namespace_type, xns);
+  if (xns->prefix == NULL)
+    return Qnil;
+  else
+    return rxml_new_cstr( xns->prefix, NULL);
+}
+
+/*
+ * call-seq:
+ *    ns.next -> XML::Namespace
+ *
+ * Obtain the next namespace.
+ *
+ * Usage:
+ *
+ *   doc = XML::Document.string('<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"/>')
+ *   ns = doc.root.namespaces.find_by_href('http://schemas.xmlsoap.org/soap/envelope/')
+ *   assert_nil(ns.next)
+ */
+static VALUE rxml_namespace_next(VALUE self)
+{
+  xmlNsPtr xns;
+  TypedData_Get_Struct(self, xmlNs, &rxml_namespace_type, xns);
+  /* Guard against libxml2's XPath hack where xns->next stores a parent
+     element pointer instead of the next namespace (see xmlXPathNodeSetAddNs
+     in xpath.c).  xmlNs.type and xmlNode.type share the same struct offset,
+     so checking the type is safe even when next points to an xmlNode. */
+  if (xns == NULL || xns->next == NULL || xns->next->type != XML_LOCAL_NAMESPACE)
+    return (Qnil);
+
+  return rxml_namespace_wrap(xns->next);
+}
+
+void rxml_init_namespace(void)
+{
+  cXMLNamespace = rb_define_class_under(mXML, "Namespace", rb_cObject);
+  rb_define_alloc_func(cXMLNamespace, rxml_namespace_alloc);
+  rb_define_method(cXMLNamespace, "initialize", rxml_namespace_initialize, 3);
+  rb_define_method(cXMLNamespace, "href", rxml_namespace_href_get, 0);
+  rb_define_method(cXMLNamespace, "next", rxml_namespace_next, 0);
+  rb_define_method(cXMLNamespace, "node_type", rxml_namespace_node_type, 0);
+  rb_define_method(cXMLNamespace, "prefix", rxml_namespace_prefix_get, 0);
+}

data/ext/libxml/ruby_xml_namespace.h

@@ -1,10 +1,11 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_NAMESPACE__
-#define __RXML_NAMESPACE__
-
-extern VALUE cXMLNamespace;
-
-void rxml_init_namespace(void);
-VALUE rxml_namespace_wrap(xmlNsPtr xns);
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_NAMESPACE__
+#define __RXML_NAMESPACE__
+
+extern VALUE cXMLNamespace;
+extern const rb_data_type_t rxml_namespace_type;
+
+void rxml_init_namespace(void);
+VALUE rxml_namespace_wrap(xmlNsPtr xns);
+#endif