libxml-ruby 1.1.4 → 2.0.0

data/ext/libxml/ruby_xml_sax_parser.c

@@ -102,14 +102,13 @@ static VALUE rxml_sax_parser_parse(VALUE self)
   if (ctxt->sax != (xmlSAXHandlerPtr) &xmlDefaultSAXHandler)
     xmlFree(ctxt->sax);
     
-  ctxt->sax = (xmlSAXHandlerPtr)&rxml_sax_handler;
+  ctxt->sax = (xmlSAXHandlerPtr) xmlMalloc(sizeof(rxml_sax_handler));
+  if (ctxt->sax == NULL)
+    rb_fatal("Not enough memory.");
+  memcpy(ctxt->sax, &rxml_sax_handler, sizeof(rxml_sax_handler));
     
   status = xmlParseDocument(ctxt);
 
-  /* IMPORTANT - null the handle to our sax handler
-     so libxml doesn't try to free it.*/
-  ctxt->sax = NULL;
-  
   /* Now check the parsing result*/
   if (status == -1 || !ctxt->wellFormed)
   {

data/ext/libxml/ruby_xml_version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "1.1.4"
-#define RUBY_LIBXML_VERNUM   114
-#define RUBY_LIBXML_VER_MAJ   1
-#define RUBY_LIBXML_VER_MIN   1
-#define RUBY_LIBXML_VER_MIC   4
+#define RUBY_LIBXML_VERSION  "2.0.0"
+#define RUBY_LIBXML_VERNUM   200
+#define RUBY_LIBXML_VER_MAJ   2
+#define RUBY_LIBXML_VER_MIN   0
+#define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/libxml/ruby_xml_xpath_context.c

@@ -155,8 +155,8 @@ static VALUE rxml_xpath_context_register_namespaces_from_node(VALUE self,
        Skip it for now. */
       if (xns->prefix)
       {
-        VALUE prefix = rb_str_new2((const char*)xns->prefix);
-        VALUE uri = rb_str_new2((const char*)xns->href);
+        VALUE prefix = rxml_str_new2((const char*)xns->prefix, xctxt->doc->encoding);
+        VALUE uri = rxml_str_new2((const char*)xns->href, xctxt->doc->encoding);
         rxml_xpath_context_register_namespace(self, prefix, uri);
       }
       xns = xns->next;
@@ -167,7 +167,7 @@ static VALUE rxml_xpath_context_register_namespaces_from_node(VALUE self,
   return self;
 }
 
-static int iterate_ns_hash(st_data_t prefix, st_data_t uri, st_data_t self)
+static int iterate_ns_hash(VALUE prefix, VALUE uri, VALUE self)
 {
   rxml_xpath_context_register_namespace(self, prefix, uri);
   return ST_CONTINUE;
@@ -192,6 +192,9 @@ static VALUE rxml_xpath_context_register_namespaces(VALUE self, VALUE nslist)
   char *cp;
   long i;
   VALUE rprefix, ruri;
+  xmlXPathContextPtr xctxt;
+
+  Data_Get_Struct(self, xmlXPathContext, xctxt);
 
   /* Need to loop through the 2nd argument and iterate through the
    * list of namespaces that we want to allow */
@@ -208,7 +211,7 @@ static VALUE rxml_xpath_context_register_namespaces(VALUE self, VALUE nslist)
     {
       rprefix = rb_str_new(StringValuePtr(nslist), (int) ((long) cp
           - (long) StringValuePtr(nslist)));
-      ruri = rb_str_new2(&cp[1]);
+      ruri = rxml_str_new2(&cp[1], xctxt->doc->encoding);
     }
     /* Should test the results of this */
     rxml_xpath_context_register_namespace(self, rprefix, ruri);
@@ -220,7 +223,7 @@ static VALUE rxml_xpath_context_register_namespaces(VALUE self, VALUE nslist)
     }
     break;
   case T_HASH:
-    st_foreach(RHASH_TBL(nslist), iterate_ns_hash, self);
+    rb_hash_foreach(nslist, iterate_ns_hash, self);
     break;
   default:
     rb_raise(
@@ -306,7 +309,7 @@ static VALUE rxml_xpath_context_find(VALUE self, VALUE xpath_expr)
     xmlXPathFreeObject(xobject);
     break;
   case XPATH_STRING:
-    result = rb_str_new2((const char*)xobject->stringval);
+    result = rxml_str_new2((const char*)xobject->stringval, xctxt->doc->encoding);
     xmlXPathFreeObject(xobject);
     break;
   default:

data/ext/libxml/ruby_xml_xpath_object.c

@@ -295,7 +295,7 @@ static VALUE rxml_xpath_object_string(VALUE self)
   if (rxpop->xpop->stringval == NULL)
     return Qnil;
 
-  return rb_str_new2((const char*) rxpop->xpop->stringval);
+  return rxml_str_new2((const char*) rxpop->xpop->stringval, rxpop->xdoc->encoding);
 }
 
 /*

data/ext/vc/libxml_ruby.sln

@@ -1,9 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "libxml_ruby_18\libxml_ruby.vcproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby", "libxml_ruby_18\libxml_ruby.vcxproj", "{0B65CD1D-EEB9-41AE-93BB-75496E504152}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby_19", "libxml_ruby_19\libxml_ruby_19.vcproj", "{0E73156F-E619-4FD9-8327-113FE3CC942E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml_ruby_19", "libxml_ruby_19\libxml_ruby_19.vcxproj", "{0E73156F-E619-4FD9-8327-113FE3CC942E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

data/lib/libxml.rb

@@ -1,30 +1,30 @@
-# If running on Windows, then add the current directory to the PATH
-# for the current process so it can find the pre-built libxml2 and 
-# iconv2 shared libraries (dlls).
-if RUBY_PLATFORM.match(/mswin/i)
-  ENV['PATH'] += ";#{File.dirname(__FILE__)}"
-end
-
-# Load the C-based binding.
-require 'libxml_ruby'
-
-# Load Ruby supporting code.
-require 'libxml/error'
-require 'libxml/parser'
-require 'libxml/document'
-require 'libxml/namespaces'
-require 'libxml/namespace'
-require 'libxml/node'
-require 'libxml/ns'
-require 'libxml/attributes'
-require 'libxml/attr'
-require 'libxml/attr_decl'
-require 'libxml/tree'
-require 'libxml/reader'
-require 'libxml/html_parser'
-require 'libxml/sax_parser'
-require 'libxml/sax_callbacks'
-require 'libxml/xpath_object'
-
-# Deprecated
+# encoding: UTF-8
+
+# Load the C-based binding.
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/libxml_ruby"
+rescue LoadError
+  require "libxml_ruby"
+end
+
+# Load Ruby supporting code.
+require 'libxml/error'
+require 'libxml/parser'
+require 'libxml/document'
+require 'libxml/namespaces'
+require 'libxml/namespace'
+require 'libxml/node'
+require 'libxml/ns'
+require 'libxml/attributes'
+require 'libxml/attr'
+require 'libxml/attr_decl'
+require 'libxml/tree'
+require 'libxml/reader'
+require 'libxml/html_parser'
+require 'libxml/sax_parser'
+require 'libxml/sax_callbacks'
+require 'libxml/xpath_object'
+
+# Deprecated
 require 'libxml/properties'

data/lib/libxml/attr.rb

@@ -1,111 +1,113 @@
-module LibXML
-  module XML
-    class Attr 
-      include Enumerable
-
-      # call-seq:
-      #    attr.child? -> (true|false)
-      #
-      # Returns whether this attribute has child attributes.
-      #
-      def child?
-        not self.children.nil?
-      end
-
-      # call-seq:
-      #    attr.doc? -> (true|false)
-      #
-      # Determine whether this attribute is associated with an
-      # XML::Document.
-      def doc?
-        not self.doc.nil?
-      end
-
-      # call-seq:
-      #    attr.last? -> (true|false)
-      #
-      # Determine whether this is the last attribute.
-      def last?
-        self.last.nil?
-      end
-
-      # call-seq:
-      #    attr.next? -> (true|false)
-      #
-      # Determine whether there is a next attribute.
-      def next?
-        not self.next.nil?
-      end
-
-      # call-seq:
-      #    attr.ns? -> (true|false)
-      #
-      # Determine whether this attribute has an associated
-      # namespace.
-      def ns?
-        not self.ns.nil?
-      end
-
-      #
-      # call-seq:
-      #    attr.parent? -> (true|false)
-      #
-      # Determine whether this attribute has a parent.
-      def parent?
-        not self.parent.nil?
-      end
-
-      # call-seq:
-      #    attr.prev? -> (true|false)
-      #
-      # Determine whether there is a previous attribute.
-      def prev?
-        not self.prev.nil?
-      end
-
-      # Returns this node's type name
-      def node_type_name
-        if node_type == Node::ATTRIBUTE_NODE
-          'attribute'
-        else
-          raise(UnknownType, "Unknown node type: %n", node.node_type);
-        end
-      end
-
-      # Iterates nodes and attributes
-      def siblings(node, &blk)
-        if n = node
-          loop do
-            blk.call(n)
-            break unless n = n.next
-          end
-        end
-      end
-
-      def each_sibling(&blk)
-        siblings(self,&blk)
-      end
-  
-      alias :each_attr :each_sibling
-      alias :each :each_sibling
-  
-      def to_h
-        inject({}) do |h,a|
-          h[a.name] = a.value
-          h
-        end
-      end
-
-      def to_a
-        inject([]) do |ary,a| 
-          ary << [a.name, a.value]
-          ary
-        end
-      end
-  
-      def to_s
-        "#{name} = #{value}"
-      end
-    end
-  end
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class Attr 
+      include Enumerable
+
+      # call-seq:
+      #    attr.child? -> (true|false)
+      #
+      # Returns whether this attribute has child attributes.
+      #
+      def child?
+        not self.children.nil?
+      end
+
+      # call-seq:
+      #    attr.doc? -> (true|false)
+      #
+      # Determine whether this attribute is associated with an
+      # XML::Document.
+      def doc?
+        not self.doc.nil?
+      end
+
+      # call-seq:
+      #    attr.last? -> (true|false)
+      #
+      # Determine whether this is the last attribute.
+      def last?
+        self.last.nil?
+      end
+
+      # call-seq:
+      #    attr.next? -> (true|false)
+      #
+      # Determine whether there is a next attribute.
+      def next?
+        not self.next.nil?
+      end
+
+      # call-seq:
+      #    attr.ns? -> (true|false)
+      #
+      # Determine whether this attribute has an associated
+      # namespace.
+      def ns?
+        not self.ns.nil?
+      end
+
+      #
+      # call-seq:
+      #    attr.parent? -> (true|false)
+      #
+      # Determine whether this attribute has a parent.
+      def parent?
+        not self.parent.nil?
+      end
+
+      # call-seq:
+      #    attr.prev? -> (true|false)
+      #
+      # Determine whether there is a previous attribute.
+      def prev?
+        not self.prev.nil?
+      end
+
+      # Returns this node's type name
+      def node_type_name
+        if node_type == Node::ATTRIBUTE_NODE
+          'attribute'
+        else
+          raise(UnknownType, "Unknown node type: %n", node.node_type);
+        end
+      end
+
+      # Iterates nodes and attributes
+      def siblings(node, &blk)
+        if n = node
+          loop do
+            blk.call(n)
+            break unless n = n.next
+          end
+        end
+      end
+
+      def each_sibling(&blk)
+        siblings(self,&blk)
+      end
+  
+      alias :each_attr :each_sibling
+      alias :each :each_sibling
+  
+      def to_h
+        inject({}) do |h,a|
+          h[a.name] = a.value
+          h
+        end
+      end
+
+      def to_a
+        inject([]) do |ary,a| 
+          ary << [a.name, a.value]
+          ary
+        end
+      end
+  
+      def to_s
+        "#{name} = #{value}"
+      end
+    end
+  end
 end

data/lib/libxml/attr_decl.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 module LibXML
   module XML
     class AttrDecl

data/lib/libxml/attributes.rb

@@ -1,12 +1,14 @@
-module LibXML
-  module XML
-    class Attributes
-      def to_h
-        inject({}) do |hash, attr|
-          hash[attr.name] = attr.value
-          hash
-        end
-      end
-    end
-  end
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class Attributes
+      def to_h
+        inject({}) do |hash, attr|
+          hash[attr.name] = attr.value
+          hash
+        end
+      end
+    end
+  end
 end

data/lib/libxml/document.rb

@@ -1,190 +1,192 @@
-module LibXML
-  module XML
-    class Document
-      # call-seq:
-      #    XML::Document.document(document) -> XML::Document
-      #
-      # Creates a new document based on the specified document.
-      #
-      # Parameters:
-      #
-      #  document - A preparsed document.
-      def self.document(value)
-        Parser.document(value).parse
-      end
-
-      # call-seq:
-      #    XML::Document.file(path) -> XML::Document
-      #    XML::Document.file(path, :encoding => XML::Encoding::UTF_8,
-      #                             :options => XML::Parser::Options::NOENT) -> XML::Document
-      #
-      # Creates a new document from the specified file or uri.
-      #
-      # You may provide an optional hash table to control how the
-      # parsing is performed.  Valid options are:
-      #
-      #  encoding - The document encoding, defaults to nil. Valid values
-      #             are the encoding constants defined on XML::Encoding.
-      #  options - Parser options.  Valid values are the constants defined on
-      #            XML::Parser::Options.  Mutliple options can be combined
-      #            by using Bitwise OR (|).
-      def self.file(value, options = {})
-        Parser.file(value, options).parse
-      end
-
-      # call-seq:
-      #    XML::Document.io(io) -> XML::Document
-      #    XML::Document.io(io, :encoding => XML::Encoding::UTF_8,
-      #                         :options => XML::Parser::Options::NOENT
-      #                         :base_uri="http://libxml.org") -> XML::Document
-      #
-      # Creates a new document from the specified io object.
-      #
-      # Parameters:
-      #
-      #  io - io object that contains the xml to parser
-      #  base_uri - The base url for the parsed document.
-      #  encoding - The document encoding, defaults to nil. Valid values
-      #             are the encoding constants defined on XML::Encoding.
-      #  options - Parser options.  Valid values are the constants defined on
-      #            XML::Parser::Options.  Mutliple options can be combined
-      #            by using Bitwise OR (|).
-      def self.io(value, options = {})
-        Parser.io(value, options).parse
-      end
-
-      # call-seq:
-      #    XML::Document.string(string)
-      #    XML::Document.string(string, :encoding => XML::Encoding::UTF_8,
-      #                               :options => XML::Parser::Options::NOENT
-      #                               :base_uri="http://libxml.org") -> XML::Document
-      #
-      # Creates a new document from the specified string.
-      #
-      # You may provide an optional hash table to control how the
-      # parsing is performed.  Valid options are:
-      #
-      #  base_uri - The base url for the parsed document.
-      #  encoding - The document encoding, defaults to nil. Valid values
-      #             are the encoding constants defined on XML::Encoding.
-      #  options - Parser options.  Valid values are the constants defined on
-      #            XML::Parser::Options.  Mutliple options can be combined
-      #            by using Bitwise OR (|).
-      def self.string(value, options = {})
-        Parser.string(value, options).parse
-      end
-
-      # Returns a new XML::XPathContext for the document.
-      #
-      # call-seq:
-      #   document.context(namespaces=nil) -> XPath::Context
-      #
-      # Namespaces is an optional array of XML::NS objects
-      def context(nslist = nil)
-        context = XPath::Context.new(self)
-        context.node = self.root
-        context.register_namespaces_from_node(self.root)
-        context.register_namespaces(nslist) if nslist
-        context
-      end
-
-      # Return the nodes matching the specified xpath expression, 
-      # optionally using the specified namespace.  For more 
-      # information about working with namespaces, please refer
-      # to the XML::XPath documentation.
-      # 
-      # Parameters:
-      # * xpath - The xpath expression as a string
-      # * namespaces - An optional list of namespaces (see XML::XPath for information).
-      # * Returns - XML::XPath::Object
-      #
-      #  document.find('/foo', 'xlink:http://www.w3.org/1999/xlink')
-      #
-      # IMPORTANT - The returned XML::Node::Set must be freed before
-      # its associated document.  In a running Ruby program this will
-      # happen automatically via Ruby's mark and sweep garbage collector.
-      # However, if the program exits, Ruby does not guarantee the order
-      # in which objects are freed
-      # (see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/17700).
-      # As a result, the associated document may be freed before the node
-      # list, which will cause a segmentation fault.
-      # To avoid this, use the following (non-ruby like) coding style:
-      #
-      #  nodes = doc.find('/header')
-      #  nodes.each do |node|
-      #    ... do stuff ...
-      #  end
-      # #  nodes = nil #  GC.start
-      def find(xpath, nslist = nil)
-        self.context(nslist).find(xpath)
-      end
-    
-      # Return the first node matching the specified xpath expression.
-      # For more information, please refer to the documentation
-      # for XML::Document#find.
-      def find_first(xpath, nslist = nil)
-        find(xpath, nslist).first
-      end
-      
-      # Returns this node's type name    
-      def node_type_name
-        case node_type
-          when XML::Node::DOCUMENT_NODE
-            'document_xml'
-          when XML::Node::DOCB_DOCUMENT_NODE
-            'document_docbook'
-          when XML::Node::HTML_DOCUMENT_NODE
-            'document_html'
-          else
-            raise(UnknownType, "Unknown node type: %n", node.node_type);
-        end
-      end
-      # :enddoc:
-
-      # Specifies if this is an DOCTYPE node
-      def document?
-        node_type == XML::Node::DOCUMENT_NODE
-      end
-
-      # Specifies if this is an docbook node
-      def docbook_doc?
-        node_type == XML::Node::DOCB_DOCUMENT_NODE
-      end
-
-      # Specifies if this is an html node
-      def html_doc?
-        node_type == XML::Node::HTML_DOCUMENT_NODE
-      end
-
-      def dump
-        warn('Document#dump is deprecated.  Use Document#to_s instead.')
-        self.to_s
-      end
-
-      def format_dump
-        warn('Document#format_dump is deprecated.  Use Document#to_s instead.')
-        self.to_s
-      end
-
-      def debug_dump
-        warn('Document#debug_dump is deprecated.  Use Document#debug instead.')
-        self.debug
-      end
-
-      def debug_dump_head
-        warn('Document#debug_dump_head is deprecated.  Use Document#debug instead.')
-        self.debug
-      end
-
-      def debug_format_dump
-        warn('Document#debug_format_dump is deprecated.  Use Document#to_s instead.')
-        self.to_s
-      end
-
-      def reader
-        warn('Document#reader is deprecated.  Use XML::Reader.document(self) instead.')
-        XML::Reader.document(self)
-      end
-    end
-  end
-end  
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class Document
+      # call-seq:
+      #    XML::Document.document(document) -> XML::Document
+      #
+      # Creates a new document based on the specified document.
+      #
+      # Parameters:
+      #
+      #  document - A preparsed document.
+      def self.document(value)
+        Parser.document(value).parse
+      end
+
+      # call-seq:
+      #    XML::Document.file(path) -> XML::Document
+      #    XML::Document.file(path, :encoding => XML::Encoding::UTF_8,
+      #                             :options => XML::Parser::Options::NOENT) -> XML::Document
+      #
+      # Creates a new document from the specified file or uri.
+      #
+      # You may provide an optional hash table to control how the
+      # parsing is performed.  Valid options are:
+      #
+      #  encoding - The document encoding, defaults to nil. Valid values
+      #             are the encoding constants defined on XML::Encoding.
+      #  options - Parser options.  Valid values are the constants defined on
+      #            XML::Parser::Options.  Mutliple options can be combined
+      #            by using Bitwise OR (|).
+      def self.file(value, options = {})
+        Parser.file(value, options).parse
+      end
+
+      # call-seq:
+      #    XML::Document.io(io) -> XML::Document
+      #    XML::Document.io(io, :encoding => XML::Encoding::UTF_8,
+      #                         :options => XML::Parser::Options::NOENT
+      #                         :base_uri="http://libxml.org") -> XML::Document
+      #
+      # Creates a new document from the specified io object.
+      #
+      # Parameters:
+      #
+      #  io - io object that contains the xml to parser
+      #  base_uri - The base url for the parsed document.
+      #  encoding - The document encoding, defaults to nil. Valid values
+      #             are the encoding constants defined on XML::Encoding.
+      #  options - Parser options.  Valid values are the constants defined on
+      #            XML::Parser::Options.  Mutliple options can be combined
+      #            by using Bitwise OR (|).
+      def self.io(value, options = {})
+        Parser.io(value, options).parse
+      end
+
+      # call-seq:
+      #    XML::Document.string(string)
+      #    XML::Document.string(string, :encoding => XML::Encoding::UTF_8,
+      #                               :options => XML::Parser::Options::NOENT
+      #                               :base_uri="http://libxml.org") -> XML::Document
+      #
+      # Creates a new document from the specified string.
+      #
+      # You may provide an optional hash table to control how the
+      # parsing is performed.  Valid options are:
+      #
+      #  base_uri - The base url for the parsed document.
+      #  encoding - The document encoding, defaults to nil. Valid values
+      #             are the encoding constants defined on XML::Encoding.
+      #  options - Parser options.  Valid values are the constants defined on
+      #            XML::Parser::Options.  Mutliple options can be combined
+      #            by using Bitwise OR (|).
+      def self.string(value, options = {})
+        Parser.string(value, options).parse
+      end
+
+      # Returns a new XML::XPathContext for the document.
+      #
+      # call-seq:
+      #   document.context(namespaces=nil) -> XPath::Context
+      #
+      # Namespaces is an optional array of XML::NS objects
+      def context(nslist = nil)
+        context = XPath::Context.new(self)
+        context.node = self.root
+        context.register_namespaces_from_node(self.root)
+        context.register_namespaces(nslist) if nslist
+        context
+      end
+
+      # Return the nodes matching the specified xpath expression, 
+      # optionally using the specified namespace.  For more 
+      # information about working with namespaces, please refer
+      # to the XML::XPath documentation.
+      # 
+      # Parameters:
+      # * xpath - The xpath expression as a string
+      # * namespaces - An optional list of namespaces (see XML::XPath for information).
+      # * Returns - XML::XPath::Object
+      #
+      #  document.find('/foo', 'xlink:http://www.w3.org/1999/xlink')
+      #
+      # IMPORTANT - The returned XML::Node::Set must be freed before
+      # its associated document.  In a running Ruby program this will
+      # happen automatically via Ruby's mark and sweep garbage collector.
+      # However, if the program exits, Ruby does not guarantee the order
+      # in which objects are freed
+      # (see http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-core/17700).
+      # As a result, the associated document may be freed before the node
+      # list, which will cause a segmentation fault.
+      # To avoid this, use the following (non-ruby like) coding style:
+      #
+      #  nodes = doc.find('/header')
+      #  nodes.each do |node|
+      #    ... do stuff ...
+      #  end
+      # #  nodes = nil #  GC.start
+      def find(xpath, nslist = nil)
+        self.context(nslist).find(xpath)
+      end
+    
+      # Return the first node matching the specified xpath expression.
+      # For more information, please refer to the documentation
+      # for XML::Document#find.
+      def find_first(xpath, nslist = nil)
+        find(xpath, nslist).first
+      end
+      
+      # Returns this node's type name    
+      def node_type_name
+        case node_type
+          when XML::Node::DOCUMENT_NODE
+            'document_xml'
+          when XML::Node::DOCB_DOCUMENT_NODE
+            'document_docbook'
+          when XML::Node::HTML_DOCUMENT_NODE
+            'document_html'
+          else
+            raise(UnknownType, "Unknown node type: %n", node.node_type);
+        end
+      end
+      # :enddoc:
+
+      # Specifies if this is an DOCTYPE node
+      def document?
+        node_type == XML::Node::DOCUMENT_NODE
+      end
+
+      # Specifies if this is an docbook node
+      def docbook_doc?
+        node_type == XML::Node::DOCB_DOCUMENT_NODE
+      end
+
+      # Specifies if this is an html node
+      def html_doc?
+        node_type == XML::Node::HTML_DOCUMENT_NODE
+      end
+
+      def dump
+        warn('Document#dump is deprecated.  Use Document#to_s instead.')
+        self.to_s
+      end
+
+      def format_dump
+        warn('Document#format_dump is deprecated.  Use Document#to_s instead.')
+        self.to_s
+      end
+
+      def debug_dump
+        warn('Document#debug_dump is deprecated.  Use Document#debug instead.')
+        self.debug
+      end
+
+      def debug_dump_head
+        warn('Document#debug_dump_head is deprecated.  Use Document#debug instead.')
+        self.debug
+      end
+
+      def debug_format_dump
+        warn('Document#debug_format_dump is deprecated.  Use Document#to_s instead.')
+        self.to_s
+      end
+
+      def reader
+        warn('Document#reader is deprecated.  Use XML::Reader.document(self) instead.')
+        XML::Reader.document(self)
+      end
+    end
+  end
+end