libxml-ruby 2.9.0 → 3.0.0

data/Rakefile

@@ -55,7 +55,7 @@ end
 # RDoc Task
 desc 'Generate rdoc documentation'
 RDoc::Task.new("rdoc") do |rdoc|
-  rdoc.rdoc_dir = 'website/_site/rdoc'
+  rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'LibXML'
   rdoc.generator = 'hanna'
 

data/ext/libxml/libxml.c

@@ -1,80 +1,80 @@
-#include "ruby_libxml.h"
-
-#if RUBY_INTERN_H
-#include <ruby/util.h>
-#else
-#include <util.h>
-#endif
-
-
-VALUE mLibXML;
-
-static void rxml_init_memory(void)
-{
- /* Disable for now - broke attributes. 
-  xmlGcMemSetup(
-      (xmlFreeFunc)ruby_xfree,
-      (xmlMallocFunc)ruby_xmalloc,
-      (xmlMallocFunc)ruby_xmalloc,
-      (xmlReallocFunc)ruby_xrealloc,
-      (xmlStrdupFunc)ruby_strdup
-  );*/
-}
-
-void Init_libxml_ruby(void)
-{
-/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
- * XML toolkit.  To get started you may:
- *
- *  require 'test_helper'
- *  document = XML::Document.new
- *
- * However, when creating an application or library you plan to
- * redistribute, it is best to not add the LibXML module to the global
- * namespace, in which case you can either write your code like this:
- *
- *  require 'libxml'
- *  document = LibXML::XML::Document.new
- *
- * Refer to the README file to get started and the LICENSE file for
- * copyright and distribution information.
- */
-
-  // Seutp for threading. http://xmlsoft.org/threads.html
-  xmlInitParser();
-
-  mLibXML = rb_define_module("LibXML");
-
-  rxml_init_memory();
-  rxml_init_xml();
-  rxml_init_io();
-  rxml_init_error();
-  rxml_init_encoding();
-  rxml_init_parser();
-  rxml_init_parser_context();
-  rxml_init_parser_options();
-  rxml_init_node();
-  rxml_init_attributes();
-  rxml_init_attr();
-  rxml_init_attr_decl();
-  rxml_init_document();
-  rxml_init_namespaces();
-  rxml_init_namespace();
-  rxml_init_sax_parser();
-  rxml_init_sax2_handler();
-  rxml_init_xinclude();
-  rxml_init_xpath();
-  rxml_init_xpath_object();
-  rxml_init_xpath_context();
-  rxml_init_xpath_expression();
-  rxml_init_xpointer();
-  rxml_init_html_parser();
-  rxml_init_html_parser_options();
-  rxml_init_html_parser_context();
-  rxml_init_input_callbacks();
-  rxml_init_dtd();
-  rxml_init_schema();
-  rxml_init_relaxng();
-  rxml_init_reader();
-  rxml_init_writer();
-}
+#include "ruby_libxml.h"
+
+#if RUBY_INTERN_H
+#include <ruby/util.h>
+#else
+#include <util.h>
+#endif
+
+
+VALUE mLibXML;
+
+static void rxml_init_memory(void)
+{
+ /* Disable for now - broke attributes. 
+  xmlGcMemSetup(
+      (xmlFreeFunc)ruby_xfree,
+      (xmlMallocFunc)ruby_xmalloc,
+      (xmlMallocFunc)ruby_xmalloc,
+      (xmlReallocFunc)ruby_xrealloc,
+      (xmlStrdupFunc)ruby_strdup
+  );*/
+}
+
+void Init_libxml_ruby(void)
+{
+/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
+ * XML toolkit.  To get started you may:
+ *
+ *  require 'test_helper'
+ *  document = XML::Document.new
+ *
+ * However, when creating an application or library you plan to
+ * redistribute, it is best to not add the LibXML module to the global
+ * namespace, in which case you can either write your code like this:
+ *
+ *  require 'libxml'
+ *  document = LibXML::XML::Document.new
+ *
+ * Refer to the README file to get started and the LICENSE file for
+ * copyright and distribution information.
+ */
+
+  // Seutp for threading. http://xmlsoft.org/threads.html
+  xmlInitParser();
+
+  mLibXML = rb_define_module("LibXML");
+
+  rxml_init_memory();
+  rxml_init_xml();
+  rxml_init_io();
+  rxml_init_error();
+  rxml_init_encoding();
+  rxml_init_parser();
+  rxml_init_parser_context();
+  rxml_init_parser_options();
+  rxml_init_node();
+  rxml_init_attributes();
+  rxml_init_attr();
+  rxml_init_attr_decl();
+  rxml_init_document();
+  rxml_init_namespaces();
+  rxml_init_namespace();
+  rxml_init_sax_parser();
+  rxml_init_sax2_handler();
+  rxml_init_xinclude();
+  rxml_init_xpath();
+  rxml_init_xpath_object();
+  rxml_init_xpath_context();
+  rxml_init_xpath_expression();
+  rxml_init_xpointer();
+  rxml_init_html_parser();
+  rxml_init_html_parser_options();
+  rxml_init_html_parser_context();
+  rxml_init_input_callbacks();
+  rxml_init_dtd();
+  rxml_init_schema();
+  rxml_init_relaxng();
+  rxml_init_reader();
+  rxml_init_writer();
+}

data/ext/libxml/ruby_libxml.h

@@ -1,75 +1,75 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_LIBXML_H__
-#define __RUBY_LIBXML_H__
-
-#include <ruby.h>
-#include <libxml/parser.h>
-#include <libxml/parserInternals.h>
-#include <libxml/debugXML.h>
-#include <libxml/xmlversion.h>
-#include <libxml/xmlmemory.h>
-#include <libxml/xpath.h>
-#include <libxml/valid.h>
-#include <libxml/catalog.h>
-#include <libxml/HTMLparser.h>
-#include <libxml/xmlreader.h>
-#include <libxml/c14n.h>
-
-/* Needed prior to Ruby 1.9.1 */
-#ifndef RHASH_TBL
-#define RHASH_TBL(s) (RHASH(s)->tbl)
-#endif
-
-// Encoding support added in Ruby 1.9.*
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-#endif
-
-#ifdef LIBXML_DEBUG_ENABLED
-#include <libxml/xpathInternals.h>
-#endif
-#ifdef LIBXML_XINCLUDE_ENABLED
-#include <libxml/xinclude.h>
-#endif
-#ifdef LIBXML_XPTR_ENABLED
-#include <libxml/xpointer.h>
-#endif
-
-#include "ruby_xml_version.h"
-#include "ruby_xml.h"
-#include "ruby_xml_io.h"
-#include "ruby_xml_error.h"
-#include "ruby_xml_encoding.h"
-#include "ruby_xml_attributes.h"
-#include "ruby_xml_attr.h"
-#include "ruby_xml_attr_decl.h"
-#include "ruby_xml_document.h"
-#include "ruby_xml_node.h"
-#include "ruby_xml_namespace.h"
-#include "ruby_xml_namespaces.h"
-#include "ruby_xml_parser.h"
-#include "ruby_xml_parser_options.h"
-#include "ruby_xml_parser_context.h"
-#include "ruby_xml_html_parser.h"
-#include "ruby_xml_html_parser_options.h"
-#include "ruby_xml_html_parser_context.h"
-#include "ruby_xml_reader.h"
-#include "ruby_xml_writer.h"
-#include "ruby_xml_sax2_handler.h"
-#include "ruby_xml_sax_parser.h"
-#include "ruby_xml_writer.h"
-#include "ruby_xml_xinclude.h"
-#include "ruby_xml_xpath.h"
-#include "ruby_xml_xpath_expression.h"
-#include "ruby_xml_xpath_context.h"
-#include "ruby_xml_xpath_object.h"
-#include "ruby_xml_xpointer.h"
-#include "ruby_xml_input_cbg.h"
-#include "ruby_xml_dtd.h"
-#include "ruby_xml_schema.h"
-#include "ruby_xml_relaxng.h"
-
-extern VALUE mLibXML;
-
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_LIBXML_H__
+#define __RUBY_LIBXML_H__
+
+#include <ruby.h>
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
+#include <libxml/debugXML.h>
+#include <libxml/xmlversion.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/xpath.h>
+#include <libxml/valid.h>
+#include <libxml/catalog.h>
+#include <libxml/HTMLparser.h>
+#include <libxml/xmlreader.h>
+#include <libxml/c14n.h>
+
+/* Needed prior to Ruby 1.9.1 */
+#ifndef RHASH_TBL
+#define RHASH_TBL(s) (RHASH(s)->tbl)
+#endif
+
+// Encoding support added in Ruby 1.9.*
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#endif
+
+#ifdef LIBXML_DEBUG_ENABLED
+#include <libxml/xpathInternals.h>
+#endif
+#ifdef LIBXML_XINCLUDE_ENABLED
+#include <libxml/xinclude.h>
+#endif
+#ifdef LIBXML_XPTR_ENABLED
+#include <libxml/xpointer.h>
+#endif
+
+#include "ruby_xml_version.h"
+#include "ruby_xml.h"
+#include "ruby_xml_io.h"
+#include "ruby_xml_error.h"
+#include "ruby_xml_encoding.h"
+#include "ruby_xml_attributes.h"
+#include "ruby_xml_attr.h"
+#include "ruby_xml_attr_decl.h"
+#include "ruby_xml_document.h"
+#include "ruby_xml_node.h"
+#include "ruby_xml_namespace.h"
+#include "ruby_xml_namespaces.h"
+#include "ruby_xml_parser.h"
+#include "ruby_xml_parser_options.h"
+#include "ruby_xml_parser_context.h"
+#include "ruby_xml_html_parser.h"
+#include "ruby_xml_html_parser_options.h"
+#include "ruby_xml_html_parser_context.h"
+#include "ruby_xml_reader.h"
+#include "ruby_xml_writer.h"
+#include "ruby_xml_sax2_handler.h"
+#include "ruby_xml_sax_parser.h"
+#include "ruby_xml_writer.h"
+#include "ruby_xml_xinclude.h"
+#include "ruby_xml_xpath.h"
+#include "ruby_xml_xpath_expression.h"
+#include "ruby_xml_xpath_context.h"
+#include "ruby_xml_xpath_object.h"
+#include "ruby_xml_xpointer.h"
+#include "ruby_xml_input_cbg.h"
+#include "ruby_xml_dtd.h"
+#include "ruby_xml_schema.h"
+#include "ruby_xml_relaxng.h"
+
+extern VALUE mLibXML;
+
+#endif

data/ext/libxml/ruby_xml.c

@@ -1,87 +1,6 @@
 #include "ruby_libxml.h"
 #include "ruby_xml.h"
 
-static struct st_table *private_pointers;
-
-static int registered = 0;   // Constant to track what nodes have been registered
-
-void rxml_register(void *xnode, VALUE value) {
-  st_insert(private_pointers, (st_data_t)xnode, (st_data_t)value);
-}
-
-void rxml_register_node(xmlNodePtr xnode, VALUE value) {
-  if (rxml_lookup_node(xnode) == Qnil) {
-    xnode->_private = &registered;
-    rxml_register(xnode, value);
-  }
-}
-
-void rxml_register_doc(xmlDocPtr xdoc, VALUE value) {
-  if (rxml_lookup_doc(xdoc) == Qnil) {
-    xdoc->_private = &registered;
-    rxml_register(xdoc, value);
-  }
-}
-
-void rxml_register_dtd(xmlDtdPtr xdtd, VALUE value) {
-  if (rxml_lookup_dtd(xdtd) == Qnil) {
-    xdtd->_private = &registered;
-    rxml_register(xdtd, value);
-  }
-}
-
-void rxml_unregister(void *xnode) {
-  st_delete(private_pointers, (st_data_t*)&xnode, NULL);
-}
-
-void rxml_unregister_node(xmlNodePtr xnode) {
-  if (xnode->_private == &registered) {
-    xnode->_private = NULL;
-    rxml_unregister(xnode);
-  }
-}
-
-void rxml_unregister_doc(xmlDocPtr xdoc) {
-  if (xdoc->_private == &registered) {
-    xdoc->_private = NULL;
-    rxml_unregister(xdoc);
-  }
-}
-
-void rxml_unregister_dtd(xmlDtdPtr xdtd) {
-  if (xdtd->_private == &registered) {
-    xdtd->_private = NULL;
-    rxml_unregister(xdtd);
-  }
-}
-
-VALUE rxml_lookup(void *pointer) {
-  st_data_t result = 0;
-  int ret = st_lookup(private_pointers, (st_data_t)pointer, &result);
-  return ret ? (VALUE)result : Qnil;
-}
-
-VALUE rxml_lookup_node(xmlNodePtr xnode) {
-  if (!xnode || xnode->_private != &registered)
-    return Qnil;
-
-  return rxml_lookup(xnode);
-}
-
-VALUE rxml_lookup_doc(xmlDocPtr xdoc) {
-  if (!xdoc || xdoc->_private != &registered)
-    return Qnil;
-
-  return rxml_lookup(xdoc);
-}
-
-VALUE rxml_lookup_dtd(xmlDtdPtr xdtd) {
-  if (!xdtd || xdtd->_private != &registered)
-    return Qnil;
-
-  return rxml_lookup(xdtd);
-}
-
 VALUE mXML;
 
 /*
@@ -915,9 +834,6 @@ static VALUE rxml_memory_used(VALUE self)
 
 void rxml_init_xml(void)
 {
-  /* Create a hashtable suitable for pointer keys */
-  private_pointers = st_init_numtable();
-
   mXML = rb_define_module_under(mLibXML, "XML");
 
   /* Constants */

data/ext/libxml/ruby_xml.h

@@ -7,14 +7,4 @@ extern VALUE mXML;
 int rxml_libxml_default_options();
 void rxml_init_xml(void);
 
-void rxml_register_node(xmlNodePtr node, VALUE value);
-void rxml_register_doc(xmlDocPtr doc, VALUE value);
-void rxml_register_dtd(xmlDtdPtr dtd, VALUE value);
-void rxml_unregister_node(xmlNodePtr node);
-void rxml_unregister_doc(xmlDocPtr doc);
-void rxml_unregister_dtd(xmlDtdPtr dtd);
-VALUE rxml_lookup_node(xmlNodePtr node);
-VALUE rxml_lookup_doc(xmlDocPtr doc);
-VALUE rxml_lookup_dtd(xmlDtdPtr dtd);
-
 #endif

data/ext/libxml/ruby_xml_attr.h

@@ -1,12 +1,12 @@
-/* Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RXML_ATTR__
-#define __RXML_ATTR__
-
-extern VALUE cXMLAttr;
-
-void rxml_init_attr(void);
-VALUE rxml_attr_wrap(xmlAttrPtr xattr);
-VALUE rxml_attr_value_get(VALUE self);
-VALUE rxml_attr_value_set(VALUE self, VALUE val);
-#endif
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RXML_ATTR__
+#define __RXML_ATTR__
+
+extern VALUE cXMLAttr;
+
+void rxml_init_attr(void);
+VALUE rxml_attr_wrap(xmlAttrPtr xattr);
+VALUE rxml_attr_value_get(VALUE self);
+VALUE rxml_attr_value_set(VALUE self, VALUE val);
+#endif