nokogiri 1.6.8.rc2-x86-mingw32 → 1.6.8.rc3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b9b6ced652a10d2952094c5c7a0994b41899f62
-  data.tar.gz: 6b9a4ce495fedf62cb9fd3c7e70b6ea63222a77c
+  metadata.gz: c0ec7810f8915eb3f4f7cf25ffeb07289f58a155
+  data.tar.gz: 85bd7afc38bb90c7aa8024725dc6aefe6cb7adbf
 SHA512:
-  metadata.gz: 08b97a7a0865aed300ddd1e670722eb11e438ca9bb8f99aa64ac0c20d52bd80f996260f446ac9ae742b5b972de4d248ded4d114563912f2671f3104ff285496c
-  data.tar.gz: b0ef21cda413513fcaa7f7bdfb26ca840c2b9882aa6f9f2c08d12f85c43cfd95311b54084cbec5df2b013a7c95b0533c1baad97a8052ac714c6e0791feb42640
+  metadata.gz: 03ac7a0e499a19b4b17a1a1e390d75598048e11812bf66f4bf163f4df9e03fd277a8f9ae812b561bba21c86b5bcad97759013507d64d6b9c21a10f8d232da035
+  data.tar.gz: 422ce41dd6c84832ae3ea48438530beb62315ce05f5b095e8f2e7291f341d554a999f205b0ff8d410125c792f02c9c95c24e9d1c1f5f2b8f85fb97f958ece5fc

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
 - 2.0
 - 2.1
 - 2.2.3
+- 2.3.0
 - jruby-19mode
 - jruby-1.7.23
 - jruby-9.0.4.0
@@ -19,6 +20,10 @@ os:
 - osx
 
 matrix:
+  allow_failures:
+  # https://github.com/travis-ci/travis-ci/issues/5361
+  - os: osx
+    rvm: 2.3.0
   exclude:
   - os: osx
     rvm: ruby-1.9.2

data/CHANGELOG.rdoc

@@ -2,7 +2,9 @@
 
 ==== Security Note
 
-* (MRI) Bundled Libxml2 is upgraded to 2.9.3, which fixes a series of security issues. See https://mail.gnome.org/archives/xml/2015-November/msg00012.html
+* (MRI) Bundled Libxml2 is upgraded to 2.9.3, which fixes a series of security issues.
+  These security issues had been patched in the vendored libxml 2.9.2 in the 1.6.7.x branch.
+  See https://mail.gnome.org/archives/xml/2015-November/msg00012.html for more.
 
 
 ==== Features
@@ -10,19 +12,23 @@
 Several changes were made to improve performance:
 
 * [MRI] Simplify NodeSet#to_a with a minor speed-up. (#1397)
-* XML::Node#ancestors optimization (#1297) (Thanks, Bruno Sutic!)
-* Use Symbol#to_proc where we weren't previously, because Ruby 1.8.7 reasons. (#1296) (Thanks, Bruno Sutic!)
+* XML::Node#ancestors optimization. (#1297) (Thanks, Bruno Sutic!)
+* Use Symbol#to_proc where we weren't previously. (#1296) (Thanks, Bruno Sutic!)
+* XML::DTD#each uses implicit block calls. (Thanks, @glaucocustodio!)
+* Fall back to the `pkg-config` gem if we're having trouble finding the system libxml2. This should help many FreeBSD users. (#1417)
 
 
 ==== Bug Fixes
 
-* [JRuby] fix load errors when deploying to JRuby/Torquebox (#1114) (Thanks, @atambo!)
+* [JRuby] fix load errors when deploying to JRuby/Torquebox (#1114) (Thanks, @atambo and @jvshahid!)
 * [JRuby] fix NPE when inspecting nodes returned by NodeSet#drop (#1042) (Thanks, @mkristian!)
 * [JRuby] fix nil attriubte node's namespace in reader (#1327) (Thanks, @codekitchen!)
 * [JRuby] fix Nokogiri munging unicode characters that require more than 2 bytes (#1113) (Thanks, @mkristian!)
 * [MRI] fix assertion failure while accessing attribute node's namespace in reader (#843) (Thanks, @2potatocakes!)
 * [MRI] fix issue with GCing namespace nodes returned in an xpath query. (#1155)
 * [MRI] Ensure C strings are null-terminated. (#1381)
+* [MRI] Ensure Rubygems is loaded before using mini_portile2 at installation. (#1393, #1411) (Thanks, @JonRowe!)
+* [MRI] Handling another edge case where the `libxml-ruby` gem's global callbacks were smashing the heap. (#1426). (Thanks to @bbergstrom for providing an isolated test case!)
 * unescape special characters in CSS queries (#1303) (Thanks, @twalpole!)
 * consistently handle empty documents (#1349)
 * Update to mini_portile2 2.1.0 to address whitespace-handling during patching. (#1402)
@@ -30,6 +36,26 @@ Several changes were made to improve performance:
 * Work around issue installing Nokogiri on overlayfs (commonly used in Docker containers). (#1370, #1405)
 
 
+
+==== Other Notes
+
+* Removed legacy code remaining from Ruby 1.8.x support.
+* Removed legacy code remaining from REE support.
+* Removing hacky workarounds for bugs in some older versions of libxml2.
+* Handling C strings in a forward-compatible manner, see https://github.com/ruby/ruby/blob/v2_2_0/NEWS#L319
+
+
+=== 1.6.7.2 / 2016-01-20
+
+This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:
+
+  CVE-2015-7499
+
+Ubuntu classifies this as "Priority: Low", RedHat classifies this as "Impact: Moderate", and NIST classifies this as "Severity: 5.0 (MEDIUM)".
+
+MITRE record is https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-7499
+
+
 === 1.6.7.1 / 2015-12-16
 
 This version pulls in several upstream patches to the vendored libxml2 and libxslt to address:

data/Gemfile

@@ -5,6 +5,7 @@
 source "https://rubygems.org/"
 
 gem "mini_portile2", "~>2.1.0"
+gem "pkg-config", "~>1.1.7"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
@@ -14,7 +15,7 @@ gem "hoe-git", ">=1.4", :group => [:development, :test]
 gem "minitest", "~>2.2.2", :group => [:development, :test]
 gem "rake", ">=0.9", :group => [:development, :test]
 gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
-gem "rake-compiler-dock", "~>0.5.0", :group => [:development, :test]
+gem "rake-compiler-dock", "~>0.5.1", :group => [:development, :test]
 gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
 gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
 gem "hoe", "~>3.14", :group => [:development, :test]

data/README.md

@@ -86,29 +86,28 @@ There are open-source tutorials (to which we invite contributions!) here: http:/
 Nokogiri is a large library, but here is example usage for parsing and examining a document:
 
 ```ruby
-  require 'nokogiri'
-  require 'open-uri'
-
-  # Fetch and parse HTML document
-  doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
-
-  ####
-  # Search for nodes by css
-  doc.css('nav ul.menu li a').each do |link|
-    puts link.content
-  end
-
-  ####
-  # Search for nodes by xpath
-  doc.xpath('//h2 | //h3').each do |link|
-    puts link.content
-  end
-
-  ####
-  # Or mix and match.
-  doc.search('code.sh', '//h2').each do |link|
-    puts link.content
-  end
+#! /usr/bin/env ruby
+
+require 'nokogiri'
+require 'open-uri'
+
+# Fetch and parse HTML document
+doc = Nokogiri::HTML(open('http://www.nokogiri.org/tutorials/installing_nokogiri.html'))
+
+puts "### Search for nodes by css"
+doc.css('nav ul.menu li a', 'article h2').each do |link|
+  puts link.content
+end
+
+puts "### Search for nodes by xpath"
+doc.xpath('//nav//ul//li/a', '//article//h2').each do |link|
+  puts link.content
+end
+
+puts "### Or mix and match."
+doc.search('nav ul.menu li a', '//article//h2').each do |link|
+  puts link.content
+end
 ```
 
 

data/ROADMAP.md

@@ -1,4 +1,4 @@
-# Roadmap for 2.0
+# Roadmap for API Changes
 
 ## overhaul serialize/pretty printing API
 
@@ -99,3 +99,13 @@ So, instead, let's make alternative methods like
 `Nokogiri::XML::Document#new_comment`, and recommend those as the
 proper convention.
 
+
+## `collect_namespaces` is just broken
+
+`collect_namespaces` is returning a hash, which means it can't return
+namespaces with the same prefix. See this issue for background:
+
+> https://github.com/sparklemotion/nokogiri/issues/885
+
+Do we care? This seems like a useless method, but then again I hate
+XML, so what do I know?

data/Rakefile

@@ -128,22 +128,22 @@ HOE = Hoe.spec 'nokogiri' do
 
   unless java?
     self.extra_deps += [
-      # Keep this version in sync with the one in extconf.rb !
-      ["mini_portile2",    "~> 2.1.0"],
+      ["mini_portile2",    "~> 2.1.0"], # keep version in sync with extconf.rb
+      ["pkg-config",       "~> 1.1.7"], # keep version in sync with extconf.rb
     ]
   end
 
   self.extra_dev_deps += [
-    ["hoe-bundler",     ">= 1.1"],
-    ["hoe-debugging",   "~> 1.2.1"],
-    ["hoe-gemspec",     ">= 1.0"],
-    ["hoe-git",         ">= 1.4"],
-    ["minitest",        "~> 2.2.2"],
-    ["rake",            ">= 0.9"],
-    ["rake-compiler",   "~> 0.9.2"],
-    ["rake-compiler-dock", "~> 0.5.0"],
-    ["racc",            ">= 1.4.6"],
-    ["rexical",         ">= 1.0.5"]
+    ["hoe-bundler",        ">= 1.1"],
+    ["hoe-debugging",      "~> 1.2.1"],
+    ["hoe-gemspec",        ">= 1.0"],
+    ["hoe-git",            ">= 1.4"],
+    ["minitest",           "~> 2.2.2"],
+    ["rake",               ">= 0.9"],
+    ["rake-compiler",      "~> 0.9.2"],
+    ["rake-compiler-dock", "~> 0.5.1"],
+    ["racc",               ">= 1.4.6"],
+    ["rexical",            ">= 1.0.5"]
   ]
 
   if java?
@@ -318,6 +318,24 @@ if Hoe.plugins.include?(:debugging)
   end
 end
 
+task "test:libxml-ruby" do
+  ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY'] = "1"
+  warn "#{__FILE__}:#{__LINE__}: --- running tests with libxml-ruby loaded ---"
+  Rake::Task[:test].execute
+  ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY'] = nil
+end
+
+Rake::Task["test:libxml-ruby"].prerequisites << :compile
+
+task "test:valgrind:libxml-ruby" do
+  ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY'] = "1"
+  warn "#{__FILE__}:#{__LINE__}: --- running tests with libxml-ruby loaded ---"
+  Rake::Task["test:valgrind"].execute
+  ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY'] = nil
+end
+
+Rake::Task["test:valgrind:libxml-ruby"].prerequisites << :compile
+
 # ----------------------------------------
 
 def verify_dll(dll, cross_ruby)

data/ext/nokogiri/extconf.rb

@@ -55,9 +55,9 @@ def do_clean
     # nokogiri.so is yet to be copied to lib.
 
     # clean the ports build directory
-    Pathname.glob(pwd.join('tmp', '*', 'ports')) { |dir|
+    Pathname.glob(pwd.join('tmp', '*', 'ports')) do |dir|
       FileUtils.rm_rf(dir, verbose: true)
-    }
+    end
 
     if enable_config('static')
       # ports installation can be safely removed if statically linked.
@@ -70,6 +70,29 @@ def do_clean
   exit! 0
 end
 
+# The gem version constraint in the Rakefile is not respected at install time.
+# Keep this version in sync with the one in the Rakefile !
+require 'rubygems'
+gem 'pkg-config', '~> 1.1.7'
+require 'pkg-config'
+message "Using pkg-config version #{PKGConfig::VERSION}\n"
+
+def package_config pkg, options={}
+  package = pkg_config(pkg)
+  return package if package
+
+  return nil unless PKGConfig.have_package(pkg)
+
+  cflags  = PKGConfig.cflags(pkg)
+  ldflags = PKGConfig.libs_only_L(pkg)
+  libs    = PKGConfig.libs_only_l(pkg)
+
+  Logging::message "PKGConfig package configuration for %s\n", pkg
+  Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", cflags, ldflags, libs
+
+  [cflags, ldflags, libs]
+end
+
 def nokogiri_try_compile
   args = if defined?(RUBY_VERSION) && RUBY_VERSION <= "1.9.2"
            ["int main() {return 0;}"]
@@ -79,6 +102,23 @@ def nokogiri_try_compile
   try_compile(*args)
 end
 
+def check_libxml_version version=nil
+  source = if version.nil?
+             <<-SRC
+#include <libxml/xmlversion.h>
+             SRC
+           else
+             version_int = sprintf "%d%2.2d%2.2d", *(version.split("."))
+             <<-SRC
+#include <libxml/xmlversion.h>
+#if LIBXML_VERSION < #{version_int}
+#error libxml2 is older than #{version}
+#endif
+             SRC
+           end
+
+  try_cpp source
+end
 
 def add_cflags(flags)
   print "checking if the C compiler accepts #{flags}... "
@@ -112,9 +152,9 @@ def asplode(lib)
 end
 
 def have_iconv?(using = nil)
-  checking_for(using ? "iconv using #{using}" : 'iconv') {
-    ['', '-liconv'].any? { |opt|
-      preserving_globals {
+  checking_for(using ? "iconv using #{using}" : 'iconv') do
+    ['', '-liconv'].any? do |opt|
+      preserving_globals do
         yield if block_given?
 
         try_link(<<-'SRC', opt)
@@ -128,22 +168,22 @@ int main(void)
     return EXIT_SUCCESS;
 }
         SRC
-      }
-    }
-  }
+      end
+    end
+  end
 end
 
 def iconv_configure_flags
   # If --with-iconv-dir or --with-opt-dir is given, it should be
   # the first priority
-  %w[iconv opt].each { |name|
+  %w[iconv opt].each do |name|
     if (config = preserving_globals { dir_config(name) }).any? &&
-       have_iconv?("--with-#{name}-* flags") { dir_config(name) }
-      idirs, ldirs = config.map { |dirs|
-        Array(dirs).flat_map { |dir|
+        have_iconv?("--with-#{name}-* flags") { dir_config(name) }
+      idirs, ldirs = config.map do |dirs|
+        Array(dirs).flat_map do |dir|
           dir.split(File::PATH_SEPARATOR)
-        } if dirs
-      }
+        end if dirs
+      end
 
       return [
         '--with-iconv=yes',
@@ -151,14 +191,14 @@ def iconv_configure_flags
         *("LDFLAGS=#{ldirs.map { |dir| '-L' << dir }.join(' ')}" if ldirs),
       ]
     end
-  }
+  end
 
   if have_iconv?
     return ['--with-iconv=yes']
   end
 
-  if (config = preserving_globals { pkg_config('libiconv') }) &&
-     have_iconv?('pkg-config libiconv') { pkg_config('libiconv') }
+  if (config = preserving_globals { package_config('libiconv') }) &&
+     have_iconv?('pkg-config libiconv') { package_config('libiconv') }
     cflags, ldflags, libs = config
 
     return [
@@ -192,13 +232,13 @@ def process_recipe(name, version, static_p, cross_p)
 
     yield recipe
 
-    env = Hash.new { |hash, key|
+    env = Hash.new do |hash, key|
       hash[key] = "#{ENV[key]}"  # (ENV[key].dup rescue '')
-    }
+    end
 
     recipe.configure_options.flatten!
 
-    recipe.configure_options.delete_if { |option|
+    recipe.configure_options.delete_if do |option|
       case option
       when /\A(\w+)=(.*)\z/
         env[$1] = $2
@@ -206,7 +246,7 @@ def process_recipe(name, version, static_p, cross_p)
       else
         false
       end
-    }
+    end
 
     if static_p
       recipe.configure_options += [
@@ -229,16 +269,16 @@ def process_recipe(name, version, static_p, cross_p)
     end
 
     if RbConfig::CONFIG['target_cpu'] == 'universal'
-      %w[CFLAGS LDFLAGS].each { |key|
+      %w[CFLAGS LDFLAGS].each do |key|
         unless env[key].include?('-arch')
           env[key] << ' ' << RbConfig::CONFIG['ARCH_FLAG']
         end
-      }
+      end
     end
 
-    recipe.configure_options += env.map { |key, value|
+    recipe.configure_options += env.map do |key, value|
       "#{key}=#{value}"
-    }
+    end
 
     message <<-"EOS"
 ************************************************************************
@@ -250,9 +290,9 @@ Building Nokogiri with a packaged version of #{name}-#{version}#{'.' if recipe.p
     unless recipe.patch_files.empty?
       message "with the following patches applied:\n"
 
-      recipe.patch_files.each { |patch|
+      recipe.patch_files.each do |patch|
         message "\t- %s\n" % File.basename(patch)
-      }
+      end
     end
 
     message <<-"EOS"
@@ -368,31 +408,21 @@ when using_system_libraries?
   # Using system libraries means we rely on the system libxml2 with
   # regard to the iconv support.
 
-  dir_config('xml2').any?  or pkg_config('libxml-2.0')
-  dir_config('xslt').any?  or pkg_config('libxslt')
-  dir_config('exslt').any? or pkg_config('libexslt')
+  dir_config('xml2').any?  or package_config('libxml-2.0')
+  dir_config('xslt').any?  or package_config('libxslt')
+  dir_config('exslt').any? or package_config('libexslt')
 
-  try_cpp(<<-SRC) or abort "libxml2 version 2.6.21 or later is required!"
-#include <libxml/xmlversion.h>
+  check_libxml_version or abort "ERROR: cannot discover where libxml2 is located on your system. please make sure `pkg-config` is installed."
+  check_libxml_version("2.6.21") or abort "ERROR: libxml2 version 2.6.21 or later is required!"
+  check_libxml_version("2.9.3") or warn "WARNING: libxml2 version 2.9.3 or later is highly recommended, but proceeding anyway."
 
-#if LIBXML_VERSION < 20621
-#error libxml2 is way too old
-#endif
-  SRC
-
-  try_cpp(<<-SRC) or warn "libxml2 version 2.9.3 or later is highly recommended, but proceeding anyway."
-#include <libxml/xmlversion.h>
-
-#if LIBXML_VERSION < 20903
-#error libxml2 is too old
-#endif
-  SRC
 else
   message "Building nokogiri using packaged libraries.\n"
 
   # The gem version constraint in the Rakefile is not respected at install time.
   # Keep this version in sync with the one in the Rakefile !
-  gem "mini_portile2", "~> 2.1.0"
+  require 'rubygems'
+  gem 'mini_portile2', '~> 2.1.0'
   require 'mini_portile2'
   message "Using mini_portile version #{MiniPortile::VERSION}\n"
 
@@ -504,13 +534,13 @@ EOM
     have_library('lzma')
   }
 
-  $libs = $libs.shellsplit.tap { |libs|
-    [libxml2_recipe, libxslt_recipe].each { |recipe|
+  $libs = $libs.shellsplit.tap do |libs|
+    [libxml2_recipe, libxslt_recipe].each do |recipe|
       libname = recipe.name[/\Alib(.+)\z/, 1]
-      File.join(recipe.path, "bin", "#{libname}-config").tap { |config|
+      File.join(recipe.path, "bin", "#{libname}-config").tap do |config|
         # call config scripts explicit with 'sh' for compat with Windows
         $CPPFLAGS = `sh #{config} --cflags`.strip << ' ' << $CPPFLAGS
-        `sh #{config} --libs`.strip.shellsplit.each { |arg|
+        `sh #{config} --libs`.strip.shellsplit.each do |arg|
           case arg
           when /\A-L(.+)\z/
             # Prioritize ports' directories
@@ -524,8 +554,8 @@ EOM
           else
             $LDFLAGS << ' ' << arg.shellescape
           end
-        }
-      }
+        end
+      end
 
       # Defining a macro that expands to a C string; double quotes are significant.
       $CPPFLAGS << ' ' << "-DNOKOGIRI_#{recipe.name.upcase}_PATH=\"#{recipe.path}\"".inspect
@@ -544,11 +574,11 @@ EOM
         # -lexslt, so add it manually.
         libs.unshift('-lexslt')
       end
-    }
-  }.shelljoin
+    end
+  end.shelljoin
 
   if static_p
-    $libs = $libs.shellsplit.map { |arg|
+    $libs = $libs.shellsplit.map do |arg|
       case arg
       when '-lxml2'
         File.join(libxml2_recipe.path, 'lib', lib_a(arg))
@@ -557,7 +587,7 @@ EOM
       else
         arg
       end
-    }.shelljoin
+    end.shelljoin
   end
 end
 
@@ -565,12 +595,12 @@ end
   "xml2"  => ['xmlParseDoc',            'libxml/parser.h'],
   "xslt"  => ['xsltParseStylesheetDoc', 'libxslt/xslt.h'],
   "exslt" => ['exsltFuncRegister',      'libexslt/exslt.h'],
-}.each { |lib, (func, header)|
+}.each do |lib, (func, header)|
   have_func(func, header) ||
   have_library(lib, func, header) ||
   have_library("lib#{lib}", func, header) or
     asplode("lib#{lib}")
-}
+end
 
 have_func('xmlHasFeature') or abort "xmlHasFeature() is missing."
 have_func('xmlFirstElementChild')
@@ -590,14 +620,14 @@ create_makefile('nokogiri/nokogiri')
 
 if enable_config('clean', true)
   # Do not clean if run in a development work tree.
-  File.open('Makefile', 'at') { |mk|
+  File.open('Makefile', 'at') do |mk|
     mk.print <<EOF
 all: clean-ports
 
 clean-ports: $(DLLIB)
 	-$(Q)$(RUBY) $(srcdir)/extconf.rb --clean --#{static_p ? 'enable' : 'disable'}-static
 EOF
-  }
+  end
 end
 
 # :startdoc:

data/ext/nokogiri/xml_node.c

@@ -233,6 +233,23 @@ ok:
      *  uninteresting libxml2 implementation detail). as a result, we cannot
      *  reparent the actual reparentee, so we reparent a duplicate.
      */
+    if (reparentee->type == XML_TEXT_NODE && reparentee->_private) {
+      /*
+       *  additionally, since we know this C struct isn't going to be related to
+       *  a Ruby object anymore, let's break the relationship on this end as
+       *  well.
+       *
+       *  this is not absolutely necessary unless libxml-ruby is also in effect,
+       *  in which case its global callback `rxml_node_deregisterNode` will try
+       *  to do things to our data.
+       *
+       *  for more details on this particular (and particularly nasty) edge
+       *  case, see:
+       *
+       *    https://github.com/sparklemotion/nokogiri/issues/1426
+       */
+      reparentee->_private = NULL ;
+    }
     nokogiri_root_node(reparentee);
     if (!(reparentee = xmlDocCopyNode(reparentee, pivot->doc, 1))) {
       rb_raise(rb_eRuntimeError, "Could not reparent node (xmlDocCopyNode)");

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.8.rc2'
+  VERSION = '1.6.8.rc3'
 
   class VersionInfo # :nodoc:
     def jruby?

data/test/helper.rb

@@ -7,6 +7,10 @@ require 'tempfile'
 require 'pp'
 
 require 'nokogiri'
+if ENV['TEST_NOKOGIRI_WITH_LIBXML_RUBY']
+  require 'libxml'
+  warn "#{__FILE__}:#{__LINE__}: loaded libxml-ruby '#{LibXML::XML::VERSION}'"
+end
 
 warn "#{__FILE__}:#{__LINE__}: version info: #{Nokogiri::VERSION_INFO.inspect}"
 

data/test/html/test_document_fragment.rb

@@ -230,7 +230,7 @@ module Nokogiri
 
       def test_element_children_counts
         doc = Nokogiri::HTML::DocumentFragment.parse("   <div>  </div>\n   ")
-        assert doc.element_children.count == 1
+        assert_equal 1, doc.element_children.count
       end
 
       def test_malformed_fragment_is_corrected

data/test/xml/test_node.rb

@@ -1228,6 +1228,17 @@ eoxml
         subject.lang = "fr"
         assert_equal "fr", subject.lang
       end
+
+      def test_text_node_robustness_gh1426
+        # notably, the original bug report was about libxml-ruby interactions
+        # this test should blow up under valgrind if we regress on libxml-ruby workarounds
+        message = "<h2>BOOM!</h2>"
+        10_000.times do
+          node = Nokogiri::HTML::DocumentFragment.parse(message)
+          node.add_previous_sibling(Nokogiri::XML::Text.new('before', node.document))
+          node.add_next_sibling(Nokogiri::XML::Text.new('after', node.document))
+        end
+      end
     end
   end
 end

data/test_all

@@ -25,6 +25,14 @@ RUBIES="\
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 
+if ! grep libxml-ruby Gemfile ; then
+  echo "ERROR: please add this line your Gemfile temporarily so we can run libxml-ruby tests:"
+  echo
+  echo "gem 'libxml-ruby', :platform => :mri"
+  echo
+  exit 1
+fi
+
 # Load RVM into a shell session *as a function*
 if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
     source "$HOME/.rvm/scripts/rvm"
@@ -83,6 +91,13 @@ for ruby in $RUBIES ; do
     compile
     echo "** running tests ..."
     bundle exec rake test 2>&1 | tee -a $TEST_LOG
+    if [[ ! $ruby =~ "jruby" ]] ; then
+      echo "** running tests again with libxml-ruby loaded ..."
+      if ! gem list libxml-ruby | fgrep 2.8.0 ; then
+        gem install libxml-ruby
+      fi
+      bundle exec rake test:libxml-ruby 2>&1 | tee -a $TEST_LOG
+    fi
     clean
 done
 
@@ -94,6 +109,8 @@ for ruby in $RUBIES ; do
         compile
         echo "** running valgrind on tests ..."
         bundle exec rake test:valgrind 2>&1 | tee -a $VALGRIND_LOG
+        echo "** running valgrind again with libxml-ruby loaded ..."
+        bundle exec rake test:valgrind:libxml-ruby 2>&1 | tee -a $VALGRIND_LOG
         clean
     fi
 done

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.8.rc2
+  version: 1.6.8.rc3
 platform: x86-mingw32
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -28,6 +28,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
+- !ruby/object:Gem::Dependency
+  name: pkg-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -146,14 +160,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement