libxml-ruby 0.9.8-x86-mswin32-60 → 0.9.9-x86-mswin32-60

data/CHANGES

@@ -1,3 +1,43 @@
+== 0.9.9 / 2009-03-05 Charlie Savage
+
+* Ruby 1.9.1 support (Charlie Savage). libxml-ruby now compiles and runs on either
+  1.8.6 and 1.9.1.  With 1.8.6 all tests should pass while on 1.9.1 all but
+  for encoding tests pass.  The port to Ruby 1.9.1 revealed two memory
+  allocation bugs (one with dtds, one with nodes) which are now fixed.
+
+* Better OS X support (Joe Khoobyar).  The default version of libxml2
+  on OS X 10.5 is fairly old, resulting in this link error:
+
+    NSLinkModule() error
+    dyld: Symbol not found: _htmlNewParserCtxt
+
+  This can be fixed by using MacPorts to get a newer version of libxml2.
+  To make use of MacPorts, the build script has been updated to use xml2-config.
+  This can be fine-tuned using the new --with-xml2-config / --without-xml2-config
+  options to extconf.rb (default is  --without-xml2-config to match existing behavior).
+
+* Greatly reduced memory usage (Joe Khoobyar).
+  See http://rubyforge.org/pipermail/libxml-devel/2009-February/001375.html.
+
+* Add Document#xhtml? and document#node_type methods (Joe Khoobyar)
+
+* Add XPath::Object#last (Joe Khoobyar)
+
+* Provide finer control over CDATA nodes on a parser by parser basis  (Joe Khoobyar).
+
+* Bug fix - Namespaces were incorrectly merged with attributes in the new sax2
+  handler (Charlie Savage).
+
+* Bug fix - Support iterating over nodes and attributes even with blocks
+  that call remove! (Charlie Savage)
+
+* Bug fix - If reader.node is NULL, return nil instead of crashing (Charlie Savage)
+
+* Bug fix - Dtd's owned by documents were freed twice in some circumstances (Joe Khoobyar).
+
+* Bug fix - Fix output escaping on attributes nodes (Joe Khoobyar).
+
+
 == 0.9.8 / 2009-1-24 Charlie Savage
 
 * Refactored XML::Parser, XML::HTMLParser, XML::SaxParser and
@@ -10,7 +50,7 @@
   boolean value.
 
 * Updated all APIs to use the encoding constants defined
-  in XML::Encoding versus string valus.  This API change
+  in XML::Encoding versus string values.  This API change
   is not backwards compatible.
 
 * Added support for attribute declarations in DTD's via the new

data/LICENSE

@@ -1,7 +1,6 @@
-LibXML-Ruby
-
- Copyright (c) 2002-2006 Sean Chittenden <sean@chittenden.org> and contributors
- Copyright (c) 2001 Wai-Sun "Squidster" Chia <waisun.chia@compaq.com>
+  Copyright (c) 2008-2009 Charlie Savage and contributors
+  Copyright (c) 2002-2007 Sean Chittenden and contributors
+  Copyright (c) 2001 Wai-Sun "Squidster" Chia
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in 

data/README

@@ -43,28 +43,30 @@ solution.  If you wish to run a debug version of libxml-ruby on
 Windows, then it is highly recommended you use VC++.
 
 == Getting Started
-Using libxml is easy. First decide what parser you want to use.
-Generally you'll want to use the LibXML::XML::Parser which provides a tree based API.
-For larger documents that don't fit into memory, or if you prefer an input based API,
-then use LibXML::XML::Reader. If you are parsing HTML files, then use LibXML::XML::HTMLParser.
-Finally, if you are masochistic, then use the LibXML::XML::SaxParser, which provides a callback API.
+Using libxml is easy. First decide what parser you want to use:
 
-Once you choose a parser, then choose a datasource and its
-encoding.  Libxml can parse files, strings, URIs and IO stream.
-For more information, see LibXML::XML::Input.
+* Generally you'll want to use the LibXML::XML::Parser which provides a tree based API.
+* For larger documents that don't fit into memory, or if you prefer an input based API, use the LibXML::XML::Reader.
+* To parse HTML files use LibXML::XML::HTMLParser.
+* If you are masochistic, then use the LibXML::XML::SaxParser, which provides a callback API.
+
+Once you have choosen a parser, choose a datasource.  Libxml can parse files, strings, URIs
+and IO streams.  For each data source you can specify an LibXML::XML::Encoding, a base uri and
+various parser options.  For more information, refer the LibXML::XML::Parser.document,
+LibXML::XML::Parser.file, LibXML::XML::Parser.io or LibXML:::XML::Parser.string methods (the
+same methods are defined on all four parser classes).
 
 == Advanced Functionality
 Beyond the basics of parsing and processing XML and HTML documents,
-lLibxml provides a wealth of additional functionality.
+libxml provides a wealth of additional functionality.
 
 Most commonly, you'll want to use its LibXML::XML::XPath support, which makes
-it easy to search for data inside and XML document.  Although not as
-popular, LibXML::XML::XPointer provides another API for finding data inside
-an XML document.
+it easy to find data inside a XML document.  Although not as popular,
+LibXML::XML::XPointer provides another API for finding data inside an XML document.
 
 Often times you'll need to validate data before processing it. For example,
 if you accept user generated content submitted over the Web, you'll
-want to first verify it does not contain malicious code such as embedded scripts.
+want to verify that it does not contain malicious code such as embedded scripts.
 This can be done using libxml's powerful set of validators:
 
 * DTDs (LibXML::XML::Dtd)
@@ -72,7 +74,7 @@ This can be done using libxml's powerful set of validators:
 * XML Schema (LibXML::XML::Schema)
 
 Finally, if you'd like to use XSL Transformations to process data,
-then also install the libxslt gem which is available at
+then install the libxslt gem which is available at
 http://rubyforge.org/projects/libxsl/.
 
 == Usage
@@ -94,8 +96,8 @@ namespace, in which case you can either write your code like this:
   require 'libxml'
   document = LibXML::XML::Document.new
 
-or, more conveniently, utilize a proper namespace for you own work
-and include LibXML into it. For example:
+Or you can utilize a namespace for you own work and include LibXML into it.
+For example:
 
   require 'libxml'
 
@@ -133,16 +135,27 @@ From https://svn.concord.org/svn/projects/trunk/common/ruby/xml_benchmarks/
  rexml    22.859000   0.047000  22.906000 ( 23.203000) 
 
 
-== DOCUMENTATION
-For more information please refer to the documentation.
+== Documentation
+Documentation is provided via rdoc.  To generate the documentation,
+run the the command 'rake doc'.  libxml-ruby's online documentation
+is generated using Hanna.  To use hanna:
 
-RDoc comments are included - run 'rake doc' to generate documentation.
-You can find the latest documentation at:
+  gem install mislav-hanna
+  rake rdoc RDOCOPT="-S -T hanna"
 
-* http://libxml.rubyforge.org/rdoc/
+Note that older versions of Rdoc, which ship with Ruby 1.8.x, will report
+a number of errors.  To avoid them, install Rdoc 2.1 or higher from
+RubyForge (http://rdoc.rubyforge.org/).  Once you have installed the gem,
+you'll have to disable the version of Rdoc that Ruby 1.8.x includes.  An
+easy way to do that is rename the directory uby/lib/ruby/1.8/rdoc to
+ruby/lib/ruby/1.8/rdoc_old.
 
-If you have any questions, please send email to libxml-devel@rubyforge.org.
+== Support
 
-== License
-See LICENSE for license information.
+If you have any questions about using libxml-ruby, please send them to
+libxml-devel@rubyforge.org.  If you have found any bugs in libxml-devel,
+or have developed new patches, please submit them to Ruby Forge at
+http://rubyforge.org/tracker/?group_id=494.
 
+== License
+See LICENSE for license information.

data/Rakefile

@@ -43,7 +43,7 @@ default_spec = Gem::Specification.new do |spec|
 
   # Determine the current version of the software
   spec.version = 
-    if File.read('ext/libxml/version.h') =~ /\s*RUBY_LIBXML_VERSION\s*['"](\d.+)['"]/
+    if File.read('ext/libxml/ruby_xml_version.h') =~ /\s*RUBY_LIBXML_VERSION\s*['"](\d.+)['"]/
       CURRENT_VERSION = $1
     else
       CURRENT_VERSION = "0.0.0"
@@ -96,7 +96,7 @@ Rake::RDocTask.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.title    = "LibXML"
   # Show source inline with line numbers
-  rdoc.options << "--inline-source" << "--line-numbers"
+  rdoc.options << "--line-numbers"
   # Make the readme file the start page for the generated html
   rdoc.options << '--main' << 'README'
   rdoc.rdoc_files.include('doc/*.rdoc',

data/ext/libxml/extconf.rb

@@ -31,7 +31,6 @@ def crash(str)
 end
 
 dir_config('iconv')
-dir_config('xml2')
 dir_config('zlib')
 
 have_library('socket','socket')
@@ -74,21 +73,41 @@ to extconf.rb:
 EOL
 end
 
-unless (have_library('xml2', 'xmlParseDoc') or
-        have_library('libxml2', 'xmlParseDoc') or
-        find_library('xml2', 'xmlParseDoc', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
-       (have_header('libxml/xmlversion.h') or
-        find_header('libxml/xmlversion.h',
-                    "#{CONFIG['prefix']}/include",
-                    "#{CONFIG['prefix']}/include/libxml2",
-                    '/opt/include/libxml2', 
-                    '/usr/local/include/libxml2', 
-                    '/usr/include/libxml2'))
-  crash(<<EOL)
+if (xc = with_config('xml2-config')) or RUBY_PLATFORM.match(/darwin/i) then
+  xc = 'xml2-config' if xc == true or xc.nil?
+  cflags = `#{xc} --cflags`.chomp
+  if $? != 0
+		cflags = nil
+	else
+  	libs = `#{xc} --libs`.chomp
+  	if $? != 0
+			libs = nil
+		else
+  		$CFLAGS += ' ' + cflags
+  		$libs = libs + " " + $libs
+		end
+	end
+else
+	dir_config('xml2')
+end
+
+unless (cflags and libs) or
+			 (have_library('xml2', 'xmlParseDoc') or
+				have_library('libxml2', 'xmlParseDoc') or
+				find_library('xml2', 'xmlParseDoc', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
+			 (have_header('libxml/xmlversion.h') or
+				find_header('libxml/xmlversion.h',
+										"#{CONFIG['prefix']}/include",
+										"#{CONFIG['prefix']}/include/libxml2",
+										'/opt/include/libxml2', 
+										'/usr/local/include/libxml2', 
+										'/usr/include/libxml2'))
+		crash(<<EOL)
 need libxml2.
 
     Install the library or try one of the following options to extconf.rb:
 
+      --with-xml2-config=/path/to/xml2-config
       --with-xml2-dir=/path/to/libxml2
       --with-xml2-lib=/path/to/libxml2/lib
       --with-xml2-include=/path/to/libxml2/include

data/ext/libxml/libxml.c

@@ -1,878 +1,76 @@
-/* $Id: libxml.c 756 2009-01-24 22:56:05Z cfis $ */
-
-/* Please see the LICENSE file for copyright and distribution information */
-
 #include "ruby_libxml.h"
 
-VALUE mLibXML;
-VALUE mXML;
-
-/*
- * call-seq:
- * 		XML.catalog_dump -> true
- *
- * Dump all the global catalog content stdout.
- */
-static VALUE rxml_catalog_dump(VALUE self)
-{
-  xmlCatalogDump(stdout);
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- * 		XML.catalog_remove(catalog) -> true
- *
- * Remove the specified resource catalog.
- */
-static VALUE rxml_catalog_remove(VALUE self, VALUE cat)
-{
-  Check_Type(cat, T_STRING);
-  xmlCatalogRemove((xmlChar *) StringValuePtr(cat));
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- * 		XML.check_lib_versions -> true
- *
- * Check LIBXML version matches version the bindings
- * were compiled to. Throws an exception if not.
- */
-static VALUE rxml_check_lib_versions(VALUE class)
-{
-  xmlCheckVersion(LIBXML_VERSION);
-  return (Qtrue);
-}
-
-/*
- * call-seq:
- * 		XML.enabled_automata? -> (true|false)
- *
- * Determine whether libxml regexp automata support is enabled.
- */
-static VALUE rxml_enabled_automata_q(VALUE class)
-{
-#ifdef LIBXML_AUTOMATA_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_c14n? -> (true|false)
- *
- * Determine whether libxml 'canonical XML' support is enabled.
- * See "Canonical XML" (http://www.w3.org/TR/xml-c14n)
- */
-static VALUE rxml_enabled_c14n_q(VALUE class)
-{
-#ifdef LIBXML_C14N_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_catalog? -> (true|false)
- *
- * Determine whether libxml resource catalog support is enabled.
- */
-static VALUE rxml_enabled_catalog_q(VALUE class)
-{
-#ifdef LIBXML_CATALOG_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_debug? -> (true|false)
- *
- * Determine whether libxml debugging support is enabled.
- */
-static VALUE rxml_enabled_debug_q(VALUE class)
-{
-#ifdef LIBXML_DEBUG_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_docbook? -> (true|false)
- *
- * Determine whether libxml docbook support is enabled.
- */
-static VALUE rxml_enabled_docbook_q(VALUE class)
-{
-#ifdef LIBXML_DOCB_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_ftp? -> (true|false)
- *
- * Determine whether libxml ftp client support is enabled.
- */
-static VALUE rxml_enabled_ftp_q(VALUE class)
-{
-#ifdef LIBXML_FTP_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_http? -> (true|false)
- *
- * Determine whether libxml http client support is enabled.
- */
-static VALUE rxml_enabled_http_q(VALUE class)
-{
-#ifdef LIBXML_HTTP_ENABLED
-  return(Qtrue);
+#if RUBY_INTERN_H
+#include <ruby/util.h>
 #else
-  return (Qfalse);
+#include <util.h>
 #endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_html? -> (true|false)
- *
- * Determine whether libxml html support is enabled.
- */
-static VALUE rxml_enabled_html_q(VALUE class)
-{
-#ifdef LIBXML_HTML_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
 
-/*
- * call-seq:
- * 		XML.enabled_iconv? -> (true|false)
- *
- * Determine whether libxml iconv support is enabled.
- */
-static VALUE rxml_enabled_iconv_q(VALUE class)
-{
-#ifdef LIBXML_ICONV_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_memory_debug? -> (true|false)
- *
- * Determine whether libxml memory location debugging support
- * is enabled.
- */
-static VALUE rxml_enabled_memory_debug_location_q(VALUE class)
-{
-#ifdef DEBUG_MEMORY_LOCATION
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_regexp? -> (true|false)
- *
- * Determine whether libxml regular expression support is enabled.
- */
-static VALUE rxml_enabled_regexp_q(VALUE class)
-{
-#ifdef LIBXML_REGEXP_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_schemas? -> (true|false)
- *
- * Determine whether libxml schema support is enabled.
- */
-static VALUE rxml_enabled_schemas_q(VALUE class)
-{
-#ifdef LIBXML_SCHEMAS_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_thread? -> (true|false)
- *
- * Determine whether libxml thread-safe semantics support
- * is enabled (I think?).
- */
-static VALUE rxml_enabled_thread_q(VALUE class)
-{
-#ifdef LIBXML_THREAD_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_unicode? -> (true|false)
- *
- * Determine whether libxml unicode support is enabled.
- */
-static VALUE rxml_enabled_unicode_q(VALUE class)
-{
-#ifdef LIBXML_UNICODE_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_xinclude? -> (true|false)
- *
- * Determine whether libxml xinclude support is enabled.
- */
-static VALUE rxml_enabled_xinclude_q(VALUE class)
-{
-#ifdef LIBXML_XINCLUDE_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_xpath? -> (true|false)
- *
- * Determine whether libxml xpath support is enabled.
- */
-static VALUE rxml_enabled_xpath_q(VALUE class)
-{
-#ifdef LIBXML_XPATH_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_xpointer? -> (true|false)
- *
- * Determine whether libxml xpointer support is enabled.
- */
-static VALUE rxml_enabled_xpointer_q(VALUE class)
-{
-#ifdef LIBXML_XPTR_ENABLED
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- * 		XML.enabled_zlib? -> (true|false)
- *
- * Determine whether libxml zlib support is enabled.
- */
-static VALUE rxml_enabled_zlib_q(VALUE class)
-{
-#ifdef HAVE_ZLIB_H
-  return(Qtrue);
-#else
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- *    XML.debug_entities -> (true|false)
- *
- * Determine whether included-entity debugging is enabled.
- * (Requires Libxml to be compiled with debugging support)
- */
-static VALUE rxml_debug_entities_get(VALUE class)
-{
-#ifdef LIBXML_DEBUG_ENABLED
-  if (xmlParserDebugEntities)
-  return(Qtrue);
-  else
-  return(Qfalse);
-#else
-  rb_warn("libxml was compiled with debugging turned off");
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- *    XML.debug_entities = true|false
- *
- * Enable or disable included-entity debugging.
- * (Requires Libxml to be compiled with debugging support)
- */
-static VALUE rxml_debug_entities_set(VALUE class, VALUE bool)
-{
-#ifdef LIBXML_DEBUG_ENABLED
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlParserDebugEntities = 0;
-    return(Qfalse);
-  }
-  else
-  {
-    xmlParserDebugEntities = 1;
-    return(Qtrue);
-  }
-#else
-  rb_warn("libxml was compiled with debugging turned off");
-#endif
-}
-
-/*
- * call-seq:
- *    XML.default_keep_blanks -> (true|false)
- *
- * Determine whether parsers retain whitespace by default.
- */
-static VALUE rxml_default_keep_blanks_get(VALUE class)
-{
-  if (xmlKeepBlanksDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_keep_blanks = true|false
- *
- * Controls whether parsers retain whitespace by default.
- */
-static VALUE rxml_default_keep_blanks_set(VALUE class, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlKeepBlanksDefaultValue = 0;
-    return (Qfalse);
-  }
-  else if (TYPE(bool) == T_TRUE)
-  {
-    xmlKeepBlanksDefaultValue = 1;
-    return (Qtrue);
-  }
-  else
-  {
-    rb_raise(rb_eArgError, "Invalid argument, must be a boolean");
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_load_external_dtd -> (true|false)
- *
- * Determine whether parsers load external DTDs by default.
- */
-static VALUE rxml_default_load_external_dtd_get(VALUE class)
-{
-  if (xmlLoadExtDtdDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_load_external_dtd = true|false
- *
- * Controls whether parsers load external DTDs by default.
- */
-static VALUE rxml_default_load_external_dtd_set(VALUE class, VALUE bool)
-{
-  if (bool == Qfalse)
-  {
-    xmlLoadExtDtdDefaultValue = 0;
-    return (Qfalse);
-  }
-  else
-  {
-    xmlLoadExtDtdDefaultValue = 1;
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_line_numbers -> (true|false)
- *
- * Determine whether parsers retain line-numbers by default.
- */
-static VALUE rxml_default_line_numbers_get(VALUE class)
-{
-  if (xmlLineNumbersDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_line_numbers = true|false
- *
- * Controls whether parsers retain line-numbers by default.
- */
-static VALUE rxml_default_line_numbers_set(VALUE class, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlLineNumbersDefault(0);
-    return (Qfalse);
-  }
-  else
-  {
-    xmlLineNumbersDefault(1);
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_pedantic_parser -> (true|false)
- *
- * Determine whether parsers are pedantic by default.
- */
-static VALUE rxml_default_pedantic_parser_get(VALUE class)
-{
-  if (xmlPedanticParserDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_pedantic_parser = true|false
- *
- * Controls whether parsers are pedantic by default.
- */
-static VALUE rxml_default_pedantic_parser_set(VALUE class, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlPedanticParserDefault(0);
-    return (Qfalse);
-  }
-  else
-  {
-    xmlPedanticParserDefault(1);
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_substitute_entities -> (true|false)
- *
- * Determine whether parsers perform inline entity substitution
- * (for external entities) by default.
- */
-static VALUE rxml_default_substitute_entities_get(VALUE class)
-{
-  if (xmlSubstituteEntitiesDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_substitute_entities = true|false
- *
- * Controls whether parsers perform inline entity substitution
- * (for external entities) by default.
- */
-static VALUE rxml_default_substitute_entities_set(VALUE class, VALUE bool)
-{
-  if (bool == Qfalse)
-  {
-    xmlSubstituteEntitiesDefault(0);
-    return (Qfalse);
-  }
-  else
-  {
-    xmlSubstituteEntitiesDefault(1);
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_tree_indent_string -> "string"
- *
- * Obtain the default string used by parsers to indent the XML tree
- * for output.
- */
-static VALUE rxml_default_tree_indent_string_get(VALUE class)
-{
-  if (xmlTreeIndentString == NULL)
-    return (Qnil);
-  else
-    return (rb_str_new2(xmlTreeIndentString));
-}
-
-/*
- * call-seq:
- *    XML.default_tree_indent_string = "string"
- *
- * Set the default string used by parsers to indent the XML tree
- * for output.
- */
-static VALUE rxml_default_tree_indent_string_set(VALUE class, VALUE string)
-{
-  Check_Type(string, T_STRING);
-  xmlTreeIndentString = xmlStrdup((xmlChar *)StringValuePtr(string));
-  return (string);
-}
-
-/*
- * call-seq:
- *    XML.default_validity_checking -> (true|false)
- *
- * Determine whether parsers perform XML validation by default.
- */
-static VALUE rxml_default_validity_checking_get(VALUE class)
-{
-  if (xmlDoValidityCheckingDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_validity_checking = true|false
- *
- * Controls whether parsers perform XML validation by default.
- */
-static VALUE rxml_default_validity_checking_set(VALUE class, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlDoValidityCheckingDefaultValue = 0;
-    return (Qfalse);
-  }
-  else
-  {
-    xmlDoValidityCheckingDefaultValue = 1;
-    return (Qtrue);
-  }
-}
-
-/*
- * call-seq:
- *    XML.default_warnings -> (true|false)
- *
- * Determine whether parsers output warnings by default.
- */
-static VALUE rxml_default_warnings_get(VALUE class)
-{
-  if (xmlGetWarningsDefaultValue)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.default_warnings = true|false
- *
- * Controls whether parsers output warnings by default.
- */
-static VALUE rxml_default_warnings_set(VALUE class, VALUE bool)
-{
-  if (TYPE(bool) == T_FALSE)
-  {
-    xmlGetWarningsDefaultValue = 0;
-    return (Qfalse);
-  }
-  else
-  {
-    xmlGetWarningsDefaultValue = 1;
-    return (Qtrue);
-  }
-}
+VALUE mLibXML;
 
-/*
- * call-seq:
- *    XML.default_compression -> (true|false)
- *
- * Determine whether parsers use Zlib compression by default
- * (requires libxml to be compiled with Zlib support).
- */
-static VALUE rxml_default_compression_get(VALUE class)
+static void rxml_init_memory(void)
 {
-#ifdef HAVE_ZLIB_H
-  return(INT2FIX(xmlGetCompressMode()));
-#else
-  rb_warn("libxml was compiled without zlib support");
-  return (Qfalse);
-#endif
+  xmlGcMemSetup(
+      (xmlFreeFunc)ruby_xfree,
+      (xmlMallocFunc)ruby_xmalloc,
+      (xmlMallocFunc)ruby_xmalloc,
+      (xmlReallocFunc)ruby_xrealloc,
+      (xmlStrdupFunc)ruby_strdup
+  );
 }
 
-/*
- * call-seq:
- *    XML.default_compression = true|false
- *
- * Controls whether parsers use Zlib compression by default
- * (requires libxml to be compiled with Zlib support).
- */
-static VALUE rxml_default_compression_set(VALUE class, VALUE num)
-{
-#ifdef HAVE_ZLIB_H
-  Check_Type(num, T_FIXNUM);
-  xmlSetCompressMode(FIX2INT(num));
-  return(num);
-#else
-  rb_warn("libxml was compiled without zlib support");
-  return (Qfalse);
+#if defined(_WIN32)
+__declspec(dllexport)
 #endif
-}
-
-/*
- * call-seq:
- *    XML.features -> ["feature", ..., "feature"]
- *
- * Obtains an array of strings representing features supported
- * (and enabled) by the installed libxml.
- */
-static VALUE rxml_features(VALUE class)
+void Init_libxml_ruby(void)
 {
-  VALUE arr, str;
-  int i, len = MAX_LIBXML_FEATURES_LEN;
-  char **list = NULL;
-
-  list = ALLOC_N(char *,MAX_LIBXML_FEATURES_LEN);
-  MEMZERO(list, char *, MAX_LIBXML_FEATURES_LEN);
-
-  arr = rb_ary_new();
-  if (xmlGetFeaturesList(&len, (const char **) list) == -1)
-    return Qnil;
-
-  for (i = 0; i < len; i++)
-  {
-    str = rb_str_new2((const char *) list[i]);
-    rb_gc_unregister_address(&str);
-    rb_ary_push(arr, str);
-  }
-
-  if (len == MAX_LIBXML_FEATURES_LEN)
-    rb_warn(
-        "Please contact libxml-devel@rubyforge.org and ask to have the \"MAX_LIBXML_FEATURES_LEN increased\" because you could possibly be seeing an incomplete list");
-
-  ruby_xfree(list);
-  return (arr);
-}
-
-/*
- * call-seq:
- *    XML.indent_tree_output -> (true|false)
+/* The libxml gem provides Ruby language bindings for GNOME's Libxml2
+ * XML toolkit.  To get started you may:
  *
- * Determines whether XML output will be indented
- * (using the string supplied to +default_indent_tree_string+)
- */
-static VALUE rxml_indent_tree_output_get(VALUE class)
-{
-  if (xmlIndentTreeOutput)
-    return (Qtrue);
-  else
-    return (Qfalse);
-}
-
-/*
- * call-seq:
- *    XML.indent_tree_output = true|false
+ *  require 'xml'
+ *  document = XML::Document.new
  *
- * Controls whether XML output will be indented
- * (using the string supplied to +default_indent_tree_string+)
- */
-static VALUE rxml_indent_tree_output_set(VALUE class, VALUE bool)
-{
-  if (TYPE(bool) == T_TRUE)
-  {
-    xmlIndentTreeOutput = 1;
-    return (Qtrue);
-  }
-  else if (TYPE(bool) == T_FALSE)
-  {
-    xmlIndentTreeOutput = 0;
-    return (Qfalse);
-  }
-  else
-  {
-    rb_raise(rb_eArgError, "Invalid argument, must be boolean");
-  }
-}
-
-/*
- * call-seq:
- *    XML.memory_dump -> (true|false)
+ * 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:
  *
- * Perform a parser memory dump (requires memory debugging
- * support in libxml).
- */
-static VALUE rxml_memory_dump(VALUE self)
-{
-#ifdef DEBUG_MEMORY_LOCATION
-  xmlMemoryDump();
-  return(Qtrue);
-#else
-  rb_warn("libxml was compiled without memory debugging support");
-  return (Qfalse);
-#endif
-}
-
-/*
- * call-seq:
- *    XML.memory_used -> num_bytes
+ *  require 'libxml'
+ *  document = LibXML::XML::Document.new
  *
- * Perform a parser memory dump (requires memory debugging
- * support in libxml).
+ * Refer to the README file to get started and the LICENSE file for
+ * copyright and distribution information.
  */
-static VALUE rxml_memory_used(VALUE self)
-{
-#ifdef DEBUG_MEMORY_LOCATION
-  return(INT2NUM(xmlMemUsed()));
-#else
-  rb_warn("libxml was compiled without memory debugging support");
-  return (Qfalse);
-#endif
-}
-
-#if defined(_WIN32)
-__declspec(dllexport)
-#endif
-void Init_libxml_ruby(void)
-{
   mLibXML = rb_define_module("LibXML");
-  mXML = rb_define_module_under(mLibXML, "XML");
-
-  /* Constants */
-  rb_define_const(mXML, "LIBXML_VERSION", rb_str_new2(LIBXML_DOTTED_VERSION));
-  rb_define_const(mXML, "VERSION", rb_str_new2(RUBY_LIBXML_VERSION));
-  rb_define_const(mXML, "VERNUM", INT2NUM(RUBY_LIBXML_VERNUM));
-  rb_define_const(mXML, "XML_NAMESPACE", rb_str_new2(
-      (const char*) XML_XML_NAMESPACE));
-
-  rb_define_module_function(mXML, "enabled_automata?", rxml_enabled_automata_q, 0);
-  rb_define_module_function(mXML, "enabled_c14n?", rxml_enabled_c14n_q, 0);
-  rb_define_module_function(mXML, "enabled_catalog?", rxml_enabled_catalog_q, 0);
-  rb_define_module_function(mXML, "enabled_debug?", rxml_enabled_debug_q, 0);
-  rb_define_module_function(mXML, "enabled_docbook?", rxml_enabled_docbook_q, 0);
-  rb_define_module_function(mXML, "enabled_ftp?", rxml_enabled_ftp_q, 0);
-  rb_define_module_function(mXML, "enabled_http?", rxml_enabled_http_q, 0);
-  rb_define_module_function(mXML, "enabled_html?", rxml_enabled_html_q, 0);
-  rb_define_module_function(mXML, "enabled_iconv?", rxml_enabled_iconv_q, 0);
-  rb_define_module_function(mXML, "enabled_memory_debug?", rxml_enabled_memory_debug_location_q, 0);
-  rb_define_module_function(mXML, "enabled_regexp?", rxml_enabled_regexp_q, 0);
-  rb_define_module_function(mXML, "enabled_schemas?", rxml_enabled_schemas_q, 0);
-  rb_define_module_function(mXML, "enabled_thread?", rxml_enabled_thread_q, 0);
-  rb_define_module_function(mXML, "enabled_unicode?", rxml_enabled_unicode_q, 0);
-  rb_define_module_function(mXML, "enabled_xinclude?", rxml_enabled_xinclude_q, 0);
-  rb_define_module_function(mXML, "enabled_xpath?", rxml_enabled_xpath_q, 0);
-  rb_define_module_function(mXML, "enabled_xpointer?", rxml_enabled_xpointer_q, 0);
-  rb_define_module_function(mXML, "enabled_zlib?", rxml_enabled_zlib_q, 0);
-
-  rb_define_module_function(mXML, "catalog_dump", rxml_catalog_dump, 0);
-  rb_define_module_function(mXML, "catalog_remove", rxml_catalog_remove, 1);
-  rb_define_module_function(mXML, "check_lib_versions", rxml_check_lib_versions, 0);
-  rb_define_module_function(mXML, "debug_entities", rxml_debug_entities_get, 0);
-  rb_define_module_function(mXML, "debug_entities=", rxml_debug_entities_set, 1);
-  rb_define_module_function(mXML, "default_compression", rxml_default_compression_get, 0);
-  rb_define_module_function(mXML, "default_compression=", rxml_default_compression_set, 1);
-  rb_define_module_function(mXML, "default_keep_blanks", rxml_default_keep_blanks_get, 0);
-  rb_define_module_function(mXML, "default_keep_blanks=", rxml_default_keep_blanks_set, 1);
-  rb_define_module_function(mXML, "default_load_external_dtd", rxml_default_load_external_dtd_get, 0);
-  rb_define_module_function(mXML, "default_load_external_dtd=", rxml_default_load_external_dtd_set, 1);
-  rb_define_module_function(mXML, "default_line_numbers", rxml_default_line_numbers_get, 0);
-  rb_define_module_function(mXML, "default_line_numbers=", rxml_default_line_numbers_set, 1);
-  rb_define_module_function(mXML, "default_pedantic_parser", rxml_default_pedantic_parser_get, 0);
-  rb_define_module_function(mXML, "default_pedantic_parser=", rxml_default_pedantic_parser_set, 1);
-  rb_define_module_function(mXML, "default_substitute_entities", rxml_default_substitute_entities_get, 0);
-  rb_define_module_function(mXML, "default_substitute_entities=", rxml_default_substitute_entities_set, 1);
-  rb_define_module_function(mXML, "default_tree_indent_string", rxml_default_tree_indent_string_get, 0);
-  rb_define_module_function(mXML, "default_tree_indent_string=", rxml_default_tree_indent_string_set, 1);
-  rb_define_module_function(mXML, "default_validity_checking", rxml_default_validity_checking_get, 0);
-  rb_define_module_function(mXML, "default_validity_checking=", rxml_default_validity_checking_set, 1);
-  rb_define_module_function(mXML, "default_warnings", rxml_default_warnings_get, 0);
-  rb_define_module_function(mXML, "default_warnings=", rxml_default_warnings_set, 1);
-  rb_define_module_function(mXML, "features", rxml_features, 0);
-  rb_define_module_function(mXML, "indent_tree_output", rxml_indent_tree_output_get, 0);
-  rb_define_module_function(mXML, "indent_tree_output=", rxml_indent_tree_output_set, 1);
-  rb_define_module_function(mXML, "memory_dump", rxml_memory_dump, 0);
-  rb_define_module_function(mXML, "memory_used", rxml_memory_used, 0);
 
-  /* Now initialize all the other modules */
+  rxml_init_memory();
+  rxml_init_xml();
   rxml_init_io();
-  ruby_init_xml_error();
-  ruby_init_xml_encoding();
-  ruby_init_state();
-  ruby_init_parser();
-  ruby_init_xml_parser_context();
-  ruby_init_parser_options();
-  ruby_init_xml_node();
-  ruby_init_xml_attributes();
-  ruby_init_xml_attr();
-  ruby_init_xml_attr_decl();
-  ruby_init_xml_document();
-  ruby_init_xml_namespaces();
-  ruby_init_xml_namespace();
-  ruby_init_xml_sax_parser();
-  ruby_init_xml_sax2_handler();
-  ruby_init_xml_xinclude();
-  ruby_init_xml_xpath();
-  ruby_init_xml_xpath_context();
-  ruby_init_xml_xpath_expression();
-  ruby_init_xml_xpointer();
-  ruby_init_html_parser();
-  ruby_init_html_parser_options();
-  ruby_init_html_parser_context();
-  ruby_init_input_callbacks();
-  ruby_init_xml_dtd();
-  ruby_init_xml_schema();
-  ruby_init_xml_relaxng();
-  ruby_init_xml_reader();
+  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();
 }