RubyGems - libxml-ruby - Versions diffs - 0.8.0 → 0.8.1 - Mend

libxml-ruby 0.8.0 → 0.8.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (92) hide show

data/doc/{index.html → rdoc/index.html} RENAMED

@@ -5,12 +5,12 @@
 <!--
-    libxml-ruby
+    LibXML
   -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <title>libxml-ruby</title>
+  <title>LibXML</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 </head>
 <frameset rows="20%, 80%">

data/doc/{rdoc-style.css → rdoc/rdoc-style.css} RENAMED

File without changes

data/ext/libxml/extconf.rb CHANGED

@@ -11,147 +11,105 @@ def method_missing(s, *args)
   end
 end
+require 'mkmf'
-if RUBY_PLATFORM =~ /win32/  # FIXME: Make more robust
-  # We can't use Ruby's standard build procedures
-  # on Windows because the Ruby executable is
-  # built with VC++ while here we want to build
-  # with MingW.  So just roll our own...
-  target = "libxml"
-  #RUBY_INCLUDE_DIR = Config::CONFIG["archdir"]
-  #RUBY_BIN_DIR = Config::CONFIG["bindir"]
-  #RUBY_LIB_DIR = Config::CONFIG["libdir"]
-  #RUBY_SHARED_LIB = Config::CONFIG["LIBRUBY"]
-  #RUBY_SHARED_DLL = RUBY_SHARED_LIB.gsub(/lib$/, 'dll')
-  #CLEAN.include('*.o')
-  #CLOBBER.include('ruby_prof.so')
-  srcs = Dir['../ext/*.c']
-  objs = srcs.collect do |srcfile|
-    srcfile = File.basename(srcfile)
-    srcfile.chomp(File.extname(srcfile) + '.o')
-  end
-  #srcs.each do |srcfile|
-  #  srcfile = File.basename(srcfile)
-  #  objfile = srcfile.chomp(File.extname(srcfile) + '.o')
-  #
-  #  if File.mtime(objfile) < File.mtime(srcfile)
-  #    system "gcc -c -fPIC -O2 -Wall -o #{objfile} #{srcfile} -I#{RUBY_INCLUDE_DIR}"
-  #  end
-  #end
-  #system "gcc -shared -o #{LIBNAME} #{obj} #{RUBY_BIN_DIR}/#{RUBY_SHARED_DLL}"
-  makefile_template = DATA.read
-  makefile = eval(makefile_template)
-  File.open('Makefile', 'w'){ |f| f << makefile }
-else
-  require 'mkmf'
-  if defined?(CFLAGS)
-    if CFLAGS.index(CONFIG['CCDLFLAGS'])
-      $CFLAGS = CFLAGS
-    else
-      $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
-    end
+if defined?(CFLAGS)
+  if CFLAGS.index(CONFIG['CCDLFLAGS'])
+    $CFLAGS = CFLAGS + ' ' + CONFIG['CCDLFLAGS']
   else
-    $CFLAGS = CONFIG['CFLAGS']
+    $CFLAGS = CFLAGS
   end
-  $LDFLAGS = CONFIG['LDFLAGS']
-  $LIBPATH.push(Config::CONFIG['libdir'])
+else
+  $CFLAGS = CONFIG['CFLAGS']
+end
+$LDFLAGS = CONFIG['LDFLAGS']
+$LIBPATH.push(Config::CONFIG['libdir'])
-  def crash(str)
-    printf(" extconf failure: %s\n", str)
-    exit 1
-  end
+def crash(str)
+  printf(" extconf failure: %s\n", str)
+  exit 1
+end
-  dir_config('iconv')
-  dir_config('xml2')
-  dir_config('zlib')
+dir_config('iconv')
+dir_config('xml2')
+dir_config('zlib')
-  have_library('socket','socket')
-  have_library('nsl','gethostbyname')
+have_library('socket','socket')
+have_library('nsl','gethostbyname')
+unless have_library('m', 'atan')
+  # try again for gcc 4.0
+  saveflags = $CFLAGS
+  $CFLAGS += ' -fno-builtin'
   unless have_library('m', 'atan')
-    # try again for gcc 4.0
-    saveflags = $CFLAGS
-    $CFLAGS += ' -fno-builtin'
-    unless have_library('m', 'atan')
-      crash('need libm')
-    end
-    $CFLAGS = saveflags
+    crash('need libm')
   end
+  $CFLAGS = saveflags
+end
-  unless have_library('z', 'inflate') or
-         have_library('zlib', 'inflate') or
-         have_library('zlib1', 'inflate')
-    crash('need zlib')
-  else
-    $defs.push('-DHAVE_ZLIB_H')
-  end
+unless have_library('z', 'inflate') or
+       have_library('zlib', 'inflate') or
+       have_library('zlib1', 'inflate')
+  crash('need zlib')
+else
+  $defs.push('-DHAVE_ZLIB_H')
+end
-  unless have_library('iconv','iconv_open') or
-         have_library('iconv','libiconv_open') or
-         have_library('libiconv', 'libiconv_open') or
-         have_library('libiconv', 'iconv_open') or
-         have_library('c','iconv_open') or
-         have_library('recode','iconv_open') or
-         have_library('iconv')
-    crash(<<EOL)
+unless have_library('iconv','iconv_open') or
+       have_library('iconv','libiconv_open') or
+       have_library('libiconv', 'libiconv_open') or
+       have_library('libiconv', 'iconv_open') or
+       have_library('c','iconv_open') or
+       have_library('recode','iconv_open') or
+       have_library('iconv')
+  crash(<<EOL)
 need libiconv.
-  Install the libiconv or try passing one of the following options
-  to extconf.rb:
+Install the libiconv or try passing one of the following options
+to extconf.rb:
-    --with-iconv-dir=/path/to/iconv
-    --with-iconv-lib=/path/to/iconv/lib
-    --with-iconv-include=/path/to/iconv/include
+  --with-iconv-dir=/path/to/iconv
+  --with-iconv-lib=/path/to/iconv/lib
+  --with-iconv-include=/path/to/iconv/include
 EOL
-  end
+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",
-                      '/opt/include/libxml2',
-                      '/usr/local/include/libxml2',
-                      '/usr/include/libxml2'))
-    crash(<<EOL)
+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",
+                    '/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:
+    Install the library or try one of the following options to extconf.rb:
-        --with-xml2-dir=/path/to/libxml2
-        --with-xml2-lib=/path/to/libxml2/lib
-        --with-xml2-include=/path/to/libxml2/include
+      --with-xml2-dir=/path/to/libxml2
+      --with-xml2-lib=/path/to/libxml2/lib
+      --with-xml2-include=/path/to/libxml2/include
 EOL
-  end
+end
-  unless have_func('xmlDocFormatDump')
-    crash('Your version of libxml2 is too old.  Please upgrade.')
-  end
+unless have_func('xmlDocFormatDump')
+  crash('Your version of libxml2 is too old.  Please upgrade.')
+end
-  unless have_func('docbCreateFileParserCtxt')
-    crash('Need docbCreateFileParserCtxt')
-  end
+unless have_func('docbCreateFileParserCtxt')
+  crash('Need docbCreateFileParserCtxt')
+end
-  $CFLAGS << ' ' << $INCFLAGS
-  #$INSTALLFILES = [["libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
+# For FreeBSD add /usr/local/include
+$INCFLAGS << " -I/usr/local/include"
-  create_header()
-  create_makefile('libxml_ruby')
-end
+$CFLAGS << ' ' << $INCFLAGS
+#$INSTALLFILES = [["libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
+create_header()
+create_makefile('libxml_ruby')
 __END__

data/ext/libxml/ruby_xml_node.c CHANGED

@@ -19,38 +19,6 @@ check_string_or_symbol( VALUE val ) {
   return rb_obj_as_string( val );
 }
-/*
- * call-seq:
- *    node.attribute? -> (true|false)
- *
- * Determine whether this is an attribute node,
- */
-VALUE
-ruby_xml_node_attribute_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_ATTRIBUTE_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
-/*
- * call-seq:
- *    node.attribute_decl? -> (true|false)
- *
- * Determine whether this is an attribute declaration node,
- */
-VALUE
-ruby_xml_node_attribute_decl_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_ATTRIBUTE_DECL)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
  * call-seq:
@@ -101,40 +69,6 @@ ruby_xml_node_base_set(VALUE self, VALUE uri) {
 }
-/*
- * call-seq:
- *    node.cdata? -> (true|false)
- *
- * Determine whether this is a #CDATA node
- */
-VALUE
-ruby_xml_node_cdata_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_CDATA_SECTION_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
-/*
- * call-seq:
- *    node.comment? -> (true|false)
- *
- * Determine whether this is a comment node
- */
-VALUE
-ruby_xml_node_comment_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_COMMENT_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
  * call-seq:
  *    node.content -> "string"
@@ -352,79 +286,6 @@ ruby_xml_node_doc(VALUE self) {
 }
-/*
- * call-seq:
- *    node.docbook? -> (true|false)
- *
- * Determine whether this is a docbook node.
- */
-VALUE
-ruby_xml_node_docbook_doc_q(VALUE self) {
-#ifdef LIBXML_DOCB_ENABLED
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_DOCB_DOCUMENT_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-#else
-  rb_warn("libxml compiled without docbook support");
-  return(Qfalse);
-#endif
-}
-/*
- * call-seq:
- *    node.doctype? -> (true|false)
- *
- * Determine whether this is a DOCTYPE node.
- */
-VALUE
-ruby_xml_node_doctype_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_DOCUMENT_TYPE_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
-/*
- * call-seq:
- *    node.document? -> (true|false)
- *
- * Determine whether this is a document node.
- */
-VALUE
-ruby_xml_node_document_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_DOCUMENT_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
-/*
- * call-seq:
- *    node.dtd? -> (true|false)
- *
- * Determine whether this is a DTD node.
- */
-VALUE
-ruby_xml_node_dtd_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_DTD_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
  * call-seq:
  *    node.dump -> (true|nil)
@@ -472,7 +333,7 @@ ruby_xml_node_debug_dump(VALUE self) {
  * call-seq:
  *    node.each -> XML::Node
  *
- * Iterates over all of this node's children, including text
+ * Iterates over this node's children, including text
  * nodes, element nodes, etc.  If you wish to iterate
  * only over child elements, use XML::Node#each_element.
  *
@@ -494,39 +355,6 @@ ruby_xml_node_each(VALUE self) {
   return Qnil;
 }
-/*
- * call-seq:
- *    node.element? -> (true|false)
- *
- * Determine whether this is an element node.
- */
-VALUE
-ruby_xml_node_element_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_ELEMENT_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
-/*
- * call-seq:
- *    node.element_decl? -> (true|false)
- *
- * Determine whether this is an element declaration node.
- */
-VALUE
-ruby_xml_node_element_decl_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_ELEMENT_DECL)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
  * call-seq:
@@ -545,39 +373,6 @@ ruby_xml_node_empty_q(VALUE self) {
 }
-/*
- * call-seq:
- *    node.entity? -> (true|false)
- *
- * Determine whether this is an entity node.
- */
-VALUE
-ruby_xml_node_entity_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_ENTITY_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
-/*
- * call-seq:
- *    node.entity_ref? -> (true|false)
- *
- * Determine whether this is an entity reference node.
- */
-VALUE
-ruby_xml_node_entity_ref_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_ENTITY_REF_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 VALUE ruby_xml_node_to_s(VALUE self);
 /*
@@ -610,40 +405,6 @@ ruby_xml_node_eql_q(VALUE self, VALUE other) {
   }
 }
-/*
- * call-seq:
- *    node.fragment? -> (true|false)
- *
- * Determine whether this node is a fragment.
- */
-VALUE
-ruby_xml_node_fragment_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_DOCUMENT_FRAG_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
-/*
- * call-seq:
- *    node.html_doc? -> (true|false)
- *
- * Determine whether this node is an html document node.
- */
-VALUE
-ruby_xml_node_html_doc_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_HTML_DOCUMENT_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
  * call-seq:
  *    XML::Node.new_cdata(content = nil) -> XML::Node
@@ -1065,23 +826,6 @@ ruby_xml_node_namespace_set(int argc, VALUE *argv, VALUE self) {
 }
-/*
- * call-seq:
- *    node.namespace? -> (true|false)
- *
- * Determine whether this node *is* (not has) a namespace
- * node.
- */
-VALUE
-ruby_xml_node_namespace_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_NAMESPACE_DECL)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
  * memory2 implementation: xmlNode->_private holds a reference
  * to the wrapping ruby object VALUE when there is one.
@@ -1279,32 +1023,32 @@ ruby_xml_node_next_set(VALUE self, VALUE rnode) {
 /*
  * call-seq:
- *    node.notation? -> (true|false)
+ *    node.ns? -> (true|false)
  *
- * Determine whether this is a notation node
+ * Determine whether this node has a namespace.
  */
 VALUE
-ruby_xml_node_notation_q(VALUE self) {
+ruby_xml_node_ns_q(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_NOTATION_NODE)
-    return(Qtrue);
-  else
+  if (xnode->ns == NULL)
     return(Qfalse);
+  else
+    return(Qtrue);
 }
 /*
  * call-seq:
- *    node.ns? -> (true|false)
+ *    node.ns_def? -> (true|false)
  *
- * Determine whether this node is a namespace node.
+ * Obtain an array of +XML::NS+ objects representing
+ * this node's xmlns attributes
  */
 VALUE
-ruby_xml_node_ns_q(VALUE self) {
+ruby_xml_node_ns_def_q(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->ns == NULL)
+  if (xnode->nsDef == NULL)
     return(Qfalse);
   else
     return(Qtrue);
@@ -1328,24 +1072,6 @@ ruby_xml_node_ns_def_get(VALUE self) {
 }
-/*
- * call-seq:
- *    node.ns_def? -> (true|false)
- *
- * Obtain an array of +XML::NS+ objects representing
- * this node's xmlns attributes
- */
-VALUE
-ruby_xml_node_ns_def_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->nsDef == NULL)
-    return(Qfalse);
-  else
-    return(Qtrue);
-}
 /*
  * call-seq:
  *    node.parent -> XML::Node
@@ -1386,23 +1112,6 @@ ruby_xml_node_path(VALUE self) {
 }
-/*
- * call-seq:
- *    node.pi? -> (true|false)
- *
- * Determine whether this is a processing instruction node.
- */
-VALUE
-ruby_xml_node_pi_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_PI_NODE)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
  * call-seq:
  *    node.pointer -> XML::Node_set
@@ -1477,7 +1186,6 @@ ruby_xml_node_prev_set(VALUE self, VALUE rnode) {
   return(ruby_xml_node2_wrap(cXMLNode, ret));
 }
 /*
  * call-seq:
  *    node.attributes -> attributes
@@ -1489,12 +1197,7 @@ ruby_xml_node_attributes_get(VALUE self) {
   xmlNodePtr xnode;
   Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_ELEMENT_NODE) {
-    return ruby_xml_attributes_new(xnode);
-  } else {
-    return(Qnil);
-  }
+  return ruby_xml_attributes_new(xnode);
 }
 /*
@@ -1523,24 +1226,6 @@ ruby_xml_node_property_set(VALUE self, VALUE name, VALUE value) {
 }
-/*
- * call-seq:
- *    node.attributes? -> (true|false)
- *
- * Determine whether this node has properties
- * (attributes).
- */
-VALUE
-ruby_xml_node_attributes_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_ELEMENT_NODE && xnode->properties != NULL)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
  * call-seq:
 *    node.remove! -> nil
@@ -1653,24 +1338,6 @@ ruby_xml_node_space_preserve_set(VALUE self, VALUE bool) {
   return(Qnil);
 }
-/*
- * call-seq:
- *    node.text? -> (true|false)
- *
- * Determine whether this node has text.
- */
-VALUE
-ruby_xml_node_text_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode == NULL)
-    return(Qnil);
-  return((xmlNodeIsText(xnode) == 1) ? Qtrue : Qfalse);
-}
 /*
  * call-seq:
  *    node.to_s -> "string"
@@ -1708,38 +1375,6 @@ ruby_xml_node_type(VALUE self) {
 }
-/*
- * call-seq:
- *    node.xinclude_end? -> num
- *
- * Determine whether this node is an xinclude end node.
- */
-VALUE
-ruby_xml_node_xinclude_end_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_XINCLUDE_END)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
-/*
- * call-seq:
- *    node.xinclude_start? -> num
- *
- * Determine whether this node is an xinclude start node.
- */
-VALUE
-ruby_xml_node_xinclude_start_q(VALUE self) {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  if (xnode->type == XML_XINCLUDE_START)
-    return(Qtrue);
-  else
-    return(Qfalse);
-}
 /*
@@ -1898,34 +1533,19 @@ ruby_init_xml_node(void) {
   /* Rest of the node api */
-  rb_define_method(cXMLNode, "attribute?", ruby_xml_node_attribute_q, 0);
-  rb_define_method(cXMLNode, "attribute_decl?", ruby_xml_node_attribute_decl_q, 0);
   rb_define_method(cXMLNode, "attributes", ruby_xml_node_attributes_get, 0);
-  rb_define_method(cXMLNode, "attributes?", ruby_xml_node_attributes_q, 0);
   rb_define_method(cXMLNode, "base", ruby_xml_node_base_get, 0);
   rb_define_method(cXMLNode, "base=", ruby_xml_node_base_set, 1);
   rb_define_method(cXMLNode, "blank?", ruby_xml_node_empty_q, 0);
-  rb_define_method(cXMLNode, "cdata?", ruby_xml_node_cdata_q, 0);
-  rb_define_method(cXMLNode, "comment?", ruby_xml_node_comment_q, 0);
   rb_define_method(cXMLNode, "copy", ruby_xml_node_copy, 1);
   rb_define_method(cXMLNode, "content", ruby_xml_node_content_get, 0);
   rb_define_method(cXMLNode, "content=", ruby_xml_node_content_set, 1);
   rb_define_method(cXMLNode, "content_stripped", ruby_xml_node_content_stripped_get, 0);
   rb_define_method(cXMLNode, "doc", ruby_xml_node_doc, 0);
-  rb_define_method(cXMLNode, "docbook_doc?", ruby_xml_node_docbook_doc_q, 0);
-  rb_define_method(cXMLNode, "doctype?", ruby_xml_node_doctype_q, 0);
-  rb_define_method(cXMLNode, "document?", ruby_xml_node_document_q, 0);
-  rb_define_method(cXMLNode, "dtd?", ruby_xml_node_dtd_q, 0);
   rb_define_method(cXMLNode, "dump", ruby_xml_node_dump, 0);
   rb_define_method(cXMLNode, "debug_dump", ruby_xml_node_debug_dump, 0);
-  rb_define_method(cXMLNode, "element?", ruby_xml_node_element_q, 0);
-  rb_define_method(cXMLNode, "element_decl?", ruby_xml_node_element_decl_q, 0);
   rb_define_method(cXMLNode, "empty?", ruby_xml_node_empty_q, 0);
-  rb_define_method(cXMLNode, "entity?", ruby_xml_node_entity_q, 0);
-  rb_define_method(cXMLNode, "entity_ref?", ruby_xml_node_entity_ref_q, 0);
   rb_define_method(cXMLNode, "eql?", ruby_xml_node_eql_q, 1);
-  rb_define_method(cXMLNode, "fragment?", ruby_xml_node_fragment_q, 0);
-  rb_define_method(cXMLNode, "html_doc?", ruby_xml_node_html_doc_q, 0);
   rb_define_method(cXMLNode, "lang", ruby_xml_node_lang_get, 0);
   rb_define_method(cXMLNode, "lang=", ruby_xml_node_lang_set, 1);
   rb_define_method(cXMLNode, "line_num", ruby_xml_node_line_num, 0);
@@ -1933,32 +1553,25 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "name=", ruby_xml_node_name_set, 1);
   rb_define_method(cXMLNode, "namespace", ruby_xml_node_namespace_get, 0);
   rb_define_method(cXMLNode, "namespace_node", ruby_xml_node_namespace_get_node, 0);
-  rb_define_method(cXMLNode, "namespace?", ruby_xml_node_namespace_q, 0);
   rb_define_method(cXMLNode, "namespace=", ruby_xml_node_namespace_set, -1);
   rb_define_method(cXMLNode, "node_type", ruby_xml_node_type, 0);
-  rb_define_method(cXMLNode, "notation?", ruby_xml_node_notation_q, 0);
   rb_define_method(cXMLNode, "ns", ruby_xml_node_namespace_get, 0);
   rb_define_method(cXMLNode, "ns?", ruby_xml_node_ns_q, 0);
-  rb_define_method(cXMLNode, "ns_def", ruby_xml_node_ns_def_get, 0);
   rb_define_method(cXMLNode, "ns_def?", ruby_xml_node_ns_def_q, 0);
+  rb_define_method(cXMLNode, "ns_def", ruby_xml_node_ns_def_get, 0);
   rb_define_method(cXMLNode, "path", ruby_xml_node_path, 0);
-  rb_define_method(cXMLNode, "pi?", ruby_xml_node_pi_q, 0);
   rb_define_method(cXMLNode, "pointer", ruby_xml_node_pointer, 1);
   rb_define_method(cXMLNode, "remove!", ruby_xml_node_remove_ex, 0);
   rb_define_method(cXMLNode, "search_ns", ruby_xml_node_search_ns, 1);
   rb_define_method(cXMLNode, "search_href", ruby_xml_node_search_href, 1);
   rb_define_method(cXMLNode, "space_preserve", ruby_xml_node_space_preserve_get, 0);
   rb_define_method(cXMLNode, "space_preserve=", ruby_xml_node_space_preserve_set, 1);
-  rb_define_method(cXMLNode, "text?", ruby_xml_node_text_q, 0);
   rb_define_method(cXMLNode, "to_s", ruby_xml_node_to_s, 0);
-  rb_define_method(cXMLNode, "xinclude_end?", ruby_xml_node_xinclude_end_q, 0);
-  rb_define_method(cXMLNode, "xinclude_start?", ruby_xml_node_xinclude_start_q, 0);
   rb_define_method(cXMLNode, "xlink?", ruby_xml_node_xlink_q, 0);
   rb_define_method(cXMLNode, "xlink_type", ruby_xml_node_xlink_type, 0);
   rb_define_method(cXMLNode, "xlink_type_name", ruby_xml_node_xlink_type_name, 0);
   rb_define_alias(cXMLNode, "==", "eql?");
-  rb_define_alias(cXMLNode, "properties?", "attributes?");
   /* :nodoc: */
   {