nokogiri 1.14.3-java → 1.15.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3803714004a5e5365a19641aa32d13d470b10dfdc383e27bf2b76f9a43a5e58c
-  data.tar.gz: 81ea89ae9e67aa0fc32cb9e4395e1c74822f5173a4ae7d067076834297b4a73c
+  metadata.gz: 77aa99dfd4573719740455b1274f17b9dfedf73064975fd059de9a770f0cc32c
+  data.tar.gz: 8813970061dfecd1c218d8f0267e64f383ef5fce6ef5a8c23e7c4d91d173a0b2
 SHA512:
-  metadata.gz: 0004d2944cbcf3e824cd519f410fd1a303303ac00a8c6e36c69cd6b67d091314892fdf9420c3db3b5d24039fd2c25a91de313743a1d345da95699c7fe7ee3853
-  data.tar.gz: 976be3b3fc6bead605cb6a9a87e712eadafa7b0ad6c511966a8fc4130f06addc9726ad85eb34828ae5b7f695a312702b0e1d96e6238192b57d0e3e82299cf577
+  metadata.gz: bac6f68aac57e8c3e47d1ccdb4db199815236ec34e6e7f425a804d973a642572944c34e0afb9caf78cdec707b8ff919fbd6414ddee519d75c43890256231f30d
+  data.tar.gz: 24d44e5487c4cd00dcb65947eb1b6aa50932cdc87b79daa60a9c9811ea3f48a6e27965f01277686760ad327f78d0112e3f8de798fb4712c3e2fec85bd490472e

data/Gemfile

@@ -20,19 +20,20 @@ group :development do
   gem "rexical", "= 1.0.7"
 
   # tests
-  gem "minitest", "5.17.0"
-  gem "minitest-reporters", "= 1.5.0"
-  gem "ruby_memcheck", "1.2.0" unless RUBY_PLATFORM == "java"
-  gem "simplecov", "= 0.21.2"
+  gem "minitest", "5.18.0"
+  gem "minitest-reporters", "1.6.0"
+  gem "ruby_memcheck", git: "https://github.com/flavorjones/ruby_memcheck", ref: "flavorjones-nokogiri-huge-parse-option"
   gem "rubyzip", "~> 2.3.2"
+  gem "simplecov", "= 0.21.2"
 
   # rubocop
   if Gem::Requirement.new("~> 3.0").satisfied_by?(Gem::Version.new(RUBY_VERSION))
-    gem "rubocop", "1.44.1"
-    gem "rubocop-minitest", "0.27.0"
-    gem "rubocop-performance", "1.15.2"
+    gem "rubocop", "1.50.2"
+    gem "rubocop-minitest", "0.31.0"
+    gem "rubocop-packaging", "0.5.2"
+    gem "rubocop-performance", "1.17.1"
     gem "rubocop-rake", "= 0.6.0"
-    gem "rubocop-shopify", "2.10.1"
+    gem "rubocop-shopify", "2.13.0"
   end
 end
 

data/dependencies.yml

@@ -1,12 +1,12 @@
 libxml2:
-  version: "2.10.4"
-  sha256: "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"
-  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.4.sha256sum
+  version: "2.11.3"
+  sha256: "f1acae1664bda006cd81bfc238238217043d586d06659d5c0e3d1bcebe040870"
+  # sha-256 hash provided in https://download.gnome.org/sources/libxml2/2.11/libxml2-2.11.3.sha256sum
 
 libxslt:
-  version: "1.1.37"
-  sha256: "3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4"
-  # sha-256 hash provided in https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.37.sha256sum
+  version: "1.1.38"
+  sha256: "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1"
+  # sha-256 hash provided in https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.sha256sum
 
 zlib:
   version: "1.2.13"

data/ext/java/nokogiri/NokogiriService.java

@@ -227,7 +227,6 @@ public class NokogiriService implements BasicLibraryService
   {
     RubyClass stylesheet = xsltModule.defineClassUnder("Stylesheet", ruby.getObject(), XSLT_STYLESHEET_ALLOCATOR);
     stylesheet.defineAnnotatedMethods(XsltStylesheet.class);
-    xsltModule.defineAnnotatedMethod(XsltStylesheet.class, "register");
   }
 
   public static final ObjectAllocator HTML_DOCUMENT_ALLOCATOR = new ObjectAllocator()

data/ext/java/nokogiri/XmlCdata.java

@@ -45,6 +45,12 @@ public class XmlCdata extends XmlText
     }
     IRubyObject doc = args[0];
     content = args[1];
+
+    if (!(doc instanceof XmlDocument)) {
+      // TODO: deprecate allowing Node
+      context.runtime.getWarnings().warn("Passing a Node as the first parameter to CDATA.new is deprecated. Please pass a Document instead. This will become an error in a future release of Nokogiri.");
+    }
+
     Document document = ((XmlNode) doc).getOwnerDocument();
     Node node = document.createCDATASection(rubyStringToString(content));
     setNode(context.runtime, node);

data/ext/java/nokogiri/XmlNode.java

@@ -762,14 +762,14 @@ public class XmlNode extends RubyObject
     if (children.getLength() == 0) {
       return Collections.emptyList();
     }
-    ArrayList<Node> elements = firstOnly ? null : new ArrayList<Node>(children.getLength());
+    ArrayList<Node> elements = new ArrayList<Node>();
     for (int i = 0; i < children.getLength(); i++) {
       Node child = children.item(i);
       if (child.getNodeType() == Node.ELEMENT_NODE) {
+        elements.add(child);
         if (firstOnly) {
-          return Collections.singletonList(child);
+          return elements;
         }
-        elements.add(child);
       }
     }
     return elements;
@@ -1342,12 +1342,21 @@ public class XmlNode extends RubyObject
     IRubyObject io = args[0];
     IRubyObject encoding = args[1];
     IRubyObject indentString = args[2];
-    IRubyObject options = args[3];
+    IRubyObject options_rb = args[3];
+    int options = RubyFixnum.fix2int(options_rb);
 
     String encString = rubyStringToString(encoding);
 
+    // similar to behavior of libxml2's xmlSaveTree function
+    if ((options & SaveContextVisitor.AS_XML) == 0 &&
+        (options & SaveContextVisitor.AS_XHTML) == 0 &&
+        (options & SaveContextVisitor.AS_HTML) == 0 &&
+        isHtmlDoc(context)) {
+      options |= SaveContextVisitor.DEFAULT_HTML;
+    }
+
     SaveContextVisitor visitor =
-      new SaveContextVisitor(RubyFixnum.fix2int(options), rubyStringToString(indentString), encString, isHtmlDoc(context),
+      new SaveContextVisitor(options, rubyStringToString(indentString), encString, isHtmlDoc(context),
                              isFragment(), 0);
     accept(context, visitor);
 

data/ext/java/nokogiri/XmlSchema.java

@@ -149,6 +149,11 @@ public class XmlSchema extends RubyObject
       parseOptions = args[1];
     }
 
+    if (!(document instanceof XmlDocument)) {
+      // TODO: deprecate allowing Node
+      context.runtime.getWarnings().warn("Passing a Node as the first parameter to Schema.from_document is deprecated. Please pass a Document instead. This will become an error in a future release of Nokogiri.");
+    }
+
     XmlDocument doc = ((XmlDocument)((XmlNode) document).document(context));
 
     RubyArray<?> errors = (RubyArray) doc.getInstanceVariable("@errors");

data/ext/java/nokogiri/XmlText.java

@@ -53,6 +53,11 @@ public class XmlText extends XmlNode
     content = args[0];
     IRubyObject xNode = args[1];
 
+    if (!(xNode instanceof XmlDocument)) {
+      // TODO: deprecate allowing Node
+      context.runtime.getWarnings().warn("Passing a Node as the second parameter to Text.new is deprecated. Please pass a Document instead. This will become an error in a future release of Nokogiri.");
+    }
+
     Document document = asXmlNode(context, xNode).getOwnerDocument();
     // text node content should not be encoded when it is created by Text node.
     // while content should be encoded when it is created by Element node.

data/ext/java/nokogiri/XsltStylesheet.java

@@ -13,6 +13,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Templates;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
@@ -79,14 +80,12 @@ public class XsltStylesheet extends RubyObject
   private void
   addParametersToTransformer(ThreadContext context, Transformer transf, IRubyObject parameters)
   {
-    Ruby runtime = context.getRuntime();
-
     if (parameters instanceof RubyHash) {
       setHashParameters(transf, (RubyHash)parameters);
     } else if (parameters instanceof RubyArray) {
-      setArrayParameters(transf, runtime, (RubyArray)parameters);
+      setArrayParameters(transf, context, (RubyArray)parameters);
     } else {
-      throw runtime.newTypeError("parameters should be given either Array or Hash");
+      throw context.getRuntime().newTypeError("parameters should be given either Array or Hash");
     }
   }
 
@@ -100,14 +99,14 @@ public class XsltStylesheet extends RubyObject
   }
 
   private void
-  setArrayParameters(Transformer transformer, Ruby runtime, RubyArray<?> params)
+  setArrayParameters(Transformer transformer, ThreadContext context, RubyArray<?> params)
   {
     int limit = params.getLength();
     if (limit % 2 == 1) { limit--; }
 
     for (int i = 0; i < limit; i += 2) {
-      String name = params.aref(runtime.newFixnum(i)).asJavaString();
-      String value = params.aref(runtime.newFixnum(i + 1)).asJavaString();
+      String name = params.aref(context, context.getRuntime().newFixnum(i)).asJavaString();
+      String value = params.aref(context, context.getRuntime().newFixnum(i + 1)).asJavaString();
       transformer.setParameter(name, unparseValue(value));
     }
   }
@@ -184,9 +183,15 @@ public class XsltStylesheet extends RubyObject
     XmlDocument xmlDoc = (XmlDocument) doc;
     ByteArrayOutputStream writer = new ByteArrayOutputStream();
 
-    Serializer serializer = SerializerFactory.getSerializer(this.sheet.getOutputProperties());
+    java.util.Properties props = this.sheet.getOutputProperties();
+    if (props.getProperty(OutputKeys.METHOD) == null) {
+      props.setProperty(OutputKeys.METHOD, org.apache.xml.serializer.Method.UNKNOWN);
+    }
+
+    Serializer serializer = SerializerFactory.getSerializer(props);
     serializer.setOutputStream(writer);
     ((SerializationHandler) serializer).serialize(xmlDoc.getNode());
+
     return context.getRuntime().newString(writer.toString());
   }
 
@@ -345,17 +350,4 @@ public class XsltStylesheet extends RubyObject
     if (arg instanceof XmlDocument) { return; }
     throw runtime.newArgumentError("argument must be a Nokogiri::XML::Document");
   }
-
-  @JRubyMethod(name = {"registr", "register"}, meta = true)
-  public static IRubyObject
-  register(ThreadContext context, IRubyObject cls, IRubyObject uri, IRubyObject receiver)
-  {
-    throw context.getRuntime().newNotImplementedError("Nokogiri::XSLT.register method is not implemented");
-    /* When API conflict is solved, this method should be below:
-    // ThreadContext is used while executing xslt extension function
-    registry.put("context", context);
-    registry.put("receiver", receiver);
-    return context.getRuntime().getNil();
-    */
-  }
 }

data/ext/java/nokogiri/internals/HtmlDomParserContext.java

@@ -56,9 +56,7 @@ public class HtmlDomParserContext extends XmlDomParserContext
   initParser(Ruby runtime)
   {
     XMLParserConfiguration config = new HTMLConfiguration();
-    //XMLDocumentFilter removeNSAttrsFilter = new RemoveNSAttrsFilter();
     XMLDocumentFilter elementValidityCheckFilter = new ElementValidityCheckFilter(errorHandler);
-    //XMLDocumentFilter[] filters = { removeNSAttrsFilter,  elementValidityCheckFilter};
     XMLDocumentFilter[] filters = { elementValidityCheckFilter};
 
     config.setErrorHandler(this.errorHandler);
@@ -162,29 +160,6 @@ public class HtmlDomParserContext extends XmlDomParserContext
     return null;
   }
 
-  /**
-   * Filter to strip out attributes that pertain to XML namespaces.
-   */
-  public static class RemoveNSAttrsFilter extends DefaultFilter
-  {
-    @Override
-    public void
-    startElement(QName element, XMLAttributes attrs,
-                 Augmentations augs) throws XNIException
-    {
-      int i;
-      for (i = 0; i < attrs.getLength(); ++i) {
-        if (isNamespace(attrs.getQName(i))) {
-          attrs.removeAttributeAt(i);
-          --i;
-        }
-      }
-
-      element.uri = null;
-      super.startElement(element, attrs, augs);
-    }
-  }
-
   public static class ElementValidityCheckFilter extends DefaultFilter
   {
     private NokogiriErrorHandler errorHandler;

data/ext/java/nokogiri/internals/SaveContextVisitor.java

@@ -74,6 +74,7 @@ public class SaveContextVisitor
   public static final int AS_XML = 32;
   public static final int AS_HTML = 64;
   public static final int AS_BUILDER = 128;
+  public static final int DEFAULT_HTML = NO_DECL | NO_EMPTY | AS_HTML;
 
   public static final int CANONICAL = 1;
   public static final int INCL_NS = 2;

data/ext/nokogiri/extconf.rb

@@ -15,7 +15,7 @@ PACKAGE_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."
 REQUIRED_LIBXML_VERSION = "2.6.21"
 RECOMMENDED_LIBXML_VERSION = "2.9.3"
 
-REQUIRED_MINI_PORTILE_VERSION = "~> 2.8.0" # keep this version in sync with the one in the gemspec
+REQUIRED_MINI_PORTILE_VERSION = "~> 2.8.2" # keep this version in sync with the one in the gemspec
 REQUIRED_PKG_CONFIG_VERSION = "~> 1.1"
 
 # Keep track of what versions of what libraries we build against
@@ -229,7 +229,7 @@ def gnome_source
   if ENV["NOKOGIRI_USE_CANONICAL_GNOME_SOURCE"]
     "https://download.gnome.org"
   else
-    "https://mirror.csclub.uwaterloo.ca/gnome" # old reliable
+    "https://muug.ca/mirror/gnome" # old reliable
   end
 end
 
@@ -372,7 +372,7 @@ def try_link_iconv(using = nil)
       preserving_globals do
         yield if block_given?
 
-        try_link(<<~'SRC', opt)
+        try_link(<<~SRC, opt)
           #include <stdlib.h>
           #include <iconv.h>
           int main(void)
@@ -695,14 +695,34 @@ append_cppflags(' "-Idummypath"') if windows?
 
 if config_system_libraries?
   message "Building nokogiri using system libraries.\n"
-  ensure_package_configuration(opt: "zlib", pc: "zlib", lib: "z",
-    headers: "zlib.h", func: "gzdopen")
-  ensure_package_configuration(opt: "xml2", pc: "libxml-2.0", lib: "xml2",
-    headers: "libxml/parser.h", func: "xmlParseDoc")
-  ensure_package_configuration(opt: "xslt", pc: "libxslt", lib: "xslt",
-    headers: "libxslt/xslt.h", func: "xsltParseStylesheetDoc")
-  ensure_package_configuration(opt: "exslt", pc: "libexslt", lib: "exslt",
-    headers: "libexslt/exslt.h", func: "exsltFuncRegister")
+  ensure_package_configuration(
+    opt: "zlib",
+    pc: "zlib",
+    lib: "z",
+    headers: "zlib.h",
+    func: "gzdopen",
+  )
+  ensure_package_configuration(
+    opt: "xml2",
+    pc: "libxml-2.0",
+    lib: "xml2",
+    headers: "libxml/parser.h",
+    func: "xmlParseDoc",
+  )
+  ensure_package_configuration(
+    opt: "xslt",
+    pc: "libxslt",
+    lib: "xslt",
+    headers: "libxslt/xslt.h",
+    func: "xsltParseStylesheetDoc",
+  )
+  ensure_package_configuration(
+    opt: "exslt",
+    pc: "libexslt",
+    lib: "exslt",
+    headers: "libexslt/exslt.h",
+    func: "exsltFuncRegister",
+  )
 
   have_libxml_headers?(REQUIRED_LIBXML_VERSION) ||
     abort("ERROR: libxml2 version #{REQUIRED_LIBXML_VERSION} or later is required!")
@@ -785,8 +805,12 @@ else
     end
 
     unless nix?
-      libiconv_recipe = process_recipe("libiconv", dependencies["libiconv"]["version"], static_p,
-        cross_build_p) do |recipe|
+      libiconv_recipe = process_recipe(
+        "libiconv",
+        dependencies["libiconv"]["version"],
+        static_p,
+        cross_build_p,
+      ) do |recipe|
         recipe.files = [{
           url: "https://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz",
           sha256: dependencies["libiconv"]["sha256"],
@@ -824,15 +848,25 @@ else
   if zlib_recipe
     append_cppflags("-I#{zlib_recipe.path}/include")
     $LIBPATH = ["#{zlib_recipe.path}/lib"] | $LIBPATH
-    ensure_package_configuration(opt: "zlib", pc: "zlib", lib: "z",
-      headers: "zlib.h", func: "gzdopen")
+    ensure_package_configuration(
+      opt: "zlib",
+      pc: "zlib",
+      lib: "z",
+      headers: "zlib.h",
+      func: "gzdopen",
+    )
   end
 
   if libiconv_recipe
     append_cppflags("-I#{libiconv_recipe.path}/include")
     $LIBPATH = ["#{libiconv_recipe.path}/lib"] | $LIBPATH
-    ensure_package_configuration(opt: "iconv", pc: "iconv", lib: "iconv",
-      headers: "iconv.h", func: "iconv_open")
+    ensure_package_configuration(
+      opt: "iconv",
+      pc: "iconv",
+      lib: "iconv",
+      headers: "iconv.h",
+      func: "iconv_open",
+    )
   end
 
   libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"]["version"], static_p, cross_build_p) do |recipe|
@@ -848,8 +882,13 @@ else
       recipe.patch_files = Dir[File.join(PACKAGE_ROOT_DIR, "patches", "libxml2", "*.patch")].sort
     end
 
+    cppflags = concat_flags(ENV["CPPFLAGS"])
     cflags = concat_flags(ENV["CFLAGS"], "-O2", "-U_FORTIFY_SOURCE", "-g")
 
+    if cross_build_p
+      cppflags = concat_flags(cppflags, "-DNOKOGIRI_PRECOMPILED_LIBRARIES")
+    end
+
     if zlib_recipe
       recipe.configure_options << "--with-zlib=#{zlib_recipe.path}"
     end
@@ -880,6 +919,7 @@ else
       "--with-c14n",
       "--with-debug",
       "--with-threads",
+      "CPPFLAGS=#{cppflags}",
       "CFLAGS=#{cflags}",
     ]
   end
@@ -1023,7 +1063,7 @@ libgumbo_recipe = process_recipe("libgumbo", "1.0.0-nokogiri", static_p, cross_b
 
       env = { "CC" => gcc_cmd, "CFLAGS" => cflags }
       if config_cross_build?
-        if /darwin/.match?(host)
+        if host.include?("darwin")
           env["AR"] = "#{host}-libtool"
           env["ARFLAGS"] = "-o"
         else
@@ -1057,12 +1097,16 @@ unless config_system_libraries?
   if cross_build_p
     # When precompiling native gems, copy packaged libraries' headers to ext/nokogiri/include
     # These are packaged up by the cross-compiling callback in the ExtensionTask
-    copy_packaged_libraries_headers(to_path: File.join(PACKAGE_ROOT_DIR, "ext/nokogiri/include"),
-      from_recipes: [libxml2_recipe, libxslt_recipe])
+    copy_packaged_libraries_headers(
+      to_path: File.join(PACKAGE_ROOT_DIR, "ext/nokogiri/include"),
+      from_recipes: [libxml2_recipe, libxslt_recipe],
+    )
   else
     # When compiling during installation, install packaged libraries' header files into ext/nokogiri/include
-    copy_packaged_libraries_headers(to_path: "include",
-      from_recipes: [libxml2_recipe, libxslt_recipe])
+    copy_packaged_libraries_headers(
+      to_path: "include",
+      from_recipes: [libxml2_recipe, libxslt_recipe],
+    )
     $INSTALLFILES << ["include/**/*.h", "$(rubylibdir)"]
   end
 end

data/ext/nokogiri/html4_document.c

@@ -144,8 +144,7 @@ rb_html_document_s_read_memory(VALUE klass, VALUE rb_html, VALUE rb_url, VALUE r
 static VALUE
 rb_html_document_type(VALUE self)
 {
-  htmlDocPtr doc;
-  Data_Get_Struct(self, xmlDoc, doc);
+  htmlDocPtr doc = noko_xml_document_unwrap(self);
   return INT2NUM(doc->type);
 }
 

data/ext/nokogiri/html4_element_description.c

@@ -1,5 +1,10 @@
 #include <nokogiri.h>
 
+static const rb_data_type_t html4_element_description_type = {
+  .wrap_struct_name = "Nokogiri::HTML4::ElementDescription",
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED,
+};
+
 VALUE cNokogiriHtml4ElementDescription ;
 
 /*
@@ -15,7 +20,7 @@ required_attributes(VALUE self)
   VALUE list;
   int i;
 
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   list = rb_ary_new();
 
@@ -41,7 +46,7 @@ deprecated_attributes(VALUE self)
   VALUE list;
   int i;
 
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   list = rb_ary_new();
 
@@ -67,7 +72,7 @@ optional_attributes(VALUE self)
   VALUE list;
   int i;
 
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   list = rb_ary_new();
 
@@ -90,7 +95,7 @@ static VALUE
 default_sub_element(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   if (description->defaultsubelt) {
     return NOKOGIRI_STR_NEW2(description->defaultsubelt);
@@ -112,7 +117,7 @@ sub_elements(VALUE self)
   VALUE list;
   int i;
 
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   list = rb_ary_new();
 
@@ -135,7 +140,7 @@ static VALUE
 description(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   return NOKOGIRI_STR_NEW2(description->desc);
 }
@@ -150,7 +155,7 @@ static VALUE
 inline_eh(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   if (description->isinline) { return Qtrue; }
   return Qfalse;
@@ -166,7 +171,7 @@ static VALUE
 deprecated_eh(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   if (description->depr) { return Qtrue; }
   return Qfalse;
@@ -182,7 +187,7 @@ static VALUE
 empty_eh(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   if (description->empty) { return Qtrue; }
   return Qfalse;
@@ -198,7 +203,7 @@ static VALUE
 save_end_tag_eh(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   if (description->saveEndTag) { return Qtrue; }
   return Qfalse;
@@ -214,7 +219,7 @@ static VALUE
 implied_end_tag_eh(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   if (description->endTag) { return Qtrue; }
   return Qfalse;
@@ -230,7 +235,7 @@ static VALUE
 implied_start_tag_eh(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   if (description->startTag) { return Qtrue; }
   return Qfalse;
@@ -246,7 +251,7 @@ static VALUE
 name(VALUE self)
 {
   const htmlElemDesc *description;
-  Data_Get_Struct(self, htmlElemDesc, description);
+  TypedData_Get_Struct(self, htmlElemDesc, &html4_element_description_type, description);
 
   if (NULL == description->name) { return Qnil; }
   return NOKOGIRI_STR_NEW2(description->name);
@@ -266,7 +271,7 @@ get_description(VALUE klass, VALUE tag_name)
                                     );
 
   if (NULL == description) { return Qnil; }
-  return Data_Wrap_Struct(klass, 0, 0, DISCARD_CONST_QUAL(void *, description));
+  return TypedData_Wrap_Struct(klass, &html4_element_description_type, DISCARD_CONST_QUAL(void *, description));
 }
 
 void

data/ext/nokogiri/html4_sax_parser_context.c

@@ -2,13 +2,6 @@
 
 VALUE cNokogiriHtml4SaxParserContext ;
 
-static void
-deallocate(xmlParserCtxtPtr ctxt)
-{
-  ctxt->sax = NULL;
-  htmlFreeParserCtxt(ctxt);
-}
-
 static VALUE
 parse_memory(VALUE klass, VALUE data, VALUE encoding)
 {
@@ -38,7 +31,7 @@ parse_memory(VALUE klass, VALUE data, VALUE encoding)
     }
   }
 
-  return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
+  return noko_xml_sax_parser_context_wrap(klass, ctxt);
 }
 
 static VALUE
@@ -48,7 +41,13 @@ parse_file(VALUE klass, VALUE filename, VALUE encoding)
                              StringValueCStr(filename),
                              StringValueCStr(encoding)
                            );
-  return Data_Wrap_Struct(klass, NULL, deallocate, ctxt);
+
+  if (ctxt->sax) {
+    xmlFree(ctxt->sax);
+    ctxt->sax = NULL;
+  }
+
+  return noko_xml_sax_parser_context_wrap(klass, ctxt);
 }
 
 static VALUE
@@ -82,13 +81,8 @@ parse_with(VALUE self, VALUE sax_handler)
     rb_raise(rb_eArgError, "argument must be a Nokogiri::XML::SAX::Parser");
   }
 
-  Data_Get_Struct(self, htmlParserCtxt, ctxt);
-  Data_Get_Struct(sax_handler, htmlSAXHandler, sax);
-
-  /* Free the sax handler since we'll assign our own */
-  if (ctxt->sax && ctxt->sax != (xmlSAXHandlerPtr)&xmlDefaultSAXHandler) {
-    xmlFree(ctxt->sax);
-  }
+  ctxt = noko_xml_sax_parser_context_unwrap(self);
+  sax = noko_sax_handler_unwrap(sax_handler);
 
   ctxt->sax = sax;
   ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);

data/ext/nokogiri/html4_sax_push_parser.c

@@ -17,7 +17,7 @@ native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
   int status = 0;
   libxmlStructuredErrorHandlerState handler_state;
 
-  Data_Get_Struct(self, xmlParserCtxt, ctx);
+  ctx = noko_xml_sax_push_parser_unwrap(self);
 
   if (Qnil != _chunk) {
     chunk = StringValuePtr(_chunk);
@@ -54,7 +54,7 @@ initialize_native(VALUE self, VALUE _xml_sax, VALUE _filename,
   htmlParserCtxtPtr ctx;
   xmlCharEncoding enc = XML_CHAR_ENCODING_NONE;
 
-  Data_Get_Struct(_xml_sax, xmlSAXHandler, sax);
+  sax = noko_sax_handler_unwrap(_xml_sax);
 
   if (_filename != Qnil) { filename = StringValueCStr(_filename); }