nokogiri 1.6.3.1 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17d38f9fb67b16ba272f1396dab02d33fe076506
-  data.tar.gz: cb53002d5d6c4c6091b9b005eac2ce5cd41820d4
+  metadata.gz: a7c7a390c125f0b1eca55141b2c6a2b9269e2ddf
+  data.tar.gz: 9e9c9e3ed07a75d4e6cf8f23face26ddf20a4f61
 SHA512:
-  metadata.gz: 568fca09f379dd61e9d2bd8dedccc0f25b851ac92d20cc12021ded1083f3f0d9b53a69b84faa162ac5d8a6423adb82cf577fc0d366fec5cfe6c34578a6af4702
-  data.tar.gz: b2a13c133ccc33f9c0ed0b05f397dd836af3214261bed643c4f925d5a5161b6fb5a69a628f03b5d5759ae1b43a42266869751bea084f1f7cfa35e97e00643627
+  metadata.gz: 06ad0bc7f5271e67cd5cc225e9241bea832c4ee5a3944513450506eb305a70ceebc58f9b816623d5966b6f8b72f241782a9a55fa6f490ca8f0645af89d90261e
+  data.tar.gz: 295345231210ed1eaae94485abfa9a19edcfdd6afa254ccfc862461f0600332e7fb60bb4b2bad37cac2159e9fd5dd882ed07e08cf20fccc4c0cefde67bcd8371

data/.travis.yml

@@ -2,18 +2,23 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1.3
   - ruby-head
   - jruby-19mode
   - jruby-20mode
   - rbx-19mode
 
+os:
+  - linux
+  - osx
+
 jdk:
   - openjdk7
   - openjdk6
 
 matrix:
   allow_failures:
+    - os: osx
     - rvm: rbx-19mode
     # currently broken on Travis CI
     - rvm: jruby-20mode
@@ -22,7 +27,7 @@ matrix:
       jdk: openjdk7
     - rvm: 2.0.0
       jdk: openjdk7
-    - rvm: 2.1.2
+    - rvm: 2.1.3
       jdk: openjdk7
     - rvm: ruby-head
       jdk: openjdk7

data/CHANGELOG.ja.rdoc

@@ -1,3 +1,19 @@
+=== 1.6.4 / 2014-11-04
+
+==== 機能
+
+* (MRI) Bundled Libxml2 is upgraded to 2.9.2.
+* (MRI) `nokogiri --version` will include a list of applied patches.
+* (MRI) Nokogiri no longer prints messages directly to TTY while building the extension.
+* (MRI) Detect and help user fix a missing /usr/include/iconv.h on OS X. (#1111)
+* (MRI) Improve the iconv detection for building libxml2.
+
+==== バグ修正
+
+* (MRI) Fix DocumentFragment#element_children (#1138).
+* Fix a bug with CSS attribute selector without any prefix where "foo [bar]" was treated as "foo[bar]". (#1174)
+
+
 === 1.6.3.1 / 2014年7月21日
 
 ==== バグ修正

data/CHANGELOG.rdoc

@@ -1,3 +1,19 @@
+=== 1.6.4 / 2014-11-04
+
+==== Features
+
+* (MRI) Bundled Libxml2 is upgraded to 2.9.2.
+* (MRI) `nokogiri --version` will include a list of applied patches.
+* (MRI) Nokogiri no longer prints messages directly to TTY while building the extension.
+* (MRI) Detect and help user fix a missing /usr/include/iconv.h on OS X. (#1111)
+* (MRI) Improve the iconv detection for building libxml2.
+
+==== Bug fixes
+
+* (MRI) Fix DocumentFragment#element_children (#1138).
+* Fix a bug with CSS attribute selector without any prefix where "foo [bar]" was treated as "foo[bar]". (#1174)
+
+
 === 1.6.3.1 / 2014-07-21
 
 ==== Bug fixes

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "https://rubygems.org/"
 
-gem "mini_portile", "=0.6.0"
+gem "mini_portile", "~>0.6.0"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
 gem "hoe-bundler", ">=1.1", :group => [:development, :test]
@@ -16,6 +16,6 @@ gem "rake", ">=0.9", :group => [:development, :test]
 gem "rake-compiler", "~>0.9.2", :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.7", :group => [:development, :test]
+gem "hoe", "~>3.13", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Manifest.txt

@@ -239,17 +239,8 @@ lib/nokogiri/xslt.rb
 lib/nokogiri/xslt/stylesheet.rb
 lib/xercesImpl.jar
 lib/xsd/xmlparser/nokogiri.rb
-ports/patches/libxml2/0001-Fix-parser-local-buffers-size-problems.patch
-ports/patches/libxml2/0002-Fix-entities-local-buffers-size-problems.patch
-ports/patches/libxml2/0003-Fix-an-error-in-previous-commit.patch
-ports/patches/libxml2/0004-Fix-potential-out-of-bound-access.patch
-ports/patches/libxml2/0005-Detect-excessive-entities-expansion-upon-replacement.patch
-ports/patches/libxml2/0006-Do-not-fetch-external-parsed-entities.patch
-ports/patches/libxml2/0007-Enforce-XML_PARSER_EOF-state-handling-through-the-pa.patch
-ports/patches/libxml2/0008-Improve-handling-of-xmlStopParser.patch
-ports/patches/libxml2/0009-Fix-a-couple-of-return-without-value.patch
-ports/patches/libxml2/0010-Keep-non-significant-blanks-node-in-HTML-parser.patch
-ports/patches/libxml2/0011-Do-not-fetch-external-parameter-entities.patch
+ports/patches/libxml2/0001-Revert-Missing-initialization-for-the-catalog-module.patch
+ports/patches/libxml2/0002-Fix-missing-entities-after-CVE-2014-3660-fix.patch
 ports/patches/libxslt/0001-Adding-doc-update-related-to-1.1.28.patch
 ports/patches/libxslt/0002-Fix-a-couple-of-places-where-f-printf-parameters-wer.patch
 ports/patches/libxslt/0003-Initialize-pseudo-random-number-generator-with-curre.patch

data/README.ja.rdoc

@@ -67,7 +67,7 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 * Nokogiri 1.6.0以降ではlibxml2とlibxsltは同梱されているが、
   もしインストール済みのものを使いたい場合:
 
-  * libxml2 2.6.17以上2.9.0未満, iconvサポート付きのもの
+  * libxml2 2.6.21以上, iconvサポート付きのもの
     (libxml2-dev/-develパッケージも必要)
 
   * libxslt 上記のlibxml2でビルドされ、サポートされているもの
@@ -81,7 +81,7 @@ IRCのチャンネルはfreenodeの #nokogiri です。
 
 (The MIT License)
 
-Copyright (c) 2008 - 2013:
+Copyright (c) 2008 - 2014:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/README.rdoc

@@ -77,7 +77,7 @@ The IRC channel is #nokogiri on freenode.
 * in Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the
   gem, but if you want to use them installed on the system:
 
-  * libxml2 >=2.6.21 and <2.9.0, with iconv support
+  * libxml2 >=2.6.21 with iconv support
     (libxml2-dev/-devel is required too)
 
   * libxslt, built with and supported by the given libxml2
@@ -150,7 +150,7 @@ Then run rake:
 
 (The MIT License)
 
-Copyright (c) 2008 - 2013:
+Copyright (c) 2008 - 2014:
 
 * {Aaron Patterson}[http://tenderlovemaking.com]
 * {Mike Dalessio}[http://mike.daless.io]

data/Rakefile

@@ -136,7 +136,7 @@ HOE = Hoe.spec 'nokogiri' do
       # for more details, see:
       # - https://github.com/sparklemotion/nokogiri/issues/1102
       # - https://github.com/luislavena/mini_portile/issues/32
-      ["mini_portile",    "= 0.6.0"],
+      ["mini_portile",    "~> 0.6.0"],
     ]
   end
 

data/build_all

@@ -54,7 +54,7 @@ fi
 
 rvm_use () {
     current_ruby=$1
-    rvm use "${1}@nokogiri" --create || rvm -v
+    rvm use "${1}@nokogiri" --create
 }
 
 rvm_do () {

data/dependencies.yml

@@ -1,4 +1,4 @@
-libxml2: "2.8.0"
+libxml2: "2.9.2"
 libxslt: "1.1.28"
 zlib: "1.2.8"
 libiconv: "1.14"

data/ext/nokogiri/extconf.rb

@@ -40,16 +40,6 @@ HELP
   exit! 0
 end
 
-def message!(important_message)
-  message important_message
-  if !$stdout.tty? && File.chardev?('/dev/tty')
-    File.open('/dev/tty', 'w') { |tty|
-      tty.print important_message
-    }
-  end
-rescue Errno::ENXIO
-end
-
 def do_clean
   require 'pathname'
   require 'fileutils'
@@ -81,6 +71,19 @@ def do_clean
   exit! 0
 end
 
+def add_cflags(flags)
+  print "checking if the C compiler accepts #{flags}... "
+  with_cflags("#{$CFLAGS} #{flags}") do
+    if try_compile("int main() {return 0;}", werror: true)
+      puts 'yes'
+      true
+    else
+      puts 'no'
+      false
+    end
+  end
+end
+
 def preserving_globals
   values = [
     $arg_config,
@@ -96,58 +99,68 @@ ensure
 end
 
 def asplode(lib)
-  abort "-----\n#{lib} is missing.  please visit http://nokogiri.org/tutorials/installing_nokogiri.html for help with installing dependencies.\n-----"
+  abort "-----\n#{lib} is missing.  Please locate mkmf.log to investigate how it is failing.\n-----"
 end
 
-def have_iconv?
-  have_header('iconv.h') or return false
-  %w{ iconv_open libiconv_open }.any? do |method|
-    have_func(method, 'iconv.h') or
-      have_library('iconv', method, 'iconv.h')
-  end
+def have_iconv?(using = nil)
+  checking_for(using ? "iconv using #{using}" : 'iconv') {
+    ['', '-liconv'].any? { |opt|
+      preserving_globals {
+        yield if block_given?
+
+        try_link(<<-'SRC', opt)
+#include <stdlib.h>
+#include <iconv.h>
+
+int main(void)
+{
+    iconv_t cd = iconv_open("", "");
+    iconv(cd, NULL, NULL, NULL, NULL);
+    return EXIT_SUCCESS;
+}
+        SRC
+      }
+    }
+  }
 end
 
-def each_iconv_idir
+def iconv_configure_flags
   # If --with-iconv-dir or --with-opt-dir is given, it should be
   # the first priority
-  %w[iconv opt].each { |config|
-    idir = preserving_globals {
-      dir_config(config)
-    }.first and yield idir
-  }
-
-  # Try the system default
-  yield "/usr/include"
+  %w[iconv opt].each { |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|
+          dir.split(File::PATH_SEPARATOR)
+        } if dirs
+      }
 
-  cflags, = preserving_globals {
-    pkg_config('libiconv')
+      return [
+        '--with-iconv=yes',
+        *("CPPFLAGS=#{idirs.map { |dir| '-I' << dir }.join(' ')}".quote if idirs),
+        *("LDFLAGS=#{ldirs.map { |dir| '-L' << dir }.join(' ')}".quote if ldirs),
+      ]
+    end
   }
-  if cflags
-    cflags.shellsplit.each { |arg|
-      arg.sub!(/\A-I/, '') and
-      yield arg
-    }
+
+  if have_iconv?
+    return ['--with-iconv=yes']
   end
 
-  nil
-end
+  if (config = preserving_globals { pkg_config('libiconv') }) &&
+     have_iconv?('pkg-config libiconv') { pkg_config('libiconv') }
+    cflags, ldflags, libs = config
 
-def iconv_prefix
-  # Make sure libxml2 is built with iconv
-  each_iconv_idir { |idir|
-    next unless File.file?(File.join(idir, 'iconv.h'))
-
-    prefix, dir = File.split(idir)
-    next unless dir == 'include'
-
-    preserving_globals {
-      # Follow the way libxml2's configure uses a value given with
-      # --with-iconv[=DIR]
-      $CPPFLAGS = "-I#{idir}".quote << ' ' << $CPPFLAGS
-      $LIBPATH.unshift(File.join(prefix, "lib"))
-      have_iconv?
-    } and break prefix
-  } or asplode "libiconv"
+    return [
+      '--with-iconv=yes',
+      "CPPFLAGS=#{cflags}".quote,
+      "LDFLAGS=#{ldflags}".quote,
+      "LIBS=#{libs}".quote,
+    ]
+  end
+
+  asplode "libiconv"
 end
 
 def process_recipe(name, version, static_p, cross_p)
@@ -208,25 +221,31 @@ def process_recipe(name, version, static_p, cross_p)
       "#{key}=#{value}".shellescape
     }
 
-    if recipe.patch_files.empty?
-      message! "Building #{name}-#{version} for nokogiri.\n"
-    else
-      message! "Building #{name}-#{version} for nokogiri with the following patches applied:\n"
+    message <<-"EOS"
+************************************************************************
+IMPORTANT NOTICE:
+
+Buidling Nokogiri with a packaged version of #{name}-#{version}#{'.' if recipe.patch_files.empty?}
+    EOS
+
+    unless recipe.patch_files.empty?
+      message "with the following patches applied:\n"
 
       recipe.patch_files.each { |patch|
-        message! "\t- %s\n" % File.basename(patch)
+        message "\t- %s\n" % File.basename(patch)
       }
     end
 
-    message! <<-"EOS"
-************************************************************************
-IMPORTANT!  Nokogiri builds and uses a packaged version of #{name}.
+    message <<-"EOS"
 
-If this is a concern for you and you want to use the system library
-instead, abort this installation process and reinstall nokogiri as
-follows:
+Team Nokogiri will keep on doing their best to provide security
+updates in a timely manner, but if this is a concern for you and want
+to use the system library instead; abort this installation process and
+reinstall nokogiri as follows:
 
     gem install nokogiri -- --use-system-libraries
+        [--with-xml2-config=/path/to/xml2-config]
+        [--with-xslt-config=/path/to/xslt-config]
 
 If you are using Bundler, tell it to use the option:
 
@@ -234,17 +253,13 @@ If you are using Bundler, tell it to use the option:
     bundle install
     EOS
 
-    message! <<-"EOS" if name == 'libxml2'
-
-However, note that nokogiri does not necessarily support all versions
-of libxml2.
+    message <<-"EOS" if name == 'libxml2'
 
-For example, libxml2-2.9.0 and higher are currently known to be broken
-and thus unsupported by nokogiri, due to compatibility problems and
-XPath optimization bugs.
+Note, however, that nokogiri is not fully compatible with arbitrary
+versions of libxml2 provided by OS/package vendors.
     EOS
 
-    message! <<-"EOS"
+    message <<-"EOS"
 ************************************************************************
     EOS
 
@@ -302,9 +317,11 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'
   $LIBRUBYARG_STATIC.gsub!(/-static/, '')
 end
 
-$CFLAGS << " #{ENV["CFLAGS"]}"
 $LIBS << " #{ENV["LIBS"]}"
 
+# Read CFLAGS from ENV and make sure compiling works.
+add_cflags(ENV["CFLAGS"])
+
 case RbConfig::CONFIG['target_os']
 when 'mingw32', /mswin/
   windows_p = true
@@ -312,9 +329,9 @@ when 'mingw32', /mswin/
 when /solaris/
   $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
 when /darwin/
-  if RbConfig::MAKEFILE_CONFIG['CC'] !~ /gcc/ then
-    $CFLAGS << " -Wno-error=unused-command-line-argument-hard-error-in-future"
-  end
+  darwin_p = true
+  # Let Apple LLVM/clang 5.1 ignore unknown compiler flags
+  add_cflags("-Wno-error=unused-command-line-argument-hard-error-in-future")
 else
   $CFLAGS << " -g -DXP_UNIX"
 end
@@ -332,7 +349,7 @@ end
 
 case
 when arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'])
-  message! "Building nokogiri using system libraries.\n"
+  message "Building nokogiri using system libraries.\n"
 
   dir_config('zlib')
 
@@ -347,26 +364,26 @@ when arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']
 #include <libxml/xmlversion.h>
 
 #if LIBXML_VERSION < 20621
-#error libxml2 is too old
+#error libxml2 is way too old
 #endif
   SRC
 
-  try_cpp(<<-SRC) or warn "libxml2 version 2.9.0 and later is not yet supported, but proceeding anyway."
+  try_cpp(<<-SRC) or warn "libxml2 version 2.9.2 or later is highly recommended, but proceeding anyway."
 #include <libxml/xmlversion.h>
 
-#if LIBXML_VERSION >= 20900
-#error libxml2 is too new
+#if LIBXML_VERSION < 20902
+#error libxml2 is too old
 #endif
   SRC
 else
-  message! "Building nokogiri using packaged libraries.\n"
+  message "Building nokogiri using packaged libraries.\n"
 
   require 'mini_portile'
   monkey_patch_mini_portile
   require 'yaml'
 
   static_p = enable_config('static', true) or
-    message! "Static linking is disabled.\n"
+    message "Static linking is disabled.\n"
 
   dir_config('zlib')
 
@@ -418,6 +435,21 @@ else
         "LDFLAGS="
       ]
     end
+  else
+    if darwin_p && !File.exist?('/usr/include/iconv.h')
+      abort <<'EOM'.chomp
+-----
+The file "/usr/include/iconv.h" is missing in your build environment,
+which means you haven't installed Xcode Command Line Tools properly.
+
+To install Command Line Tools, try running `xcode-select --install` on
+terminal and follow the instructions.  If it fails, open Xcode.app,
+select from the menu "Xcode" - "Open Developer Tool" - "More Developer
+Tools" to open the developer site, download the installer for your OS
+version and run it.
+-----
+EOM
+    end
   end
 
   libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"], static_p, cross_build_p) do |recipe|
@@ -425,7 +457,7 @@ else
     recipe.configure_options += [
       "--without-python",
       "--without-readline",
-      "--with-iconv=#{libiconv_recipe ? libiconv_recipe.path : iconv_prefix}",
+      *(libiconv_recipe ? "--with-iconv=#{libiconv_recipe.path}" : iconv_configure_flags),
       "--with-c14n",
       "--with-debug",
       "--with-threads"
@@ -475,6 +507,7 @@ else
 
       # Defining a macro that expands to a C string; double quotes are significant.
       $CPPFLAGS << ' ' << "-DNOKOGIRI_#{recipe.name.upcase}_PATH=\"#{recipe.path}\"".shellescape
+      $CPPFLAGS << ' ' << "-DNOKOGIRI_#{recipe.name.upcase}_PATCHES=\"#{recipe.patch_files.map { |path| File.basename(path) }.join(' ')}\"".shellescape
 
       case libname
       when 'xml2'