nokogiri 1.6.2.rc1-x64-mingw32 → 1.6.2.rc2-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edfe5b7cdd699c95ef916d2090767d2a6fdc7474
-  data.tar.gz: 4050f499ba377da0c12e852784879e244e5051fc
+  metadata.gz: de101b84c4208bdda19e3f40b47de1f352cdfd97
+  data.tar.gz: b9a9d52af790ee572cd3f584afcfd99add72790e
 SHA512:
-  metadata.gz: 8b8b04be18e64af23f8a8ac715f5589dc2b4c66120bc490d69db838b9a2a471e38ab55208793cd7e0112f02e4e341132a462b1c7486980fc31f5eddc20d6eeb1
-  data.tar.gz: 49a8ace84ef267ce9eef0e378c932e017a0454c408ba40a3b59e7fae3828ce02243a8e334da1af5ab32d77fd6e1a9ce69287effe32c0c12b7e0e08e3dcf51187
+  metadata.gz: 03d17858687adca2480eb39cb374cf6c4cb0522368f6b447cb4b59ae72b6f50a793ddcf67168bc2f7094b916b43e5cf389869c3f4f60d0cf92893b1b6d6c4108
+  data.tar.gz: 2dabdbfd6ec6f7629f35ae577ea1f0c2027c9d784a835bc147d0728edbbece9efa8cb77cc3603ff8eaaf304d0b761c7a08e11954e1923b5700ee66aa96ecdced

data/CHANGELOG.ja.rdoc

@@ -1,7 +1,13 @@
 === 1.6.2 / 未リリース
 
+* 註
+
+  * Now requires libxml >= 2.6.21 (was previously >= 2.6.17).
+
 * 機能
 
+  * Add cross building of fat binary gems for 64-Bit Windows (x64-mingw32)
+    and add support for native builds on Windows. #864, #989, #1072
   * (MRI) iconvが Windows-31J をサポートしていない場合は CP932 のエイリアスとして扱うようにした #836
   * (MRI) 同梱ライブラリを静的にリンクするようになった (静的リンクをオフにするにはextconf.rbに --disable-static を渡す) #923
   * (MRI) 同梱ライブラリのビルド後に不要になったディレクトリ群を自動的に削除するようになった (デバッグ等の目的で残すようにするにはextconf.rbに --disable-clean を渡す) #952

data/CHANGELOG.rdoc

@@ -1,7 +1,13 @@
 === 1.6.2 / unreleased
 
+* Notes
+
+  * Now requires libxml >= 2.6.21 (was previously >= 2.6.17).
+
 * Features
 
+  * Add cross building of fat binary gems for 64-Bit Windows (x64-mingw32)
+    and add support for native builds on Windows. #864, #989, #1072
   * (MRI) Alias CP932 to Windows-31J if iconv does not support Windows-31J.
   * (MRI) Nokogiri now links packaged libraries statically.  To
     disable static linking, pass --disable-static to extconf.rb. #923

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.17 and <2.9.0, with iconv support
+  * libxml2 >=2.6.21 and <2.9.0, with iconv support
     (libxml2-dev/-devel is required too)
 
   * libxslt, built with and supported by the given libxml2

data/ext/nokogiri/extconf.rb

@@ -1,27 +1,38 @@
+# :stopdoc:
 ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
 
-# Available options:
-#
-# --enable-clean (default)
-# --disable-clean
-#
-# --enable-static (default)
-# --disable-static
-#
-# --with-iconv-dir=DIR
-#
-# --with-zlib-dir=DIR
-#
-# --use-system-libraries
-#   --with-xml2-dir=DIR / --with-xml2-config=CONFIG
-#   --with-xslt-dir=DIR / --with-xslt-config=CONFIG
-#   --with-exslt-dir=DIR / --with-exslt-config=CONFIG
-#
-# --enable-cross-build
+require 'mkmf'
 
-# :stopdoc:
+if arg_config('--help')
+  print <<HELP
+usage: ruby #{$0} [options]
 
-require 'mkmf'
+    --disable-clean
+        Do not clean out intermediate files after successful build.
+
+    --disable-static
+        Do not statically link bundled libraries.
+
+    --with-iconv-dir=DIR
+        Use the iconv library placed under DIR.
+
+    --with-zlib-dir=DIR
+        Use the zlib library placed under DIR.
+
+    --use-system-libraries
+        Use system libraries intead of building and using the bundled
+        libraries.
+
+    --with-xml2-dir=DIR / --with-xml2-config=CONFIG
+    --with-xslt-dir=DIR / --with-xslt-config=CONFIG
+    --with-exslt-dir=DIR / --with-exslt-config=CONFIG
+        Use libxml2/libxslt/libexslt as specified.
+
+    --enable-cross-build
+        Do cross-build.
+HELP
+  exit! 0
+end
 
 def message!(important_message)
   message important_message
@@ -30,6 +41,7 @@ def message!(important_message)
       tty.print important_message
     }
   end
+rescue Errno::ENXIO
 end
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
@@ -37,7 +49,7 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 # Workaround for Ruby bug #8074, introduced in Ruby 2.0.0, fixed in Ruby 2.1.0
 # https://bugs.ruby-lang.org/issues/8074
-@libdir_basename = "lib"
+@libdir_basename = "lib" if RUBY_VERSION < '2.1.0'
 
 if arg_config('--clean')
   require 'pathname'
@@ -131,12 +143,15 @@ end
 def iconv_prefix
   # Make sure libxml2 is built with iconv
   each_iconv_idir { |idir|
-    prefix = %r{\A(.+)?/include\z} === idir && $1 or next
-    File.exist?(File.join(idir, 'iconv.h')) or next
+    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} " << $CPPFLAGS
+      $CPPFLAGS = "-I#{idir}".quote << ' ' << $CPPFLAGS
       $LIBPATH.unshift(File.join(prefix, "lib"))
       have_iconv?
     } and break prefix
@@ -222,11 +237,11 @@ XPath optimization bugs.
   end
 end
 
-windows_p = RbConfig::CONFIG['target_os'] == 'mingw32' || RbConfig::CONFIG['target_os'] =~ /mswin/
-
-if windows_p
+case RbConfig::CONFIG['target_os']
+when 'mingw32', /mswin/
+  windows_p = true
   $CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
-elsif RbConfig::CONFIG['target_os'] =~ /solaris/
+when /solaris/
   $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
 else
   $CFLAGS << " -g -DXP_UNIX"
@@ -252,9 +267,25 @@ when arg_config('--use-system-libraries', !!ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES']
   # Using system libraries means we rely on the system libxml2 with
   # regard to the iconv support.
 
-  dir_config('xml2').any?  || pkg_config('libxml-2.0')
-  dir_config('xslt').any?  || pkg_config('libxslt')
-  dir_config('exslt').any? || pkg_config('libexslt')
+  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')
+
+  try_cpp(<<-SRC) or abort "libxml2 version 2.6.21 or later is required!"
+#include <libxml/xmlversion.h>
+
+#if LIBXML_VERSION < 20621
+#error libxml2 is too old
+#endif
+  SRC
+
+  try_cpp(<<-SRC) or warn "libxml2 version 2.9.0 and later is not yet supported, but proceeding anyway."
+#include <libxml/xmlversion.h>
+
+#if LIBXML_VERSION >= 20900
+#error libxml2 is too new
+#endif
+  SRC
 else
   message! "Building nokogiri using packaged libraries.\n"
 
@@ -414,16 +445,14 @@ end
   "xslt"  => ['xsltParseStylesheetDoc', 'libxslt/xslt.h'],
   "exslt" => ['exsltFuncRegister',      'libexslt/exslt.h'],
 }.each { |lib, (func, header)|
-  have_func(func, header) || have_library(lib, func, header) || have_library("lib#{lib}", func, header) or asplode("lib#{lib}")
+  have_func(func, header) ||
+  have_library(lib, func, header) ||
+  have_library("lib#{lib}", func, header) or
+    asplode("lib#{lib}")
 }
 
-unless have_func('xmlHasFeature')
-  abort "-----\nThe function 'xmlHasFeature' is missing from your installation of libxml2.  Likely this means that your installed version of libxml2 is old enough that nokogiri will not work well.  To get around this problem, please upgrade your installation of libxml2.
-
-Please visit http://nokogiri.org/tutorials/installing_nokogiri.html for more help!"
-end
-
-have_func 'xmlFirstElementChild'
+have_func('xmlHasFeature') or abort "xmlHasFeature() is missing."
+have_func('xmlFirstElementChild')
 have_func('xmlRelaxNGSetParserStructuredErrors')
 have_func('xmlRelaxNGSetParserStructuredErrors')
 have_func('xmlRelaxNGSetValidStructuredErrors')

data/lib/nokogiri/version.rb

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

data/test/xml/test_xpath.rb

@@ -168,7 +168,13 @@ module Nokogiri
         end
         stop = Time.now
         elapsed_time = stop - start
-        assert elapsed_time < 10, "XPath is taking too long"
+        time_limit =
+          if ENV['TRAVIS'] && ENV['CI']
+            20 # Travis CI box slowness
+          else
+            10
+          end
+        assert_send [elapsed_time, :<, time_limit], "XPath is taking too long"
       end
 
       def test_custom_xpath_function_returns_string

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.2.rc1
+  version: 1.6.2.rc2
 platform: x64-mingw32
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile