nokogiri 1.12.3-x86_64-darwin → 1.13.1-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63aaf1ed827c558c3f0a84403275c7c282f8693382ef46ec1313f44cb9d975fa
-  data.tar.gz: 7dd8b595a64c1c8c7e990b2b5b69facef24e6b678f9d9d270a433f8a7389e1ab
+  metadata.gz: 980d0a6c164cf98dbe388d9911af604d4ec6b92c5cbe74376cc3654460c5e625
+  data.tar.gz: d923f2a28bb7d8b0060be81fb486860ab243c2867ab48ad63b204a6febb15f7f
 SHA512:
-  metadata.gz: dc6657bfd3e0f6a67268aa261df831df609db975cdc5ccdd9598ec1c9a4288e2daa57901f80b6fc20a3d2fde3270e42533042311f2da7f7af2dfde5a3618e116
-  data.tar.gz: 29f495768707e9b58a3fcc7b7675d54713219f17b2afeabeee866af6b427fb7399983fd352373a15fac022b035e9189d8efdc4cffc011e75066534685bd8447b
+  metadata.gz: 97e09270f69c3cfe6e096a8030d3d9963366a67ec62fed92560ee475538796f189de17b12351adefe6e5a3820129d336a4eb6ffe8be98be7b20492b8a1b1c25c
+  data.tar.gz: 8dde623465133ae4742003e5c976406c7d019ef841eb65ba13c6db16fbba5a6e44ee19e0a15685ede6dd2e4c89ad4fb91feab6db65b48f6208f148d7678ecd82

data/Gemfile

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec
+
+# gem "rcodetools"
+# gem "rdoc", path: "../rdoc"

data/README.md

@@ -2,7 +2,7 @@
 
 # Nokogiri
 
-Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby. It provides a sensible, easy-to-understand API for [reading](https://nokogiri.org/tutorials/parsing_an_html_xml_document.html), writing, [modifying](https://nokogiri.org/tutorials/modifying_an_html_xml_document.html), and [querying](https://nokogiri.org/tutorials/searching_a_xml_html_document.html) documents. It is fast and standards-compliant by relying on native parsers like libxml2 (C) and xerces (Java).
+Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby. It provides a sensible, easy-to-understand API for [reading](https://nokogiri.org/tutorials/parsing_an_html_xml_document.html), writing, [modifying](https://nokogiri.org/tutorials/modifying_an_html_xml_document.html), and [querying](https://nokogiri.org/tutorials/searching_a_xml_html_document.html) documents. It is fast and standards-compliant by relying on native parsers like libxml2 (CRuby) and xerces (JRuby).
 
 ## Guiding Principles
 
@@ -30,7 +30,9 @@ Some guiding principles Nokogiri tries to follow:
 [![Appveyor CI](https://ci.appveyor.com/api/projects/status/xj2pqwvlxwuwgr06/branch/main?svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri/branch/main)
 
 [![Gem Version](https://badge.fury.io/rb/nokogiri.svg)](https://rubygems.org/gems/nokogiri)
-[![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score/?dependency-name=nokogiri&package-manager=bundler)
+[![SemVer compatibility](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&previous-version=1.11.7&new-version=1.12.5)](https://docs.github.com/en/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates#about-compatibility-scores)
+
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/5344/badge)](https://bestpractices.coreinfrastructure.org/projects/5344)
 [![Tidelift dependencies](https://tidelift.com/badges/package/rubygems/nokogiri)](https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme)
 
 
@@ -78,7 +80,7 @@ Full information and description of our security policy is in [`SECURITY.md`](SE
 
 ### Semantic Versioning Policy
 
-Nokogiri follows [Semantic Versioning](https://semver.org/) (since 2017 or so). [![Dependabot's SemVer compatibility score for Nokogiri](https://api.dependabot.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score/?dependency-name=nokogiri&package-manager=bundler)
+Nokogiri follows [Semantic Versioning](https://semver.org/) (since 2017 or so). [![Dependabot's SemVer compatibility score for Nokogiri](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&previous-version=1.11.7&new-version=1.12.5)](https://docs.github.com/en/code-security/supply-chain-security/managing-vulnerabilities-in-your-projects-dependencies/about-dependabot-security-updates#about-compatibility-scores)
 
 We bump `Major.Minor.Patch` versions following this guidance:
 
@@ -105,8 +107,8 @@ We bump `Major.Minor.Patch` versions following this guidance:
 
 Requirements:
 
-- Ruby >= 2.5
-- JRuby >= 9.2.0.0
+- Ruby >= 2.6
+- JRuby >= 9.3.0.0
 
 
 ### Native Gems: Faster, more reliable installation
@@ -115,12 +117,12 @@ Requirements:
 
 ### Supported Platforms
 
-As of v1.11.0, Nokogiri ships pre-compiled, "native" gems for the following platforms:
+Nokogiri ships pre-compiled, "native" gems for the following platforms:
 
 - Linux: `x86-linux` and `x86_64-linux` (req: `glibc >= 2.17`), including musl platforms like Alpine
 - Darwin/MacOS: `x86_64-darwin` and `arm64-darwin`
 - Windows: `x86-mingw32` and `x64-mingw32`
-- Java: any platform running JRuby 9.2 or higher
+- Java: any platform running JRuby 9.3 or higher
 
 To determine whether your system supports one of these gems, look at the output of `bundle platform` or `ruby -e 'puts Gem::Platform.local.to_s'`.
 

data/bin/nokogiri

@@ -1,61 +1,77 @@
 #!/usr/bin/env ruby
-require 'optparse'
-require 'open-uri'
-require 'uri'
-require 'rubygems'
-require 'nokogiri'
-autoload :IRB, 'irb'
+# frozen_string_literal: true
+
+require "optparse"
+require "open-uri"
+require "uri"
+require "rubygems"
+require "nokogiri"
+autoload :IRB, "irb"
 
 parse_class = Nokogiri
 encoding = nil
 
 # This module provides some tunables with the nokogiri CLI for use in
 # your ~/.nokogirirc.
-module Nokogiri::CLI
-  class << self
-    # Specify the console engine, defaulted to IRB.
-    #
-    # call-seq:
-    #   require 'pry'
-    #   Nokogiri::CLI.console = Pry
-    attr_writer :console
-
-    def console
-      case @console
-      when Symbol
-        Kernel.const_get(@console)
-      else
-        @console
+module Nokogiri
+  module CLI
+    class << self
+      # Specify the console engine, defaulted to IRB.
+      #
+      # call-seq:
+      #   require 'pry'
+      #   Nokogiri::CLI.console = Pry
+      attr_writer :console
+
+      def console
+        case @console
+        when Symbol
+          Kernel.const_get(@console)
+        else
+          @console
+        end
       end
+
+      attr_accessor :rcfile
     end
 
-    attr_accessor :rcfile
+    self.rcfile  = File.expand_path("~/.nokogirirc")
+    self.console = :IRB
   end
+end
 
-  self.rcfile  = File.expand_path('~/.nokogirirc')
-  self.console = :IRB
+def safe_read(uri_or_path)
+  uri = URI.parse(uri_or_path)
+  case uri
+  when URI::HTTP
+    uri.read
+  when URI::File
+    File.read(uri.path)
+  else
+    File.read(uri_or_path)
+  end
 end
 
 opts = OptionParser.new do |opts|
   opts.banner = "Nokogiri: an HTML, XML, SAX, and Reader parser"
-  opts.define_head "Usage: nokogiri <uri|path> [options]"
-  opts.separator ""
-  opts.separator "Examples:"
-  opts.separator "  nokogiri https://www.ruby-lang.org/"
-  opts.separator "  nokogiri ./public/index.html"
-  opts.separator "  curl -s http://www.nokogiri.org | nokogiri -e'p $_.css(\"h1\").length'"
-  opts.separator ""
-  opts.separator "Options:"
+  opts.define_head("Usage: nokogiri <uri|path> [options]")
+  opts.separator("")
+  opts.separator("Examples:")
+  opts.separator("  nokogiri https://www.ruby-lang.org/")
+  opts.separator("  nokogiri ./public/index.html")
+  opts.separator("  curl -s http://www.nokogiri.org | nokogiri -e'p $_.css(\"h1\").length'")
+  opts.separator("")
+  opts.separator("Options:")
 
   opts.on("--type type", "Parse as type: xml or html (default: auto)", [:xml, :html]) do |v|
-    parse_class = {:xml => Nokogiri::XML, :html => Nokogiri::HTML}[v]
+    parse_class = { xml: Nokogiri::XML, html: Nokogiri::HTML }[v]
   end
 
   opts.on("-C file", "Specifies initialization file to load (default #{Nokogiri::CLI.rcfile})") do |v|
     Nokogiri::CLI.rcfile = v
   end
 
-  opts.on("-E", "--encoding encoding", "Read as encoding (default: #{encoding || 'none'})") do |v|
+  opts.on("-E", "--encoding encoding", "Read as encoding (default: #{encoding || "none"})") do |v|
     encoding = v
   end
 
@@ -64,7 +80,7 @@ opts = OptionParser.new do |opts|
   end
 
   opts.on("--rng <uri|path>", "Validate using this rng file.") do |v|
-    @rng = open(v) {|f| Nokogiri::XML::RelaxNG(f)}
+    @rng = Nokogiri::XML::RelaxNG(safe_read(v))
   end
 
   opts.on_tail("-?", "--help", "Show this message") do
@@ -90,15 +106,10 @@ if File.file?(Nokogiri::CLI.rcfile)
   load Nokogiri::CLI.rcfile
 end
 
-if url || $stdin.tty?
-  case uri = (URI(url) rescue url)
-  when URI::HTTP
-    @doc = parse_class.parse(uri.read, url, encoding)
-  else
-    @doc = parse_class.parse(open(url).read, nil, encoding)
-  end
+@doc = if url || $stdin.tty?
+  parse_class.parse(safe_read(url), url, encoding)
 else
-  @doc = parse_class.parse($stdin, nil, encoding)
+  parse_class.parse($stdin, nil, encoding)
 end
 
 $_ = @doc
@@ -107,12 +118,14 @@ if @rng
   @rng.validate(@doc).each do |error|
     puts error.message
   end
-else
-  if @script
-    eval @script, binding, '<main>'
-  else
-    puts "Your document is stored in @doc..."
-    Nokogiri::CLI.console.start
+elsif @script
+  begin
+    eval(@script, binding, "<main>") # rubocop:disable Security/Eval
+  rescue Exception => e # rubocop:disable Lint/RescueException
+    warn("ERROR: Exception raised while evaluating '#{@script}'")
+    raise e
   end
+else
+  puts "Your document is stored in @doc..."
+  Nokogiri::CLI.console.start
 end
-

data/dependencies.yml

@@ -64,11 +64,10 @@ zlib:
   # SHA-256 hash provided on http://zlib.net/
 
 libiconv:
-  version: "1.15"
-  sha256: "ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178"
-  # gpg: Signature made Fri Feb  3 00:38:12 2017 CET
+  version: "1.16"
+  sha256: "e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
+  # gpg: Signature made Fri 26 Apr 2019 03:36:38 PM EDT
   # gpg:                using RSA key 4F494A942E4616C2
-  # gpg: Good signature from "Bruno Haible (Open Source Development) <bruno@clisp.org>" [unknown]
-  # gpg: WARNING: This key is not certified with a trusted signature!
-  # gpg:          There is no indication that the signature belongs to the owner.
+  # gpg: Good signature from "Bruno Haible (Open Source Development) <bruno@clisp.org>" [expired]
+  # gpg: Note: This key has expired!
   # Primary key fingerprint: 68D9 4D8A AEEA D48A E7DC  5B90 4F49 4A94 2E46 16C2

data/ext/nokogiri/extconf.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
-ENV["RC_ARCHS"] = "" if RUBY_PLATFORM =~ /darwin/
+
+# rubocop:disable Style/GlobalVars
+
+ENV["RC_ARCHS"] = "" if RUBY_PLATFORM.include?("darwin")
 
 require "mkmf"
 require "rbconfig"
@@ -12,16 +15,14 @@ PACKAGE_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."
 REQUIRED_LIBXML_VERSION = "2.6.21"
 RECOMMENDED_LIBXML_VERSION = "2.9.3"
 
-# The gem version constraint in the Rakefile is not respected at install time.
-# Keep this version in sync with the one in the Rakefile !
-REQUIRED_MINI_PORTILE_VERSION = "~> 2.6.1"
+REQUIRED_MINI_PORTILE_VERSION = "~> 2.7.0" # 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
 OTHER_LIBRARY_VERSIONS = {}
 
 NOKOGIRI_HELP_MESSAGE = <<~HELP
-  USAGE: ruby #{$0} [options]
+  USAGE: ruby #{$PROGRAM_NAME} [options]
 
     Flags that are always valid:
 
@@ -175,23 +176,23 @@ def config_system_libraries?
 end
 
 def windows?
-  RbConfig::CONFIG["target_os"] =~ /mingw32|mswin/
+  RbConfig::CONFIG["target_os"].match?(/mingw|mswin/)
 end
 
 def solaris?
-  RbConfig::CONFIG["target_os"] =~ /solaris/
+  RbConfig::CONFIG["target_os"].include?("solaris")
 end
 
 def darwin?
-  RbConfig::CONFIG["target_os"] =~ /darwin/
+  RbConfig::CONFIG["target_os"].include?("darwin")
 end
 
 def openbsd?
-  RbConfig::CONFIG["target_os"] =~ /openbsd/
+  RbConfig::CONFIG["target_os"].include?("openbsd")
 end
 
 def aix?
-  RbConfig::CONFIG["target_os"] =~ /aix/
+  RbConfig::CONFIG["target_os"].include?("aix")
 end
 
 def nix?
@@ -284,17 +285,16 @@ ensure
 end
 
 def abort_could_not_find_library(lib)
-  abort("-----\n#{caller[0]}\n#{lib} is missing. Please locate mkmf.log to investigate how it is failing.\n-----")
+  callers = caller(1..2).join("\n")
+  abort("-----\n#{callers}\n#{lib} is missing. Please locate mkmf.log to investigate how it is failing.\n-----")
 end
 
-def chdir_for_build
+def chdir_for_build(&block)
   # When using rake-compiler-dock on Windows, the underlying Virtualbox shared
   # folders don't support symlinks, but libiconv expects it for a build on
   # Linux. We work around this limitation by using the temp dir for cooking.
-  build_dir = ENV["RCD_HOST_RUBY_PLATFORM"].to_s =~ /mingw|mswin|cygwin/ ? "/tmp" : "."
-  Dir.chdir(build_dir) do
-    yield
-  end
+  build_dir = /mingw|mswin|cygwin/.match?(ENV["RCD_HOST_RUBY_PLATFORM"].to_s) ? "/tmp" : "."
+  Dir.chdir(build_dir, &block)
 end
 
 def sh_export_path(path)
@@ -402,9 +402,9 @@ def iconv_configure_flags
   abort_could_not_find_library("libiconv")
 end
 
-def process_recipe(name, version, static_p, cross_p, cacheable_p=true)
+def process_recipe(name, version, static_p, cross_p, cacheable_p = true)
   require "rubygems"
-  gem("mini_portile2", REQUIRED_MINI_PORTILE_VERSION)
+  gem("mini_portile2", REQUIRED_MINI_PORTILE_VERSION) # gemspec is not respected at install time
   require "mini_portile2"
   message("Using mini_portile version #{MiniPortile::VERSION}\n")
 
@@ -413,9 +413,13 @@ def process_recipe(name, version, static_p, cross_p, cacheable_p=true)
   end
 
   MiniPortile.new(name, version).tap do |recipe|
+    def recipe.port_path
+      "#{@target}/#{RUBY_PLATFORM}/#{@name}/#{@version}"
+    end
+
     recipe.target = File.join(PACKAGE_ROOT_DIR, "ports") if cacheable_p
-    # Prefer host_alias over host in order to use i586-mingw32msvc as
-    # correct compiler prefix for cross build, but use host if not set.
+    # Prefer host_alias over host in order to use the correct compiler prefix for cross build, but
+    # use host if not set.
     recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
     recipe.configure_options << "--libdir=#{File.join(recipe.path, "lib")}"
 
@@ -462,7 +466,7 @@ def process_recipe(name, version, static_p, cross_p, cacheable_p=true)
     end
 
     if RbConfig::CONFIG["target_cpu"] == "universal"
-      %w[CFLAGS LDFLAGS].each do |key|
+      ["CFLAGS", "LDFLAGS"].each do |key|
         unless env[key].include?("-arch")
           env[key] = concat_flags(env[key], RbConfig::CONFIG["ARCH_FLAG"])
         end
@@ -473,7 +477,7 @@ def process_recipe(name, version, static_p, cross_p, cacheable_p=true)
       "#{key}=#{value.strip}"
     end
 
-    checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+    checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{RUBY_PLATFORM}.installed"
     if File.exist?(checkpoint) && !recipe.source_directory
       message("Building Nokogiri with a packaged version of #{name}-#{version}.\n")
     else
@@ -487,7 +491,7 @@ def process_recipe(name, version, static_p, cross_p, cacheable_p=true)
         message("The following patches are being applied:\n")
 
         recipe.patch_files.each do |patch|
-          message("  - %s\n" % File.basename(patch))
+          message(format("  - %s\n", File.basename(patch)))
         end
       end
 
@@ -656,7 +660,7 @@ else
   if cross_build_p || windows?
     zlib_recipe = process_recipe("zlib", dependencies["zlib"]["version"], static_p, cross_build_p) do |recipe|
       recipe.files = [{
-        url: "http://zlib.net/fossils/#{recipe.name}-#{recipe.version}.tar.gz",
+        url: "https://zlib.net/fossils/#{recipe.name}-#{recipe.version}.tar.gz",
         sha256: dependencies["zlib"]["sha256"],
       }]
       if windows?
@@ -700,7 +704,7 @@ else
           end
 
           def compile
-            if host =~ /darwin/
+            if /darwin/.match?(host)
               execute("compile", "make AR=#{host}-libtool")
             else
               super
@@ -714,10 +718,13 @@ else
       libiconv_recipe = process_recipe("libiconv", dependencies["libiconv"]["version"], static_p,
         cross_build_p) do |recipe|
         recipe.files = [{
-          url: "http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz",
+          url: "https://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz",
           sha256: dependencies["libiconv"]["sha256"],
         }]
 
+        # The libiconv configure script doesn't accept "arm64" host string but "aarch64"
+        recipe.host = recipe.host.gsub("arm64-apple-darwin", "aarch64-apple-darwin")
+
         cflags = concat_flags(ENV["CFLAGS"], "-O2", "-U_FORTIFY_SOURCE", "-g")
 
         recipe.configure_options += [
@@ -741,12 +748,21 @@ else
       Tools" to open the developer site, download the installer for your OS
       version and run it.
       -----
-      EOM
+    EOM
   end
 
-  unless windows?
-    preserving_globals { local_have_library("z", "gzdopen", "zlib.h") } ||
-      abort("zlib is missing; necessary for building libxml2")
+  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")
+  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")
   end
 
   libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"]["version"], static_p, cross_build_p) do |recipe|
@@ -765,7 +781,6 @@ else
 
     if zlib_recipe
       recipe.configure_options << "--with-zlib=#{zlib_recipe.path}"
-      cflags = concat_flags(cflags, "-I#{zlib_recipe.path}/include")
     end
 
     if libiconv_recipe
@@ -834,9 +849,6 @@ else
   append_cppflags("-DNOKOGIRI_PACKAGED_LIBRARIES")
   append_cppflags("-DNOKOGIRI_PRECOMPILED_LIBRARIES") if cross_build_p
 
-  $LIBPATH = ["#{zlib_recipe.path}/lib"] | $LIBPATH if zlib_recipe
-  $LIBPATH = ["#{libiconv_recipe.path}/lib"] | $LIBPATH if libiconv_recipe
-
   $libs = $libs.shellsplit.tap do |libs|
     [libxml2_recipe, libxslt_recipe].each do |recipe|
       libname = recipe.name[/\Alib(.+)\z/, 1]
@@ -929,7 +941,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 host =~ /darwin/
+        if /darwin/.match?(host)
           env["AR"] = "#{host}-libtool"
           env["ARFLAGS"] = "-o"
         else

data/ext/nokogiri/include/libxml2/libxml/xmlerror.h

@@ -209,6 +209,7 @@ typedef enum {
     XML_ERR_VERSION_MISMATCH, /* 109 */
     XML_ERR_NAME_TOO_LONG, /* 110 */
     XML_ERR_USER_STOP, /* 111 */
+    XML_ERR_COMMENT_ABRUPTLY_ENDED, /* 112 */
     XML_NS_ERR_XML_NAMESPACE = 200,
     XML_NS_ERR_UNDEFINED_NAMESPACE, /* 201 */
     XML_NS_ERR_QNAME, /* 202 */

data/ext/nokogiri/include/libxslt/xsltconfig.h

@@ -133,7 +133,7 @@ extern "C" {
 #ifndef WITH_MODULES
 #define WITH_MODULES
 #endif
-#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/aarch64-apple-darwin/libxslt/1.1.34/lib/libxslt-plugins"
+#define LIBXSLT_DEFAULT_PLUGINS_PATH() "/home/flavorjones/code/oss/nokogiri/ports/x86_64-darwin/libxslt/1.1.34/lib/libxslt-plugins"
 #endif
 
 /**

data/ext/nokogiri/xml_document.c

@@ -533,59 +533,59 @@ block_caller(void *ctx, xmlNodePtr c_node, xmlNodePtr c_parent_node)
 static VALUE
 rb_xml_document_canonicalize(int argc, VALUE *argv, VALUE self)
 {
-  VALUE mode;
-  VALUE incl_ns;
-  VALUE with_comments;
-  xmlChar **ns;
-  long ns_len, i;
+  VALUE rb_mode;
+  VALUE rb_namespaces;
+  VALUE rb_comments_p;
+  xmlChar **c_namespaces;
 
-  xmlDocPtr doc;
-  xmlOutputBufferPtr buf;
-  xmlC14NIsVisibleCallback cb = NULL;
-  void *ctx = NULL;
+  xmlDocPtr c_doc;
+  xmlOutputBufferPtr c_obuf;
+  xmlC14NIsVisibleCallback c_callback_wrapper = NULL;
+  void *rb_callback = NULL;
 
   VALUE rb_cStringIO;
-  VALUE io;
+  VALUE rb_io;
 
-  rb_scan_args(argc, argv, "03", &mode, &incl_ns, &with_comments);
+  rb_scan_args(argc, argv, "03", &rb_mode, &rb_namespaces, &rb_comments_p);
+  if (!NIL_P(rb_mode)) { Check_Type(rb_mode, T_FIXNUM); }
+  if (!NIL_P(rb_namespaces)) { Check_Type(rb_namespaces, T_ARRAY); }
 
-  Data_Get_Struct(self, xmlDoc, doc);
+  Data_Get_Struct(self, xmlDoc, c_doc);
 
   rb_cStringIO = rb_const_get_at(rb_cObject, rb_intern("StringIO"));
-  io           = rb_class_new_instance(0, 0, rb_cStringIO);
-  buf          = xmlAllocOutputBuffer(NULL);
+  rb_io = rb_class_new_instance(0, 0, rb_cStringIO);
+  c_obuf = xmlAllocOutputBuffer(NULL);
 
-  buf->writecallback = (xmlOutputWriteCallback)noko_io_write;
-  buf->closecallback = (xmlOutputCloseCallback)noko_io_close;
-  buf->context       = (void *)io;
+  c_obuf->writecallback = (xmlOutputWriteCallback)noko_io_write;
+  c_obuf->closecallback = (xmlOutputCloseCallback)noko_io_close;
+  c_obuf->context = (void *)rb_io;
 
   if (rb_block_given_p()) {
-    cb = block_caller;
-    ctx = (void *)rb_block_proc();
+    c_callback_wrapper = block_caller;
+    rb_callback = (void *)rb_block_proc();
   }
 
-  if (NIL_P(incl_ns)) {
-    ns = NULL;
+  if (NIL_P(rb_namespaces)) {
+    c_namespaces = NULL;
   } else {
-    Check_Type(incl_ns, T_ARRAY);
-    ns_len = RARRAY_LEN(incl_ns);
-    ns = calloc((size_t)ns_len + 1, sizeof(xmlChar *));
-    for (i = 0 ; i < ns_len ; i++) {
-      VALUE entry = rb_ary_entry(incl_ns, i);
-      ns[i] = (xmlChar *)StringValueCStr(entry);
+    long ns_len = RARRAY_LEN(rb_namespaces);
+    c_namespaces = calloc((size_t)ns_len + 1, sizeof(xmlChar *));
+    for (int j = 0 ; j < ns_len ; j++) {
+      VALUE entry = rb_ary_entry(rb_namespaces, j);
+      c_namespaces[j] = (xmlChar *)StringValueCStr(entry);
     }
   }
 
+  xmlC14NExecute(c_doc, c_callback_wrapper, rb_callback,
+                 (int)(NIL_P(rb_mode) ? 0 : NUM2INT(rb_mode)),
+                 c_namespaces,
+                 (int)RTEST(rb_comments_p),
+                 c_obuf);
 
-  xmlC14NExecute(doc, cb, ctx,
-                 (int)(NIL_P(mode)        ? 0 : NUM2INT(mode)),
-                 ns,
-                 (int)      RTEST(with_comments),
-                 buf);
-
-  xmlOutputBufferClose(buf);
+  free(c_namespaces);
+  xmlOutputBufferClose(c_obuf);
 
-  return rb_funcall(io, rb_intern("string"), 0);
+  return rb_funcall(rb_io, rb_intern("string"), 0);
 }
 
 VALUE

data/ext/nokogiri/xml_document_fragment.c

@@ -28,8 +28,6 @@ new (int argc, VALUE *argv, VALUE klass)
   rb_node = noko_xml_node_wrap(klass, node);
   rb_obj_call_init(rb_node, argc, argv);
 
-  if (rb_block_given_p()) { rb_yield(rb_node); }
-
   return rb_node;
 }
 

data/ext/nokogiri/xml_dtd.c

@@ -57,9 +57,9 @@ entities(VALUE self)
 
 /*
  * call-seq:
- *   notations
+ *   notations() → Hash<name(String)⇒Notation>
  *
- * Get a hash of the notations for this DTD.
+ * [Returns] All the notations for this DTD in a Hash of Notation +name+ to Notation.
  */
 static VALUE
 notations(VALUE self)