libxml-ruby 5.0.6 → 6.0.0

data/LICENSE

@@ -1,21 +1,21 @@
-  Copyright (c) 2008-2013 Charlie Savage and contributors
-  Copyright (c) 2002-2007 Sean Chittenden and contributors
-  Copyright (c) 2001 Wai-Sun "Squidster" Chia
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  Copyright (c) 2008-2013 Charlie Savage and contributors
+  Copyright (c) 2002-2007 Sean Chittenden and contributors
+  Copyright (c) 2001 Wai-Sun "Squidster" Chia
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

data/README.md

@@ -0,0 +1,67 @@
+# LibXML Ruby
+
+## Overview
+The libxml gem provides Ruby language bindings for GNOME's Libxml2
+XML toolkit. It is free software, released under the MIT License.
+
+libxml-ruby let's you:
+
+* Read xml files
+* Write xml files
+* Search xml files using XPath
+* Validate XML files
+
+Full documentation is available at [xml4r.github.io/libxml-ruby](https://xml4r.github.io/libxml-ruby/) including a getting started guide.
+
+## Requirements
+
+libxml-ruby requires Ruby 3.2 or higher.
+
+## Installation
+The easiest way to install libxml-ruby is via RubyGems.  To install:
+
+```
+gem install libxml-ruby
+```
+
+If the extension compile process cannot find libxml2, you may need to indicate
+the location of the libxml2 configuration utility as it is used to find the
+required header and include files.  (If you need to indicate a location for the
+libxml2 library or header files different than reported by `xml2-config`,
+see the additional configuration options.)
+
+This may be done with RubyGems:
+
+```
+gem install libxml-ruby -- --with-xml2-config=/path/to/xml2-config
+```
+
+Or bundler:
+
+```
+bundle config build.libxml-ruby --with-xml2-config=/path/to/xml2-config
+bundle install
+```
+
+Full documentation is available at [xml4r.github.io/libxml-ruby](https://xml4r.github.io/libxml-ruby/) including a [getting started](https://xml4r.github.io/libxml-ruby/getting_started/) guide.
+
+## Tests
+
+To run tests you first need to build the shared library:
+
+```
+rake compile
+```
+
+Once you have built the shared library, you can then run tests using rake:
+
+```
+rake test
+```
+
+## Support
+If you have any questions about using libxml-ruby, please report an issue
+on [GitHub](https://github.com/xml4r/libxml-ruby/issues).
+
+## License
+See [LICENSE](LICENSE) for license information.

data/Rakefile

@@ -21,25 +21,6 @@ Rake::ExtensionTask.new do |ext|
   ext.name = SO_NAME
   ext.ext_dir = "ext/libxml"
   ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d+$/, '')}"
-  if RUBY_PLATFORM.match(/mingw/)
-    ext.config_options <<
-      if (dir = ENV['WINDOWS_XML2_INCLUDE'])
-        "--with-xml2-include=#{dir}"
-      else
-        case RUBY_PLATFORM
-        when 'i386-mingw32'
-          '--with-xml2-include=C:/msys64/mingw32/include/libxml2'
-        when 'x64-mingw32'
-          '--with-xml2-include=C:/msys64/mingw64/include/libxml2'
-        when 'x64-mingw-ucrt'
-          '--with-xml2-include=C:/msys64/ucrt64/include/libxml2'
-        else
-          raise "Unknown Windows Ruby, please set ENV['WINDOWS_XML2_INCLUDE']"
-        end
-      end
-  else
-    ext.config_options << '--with-xml2-include=/usr/include/libxml2'
-  end
 end
 
 # Setup generic gem
@@ -49,21 +30,20 @@ Gem::PackageTask.new(spec) do |pkg|
 end
 
 # Setup Windows Gem
-if RUBY_PLATFORM.match(/mswin|mingw/)
-  binaries = (FileList['lib/**/*.so',
-                       'lib/**/*dll'])
+if RUBY_PLATFORM.match(/mingw/)
+  binaries = (FileList['lib/**/*.so'])
 
   # Windows specification
-  win_spec = spec.clone
-  win_spec.platform = Gem::Platform::CURRENT
-  win_spec.files += binaries.to_a
-  win_spec.instance_variable_set(:@cache_file, nil)
+  mingw_spec = spec.clone
+  mingw_spec.platform = Gem::Platform::CURRENT
+  mingw_spec.files += binaries.to_a
+  mingw_spec.instance_variable_set(:@cache_file, nil)
 
   # Unset extensions
-  win_spec.extensions = nil
+  mingw_spec.extensions = nil
 
   # Rake task to build the windows package
-  Gem::PackageTask.new(win_spec) do |pkg|
+  Gem::PackageTask.new(mingw_spec) do |pkg|
     pkg.package_dir = 'pkg'
     pkg.need_tar = false
   end
@@ -74,20 +54,19 @@ desc 'Generate rdoc documentation'
 RDoc::Task.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'LibXML'
-  rdoc.generator = 'hanna'
+  rdoc.generator = 'aliki'
 
   # Show source inline with line numbers
   rdoc.options << '--line-numbers'
   rdoc.options << '--charset=utf-8'
   # Make the readme file the start page for the generated html
-  rdoc.main = 'README.rdoc'
-  rdoc.rdoc_files.include('doc/*.rdoc',
-                          'ext/**/libxml.c',
+  rdoc.main = 'README.md'
+  rdoc.rdoc_files.include('ext/**/libxml.c',
                           'ext/**/ruby_xml.c',
                           'ext/**/*.c',
                           'lib/**/*.rb',
-                          'README.rdoc',
-                          'HISTORY',
+                          'README.md',
+                          'CHANGELOG.md',
                           'LICENSE')
 end
 

data/ext/libxml/extconf.rb

@@ -23,32 +23,46 @@ if xc
   end
 else
   dir_config('xml2')
+  pkg_config('libxml-2.0')
 end
 
-found_header = find_header('libxml/xmlversion.h',
-                           '/opt/include/libxml2',
-                           '/opt/local/include/libxml2',
-                           '/opt/homebrew/opt/libxml2/include/libxml2',
-                           '/usr/local/include/libxml2',
-                           '/usr/include/libxml2',
-                           '/usr/local/include',
-                           '/usr/local/opt/libxml2/include/libxml2')
+include_dirs = []
+lib_dirs = []
+
+if (msystem_prefix = ENV['MSYSTEM_PREFIX']) && !msystem_prefix.empty?
+  include_dirs.concat([
+    "#{msystem_prefix}/include/libxml2",
+    "#{msystem_prefix}/include"
+  ])
+  lib_dirs << "#{msystem_prefix}/lib"
+end
+
+include_dirs.concat([
+  '/opt/include/libxml2',
+  '/opt/local/include/libxml2',
+  '/opt/homebrew/opt/libxml2/include/libxml2',
+  '/usr/local/include/libxml2',
+  '/usr/include/libxml2',
+  '/usr/local/include',
+  '/usr/local/opt/libxml2/include/libxml2'
+])
+
+lib_dirs.concat([
+  '/opt/lib',
+  '/opt/local/lib',
+  '/opt/homebrew/opt/libxml2/lib',
+  '/usr/lib',
+  '/usr/local/lib',
+  '/usr/local/opt/libxml2/lib'
+])
+
+found_header = find_header('libxml/xmlversion.h', *include_dirs)
 
 found_lib = find_library('xml2', 'xmlParseDoc',
-                           '/opt/lib',
-                           '/opt/local/lib',
-                           '/opt/homebrew/opt/libxml2/lib',
-                           '/usr/lib',
-                           '/usr/local/lib',
-                           '/usr/local/opt/libxml2/lib')
+                         *lib_dirs)
 
 found_lib ||= find_library('libxml2', 'xmlParseDoc',
-                           '/opt/lib',
-                           '/opt/local/lib',
-                           '/opt/homebrew/opt/libxml2/lib',
-                           '/usr/lib',
-                           '/usr/local/lib',
-                           '/usr/local/opt/libxml2/lib')
+                           *lib_dirs)
 
 if !found_header || !found_lib
     crash(<<~EOL)

data/ext/libxml/libxml.c

@@ -9,18 +9,6 @@
 
 VALUE mLibXML;
 
-static void rxml_init_memory(void)
-{
- /* Disable for now - broke attributes. 
-  xmlGcMemSetup(
-      (xmlFreeFunc)ruby_xfree,
-      (xmlMallocFunc)ruby_xmalloc,
-      (xmlMallocFunc)ruby_xmalloc,
-      (xmlReallocFunc)ruby_xrealloc,
-      (xmlStrdupFunc)ruby_strdup
-  );*/
-}
-
 void Init_libxml_ruby(void)
 {
 /* The libxml gem provides Ruby language bindings for GNOME's Libxml2
@@ -40,12 +28,12 @@ void Init_libxml_ruby(void)
  * copyright and distribution information.
  */
 
-  // Seutp for threading. http://xmlsoft.org/threads.html
+  // Setup for threading. http://xmlsoft.org/threads.html
   xmlInitParser();
 
   mLibXML = rb_define_module("LibXML");
 
-  rxml_init_memory();
+  rxml_init_registry();
   rxml_init_xml();
   rxml_init_io();
   rxml_init_error();

data/ext/libxml/ruby_libxml.h

@@ -24,7 +24,6 @@
 #include "ruby_xml_html_parser_options.h"
 #include "ruby_xml_html_parser_context.h"
 #include "ruby_xml_reader.h"
-#include "ruby_xml_writer.h"
 #include "ruby_xml_sax2_handler.h"
 #include "ruby_xml_sax_parser.h"
 #include "ruby_xml_writer.h"
@@ -37,6 +36,7 @@
 #include "ruby_xml_dtd.h"
 #include "ruby_xml_schema.h"
 #include "ruby_xml_relaxng.h"
+#include "ruby_xml_registry.h"
 
 extern VALUE mLibXML;
 

data/ext/libxml/ruby_xml_attr.c

@@ -32,22 +32,29 @@
 
 VALUE cXMLAttr;
 
-void rxml_attr_mark(xmlAttrPtr xattr)
+static void rxml_attr_mark(void *data)
 {
+  xmlAttrPtr xattr = (xmlAttrPtr) data;
   /* This can happen if Ruby does a GC run after creating the
      new attribute but before initializing it. */
   if (xattr != NULL)
     rxml_node_mark((xmlNodePtr) xattr);
 }
 
+const rb_data_type_t rxml_attr_type = {
+  "LibXML::XML::Attr",
+  {rxml_attr_mark, NULL, 0},
+  &rxml_node_data_type, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rxml_attr_wrap(xmlAttrPtr xattr)
 {
-  return Data_Wrap_Struct(cXMLAttr, rxml_attr_mark, NULL, xattr);
+  return TypedData_Wrap_Struct(cXMLAttr, &rxml_attr_type, xattr);
 }
 
 static VALUE rxml_attr_alloc(VALUE klass)
 {
-  return Data_Wrap_Struct(klass, rxml_attr_mark, NULL, NULL);
+  return TypedData_Wrap_Struct(klass, &rxml_attr_type, NULL);
 }
 
 /*
@@ -78,7 +85,7 @@ static VALUE rxml_attr_initialize(int argc, VALUE *argv, VALUE self)
   Check_Type(name, T_STRING);
   Check_Type(value, T_STRING);
 
-  Data_Get_Struct(node, xmlNode, xnode);
+  TypedData_Get_Struct(node, xmlNode, &rxml_node_data_type, xnode);
 
   if (xnode->type != XML_ELEMENT_NODE)
     rb_raise(rb_eArgError, "Attributes can only be created on element nodes.");
@@ -90,14 +97,14 @@ static VALUE rxml_attr_initialize(int argc, VALUE *argv, VALUE self)
   else
   {
     xmlNsPtr xns;
-    Data_Get_Struct(ns, xmlNs, xns);
+    TypedData_Get_Struct(ns, xmlNs, &rxml_namespace_type, xns);
     xattr = xmlNewNsProp(xnode, xns, (xmlChar*)StringValuePtr(name), (xmlChar*)StringValuePtr(value));
   }
 
   if (!xattr)
     rb_raise(rb_eRuntimeError, "Could not create attribute.");
 
-  DATA_PTR( self) = xattr;
+  RTYPEDDATA_DATA( self) = xattr;
   return self;
 }
 
@@ -110,7 +117,7 @@ static VALUE rxml_attr_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE rxml_attr_child_get(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   if (xattr->children == NULL)
     return Qnil;
   else
@@ -129,11 +136,11 @@ static VALUE rxml_attr_child_get(VALUE self)
 static VALUE rxml_attr_doc_get(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   if (xattr->doc == NULL)
     return Qnil;
   else
-    return rxml_document_wrap(xattr->doc);
+    return rxml_registry_lookup(xattr->doc);
 }
 
 /*
@@ -145,7 +152,7 @@ static VALUE rxml_attr_doc_get(VALUE self)
 static VALUE rxml_attr_last_get(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   if (xattr->last == NULL)
     return Qnil;
   else
@@ -161,7 +168,7 @@ static VALUE rxml_attr_last_get(VALUE self)
 static VALUE rxml_attr_name_get(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
 
   if (xattr->name == NULL)
     return Qnil;
@@ -178,7 +185,7 @@ static VALUE rxml_attr_name_get(VALUE self)
 static VALUE rxml_attr_next_get(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   if (xattr->next == NULL)
     return Qnil;
   else
@@ -194,7 +201,7 @@ static VALUE rxml_attr_next_get(VALUE self)
 static VALUE rxml_attr_node_type(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   return INT2NUM(xattr->type);
 }
 
@@ -207,7 +214,7 @@ static VALUE rxml_attr_node_type(VALUE self)
 static VALUE rxml_attr_ns_get(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   if (xattr->ns == NULL)
     return Qnil;
   else
@@ -223,7 +230,7 @@ static VALUE rxml_attr_ns_get(VALUE self)
 static VALUE rxml_attr_parent_get(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   if (xattr->parent == NULL)
     return Qnil;
   else
@@ -239,7 +246,7 @@ static VALUE rxml_attr_parent_get(VALUE self)
 static VALUE rxml_attr_prev_get(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   if (xattr->prev == NULL)
     return Qnil;
   else
@@ -258,12 +265,10 @@ static VALUE rxml_attr_prev_get(VALUE self)
 static VALUE rxml_attr_remove_ex(VALUE self)
 {
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   xmlRemoveProp(xattr);
 
-  RDATA(self)->data = NULL;
-  RDATA(self)->dfree = NULL;
-  RDATA(self)->dmark = NULL;
+  RTYPEDDATA_DATA(self) = NULL;
 
   return Qnil;
 }
@@ -280,7 +285,7 @@ VALUE rxml_attr_value_get(VALUE self)
   xmlChar *value;
   VALUE result = Qnil;
 
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
   value = xmlNodeGetContent((xmlNodePtr)xattr);
 
   if (value != NULL)
@@ -302,7 +307,7 @@ VALUE rxml_attr_value_set(VALUE self, VALUE val)
   xmlAttrPtr xattr;
 
   Check_Type(val, T_STRING);
-  Data_Get_Struct(self, xmlAttr, xattr);
+  TypedData_Get_Struct(self, xmlAttr, &rxml_attr_type, xattr);
 
   if (xattr->ns)
     xmlSetNsProp(xattr->parent, xattr->ns, xattr->name,

data/ext/libxml/ruby_xml_attr.h

@@ -4,6 +4,7 @@
 #define __RXML_ATTR__
 
 extern VALUE cXMLAttr;
+extern const rb_data_type_t rxml_attr_type;
 
 void rxml_init_attr(void);
 VALUE rxml_attr_wrap(xmlAttrPtr xattr);

data/ext/libxml/ruby_xml_attr_decl.c

@@ -13,14 +13,21 @@
 
 VALUE cXMLAttrDecl;
 
-void rxml_attr_decl_mark(xmlAttributePtr xattr)
+static void rxml_attr_decl_mark(void *data)
 {
-  rxml_node_mark((xmlNodePtr) xattr);
+  xmlAttributePtr xattr = (xmlAttributePtr)data;
+  rxml_node_mark((xmlNodePtr)xattr);
 }
 
+static const rb_data_type_t rxml_attr_decl_type = {
+  "LibXML::XML::AttrDecl",
+  {rxml_attr_decl_mark, NULL, 0},
+  &rxml_attr_type, 0, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE rxml_attr_decl_wrap(xmlAttributePtr xattr)
 {
-  return Data_Wrap_Struct(cXMLAttrDecl, rxml_attr_decl_mark, NULL, xattr);
+  return TypedData_Wrap_Struct(cXMLAttrDecl, &rxml_attr_decl_type, xattr);
 }
 
 /*
@@ -32,11 +39,11 @@ VALUE rxml_attr_decl_wrap(xmlAttributePtr xattr)
 static VALUE rxml_attr_decl_doc_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
   if (xattr->doc == NULL)
     return Qnil;
   else
-    return rxml_document_wrap(xattr->doc);
+    return rxml_registry_lookup(xattr->doc);
 }
 
 
@@ -49,7 +56,7 @@ static VALUE rxml_attr_decl_doc_get(VALUE self)
 static VALUE rxml_attr_decl_name_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
 
   if (xattr->name == NULL)
     return Qnil;
@@ -66,7 +73,7 @@ static VALUE rxml_attr_decl_name_get(VALUE self)
 static VALUE rxml_attr_decl_next_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
   if (xattr->next == NULL)
     return Qnil;
   else
@@ -81,8 +88,8 @@ static VALUE rxml_attr_decl_next_get(VALUE self)
  */
 static VALUE rxml_attr_decl_node_type(VALUE self)
 {
-  xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlAttr, xattr);
+  xmlAttributePtr xattr;
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
   return INT2NUM(xattr->type);
 }
 
@@ -96,7 +103,7 @@ static VALUE rxml_attr_decl_node_type(VALUE self)
 static VALUE rxml_attr_decl_parent_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
 
   if (xattr->parent == NULL)
     return Qnil;
@@ -114,7 +121,7 @@ static VALUE rxml_attr_decl_parent_get(VALUE self)
 static VALUE rxml_attr_decl_prev_get(VALUE self)
 {
   xmlAttributePtr xattr;
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
 
   if (xattr->prev == NULL)
     return Qnil;
@@ -132,7 +139,7 @@ VALUE rxml_attr_decl_value_get(VALUE self)
 {
   xmlAttributePtr xattr;
 
-  Data_Get_Struct(self, xmlAttribute, xattr);
+  TypedData_Get_Struct(self, xmlAttribute, &rxml_attr_decl_type, xattr);
 
   if (xattr->defaultValue)
     return rxml_new_cstr(xattr->defaultValue, NULL);

data/ext/libxml/ruby_xml_attributes.c

@@ -32,17 +32,26 @@
 
 VALUE cXMLAttributes;
 
-void rxml_attributes_mark(xmlNodePtr xnode)
+void rxml_attributes_mark(void *data)
 {
-  rxml_node_mark(xnode);
+  rxml_node_mark((xmlNodePtr)data);
 }
 
+static const rb_data_type_t rxml_attributes_data_type = {
+  .wrap_struct_name = "LibXML::XML::Attributes",
+  .function = {
+    .dmark = rxml_attributes_mark,
+    .dfree = NULL,
+  },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
 /*
  * Creates a  new attributes instance.  Not exposed to ruby.
  */
 VALUE rxml_attributes_new(xmlNodePtr xnode)
 {
-  return Data_Wrap_Struct(cXMLAttributes, rxml_attributes_mark, NULL, xnode);
+  return TypedData_Wrap_Struct(cXMLAttributes, &rxml_attributes_data_type, xnode);
 }
 
 /*
@@ -56,7 +65,7 @@ VALUE rxml_attributes_new(xmlNodePtr xnode)
 VALUE rxml_attributes_node_get(VALUE self)
 {
   xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
   return rxml_node_wrap(xnode);
 }
 
@@ -80,7 +89,7 @@ static VALUE rxml_attributes_get_attribute(VALUE self, VALUE name)
 
   name = rb_obj_as_string(name);
 
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   xattr = xmlHasProp(xnode, (xmlChar*) StringValuePtr(name));
 
@@ -114,7 +123,7 @@ static VALUE rxml_attributes_get_attribute_ns(VALUE self, VALUE namespace,
 
   name = rb_obj_as_string(name);
 
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   xattr = xmlHasNsProp(xnode, (xmlChar*) StringValuePtr(name),
                       (xmlChar*) StringValuePtr(namespace));
@@ -191,7 +200,7 @@ static VALUE rxml_attributes_each(VALUE self)
 {
   xmlNodePtr xnode;
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   xattr = xnode->properties;
 
@@ -222,7 +231,7 @@ static VALUE rxml_attributes_length(VALUE self)
   int length = 0;
   xmlNodePtr xnode;
   xmlAttrPtr xattr;
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   xattr = xnode->properties;
 
@@ -246,7 +255,7 @@ static VALUE rxml_attributes_length(VALUE self)
 static VALUE rxml_attributes_first(VALUE self)
 {
   xmlNodePtr xnode;
-  Data_Get_Struct(self, xmlNode, xnode);
+  TypedData_Get_Struct(self, xmlNode, &rxml_attributes_data_type, xnode);
 
   if (xnode->type == XML_ELEMENT_NODE)
   {