nokogiri 1.3.3 → 1.4.0

data/ext/nokogiri/xml_element_content.c

@@ -0,0 +1,123 @@
+#include <xml_element_content.h>
+
+VALUE cNokogiriXmlElementContent;
+
+/*
+ * call-seq:
+ *  name
+ *
+ * Get the require element +name+
+ */
+static VALUE get_name(VALUE self)
+{
+  xmlElementContentPtr elem;
+  Data_Get_Struct(self, xmlElementContent, elem);
+
+  if(!elem->name) return Qnil;
+  return NOKOGIRI_STR_NEW2(elem->name);
+}
+
+/*
+ * call-seq:
+ *  type
+ *
+ * Get the element content +type+.  Possible values are PCDATA, ELEMENT, SEQ,
+ * or OR.
+ */
+static VALUE get_type(VALUE self)
+{
+  xmlElementContentPtr elem;
+  Data_Get_Struct(self, xmlElementContent, elem);
+
+  return INT2NUM((long)elem->type);
+}
+
+/*
+ * call-seq:
+ *  c1
+ *
+ * Get the first child.
+ */
+static VALUE get_c1(VALUE self)
+{
+  xmlElementContentPtr elem;
+  Data_Get_Struct(self, xmlElementContent, elem);
+
+  if(!elem->c1) return Qnil;
+  return Nokogiri_wrap_element_content(rb_iv_get(self, "@document"), elem->c1);
+}
+
+/*
+ * call-seq:
+ *  c2
+ *
+ * Get the first child.
+ */
+static VALUE get_c2(VALUE self)
+{
+  xmlElementContentPtr elem;
+  Data_Get_Struct(self, xmlElementContent, elem);
+
+  if(!elem->c2) return Qnil;
+  return Nokogiri_wrap_element_content(rb_iv_get(self, "@document"), elem->c2);
+}
+
+/*
+ * call-seq:
+ *  occur
+ *
+ * Get the element content +occur+ flag.  Possible values are ONCE, OPT, MULT
+ * or PLUS.
+ */
+static VALUE get_occur(VALUE self)
+{
+  xmlElementContentPtr elem;
+  Data_Get_Struct(self, xmlElementContent, elem);
+
+  return INT2NUM((long)elem->ocur);
+}
+
+/*
+ * call-seq:
+ *  prefix
+ *
+ * Get the element content namespace +prefix+.
+ */
+static VALUE get_prefix(VALUE self)
+{
+  xmlElementContentPtr elem;
+  Data_Get_Struct(self, xmlElementContent, elem);
+
+  if(!elem->prefix) return Qnil;
+
+  return NOKOGIRI_STR_NEW2(elem->prefix);
+}
+
+VALUE Nokogiri_wrap_element_content(VALUE doc, xmlElementContentPtr element)
+{
+  VALUE elem = Data_Wrap_Struct(cNokogiriXmlElementContent, 0, 0, element);
+
+  // Setting the document is necessary so that this does not get GC'd until
+  // the document is GC'd
+  rb_iv_set(elem, "@document", doc);
+
+  return elem;
+}
+
+void init_xml_element_content()
+{
+  VALUE nokogiri = rb_define_module("Nokogiri");
+  VALUE xml = rb_define_module_under(nokogiri, "XML");
+
+  VALUE klass = rb_define_class_under(xml, "ElementContent", rb_cObject);
+
+  cNokogiriXmlElementContent = klass;
+
+  rb_define_method(klass, "name", get_name, 0);
+  rb_define_method(klass, "type", get_type, 0);
+  rb_define_method(klass, "occur", get_occur, 0);
+  rb_define_method(klass, "prefix", get_prefix, 0);
+
+  rb_define_private_method(klass, "c1", get_c1, 0);
+  rb_define_private_method(klass, "c2", get_c2, 0);
+}

data/ext/nokogiri/xml_element_content.h

@@ -0,0 +1,10 @@
+#ifndef NOKOGIRI_XML_ELEMENT_CONTENT
+#define NOKOGIRI_XML_ELEMENT_CONTENT
+
+#include <nokogiri.h>
+
+
+VALUE Nokogiri_wrap_element_content(VALUE doc, xmlElementContentPtr element);
+void init_xml_element_content();
+
+#endif

data/ext/nokogiri/xml_element_decl.c

@@ -0,0 +1,69 @@
+#include <xml_element_decl.h>
+
+static ID id_document;
+
+/*
+ * call-seq:
+ *  element_type
+ *
+ * The element_type
+ */
+static VALUE element_type(VALUE self)
+{
+  xmlElementPtr node;
+  Data_Get_Struct(self, xmlElement, node);
+  return INT2NUM((long)node->etype);
+}
+
+/*
+ * call-seq:
+ *  content
+ *
+ * The allowed content for this ElementDecl
+ */
+static VALUE content(VALUE self)
+{
+  xmlElementPtr node;
+  Data_Get_Struct(self, xmlElement, node);
+
+  if(!node->content) return Qnil;
+
+  return Nokogiri_wrap_element_content(
+      rb_funcall(self, id_document, 0),
+      node->content
+  );
+}
+
+/*
+ * call-seq:
+ *  prefix
+ *
+ * The namespace prefix for this ElementDecl
+ */
+static VALUE prefix(VALUE self)
+{
+  xmlElementPtr node;
+  Data_Get_Struct(self, xmlElement, node);
+
+  if(!node->prefix) return Qnil;
+
+  return NOKOGIRI_STR_NEW2(node->prefix);
+}
+
+VALUE cNokogiriXmlElementDecl;
+
+void init_xml_element_decl()
+{
+  VALUE nokogiri = rb_define_module("Nokogiri");
+  VALUE xml = rb_define_module_under(nokogiri, "XML");
+  VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
+  VALUE klass = rb_define_class_under(xml, "ElementDecl", node);
+
+  cNokogiriXmlElementDecl = klass;
+
+  rb_define_method(klass, "element_type", element_type, 0);
+  rb_define_method(klass, "content", content, 0);
+  rb_define_method(klass, "prefix", prefix, 0);
+
+  id_document = rb_intern("document");
+}

data/ext/nokogiri/xml_element_decl.h

@@ -0,0 +1,9 @@
+#ifndef NOKOGIRI_XML_ELEMENT_DECL
+#define NOKOGIRI_XML_ELEMENT_DECL
+
+#include <nokogiri.h>
+
+void init_xml_element_decl();
+
+extern VALUE cNokogiriXmlElementDecl;
+#endif

data/ext/nokogiri/xml_entity_decl.c

@@ -0,0 +1,97 @@
+#include <xml_entity_decl.h> 
+
+/*
+ * call-seq:
+ *  original_content
+ *
+ * Get the original_content before ref substitution
+ */
+static VALUE original_content(VALUE self)
+{
+  xmlEntityPtr node;
+  Data_Get_Struct(self, xmlEntity, node);
+
+  if(!node->orig) return Qnil;
+
+  return NOKOGIRI_STR_NEW2(node->orig);
+}
+
+/*
+ * call-seq:
+ *  content
+ *
+ * Get the content
+ */
+static VALUE get_content(VALUE self)
+{
+  xmlEntityPtr node;
+  Data_Get_Struct(self, xmlEntity, node);
+
+  if(!node->content) return Qnil;
+
+  return NOKOGIRI_STR_NEW(node->content, node->length);
+}
+
+/*
+ * call-seq:
+ *  content
+ *
+ * Get the entity type
+ */
+static VALUE entity_type(VALUE self)
+{
+  xmlEntityPtr node;
+  Data_Get_Struct(self, xmlEntity, node);
+
+  return INT2NUM((int)node->etype);
+}
+
+/*
+ * call-seq:
+ *  external_id
+ *
+ * Get the external identifier for PUBLIC
+ */
+static VALUE external_id(VALUE self)
+{
+  xmlEntityPtr node;
+  Data_Get_Struct(self, xmlEntity, node);
+
+  if(!node->ExternalID) return Qnil;
+
+  return NOKOGIRI_STR_NEW2(node->ExternalID);
+}
+
+/*
+ * call-seq:
+ *  system_id
+ *
+ * Get the URI for a SYSTEM or PUBLIC Entity
+ */
+static VALUE system_id(VALUE self)
+{
+  xmlEntityPtr node;
+  Data_Get_Struct(self, xmlEntity, node);
+
+  if(!node->SystemID) return Qnil;
+
+  return NOKOGIRI_STR_NEW2(node->SystemID);
+}
+
+VALUE cNokogiriXmlEntityDecl;
+
+void init_xml_entity_decl()
+{
+  VALUE nokogiri = rb_define_module("Nokogiri");
+  VALUE xml = rb_define_module_under(nokogiri, "XML");
+  VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
+  VALUE klass = rb_define_class_under(xml, "EntityDecl", node);
+
+  cNokogiriXmlEntityDecl = klass;
+
+  rb_define_method(klass, "original_content", original_content, 0);
+  rb_define_method(klass, "content", get_content, 0);
+  rb_define_method(klass, "entity_type", entity_type, 0);
+  rb_define_method(klass, "external_id", external_id, 0);
+  rb_define_method(klass, "system_id", system_id, 0);
+}

data/ext/nokogiri/xml_entity_decl.h

@@ -0,0 +1,10 @@
+#ifndef NOKOGIRI_XML_ENTITY_DECL
+#define NOKOGIRI_XML_ENTITY_DECL
+
+#include <nokogiri.h>
+
+void init_xml_entity_decl();
+
+extern VALUE cNokogiriXmlEntityDecl;
+#endif
+

data/ext/nokogiri/xml_entity_reference.c

@@ -25,7 +25,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   NOKOGIRI_ROOT_NODE(node);
 
   VALUE rb_node = Nokogiri_wrap_xml_node(klass, node);
-  rb_funcall2(rb_node, rb_intern("initialize"), argc, argv);
+  rb_obj_call_init(rb_node, argc, argv);
 
   if(rb_block_given_p()) rb_yield(rb_node);
 

data/ext/nokogiri/xml_io.c

@@ -1,10 +1,12 @@
 #include <xml_io.h>
 
+static ID id_read, id_write;
+
 int io_read_callback(void * ctx, char * buffer, int len) {
   VALUE io = (VALUE)ctx;
-  VALUE string = rb_funcall(io, rb_intern("read"), 1, INT2NUM(len));
+  VALUE string = rb_funcall(io, id_read, 1, INT2NUM(len));
 
-  if(Qnil == string) return 0;
+  if(NIL_P(string)) return 0;
 
   memcpy(buffer, StringValuePtr(string), (unsigned int)RSTRING_LEN(string));
 
@@ -15,10 +17,15 @@ int io_write_callback(void * ctx, char * buffer, int len) {
   VALUE io = (VALUE)ctx;
   VALUE string = rb_str_new(buffer, len);
 
-  rb_funcall(io, rb_intern("write"), 1, string);
+  rb_funcall(io, id_write, 1, string);
   return len;
 }
 
 int io_close_callback(void * ctx) {
   return 0;
 }
+
+void init_nokogiri_io() {
+  id_read = rb_intern("read");
+  id_write = rb_intern("write");
+}

data/ext/nokogiri/xml_io.h

@@ -6,5 +6,6 @@
 int io_read_callback(void * ctx, char * buffer, int len);
 int io_write_callback(void * ctx, char * buffer, int len);
 int io_close_callback(void * ctx);
+void init_nokogiri_io();
 
 #endif

data/ext/nokogiri/xml_namespace.c

@@ -18,7 +18,7 @@ static VALUE prefix(VALUE self)
 
   Data_Get_Struct(rb_iv_get(self, "@document"), xmlDoc, doc);
 
-  return NOKOGIRI_STR_NEW2(ns->prefix, doc->encoding);
+  return NOKOGIRI_STR_NEW2(ns->prefix);
 }
 
 /*
@@ -37,7 +37,7 @@ static VALUE href(VALUE self)
 
   Data_Get_Struct(rb_iv_get(self, "@document"), xmlDoc, doc);
 
-  return NOKOGIRI_STR_NEW2(ns->href, doc->encoding);
+  return NOKOGIRI_STR_NEW2(ns->href);
 }
 
 VALUE Nokogiri_wrap_xml_namespace(xmlDocPtr doc, xmlNsPtr node)

data/ext/nokogiri/xml_node.c

@@ -1,5 +1,7 @@
 #include <xml_node.h>
 
+static ID decorate, decorate_bang;
+
 #ifdef DEBUG
 static void debug_node_dealloc(xmlNodePtr x)
 {
@@ -24,8 +26,11 @@ typedef xmlNodePtr (*node_other_func)(xmlNodePtr, xmlNodePtr);
 /* :nodoc: */
 static void relink_namespace(xmlNodePtr reparented)
 {
+  // Avoid segv when relinking against unlinked nodes.
+  if(!reparented->parent) return;
+
   // Make sure that our reparented node has the correct namespaces
-  if(reparented->doc != (xmlDocPtr)reparented->parent)
+  if(!reparented->ns && reparented->doc != (xmlDocPtr)reparented->parent)
     xmlSetNs(reparented, reparented->parent->ns);
 
   // Search our parents for an existing definition
@@ -57,12 +62,15 @@ static VALUE reparent_node_with(VALUE node_obj, VALUE other_obj, node_other_func
   VALUE reparented_obj ;
   xmlNodePtr node, other, reparented ;
 
-  if(! rb_funcall(node_obj, rb_intern("is_a?"), 1, cNokogiriXmlNode))
+  if(!rb_obj_is_kind_of(node_obj, cNokogiriXmlNode))
     rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
 
   Data_Get_Struct(node_obj, xmlNode, node);
   Data_Get_Struct(other_obj, xmlNode, other);
 
+  if(XML_DOCUMENT_NODE == node->type || XML_HTML_DOCUMENT_NODE == node->type)
+    rb_raise(rb_eArgError, "cannot reparent a document node");
+
   // If a document fragment is added, we need to reparent all of it's children
   if(node->type == XML_DOCUMENT_FRAG_NODE)
   {
@@ -74,18 +82,27 @@ static VALUE reparent_node_with(VALUE node_obj, VALUE other_obj, node_other_func
     return node_obj;
   }
 
+  if(node->type == XML_TEXT_NODE) {
+    NOKOGIRI_ROOT_NODE(node);
+    node = xmlDocCopyNode(node, other->doc, 1);
+  }
+
   if (node->doc == other->doc) {
     xmlUnlinkNode(node) ;
+
+    // TODO: I really want to remove this.  We shouldn't support 2.6.16 anymore
     if ( node->type == XML_TEXT_NODE
          && other->type == XML_TEXT_NODE
          && is_2_6_16() ) {
-      other->content = xmlStrdup(other->content); // we'd rather leak than segfault.
+
+      // we'd rather leak than segfault.
+      other->content = xmlStrdup(other->content);
+
     }
 
     if(!(reparented = (*func)(other, node))) {
       rb_raise(rb_eRuntimeError, "Could not reparent node (1)");
     }
-
   } else {
     xmlNodePtr duped_node ;
     // recursively copy to the new document
@@ -110,7 +127,7 @@ static VALUE reparent_node_with(VALUE node_obj, VALUE other_obj, node_other_func
 
   reparented_obj = Nokogiri_wrap_xml_node(Qnil, reparented);
 
-  rb_funcall(reparented_obj, rb_intern("decorate!"), 0);
+  rb_funcall(reparented_obj, decorate_bang, 0);
 
   return reparented_obj ;
 }
@@ -140,7 +157,7 @@ static VALUE pointer_id(VALUE self)
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
 
-  return INT2NUM((int)(node));
+  return INT2NUM((long)(node));
 }
 
 /*
@@ -158,12 +175,92 @@ static VALUE encode_special_chars(VALUE self, VALUE string)
       (const xmlChar *)StringValuePtr(string)
   );
 
-  VALUE encoded_str = NOKOGIRI_STR_NEW2(encoded, node->doc->encoding);
+  VALUE encoded_str = NOKOGIRI_STR_NEW2(encoded);
   xmlFree(encoded);
 
   return encoded_str;
 }
 
+/*
+ * call-seq:
+ *  create_internal_subset(name, external_id, system_id)
+ *
+ * Create an internal subset
+ */
+static VALUE create_internal_subset(VALUE self, VALUE name, VALUE external_id, VALUE system_id)
+{
+  xmlNodePtr node;
+  xmlDocPtr doc;
+  Data_Get_Struct(self, xmlNode, node);
+
+  doc = node->doc;
+
+  if(xmlGetIntSubset(doc))
+    rb_raise(rb_eRuntimeError, "Document already has an internal subset");
+
+  xmlDtdPtr dtd = xmlCreateIntSubset(
+      doc, 
+      NIL_P(name)        ? NULL : (const xmlChar *)StringValuePtr(name),
+      NIL_P(external_id) ? NULL : (const xmlChar *)StringValuePtr(external_id),
+      NIL_P(system_id)   ? NULL : (const xmlChar *)StringValuePtr(system_id)
+  );
+
+  if(!dtd) return Qnil;
+
+  return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)dtd);
+}
+
+/*
+ * call-seq:
+ *  create_external_subset(name, external_id, system_id)
+ *
+ * Create an external subset
+ */
+static VALUE create_external_subset(VALUE self, VALUE name, VALUE external_id, VALUE system_id)
+{
+  xmlNodePtr node;
+  xmlDocPtr doc;
+  Data_Get_Struct(self, xmlNode, node);
+
+  doc = node->doc;
+
+  if(doc->extSubset)
+    rb_raise(rb_eRuntimeError, "Document already has an external subset");
+
+  xmlDtdPtr dtd = xmlNewDtd(
+      doc, 
+      NIL_P(name)        ? NULL : (const xmlChar *)StringValuePtr(name),
+      NIL_P(external_id) ? NULL : (const xmlChar *)StringValuePtr(external_id),
+      NIL_P(system_id)   ? NULL : (const xmlChar *)StringValuePtr(system_id)
+  );
+
+  if(!dtd) return Qnil;
+
+  return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)dtd);
+}
+
+/*
+ * call-seq:
+ *  external_subset
+ *
+ * Get the external subset
+ */
+static VALUE external_subset(VALUE self)
+{
+  xmlNodePtr node;
+  xmlDocPtr doc;
+  Data_Get_Struct(self, xmlNode, node);
+
+  if(!node->doc) return Qnil;
+
+  doc = node->doc;
+  xmlDtdPtr dtd = doc->extSubset;
+
+  if(!dtd) return Qnil;
+
+  return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)dtd);
+}
+
 /*
  * call-seq:
  *  internal_subset
@@ -198,12 +295,12 @@ static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
   VALUE level;
 
   if(rb_scan_args(argc, argv, "01", &level) == 0)
-    level = INT2NUM(1);
+    level = INT2NUM((long)1);
 
   xmlNodePtr node, dup;
   Data_Get_Struct(self, xmlNode, node);
 
-  dup = xmlDocCopyNode(node, node->doc, NUM2INT(level));
+  dup = xmlDocCopyNode(node, node->doc, (int)NUM2INT(level));
   if(dup == NULL) return Qnil;
 
   return Nokogiri_wrap_xml_node(rb_obj_class(self), dup);
@@ -358,7 +455,7 @@ static VALUE namespaced_key_eh(VALUE self, VALUE attribute, VALUE namespace)
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
   if(xmlHasNsProp(node, (xmlChar *)StringValuePtr(attribute),
-        Qnil == namespace ? NULL : (xmlChar *)StringValuePtr(namespace)))
+        NIL_P(namespace) ? NULL : (xmlChar *)StringValuePtr(namespace)))
     return Qtrue;
   return Qfalse;
 }
@@ -393,13 +490,13 @@ static VALUE get(VALUE self, VALUE attribute)
   VALUE rval ;
   Data_Get_Struct(self, xmlNode, node);
 
-  if(attribute == Qnil) return Qnil;
+  if(NIL_P(attribute)) return Qnil;
 
   propstr = xmlGetProp(node, (xmlChar *)StringValuePtr(attribute));
 
-  if(NULL == propstr) return Qnil;
+  if(!propstr) return Qnil;
 
-  rval = NOKOGIRI_STR_NEW2(propstr, node->doc->encoding);
+  rval = NOKOGIRI_STR_NEW2(propstr);
 
   xmlFree(propstr);
   return rval ;
@@ -453,7 +550,7 @@ static VALUE attribute_with_ns(VALUE self, VALUE name, VALUE namespace)
   xmlAttrPtr prop;
   Data_Get_Struct(self, xmlNode, node);
   prop = xmlHasNsProp(node, (xmlChar *)StringValuePtr(name),
-      Qnil == namespace ? NULL : (xmlChar *)StringValuePtr(namespace));
+      NIL_P(namespace) ? NULL : (xmlChar *)StringValuePtr(namespace));
 
   if(! prop) return Qnil;
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)prop);
@@ -468,12 +565,11 @@ static VALUE attribute_with_ns(VALUE self, VALUE name, VALUE namespace)
 static VALUE attribute_nodes(VALUE self)
 {
     /* this code in the mode of xmlHasProp() */
-    xmlNodePtr node ;
-    VALUE attr ;
+    xmlNodePtr node;
 
-    attr = rb_ary_new() ;
     Data_Get_Struct(self, xmlNode, node);
 
+    VALUE attr = rb_ary_new();
     Nokogiri_xml_node_properties(node, attr);
 
     return attr ;
@@ -534,7 +630,7 @@ static VALUE node_type(VALUE self)
 {
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
-  return INT2NUM((int)node->type);
+  return INT2NUM((long)node->type);
 }
 
 /*
@@ -564,7 +660,7 @@ static VALUE get_content(VALUE self)
 
   xmlChar * content = xmlNodeGetContent(node);
   if(content) {
-    VALUE rval = NOKOGIRI_STR_NEW2(content, node->doc->encoding);
+    VALUE rval = NOKOGIRI_STR_NEW2(content);
     xmlFree(content);
     return rval;
   }
@@ -624,7 +720,7 @@ static VALUE get_name(VALUE self)
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
   if(node->name)
-    return NOKOGIRI_STR_NEW2(node->name, node->doc->encoding);
+    return NOKOGIRI_STR_NEW2(node->name);
   return Qnil;
 }
 
@@ -641,7 +737,7 @@ static VALUE path(VALUE self)
   Data_Get_Struct(self, xmlNode, node);
   
   path = xmlGetNodePath(node);
-  VALUE rval = NOKOGIRI_STR_NEW2(path, node->doc->encoding);
+  VALUE rval = NOKOGIRI_STR_NEW2(path);
   xmlFree(path);
   return rval ;
 }
@@ -696,7 +792,7 @@ static VALUE native_write_to(
       (xmlOutputCloseCallback)io_close_callback,
       (void *)io,
       RTEST(encoding) ? StringValuePtr(encoding) : NULL,
-      NUM2INT(options)
+      (int)NUM2INT(options)
   );
 
   xmlSaveTree(savectx, node);
@@ -717,7 +813,7 @@ static VALUE line(VALUE self)
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
 
-  return INT2NUM(node->line);
+  return INT2NUM(xmlGetLineNo(node));
 }
 
 /*
@@ -735,18 +831,18 @@ static VALUE add_namespace_definition(VALUE self, VALUE prefix, VALUE href)
   xmlNsPtr ns = xmlNewNs(
       node,
       (const xmlChar *)StringValuePtr(href),
-      (const xmlChar *)(prefix == Qnil ? NULL : StringValuePtr(prefix))
+      (const xmlChar *)(NIL_P(prefix) ? NULL : StringValuePtr(prefix))
   );
 
   if(!ns) {
     ns = xmlSearchNs(
         node->doc,
         node,
-        (const xmlChar *)(prefix == Qnil ? NULL : StringValuePtr(prefix))
+        (const xmlChar *)(NIL_P(prefix) ? NULL : StringValuePtr(prefix))
     );
   }
 
-  if(Qnil == prefix) xmlSetNs(node, ns);
+  if(NIL_P(prefix)) xmlSetNs(node, ns);
 
   return Nokogiri_wrap_xml_namespace(node->doc, ns);
 }
@@ -776,7 +872,7 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
       klass == cNokogiriXmlNode ? (VALUE)NULL : klass,
       node
   );
-  rb_funcall2(rb_node, rb_intern("initialize"), argc, argv);
+  rb_obj_call_init(rb_node, argc, argv);
 
   if(rb_block_given_p()) rb_yield(rb_node);
 
@@ -797,7 +893,7 @@ static VALUE dump_html(VALUE self)
 
   buf = xmlBufferCreate() ;
   htmlNodeDump(buf, node->doc, node);
-  VALUE html = NOKOGIRI_STR_NEW2(buf->content, node->doc->encoding);
+  VALUE html = NOKOGIRI_STR_NEW2(buf->content);
   xmlBufferFree(buf);
   return html ;
 }
@@ -814,7 +910,7 @@ static VALUE compare(VALUE self, VALUE _other)
   Data_Get_Struct(self, xmlNode, node);
   Data_Get_Struct(_other, xmlNode, other);
 
-  return INT2NUM(xmlXPathCmpNodes(other, node));
+  return INT2NUM((long)xmlXPathCmpNodes(other, node));
 }
 
 VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
@@ -857,7 +953,7 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
       klass = cNokogiriXmlProcessingInstruction;
       break;
     case XML_ENTITY_DECL:
-      klass = cNokogiriXmlEntityDeclaration;
+      klass = cNokogiriXmlEntityDecl;
       break;
     case XML_CDATA_SECTION_NODE:
       klass = cNokogiriXmlCData;
@@ -865,6 +961,12 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
     case XML_DTD_NODE:
       klass = cNokogiriXmlDtd;
       break;
+    case XML_ATTRIBUTE_DECL:
+      klass = cNokogiriXmlAttributeDecl;
+      break;
+    case XML_ELEMENT_DECL:
+      klass = cNokogiriXmlElementDecl;
+      break;
     default:
       klass = cNokogiriXmlNode;
   }
@@ -879,7 +981,7 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
     document = DOC_RUBY_OBJECT(node->doc);
     node_cache = DOC_NODE_CACHE(node->doc);
     rb_ary_push(node_cache, rb_node);
-    rb_funcall(document, rb_intern("decorate"), 1, rb_node);
+    rb_funcall(document, decorate, 1, rb_node);
   }
 
   return rb_node ;
@@ -898,7 +1000,6 @@ void Nokogiri_xml_node_properties(xmlNodePtr node, VALUE attr_list)
 
 VALUE cNokogiriXmlNode ;
 VALUE cNokogiriXmlElement ;
-VALUE cNokogiriXmlEntityDeclaration ;
 
 void init_xml_node()
 {
@@ -909,8 +1010,6 @@ void init_xml_node()
   cNokogiriXmlNode = klass;
 
   cNokogiriXmlElement = rb_define_class_under(xml, "Element", klass);
-  cNokogiriXmlEntityDeclaration =
-    rb_define_class_under(xml, "EntityDeclaration", klass);
 
   rb_define_singleton_method(klass, "new", new, -1);
 
@@ -942,6 +1041,9 @@ void init_xml_node()
   rb_define_method(klass, "dup", duplicate_node, -1);
   rb_define_method(klass, "unlink", unlink_node, 0);
   rb_define_method(klass, "internal_subset", internal_subset, 0);
+  rb_define_method(klass, "external_subset", external_subset, 0);
+  rb_define_method(klass, "create_internal_subset", create_internal_subset, 3);
+  rb_define_method(klass, "create_external_subset", create_external_subset, 3);
   rb_define_method(klass, "pointer_id", pointer_id, 0);
   rb_define_method(klass, "line", line, 0);
 
@@ -952,4 +1054,7 @@ void init_xml_node()
   rb_define_private_method(klass, "get", get, 1);
   rb_define_private_method(klass, "set_namespace", set_namespace, 1);
   rb_define_private_method(klass, "compare", compare, 1);
+
+  decorate = rb_intern("decorate");
+  decorate_bang = rb_intern("decorate!");
 }