libxml-ruby 0.3.6 → 0.3.8

data/CHANGELOG

@@ -1,14 +1,39 @@
-===== 21.2.2006 Ross Bamford <rosco@roscopeco.co.uk>
+===== 15.4.2006 Ross Bamford <rosco at roscopeco.co.uk>
+* Implemented SAX parser callback handling
+
+===== 12.4.2006 Ross Bamford <rosco at roscopeco.co.uk>
+* Integrated / tested community patches
+* Defined XML::Node (hash) equality in terms of XML representation
+
+===== 12.4.2006 Tim Yamin <plasmaroo at gentoo.org> (patches)
+* Fixed XML::Node#content inoperable bug
+* Fixed memory leak in same
+
+===== 12.4.2006 Mark Van Holstyn <mvette13 at gmail.com> (patches)
+* Added XML::Node::Set#first
+* Added XML::Node::Set#empty?
+* Fixes to XML::Node::Set#to_a
+* Added XML::Node#find_first
+* Added XML::Node#remove!
+
+===== 27.3.2006 Ross Bamford <rosco at roscopeco.co.uk>
+* Integrated contributed XML::Parser.register_error_handler patch
+
+===== 27.2.2006 Ross Bamford <rosco at roscopeco.co.uk>
+* Fixed all multiple symbol definitions for -fno-common.
+* Removed OSX -fno-common workaround.
+
+===== 21.2.2006 Ross Bamford <rosco at roscopeco.co.uk>
 * Patched extconf.rb with OSX -fno-common workaround
 * Added gem and packaging support to Rakefile
 * Moved version update to Rakefile
 * Removed legacy project utility scripts
 
-===== 19.2.2006 Ross Bamford <rosco@roscopeco.co.uk>
+===== 19.2.2006 Ross Bamford <rosco at roscopeco.co.uk>
 * Fixed doublefree bug in ruby_xml_attr.
 * Fixed small leak in parser
 
-===== 18.12.2005 Ross Bamford <rosco@roscopeco.co.uk>
+===== 18.12.2005 Ross Bamford <rosco at roscopeco.co.uk>
 * Updated for GCC 4.0 (community patches)
 * Fixed default validation bug
 * Refactored project, removed outdated files, cleaned up tests.

data/LICENSE

@@ -1,6 +1,6 @@
-# $Id: LICENSE,v 1.2 2005/12/29 19:00:01 bshow Exp $
+# $Id: LICENSE,v 1.3 2006/02/28 09:57:52 roscopeco Exp $
 
- Copyright (c) 2002-2005 Sean Chittenden <sean@chittenden.org> and contributors
+ Copyright (c) 2002-2006 Sean Chittenden <sean@chittenden.org> and contributors
  Copyright (c) 2001 Wai-Sun "Squidster" Chia <waisun.chia@compaq.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

data/README

@@ -2,13 +2,25 @@
 
 Installation is simple.  Follow the following steps:
 
-	$ ruby extconf.rb
-	$ make
-	# make install
+=== Rubygems
+
+  gem install libxml-ruby
+	
+=== Tarball/zip	
+
+  $ rake test
+  $ rake install
 
 If extconf yacks up an error, follow the instructions it provides.
-Once installed, look at the test scripts (*.rb, not extconf.rb) and
-make sure you run document_self.rb to see what's available.
+You will need to chdir to ext/xml and run 'ruby extconf.rb' to provide
+options, after which you can either use Rake for everything or 
+do with make (make && make install).
+
+Once installed, look at the test scripts (tests/*.rb), and run 
+'rake doc' to generate API documentation.
+You can find the latest documentation at:
+
+* http://libxml.rubyforge.org/doc
 
 == DEPENDENCIES
 
@@ -28,7 +40,9 @@ Basic usage for reading and writing documents.
 
 Writing a simple document:
 
+  # require 'rubygems' # if installed via Gems
 	require 'xml/libxml'
+	
 	doc = XML::Document.new()
 	doc.root = XML::Node.new('root_node')
 	root = doc.root
@@ -94,6 +108,7 @@ perform this operation.  This reads in and processes the above
 generated XML document, output.xml. This script assumes that the
 structure of the document is already known.
 
+  # require 'rubygems' # if installed via Gems
 	require 'xml/libxml'
 	doc = XML::Document.file('output.xml')
 	root = doc.root
@@ -126,4 +141,4 @@ And your terminal should look like:
 
 If you have any questions, please send email to libxml-devel@rubyforge.org.
 
-# $Id: README,v 1.2 2005/12/19 20:51:39 roscopeco Exp $
+# $Id: README,v 1.5 2006/04/24 19:29:49 roscopeco Exp $

data/Rakefile

@@ -71,14 +71,14 @@ task :test => :unittests
 
 Rake::TestTask.new(:alltests) do |t|
   t.test_files = FileList[
-    'tests/tc_*.rb',
+    'tests/runner.rb',
     'tests/contrib/*.rb',
   ]
   t.verbose = true
 end
                     
 Rake::TestTask.new(:unittests) do |t|
-  t.test_files = FileList['tests/tc_*.rb']
+  t.test_files = FileList['tests/runner.rb']
   t.verbose = false
 end
                           
@@ -98,7 +98,8 @@ rd = Rake::RDocTask.new(:doc) do |rdoc|
   rdoc.title    = "Libxml-Ruby API"
   rdoc.options << '--main' << 'README'
   rdoc.rdoc_files.include('README', 'LICENSE', 'TODO')
-  rdoc.rdoc_files.include('ext/xml/ruby_xml*.c', '*.rdoc')
+  rdoc.rdoc_files.include('ext/xml/ruby_xml*.c', 'ext/xml/*.rb')
+  rdoc.rdoc_files.include('*.rdoc')
 end
 
 desc "Publish the RDoc documentation to project web site"
@@ -119,9 +120,13 @@ end
 task :update_version do
   unless PKG_VERSION == CURRENT_VERSION
     File.open('ext/xml/libxml.h.new','w+') do |f|      
+    maj, min, mic = /(\d+)\.(\d+)(?:\.(\d+))?/.match(PKG_VERSION).captures
       f << File.read('ext/xml/libxml.h').
            gsub(/RUBY_LIBXML_VERSION\s+"(\d.+)"/) { "RUBY_LIBXML_VERSION  \"#{PKG_VERSION}\"" }.
-           gsub(/RUBY_LIBXML_VERNUM\s+\d+/) { "RUBY_LIBXML_VERNUM   #{PKG_VERSION.tr('.','')}" }
+           gsub(/RUBY_LIBXML_VERNUM\s+\d+/) { "RUBY_LIBXML_VERNUM   #{PKG_VERSION.tr('.','').sub(/^0*/,'')}" }.
+           gsub(/RUBY_LIBXML_VER_MAJ\s+\d+/) { "RUBY_LIBXML_VER_MAJ   #{maj}" }.
+           gsub(/RUBY_LIBXML_VER_MIN\s+\d+/) { "RUBY_LIBXML_VER_MIN   #{min}" }.
+           gsub(/RUBY_LIBXML_VER_MIC\s+\d+/) { "RUBY_LIBXML_VER_MIC   #{mic || 0}" }           
     end
     mv('ext/xml/libxml.h.new', 'ext/xml/libxml.h')     
   end
@@ -130,7 +135,8 @@ end
 PKG_FILES = FileList[
   'ext/xml/extconf.rb',
   '[A-Z]*',
-  'ext/xml/*.c', 
+  'ext/xml/*.c',
+  'ext/xml/*.inc', 
   'ext/xml/ruby_xml*.h',
   'ext/xml/libxml.h',
   'tests/**/*',
@@ -161,11 +167,10 @@ else
     
     #### Documentation and testing.
     s.has_rdoc = true
-    s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$/ }.to_a
+    s.extra_rdoc_files = rd.rdoc_files.to_a
     s.rdoc_options <<
       '--title' <<  'Libxml-Ruby API' <<
-      '--main' << 'README' <<
-      '-o' << 'rdoc'      
+      '--main' << 'README'
 
     s.test_files = Dir.glob('tests/*runner.rb')
     

data/TODO

@@ -1,19 +1,10 @@
-$Id: TODO,v 1.1 2005/12/19 19:53:07 roscopeco Exp $
+$Id: TODO,v 1.4 2006/04/12 12:08:39 roscopeco Exp $
 
 ==== BUGS
 
-* Hunt down a 4-8KB/s leak while running rubytest -i0 -F on the library.
-
-* Also some other C-side problems:
-  * doublefree at Ruby exit when copying nodes between documents,
-	  and using node sets, sample trace in node_set_bug.txt
-  * XML::Attr.name gives [BUG] segfault line.
-
 * Some C funcs need more NULL checking, they're throwing wierd 
   ArgumentErrors into RubyLand. See TODOs in source.
   
-* Get libxml to compile and build with OS-X.
-
 ==== ENHANCEMENTS
 
 * Add warnings to each of the xpath functions if xpath isn't compiled
@@ -51,8 +42,6 @@ $Id: TODO,v 1.1 2005/12/19 19:53:07 roscopeco Exp $
   'return(Qnil)' with exceptions if 'return(Qnil)' is being used for
   signaling an error or inability to process the document.
   
-* Pointer target signedness warnings (GCC 4.0)  
-
 * Need to add the ability to create namespace objects and modify them
   accordingly.
 
@@ -78,6 +67,10 @@ $Id: TODO,v 1.1 2005/12/19 19:53:07 roscopeco Exp $
 
 * Add ability to append hashes and arrays via the XML::Node#<< method.
 
+* Node (etc.) #[] should support symbol keys.
+
+* Make nodes comparable (on qualified name?)
+
 ==== Data Serialization
 
 * Need to define DTD for basic ruby types that have been XML serialized

data/ext/xml/extconf.rb

@@ -42,8 +42,10 @@ else
   $defs.push('-DHAVE_ZLIB_H')
 end
 
-unless have_library('iconv','iconv_open') or have_library('c','iconv_open') or
-  have_library('recode','iconv_open')
+unless have_library('iconv','iconv_open') or 
+       have_library('c','iconv_open') or
+       have_library('recode','iconv_open') or
+       have_library('iconv')
   crash(<<EOL)
 need libiconv.
 
@@ -56,7 +58,13 @@ need libiconv.
 EOL
 end
 
-unless have_library('xml2', 'xmlParseDoc')
+unless (have_library('xml2', 'xmlParseDoc') or
+        find_library('xml2', '/opt/lib', '/usr/local/lib', '/usr/lib')) and 
+       (have_header('libxml/xmlversion.h') or
+        find_header('libxml/xmlversion.h', 
+                    '/opt/include/libxml2', 
+                    '/usr/local/include/libxml2', 
+                    '/usr/include/libxml2'))
   crash(<<EOL)
 need libxml2.
 
@@ -76,20 +84,12 @@ unless have_func('docbCreateFileParserCtxt')
   crash('Need docbCreateFileParserCtxt')
 end
 
-$LDFLAGS << ' ' + `xslt-config --libs`.chomp
-$LDFLAGS << ' ' + `xml2-config --libs`.chomp
+if try_compile('int main() { return 0; }','-Wall')
+  $CFLAGS << ' -Wall'
+end
 
-$CFLAGS << ' ' + `xslt-config --cflags`.chomp
-$CFLAGS << ' ' + `xml2-config --cflags`.chomp
-$CFLAGS = '-g -Wall ' + $CFLAGS
+$CFLAGS << ' ' << $INCFLAGS
+$INSTALLFILES = [["../xml/libxml.rb", "$(RUBYLIBDIR)", "../xml"]]
 
 create_header()
-create_makefile('xml/libxml')
-
-# Quick hack around a problem building on OSX
-if RUBY_PLATFORM =~ /darwin/
-   mf = File.read('Makefile')
-   File.open('Makefile','w+') do |f|
-     f << mf.gsub(/^CFLAGS\s+=\s+(.*)/) { "CFLAGS = #{$1.gsub('-fno-common','')}" }
-   end
-end
+create_makefile('xml/libxml_so')

data/ext/xml/libxml.c

@@ -1,4 +1,4 @@
-/* $Id: libxml.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: libxml.c,v 1.2 2006/04/17 13:30:22 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -46,7 +46,7 @@ static xmlReallocFunc reallocFunc = NULL;
 static xmlStrdupFunc strdupFunc = NULL;
 
 void
-Init_libxml(void) {
+Init_libxml_so(void) {
   /* Some libxml memory goo that should be done before anything else */
   xmlMemGet((xmlFreeFunc *) & freeFunc,
             (xmlMallocFunc *) & mallocFunc,

data/ext/xml/libxml.h

@@ -6,8 +6,11 @@
 /* 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  "0.3.6"
-#define RUBY_LIBXML_VERNUM   036
+#define RUBY_LIBXML_VERSION  "0.3.8"
+#define RUBY_LIBXML_VERNUM   38
+#define RUBY_LIBXML_VER_MAJ   0
+#define RUBY_LIBXML_VER_MIN   3
+#define RUBY_LIBXML_VER_MIC   8
 
 #include <ruby.h>
 #include <rubyio.h>

data/ext/xml/libxml.rb

@@ -0,0 +1,107 @@
+# $Id: libxml.rb,v 1.1 2006/04/17 13:30:22 roscopeco Exp $ 
+# Please see the LICENSE file for copyright and distribution information 
+require 'xml/libxml_so'
+
+class XML::Node::Set
+  def empty? #:nodoc:
+  	self.length <= 0
+  end
+  
+  def first #:nodoc:
+  	self.each { |n| return n }
+  end
+end
+
+class XML::Document
+  include Enumerable
+
+  # maybe, maybe not...
+  def each(&blk) #:nodoc:
+    find('//*').each(&blk)
+  end
+end
+
+class XML::Node::Set 
+  # inefficient, but maybe can find a way to cache the
+  # ary and dump on change?
+  def [](i, count = nil) #:nodoc:
+    if count
+      to_a[i,count]
+    else
+      to_a[i]
+    end
+  end
+
+  def to_s #:nodoc:
+    to_a.to_s
+  end
+end
+
+module XML::SiblingEnum #:nodoc:all
+  private 
+  
+  # Iterates nodes and attributes
+  def siblings(node, &blk)
+    if n = node
+      loop do
+        blk.call(n)
+        break unless n = n.next
+      end
+    end 
+  end
+end
+
+class XML::Node
+  include XML::SiblingEnum
+  include Enumerable
+  include Comparable
+  
+  # maybe these don't belong on all nodes...
+  def each_child(&blk) #:nodoc:
+    siblings(child, &blk)   
+  end
+
+  def each_attr(&blk) #:nodoc:
+    siblings(properties, &blk)
+  end
+
+  # all siblings INCLUDING self
+  def each_sibling(&blk) #:nodoc:
+    siblings(self, &blk)
+  end
+  
+  # I guess this is what you'd expect?
+  alias :each :each_child
+
+  def to_a #:nodoc:
+    inject([]) { |ary,n| ary << n }
+  end
+  
+  def <=>(other) #:nodoc:
+    to_s <=> other.to_s
+  end  
+end
+
+class XML::Attr 
+  include XML::SiblingEnum
+  include Enumerable
+
+  def each_sibling(&blk) #:nodoc:
+    siblings(self,&blk)
+  end
+  
+  alias :each_attr :each_sibling
+  alias :each :each_sibling
+  
+  def to_h #:nodoc:
+    inject({}) do |h,a| h[a.name] = a.value end
+  end
+
+  def to_a #:nodoc:
+    inject([]) do |ary,a| ary << [a.name, a.value] end
+  end
+  
+  def to_s #:nodoc:
+    "#{name} = #{value}"
+  end
+end

data/ext/xml/ruby_xml_dtd.c

@@ -22,10 +22,10 @@ ruby_xml_dtd_mark(ruby_xml_dtd *rxdtd) {
 
 /*
  * call-seq:
- *    XML::DTD.new("public system") => dtd
- *    XML::DTD.new("public", "system") => dtd
+ *    XML::Dtd.new("public system") => dtd
+ *    XML::Dtd.new("public", "system") => dtd
  * 
- * Create a new DTD from the specified public and system
+ * Create a new Dtd from the specified public and system
  * identifiers.
  */
 VALUE

data/ext/xml/ruby_xml_node.c

@@ -1,4 +1,4 @@
-/* $Id: ruby_xml_node.c,v 1.1 2006/02/21 20:40:16 roscopeco Exp $ */
+/* $Id: ruby_xml_node.c,v 1.3 2006/04/12 12:08:39 roscopeco Exp $ */
 
 /* Please see the LICENSE file for copyright and distribution information */
 
@@ -141,7 +141,7 @@ ruby_xml_node_content_add(VALUE self, VALUE obj) {
   } else {
     str = rb_obj_as_string(obj);
     if (NIL_P(str) || TYPE(str) != T_STRING)
-      rb_raise(rb_eTypeError, "invalid argumnt: must be string or XML::Node");
+      rb_raise(rb_eTypeError, "invalid argument: must be string or XML::Node");
 
     xmlNodeAddContent(node->node, (xmlChar*)StringValuePtr(str));
     return(obj);
@@ -158,24 +158,17 @@ ruby_xml_node_content_add(VALUE self, VALUE obj) {
 VALUE
 ruby_xml_node_content_get(VALUE self) {
   ruby_xml_node *rxn;
-
+  xmlChar *content;
+  VALUE out;
+  
   Data_Get_Struct(self, ruby_xml_node, rxn);
-  if (rxn->node->type == XML_ELEMENT_NODE || rxn->node->content == NULL)
-    return(Qnil);
-  else {
-    return(rb_str_new2((const char*)rxn->node->content));
-  }
+  content = xmlNodeGetContent(rxn->node);
+  out = rb_str_new2((const char *) content);
+  xmlFree(content);
+ 
+  return out;
 }
 
-/////////////////////////////////////////////
-// TODO may be bugged:
-//
-//    node.content = "123"
-//    node.content          => nil
-//    node.content_stripped => nil
-//    node.to_s             => "<head xml:base=\"123\">wow</head>"
-
-
 /*
  * call-seq:
  *    node.content = "string"
@@ -193,15 +186,14 @@ ruby_xml_node_content_set(VALUE self, VALUE content) {
 }
 
 
-/////////////////////////////////////////////////////
-// TODO may be bugged: see above
-//
-
 /*
  * call-seq:
  *    node.content_stripped => "string"
  * 
  * Obtain this node's stripped content.
+ * 
+ * *Deprecated*: Stripped content can be obtained via the
+ * +content+ method.
  */
 VALUE
 ruby_xml_node_content_stripped_get(VALUE self) {
@@ -584,6 +576,28 @@ ruby_xml_node_entity_ref_q(VALUE self) {
     return(Qfalse);
 }
 
+VALUE ruby_xml_node_to_s(VALUE self);
+
+/*
+ * call-seq:
+ *    node.eql?(other_node) => (true|false)
+ * 
+ * Test equality between the two nodes. Equality is determined based
+ * on the XML representation of the nodes.
+ */
+VALUE
+ruby_xml_node_eql_q(VALUE self, VALUE other) {
+  // TODO this isn't the best way to handle this
+  ruby_xml_node *rxn, *orxn;  
+  VALUE thisxml, otherxml;
+  Data_Get_Struct(self, ruby_xml_node, rxn);
+  Data_Get_Struct(other, ruby_xml_node, orxn);
+  thisxml = ruby_xml_node_to_s(self);
+  otherxml = ruby_xml_node_to_s(other);
+  
+  return(rb_funcall(thisxml, rb_intern("=="), 1, otherxml));
+}
+
 
 /*
  * call-seq:
@@ -609,6 +623,34 @@ ruby_xml_node_find(int argc, VALUE *argv, VALUE self) {
   return(ruby_xml_xpath_find2(vargc, vargv));
 }
 
+/*
+ * call-seq:
+ *    node.find_first(xpath_expr, namespace = [any]) => nodeset
+ *
+ * Find the first node matching the specified xpath expression, optionally
+ * using the specified namespaces. Returns an XML::Node.
+ */
+VALUE
+ruby_xml_node_find_first(int argc, VALUE *argv, VALUE self) {
+  VALUE ns = ruby_xml_node_find(argc, argv, self);
+  ruby_xml_node_set *rxnset;
+
+  Data_Get_Struct(ns, ruby_xml_node_set, rxnset);
+  if (rxnset->node_set == NULL || rxnset->node_set->nodeNr < 1)
+    return(Qnil);
+
+  VALUE nodeobj;
+  switch(rxnset->node_set->nodeTab[0]->type) {
+    case XML_ATTRIBUTE_NODE:
+      nodeobj = ruby_xml_attr_new2(cXMLAttr, rxnset->xd, (xmlAttrPtr)rxnset->node_set->nodeTab[0]);
+      break;
+    default:
+      nodeobj = ruby_xml_node_new2(cXMLNode, rxnset->xd, rxnset->node_set->nodeTab[0]);
+  }
+
+  return(nodeobj);
+}
+
 
 /*
  * call-seq:
@@ -638,6 +680,24 @@ void ruby_xml_node_free(ruby_xml_node *rxn) {
 }
 
 
+/*
+ * call-seq:
+ *    node.hash => fixnum
+ * 
+ * Returns the hash-code for this node. This is the hash of the XML
+ * representation in order to be consistent with eql.
+ */
+VALUE
+ruby_xml_node_hash(VALUE self) {
+  ruby_xml_node *rxn;
+  VALUE thisxml;
+  Data_Get_Struct(self, ruby_xml_node, rxn);
+  thisxml = ruby_xml_node_to_s(self);
+  
+  return(rb_funcall(thisxml, rb_intern("hash"), 0));
+}
+
+
 /*
  * call-seq:
  *    node.html_doc? => (true|false)
@@ -1599,10 +1659,17 @@ ruby_xml_node_property_set(VALUE self, VALUE key, VALUE val) {
   xmlAttrPtr attr;
   VALUE rattr;
 
-  Check_Type(key, T_STRING);
-  Check_Type(val, T_STRING);
   Data_Get_Struct(self, ruby_xml_node, node);
-
+  Check_Type(key, T_STRING);
+  
+  if( val == Qnil ) {
+    attr = xmlSetProp(node->node, (xmlChar*)StringValuePtr(key), NULL);
+    xmlRemoveProp( attr );
+    return Qnil;
+  } else {
+    Check_Type(val, T_STRING);
+  }
+  
   attr = xmlSetProp(node->node, (xmlChar*)StringValuePtr(key), (xmlChar*)StringValuePtr(val));
   if (attr == NULL) {
     attr = xmlNewProp(node->node, (xmlChar*)StringValuePtr(key), (xmlChar*)StringValuePtr(val));
@@ -1656,6 +1723,21 @@ ruby_xml_node_properties_q(VALUE self) {
 }
 
 
+/*
+ * call-seq:
+*    node.remove! => nil
+*
+* Removes this node from it's parent.
+*/
+VALUE
+ruby_xml_node_remove_ex(VALUE self) {
+  ruby_xml_node *rxn;
+  Data_Get_Struct(self, ruby_xml_node, rxn);
+  xmlUnlinkNode(rxn->node);
+    return(Qnil);
+}
+
+
 /*
  * call-seq:
  *    node.search_href => namespace
@@ -1800,7 +1882,6 @@ ruby_xml_node_to_s(VALUE self) {
   buf = xmlBufferCreate();
   xmlNodeDump(buf, rxn->node->doc, rxn->node, 0, 1);
   result = rb_str_new2((const char*)buf->content);
-  // TODO result = rb_str_new2((const char*)buf->content); ?
   
   xmlBufferFree(buf);
   return result;
@@ -2004,8 +2085,11 @@ ruby_init_xml_node(void) {
   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, "find", ruby_xml_node_find, -1);
+  rb_define_method(cXMLNode, "find_first", ruby_xml_node_find_first, -1);
   rb_define_method(cXMLNode, "fragment?", ruby_xml_node_fragment_q, 0);
+  rb_define_method(cXMLNode, "hash", ruby_xml_node_hash, 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);
@@ -2037,6 +2121,7 @@ ruby_init_xml_node(void) {
   rb_define_method(cXMLNode, "property", ruby_xml_node_property_get, 1);
   rb_define_method(cXMLNode, "properties", ruby_xml_node_properties_get, 0);
   rb_define_method(cXMLNode, "properties?", ruby_xml_node_properties_q, 0);
+  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, "sibling=", ruby_xml_node_sibling_set, 1);
@@ -2049,4 +2134,6 @@ ruby_init_xml_node(void) {
   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?");
 }