libxml-ruby 5.0.6 → 6.0.0

data/ext/libxml/ruby_xml_document.c

@@ -60,25 +60,30 @@
 
 VALUE cXMLDocument;
 
-void rxml_document_free(xmlDocPtr xdoc)
+void rxml_document_free(void* data)
 {
-  xdoc->_private = NULL;
+  xmlDocPtr xdoc = (xmlDocPtr)data;
+  if (!xdoc) return;
+  rxml_registry_unregister(xdoc);
   xmlFreeDoc(xdoc);
 }
 
+const rb_data_type_t rxml_document_data_type = {
+  .wrap_struct_name = "LibXML::XML::Document",
+  .function = { .dmark = NULL, .dfree = rxml_document_free },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 VALUE rxml_document_wrap(xmlDocPtr xdoc)
 {
   VALUE result = Qnil;
 
-  // Is this node is already wrapped?
-  if (xdoc->_private != NULL)
-  {
-    result = (VALUE)xdoc->_private;
-  }
-  else
+  // Is this document already wrapped?
+  result = rxml_registry_lookup(xdoc);
+  if (NIL_P(result))
   {
-    result = Data_Wrap_Struct(cXMLDocument, NULL, rxml_document_free, xdoc);
-    xdoc->_private = (void*)result;
+    result = TypedData_Wrap_Struct(cXMLDocument, &rxml_document_data_type, xdoc);
+    rxml_registry_register(xdoc, result);
   }
 
   return result;
@@ -93,7 +98,7 @@ VALUE rxml_document_wrap(xmlDocPtr xdoc)
  */
 static VALUE rxml_document_alloc(VALUE klass)
 {
-  return Data_Wrap_Struct(klass, NULL, rxml_document_free, NULL);
+  return TypedData_Wrap_Struct(klass, &rxml_document_data_type, NULL);
 }
 
 /*
@@ -124,8 +129,8 @@ static VALUE rxml_document_initialize(int argc, VALUE *argv, VALUE self)
   xdoc = xmlNewDoc((xmlChar*) StringValuePtr(xmlver));
 
   // Link the ruby object to the document and the document to the ruby object
-  RDATA(self)->data = xdoc;
-  xdoc->_private = (void*)self;
+  RTYPEDDATA_DATA(self) = xdoc;
+  rxml_registry_register(xdoc, self);
 
   return self;
 }
@@ -213,10 +218,10 @@ rxml_document_canonicalize(int argc, VALUE *argv, VALUE self)
   // Do stuff if ruby hash passed as argument
   if (!NIL_P(option_hash)) 
   {
-	VALUE o_comments = Qnil;
-	VALUE o_mode = Qnil;
-	VALUE o_i_ns_prefixes = Qnil;
-		
+    VALUE o_comments = Qnil;
+    VALUE o_mode = Qnil;
+    VALUE o_i_ns_prefixes = Qnil;
+    
     Check_Type(option_hash, T_HASH);
 
     o_comments = rb_hash_aref(option_hash, ID2SYM(rb_intern("comments")));
@@ -224,7 +229,7 @@ rxml_document_canonicalize(int argc, VALUE *argv, VALUE self)
 
     o_mode = rb_hash_aref(option_hash, ID2SYM(rb_intern("mode")));
     if (!NIL_P(o_mode)) 
-	{
+    {
       Check_Type(o_mode, T_FIXNUM);
       c14n_mode = NUM2INT(o_mode);
       //TODO: clean this up
@@ -234,25 +239,25 @@ rxml_document_canonicalize(int argc, VALUE *argv, VALUE self)
 
     o_i_ns_prefixes = rb_hash_aref(option_hash, ID2SYM(rb_intern("inclusive_ns_prefixes")));
     if (!NIL_P(o_i_ns_prefixes)) 
-	{
+    {
       int i;
       int p = 0; //pointer array index
       VALUE *list_in = NULL;
       long list_size = 0;
 
-	  Check_Type(o_i_ns_prefixes, T_ARRAY);
+      Check_Type(o_i_ns_prefixes, T_ARRAY);
       list_in = RARRAY_PTR(o_i_ns_prefixes);
       list_size = RARRAY_LEN(o_i_ns_prefixes);
 
       if (list_size > 0) 
-	  {
+      {
         for(i=0; i < list_size; ++i) {
           if (p >= C14N_NS_LIMIT) { break; }
 
           if (RTEST(list_in[i])) 
-		  {
+          {
             if (TYPE(list_in[i]) == T_STRING) 
-			{
+            {
               inc_ns_prefixes_ptr[p] = (xmlChar *)StringValueCStr(list_in[i]);
               p++;
             }
@@ -270,46 +275,54 @@ rxml_document_canonicalize(int argc, VALUE *argv, VALUE self)
     //o_ns_prefixes will free at end of block
 
     o_nodes = rb_hash_aref(option_hash, ID2SYM(rb_intern("nodes")));
-    if (!NIL_P(o_nodes)) 
-	{
-      int i;
-      int p = 0; // index of pointer array
-      VALUE * list_in = NULL;
-      long node_list_size = 0;
-
-	  if (CLASS_OF(o_nodes) == cXMLXPathObject)
-	  {
-		  o_nodes = rb_funcall(o_nodes, rb_intern("to_a"), 0);
-	  }
-	  else
-	  {
-		  Check_Type(o_nodes, T_ARRAY);
-	  }
-      list_in = RARRAY_PTR(o_nodes);
-      node_list_size = RARRAY_LEN(o_nodes);
-
-      for (i=0; i < node_list_size; ++i)
-	  {
-        if (p >= C14N_NODESET_LIMIT) { break; }
-
-        if (RTEST(list_in[i])) 
-		{
-          xmlNodePtr node_ptr;
-          Data_Get_Struct(list_in[i], xmlNode, node_ptr);
-          node_ptr_array[p] = node_ptr;
-          p++;
+    if (!NIL_P(o_nodes))
+    {
+      if (CLASS_OF(o_nodes) == cXMLXPathObject)
+      {
+        /* Use the raw xmlNodeSet directly to preserve namespace nodes
+           which cannot survive a roundtrip through Ruby objects */
+        rxml_xpath_object *rxpop;
+        TypedData_Get_Struct(o_nodes, rxml_xpath_object, &rxml_xpath_object_data_type, rxpop);
+        if (rxpop->xpop->nodesetval)
+        {
+          nodeset.nodeNr = rxpop->xpop->nodesetval->nodeNr;
+          nodeset.nodeMax = rxpop->xpop->nodesetval->nodeMax;
+          nodeset.nodeTab = rxpop->xpop->nodesetval->nodeTab;
         }
       }
+      else
+      {
+        int i;
+        int p = 0;
+        VALUE *list_in = NULL;
+        long node_list_size = 0;
+
+        Check_Type(o_nodes, T_ARRAY);
+        list_in = RARRAY_PTR(o_nodes);
+        node_list_size = RARRAY_LEN(o_nodes);
+
+        for (i=0; i < node_list_size; ++i)
+        {
+          if (p >= C14N_NODESET_LIMIT) { break; }
+
+          if (RTEST(list_in[i]))
+          {
+            xmlNodePtr node_ptr;
+            TypedData_Get_Struct(list_in[i], xmlNode, &rxml_node_data_type, node_ptr);
+            node_ptr_array[p] = node_ptr;
+            p++;
+          }
+        }
 
-      // Need to set values in nodeset struct
-      nodeset.nodeNr = (node_list_size > C14N_NODESET_LIMIT ?
-                        C14N_NODESET_LIMIT :
-                        (int)node_list_size);
-      nodeset.nodeTab = node_ptr_array;
+        nodeset.nodeNr = (node_list_size > C14N_NODESET_LIMIT ?
+                          C14N_NODESET_LIMIT :
+                          (int)node_list_size);
+        nodeset.nodeTab = node_ptr_array;
+      }
     }
   }//option_hash
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   xmlC14NDocDumpMemory(xdoc,
                        (nodeset.nodeNr == 0 ? NULL : &nodeset),
                        c14n_mode,
@@ -339,7 +352,7 @@ static VALUE rxml_document_compression_get(VALUE self)
   xmlDocPtr xdoc;
 
   int compmode;
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   compmode = xmlGetDocCompressMode(xdoc);
   if (compmode == -1)
@@ -365,7 +378,7 @@ static VALUE rxml_document_compression_set(VALUE self, VALUE num)
 
   int compmode;
   Check_Type(num, T_FIXNUM);
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc == NULL)
   {
@@ -398,7 +411,7 @@ static VALUE rxml_document_compression_q(VALUE self)
 #ifdef HAVE_ZLIB_H
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->compression != -1)
   return(Qtrue);
@@ -419,7 +432,7 @@ static VALUE rxml_document_compression_q(VALUE self)
 static VALUE rxml_document_child_get(VALUE self)
 {
   xmlDocPtr xdoc;
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->children == NULL)
     return (Qnil);
@@ -436,7 +449,7 @@ static VALUE rxml_document_child_get(VALUE self)
 static VALUE rxml_document_child_q(VALUE self)
 {
   xmlDocPtr xdoc;
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->children == NULL)
     return (Qfalse);
@@ -456,7 +469,7 @@ static VALUE rxml_document_debug(VALUE self)
 {
 #ifdef LIBXML_DEBUG_ENABLED
   xmlDocPtr xdoc;
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   xmlDebugDumpDocument(NULL, xdoc);
   return Qtrue;
 #else
@@ -475,7 +488,7 @@ static VALUE rxml_document_encoding_get(VALUE self)
 {
   xmlDocPtr xdoc;
   const char *xencoding;
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   xencoding = (const char*)xdoc->encoding;
   return INT2NUM(xmlParseCharEncoding(xencoding));
@@ -493,7 +506,7 @@ static VALUE rxml_document_rb_encoding_get(VALUE self)
 {
   xmlDocPtr xdoc;
   rb_encoding* rbencoding;
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   rbencoding = rxml_xml_encoding_to_rb_encoding(mXMLEncoding, xmlParseCharEncoding((const char*)xdoc->encoding));
   return rb_enc_from_encoding(rbencoding);
@@ -510,7 +523,7 @@ static VALUE rxml_document_encoding_set(VALUE self, VALUE encoding)
   xmlDocPtr xdoc;
   const char* xencoding = xmlGetCharEncodingName((xmlCharEncoding)NUM2INT(encoding));
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->encoding != NULL)
     xmlFree((xmlChar *) xdoc->encoding);
@@ -536,8 +549,8 @@ static VALUE rxml_document_import(VALUE self, VALUE node)
   xmlDocPtr xdoc;
   xmlNodePtr xnode, xresult;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
-  Data_Get_Struct(node, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
+  TypedData_Get_Struct(node, xmlNode, &rxml_node_data_type, xnode);
 
   xresult = xmlDocCopyNode(xnode, xdoc, 1);
 
@@ -557,7 +570,7 @@ static VALUE rxml_document_last_get(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->last == NULL)
     return (Qnil);
@@ -575,7 +588,7 @@ static VALUE rxml_document_last_q(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->last == NULL)
     return (Qfalse);
@@ -593,7 +606,7 @@ static VALUE rxml_document_next_get(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->next == NULL)
     return (Qnil);
@@ -611,7 +624,7 @@ static VALUE rxml_document_next_q(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->next == NULL)
     return (Qfalse);
@@ -627,9 +640,9 @@ static VALUE rxml_document_next_q(VALUE self)
  */
 static VALUE rxml_document_node_type(VALUE self)
 {
-  xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
-  return (INT2NUM(xnode->type));
+  xmlDocPtr xdoc;
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
+  return (INT2NUM(xdoc->type));
 }
 
 /*
@@ -642,7 +655,7 @@ static VALUE rxml_document_parent_get(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->parent == NULL)
     return (Qnil);
@@ -660,7 +673,7 @@ static VALUE rxml_document_parent_q(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->parent == NULL)
     return (Qfalse);
@@ -678,7 +691,7 @@ static VALUE rxml_document_prev_get(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->prev == NULL)
     return (Qnil);
@@ -696,7 +709,7 @@ static VALUE rxml_document_prev_q(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
 
   if (xdoc->prev == NULL)
     return (Qfalse);
@@ -715,7 +728,7 @@ static VALUE rxml_document_root_get(VALUE self)
   xmlDocPtr xdoc;
   xmlNodePtr root;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   root = xmlDocGetRootElement(xdoc);
 
   if (root == NULL)
@@ -738,8 +751,8 @@ static VALUE rxml_document_root_set(VALUE self, VALUE node)
   if (rb_obj_is_kind_of(node, cXMLNode) == Qfalse)
     rb_raise(rb_eTypeError, "must pass an XML::Node type object");
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
-  Data_Get_Struct(node, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
+  TypedData_Get_Struct(node, xmlNode, &rxml_node_data_type, xnode);
 
   if (xnode->doc != NULL && xnode->doc != xdoc)
     rb_raise(eXMLError, "Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import");
@@ -784,7 +797,7 @@ static VALUE rxml_document_save(int argc, VALUE *argv, VALUE self)
   Check_Type(filename, T_STRING);
   xfilename = StringValuePtr(filename);
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   xencoding = xdoc->encoding;
 
   if (!NIL_P(options))
@@ -823,7 +836,7 @@ static VALUE rxml_document_standalone_q(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   if (xdoc->standalone)
     return (Qtrue);
   else
@@ -877,7 +890,7 @@ static VALUE rxml_document_to_s(int argc, VALUE *argv, VALUE self)
     }
   }
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   xmlDocDumpFormatMemoryEnc(xdoc, &buffer, &length, (const char*)xencoding, indent);
 
   result = rxml_new_cstr(buffer, xencoding);
@@ -895,7 +908,7 @@ static VALUE rxml_document_url_get(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   if (xdoc->URL == NULL)
     return (Qnil);
   else
@@ -912,7 +925,7 @@ static VALUE rxml_document_version_get(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   if (xdoc->version == NULL)
     return (Qnil);
   else
@@ -928,9 +941,9 @@ static VALUE rxml_document_version_get(VALUE self)
 static VALUE rxml_document_xhtml_q(VALUE self)
 {
   xmlDocPtr xdoc;
-	xmlDtdPtr xdtd;
-  Data_Get_Struct(self, xmlDoc, xdoc);
-	xdtd = xmlGetIntSubset(xdoc);
+  xmlDtdPtr xdtd;
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
+  xdtd = xmlGetIntSubset(xdoc);
   if (xdtd != NULL && xmlIsXHTML(xdtd->SystemID, xdtd->ExternalID) > 0)
     return (Qtrue);
   else
@@ -950,7 +963,7 @@ static VALUE rxml_document_xinclude(VALUE self)
 
   int ret;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   ret = xmlXIncludeProcess(xdoc);
   if (ret >= 0)
   {
@@ -979,7 +992,7 @@ static VALUE rxml_document_order_elements(VALUE self)
 {
   xmlDocPtr xdoc;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
   return LONG2FIX(xmlXPathOrderDocElems(xdoc));
 }
 
@@ -998,8 +1011,8 @@ static VALUE rxml_document_validate_schema(VALUE self, VALUE schema)
   xmlSchemaPtr xschema;
   int is_invalid;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
-  Data_Get_Struct(schema, xmlSchema, xschema);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
+  TypedData_Get_Struct(schema, xmlSchema, &rxml_schema_type, xschema);
 
   vptr = xmlSchemaNewValidCtxt(xschema);
 
@@ -1031,8 +1044,8 @@ static VALUE rxml_document_validate_relaxng(VALUE self, VALUE relaxng)
   xmlRelaxNGPtr xrelaxng;
   int is_invalid;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
-  Data_Get_Struct(relaxng, xmlRelaxNG, xrelaxng);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
+  TypedData_Get_Struct(relaxng, xmlRelaxNG, &rxml_relaxng_data_type, xrelaxng);
 
   vptr = xmlRelaxNGNewValidCtxt(xrelaxng);
 
@@ -1063,8 +1076,8 @@ static VALUE rxml_document_validate_dtd(VALUE self, VALUE dtd)
   xmlDocPtr xdoc;
   xmlDtdPtr xdtd;
 
-  Data_Get_Struct(self, xmlDoc, xdoc);
-  Data_Get_Struct(dtd, xmlDtd, xdtd);
+  TypedData_Get_Struct(self, xmlDoc, &rxml_document_data_type, xdoc);
+  TypedData_Get_Struct(dtd, xmlDtd, &rxml_dtd_data_type, xdtd);
 
   /* Setup context */
   memset(&ctxt, 0, sizeof(xmlValidCtxt));

data/ext/libxml/ruby_xml_document.h

@@ -4,6 +4,7 @@
 #define __RXML_DOCUMENT__
 
 extern VALUE cXMLDocument;
+extern const rb_data_type_t rxml_document_data_type;
 void rxml_init_document(void);
 VALUE rxml_document_wrap(xmlDocPtr xnode);
 

data/ext/libxml/ruby_xml_dtd.c

@@ -28,31 +28,52 @@
  *  instance.validate(dtd)
  */
 
+#ifndef TYPED_DATA_EMBEDDED
+#define TYPED_DATA_EMBEDDED ((VALUE)1)
+#endif
+
 VALUE cXMLDtd;
 
-void rxml_dtd_free(xmlDtdPtr xdtd)
+static void rxml_dtd_free(void* data)
 {
+  xmlDtdPtr xdtd = (xmlDtdPtr)data;
+  if (!xdtd) return;
   if (xdtd->doc == NULL && xdtd->parent == NULL)
     xmlFreeDtd(xdtd);
 }
 
-void rxml_dtd_mark(xmlDtdPtr xdtd)
+static void rxml_dtd_mark(void* data)
 {
+  xmlDtdPtr xdtd = (xmlDtdPtr)data;
   if (xdtd && xdtd->doc)
   {
-      VALUE doc = (VALUE)xdtd->doc->_private;
-      rb_gc_mark(doc);
+      VALUE doc = rxml_registry_lookup(xdtd->doc);
+      if (!NIL_P(doc))
+        rb_gc_mark(doc);
   }
 }
 
+const rb_data_type_t rxml_dtd_data_type = {
+  .wrap_struct_name = "LibXML::XML::Dtd",
+  .function = { .dmark = rxml_dtd_mark, .dfree = NULL },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+static const rb_data_type_t rxml_dtd_managed_data_type = {
+  .wrap_struct_name = "LibXML::XML::Dtd (managed)",
+  .function = { .dmark = rxml_dtd_mark, .dfree = rxml_dtd_free },
+  .parent = &rxml_dtd_data_type,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 static VALUE rxml_dtd_alloc(VALUE klass)
 {
-  return Data_Wrap_Struct(klass, rxml_dtd_mark, rxml_dtd_free, NULL);
+  return TypedData_Wrap_Struct(klass, &rxml_dtd_managed_data_type, NULL);
 }
 
 VALUE rxml_dtd_wrap(xmlDtdPtr xdtd)
 {
-  return  Data_Wrap_Struct(cXMLDtd, NULL, NULL, xdtd);
+  return TypedData_Wrap_Struct(cXMLDtd, &rxml_dtd_data_type, xdtd);
 }
 
 /*
@@ -64,7 +85,7 @@ VALUE rxml_dtd_wrap(xmlDtdPtr xdtd)
 static VALUE rxml_dtd_external_id_get(VALUE self)
 {
   xmlDtdPtr xdtd;
-  Data_Get_Struct(self, xmlDtd, xdtd);
+  TypedData_Get_Struct(self, xmlDtd, &rxml_dtd_data_type, xdtd);
 
 
   if (xdtd->ExternalID == NULL)
@@ -82,7 +103,7 @@ static VALUE rxml_dtd_external_id_get(VALUE self)
 static VALUE rxml_dtd_name_get(VALUE self)
 {
   xmlDtdPtr xdtd;
-  Data_Get_Struct(self, xmlDtd, xdtd);
+  TypedData_Get_Struct(self, xmlDtd, &rxml_dtd_data_type, xdtd);
 
 
   if (xdtd->name == NULL)
@@ -101,7 +122,7 @@ static VALUE rxml_dtd_name_get(VALUE self)
 static VALUE rxml_dtd_uri_get(VALUE self)
 {
   xmlDtdPtr xdtd;
-  Data_Get_Struct(self, xmlDtd, xdtd);
+  TypedData_Get_Struct(self, xmlDtd, &rxml_dtd_data_type, xdtd);
 
   if (xdtd->SystemID == NULL)
     return (Qnil);
@@ -118,7 +139,7 @@ static VALUE rxml_dtd_uri_get(VALUE self)
 static VALUE rxml_dtd_type(VALUE self)
 {
   xmlDtdPtr xdtd;
-  Data_Get_Struct(self, xmlDtd, xdtd);
+  TypedData_Get_Struct(self, xmlDtd, &rxml_dtd_data_type, xdtd);
   return (INT2NUM(xdtd->type));
 }
 
@@ -162,11 +183,17 @@ static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
           VALUE name, doc, internal;
           rb_scan_args(argc, argv, "23", &external, &system, &name, &doc, &internal);
 
-          Check_Type(external, T_STRING);
-          xpublic = (const xmlChar*) StringValuePtr(external);
+          if (external != Qnil)
+          {
+            Check_Type(external, T_STRING);
+            xpublic = (const xmlChar*) StringValuePtr(external);
+          }
 
-          Check_Type(system, T_STRING);
-          xsystem = (const xmlChar*) StringValuePtr(system);
+          if (system != Qnil)
+          {
+            Check_Type(system, T_STRING);
+            xsystem = (const xmlChar*) StringValuePtr(system);
+          }
 
           if (name != Qnil)
           {
@@ -178,7 +205,7 @@ static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
           {
             if (rb_obj_is_kind_of(doc, cXMLDocument) == Qfalse)
               rb_raise(rb_eTypeError, "Must pass an LibXML::XML::Document object");
-            Data_Get_Struct(doc, xmlDoc, xdoc);
+            TypedData_Get_Struct(doc, xmlDoc, &rxml_document_data_type, xdoc);
           }
 
           if (internal == Qnil || internal == Qfalse)
@@ -190,8 +217,11 @@ static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
             rxml_raise(xmlGetLastError());
 
           /* The document will free the dtd so Ruby should not */
-          RDATA(self)->dfree = NULL;
-          DATA_PTR(self) = xdtd;
+          {
+            VALUE *type_ptr = (VALUE *)&RTYPEDDATA(self)->type;
+            *type_ptr = (*type_ptr & TYPED_DATA_EMBEDDED) | (VALUE)&rxml_dtd_data_type;
+          }
+          RTYPEDDATA_DATA(self) = xdtd;
 
           xmlSetTreeDoc((xmlNodePtr) xdtd, xdoc);
         }
@@ -209,7 +239,7 @@ static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
         if (xdtd == NULL)
           rxml_raise(xmlGetLastError());
 
-        DATA_PTR(self) = xdtd;
+        RTYPEDDATA_DATA(self) = xdtd;
 
         xmlSetTreeDoc((xmlNodePtr) xdtd, NULL);
         break;
@@ -234,7 +264,7 @@ static VALUE rxml_dtd_initialize(int argc, VALUE *argv, VALUE self)
 
         xmlFree(new_string);
 
-        DATA_PTR(self) = xdtd;
+        RTYPEDDATA_DATA(self) = xdtd;
         break;
       }
       default:

data/ext/libxml/ruby_xml_dtd.h

@@ -2,6 +2,7 @@
 #define __RXML_DTD__
 
 extern VALUE cXMLDtd;
+extern const rb_data_type_t rxml_dtd_data_type;
 
 void  rxml_init_dtd(void);
 VALUE rxml_dtd_wrap(xmlDtdPtr xdtd);

data/ext/libxml/ruby_xml_html_parser.c

@@ -64,7 +64,7 @@ static VALUE rxml_html_parser_parse(VALUE self)
   xmlParserCtxtPtr ctxt;
   VALUE context = rb_ivar_get(self, CONTEXT_ATTR);
   
-  Data_Get_Struct(context, xmlParserCtxt, ctxt);
+  TypedData_Get_Struct(context, xmlParserCtxt, &rxml_html_parser_context_type, ctxt);
 
   if (htmlParseDocument(ctxt) == -1 && ! ctxt->recovery)
   {