nokogiri 1.6.6.4 → 1.6.7.rc2

data/Rakefile

@@ -12,7 +12,6 @@ Hoe.add_include_dirs '.'
 
 GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
 GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
-CROSS_DIR           =  File.join(File.dirname(__FILE__), 'ports')
 
 def java?
   /java/ === RUBY_PLATFORM
@@ -25,14 +24,18 @@ CrossRuby = Struct.new(:version, :host) {
     @ver ||= version[/\A[^-]+/]
   end
 
+  def minor_ver
+    @minor_ver ||= ver[/\A\d\.\d(?=\.)/]
+  end
+
   def api_ver_suffix
-    case ver
-    when /\A([2-9])\.([0-9])\./
-      "#{$1}#{$2}0"
-    when /\A1\.9\./
+    case minor_ver
+    when nil
+      raise "unsupported version: #{ver}"
+    when '1.9'
       '191'
     else
-      raise "unsupported version: #{ver}"
+      minor_ver.delete('.') << '0'
     end
   end
 
@@ -110,7 +113,7 @@ HOE = Hoe.spec 'nokogiri' do
 
   license "MIT"
 
-  self.readme_file  = ['README',    ENV['HLANG'], 'rdoc'].compact.join('.')
+  self.readme_file  = "README.md"
   self.history_file = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
 
   self.extra_rdoc_files = FileList['*.rdoc','ext/nokogiri/*.c']
@@ -119,22 +122,13 @@ HOE = Hoe.spec 'nokogiri' do
   self.clean_globs += [
     'nokogiri.gemspec',
     'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
-    'lib/nokogiri/[0-9].[0-9]',
-    'ports/*.installed',
-    'ports/{i[3-6]86,x86_64}-{w64-,}mingw32*',
-    'ports/libxml2',
-    'ports/libxslt',
-    # GENERATED_PARSER,
-    # GENERATED_TOKENIZER
+    'lib/nokogiri/[0-9].[0-9]'
   ]
+  self.clean_globs += Dir.glob("ports/*").reject { |d| d =~ %r{/archives$} }
 
   unless java?
     self.extra_deps += [
-      # this dependency locked because we're monkey-punching mini_portile.
-      # 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.7.0.rc2"],
     ]
   end
 
@@ -146,6 +140,7 @@ HOE = Hoe.spec 'nokogiri' do
     ["minitest",        "~> 2.2.2"],
     ["rake",            ">= 0.9"],
     ["rake-compiler",   "~> 0.9.2"],
+    ["rake-compiler-dock", "~> 0.4.2"],
     ["racc",            ">= 1.4.6"],
     ["rexical",         ">= 1.0.5"]
   ]
@@ -200,7 +195,6 @@ else
     Rake::ExtensionCompiler.mingw_host
     mingw_available = true
   rescue
-    puts "WARNING: cross compilation not available: #{$!}"
     mingw_available = false
   end
   require "rake/extensiontask"
@@ -214,7 +208,7 @@ else
       version = dependencies[lib]
       archive = File.join("ports", "archives", "#{lib}-#{version}.tar.gz")
       add_file_to_gem archive
-      patchesdir = File.join("ports", "patches", lib)
+      patchesdir = File.join("patches", lib)
       patches = `#{['git', 'ls-files', patchesdir].shelljoin}`.split("\n").grep(/\.patch\z/)
       patches.each { |patch|
         add_file_to_gem patch
@@ -238,6 +232,11 @@ else
       ext.cross_compiling do |spec|
         libs = dependencies.map { |name, version| "#{name}-#{version}" }.join(', ')
 
+        spec.required_ruby_version = [
+          '>= 1.9.2',
+          "< #{CROSS_RUBIES.max_by(&:ver).minor_ver.succ}"
+        ]
+
         spec.post_install_message = <<-EOS
 Nokogiri is built with the packaged libraries: #{libs}.
         EOS
@@ -349,6 +348,9 @@ task :cross do
 end
 
 desc "build a windows gem without all the ceremony."
-task "gem:windows" => %w[cross native gem]
+task "gem:windows" do
+  require "rake_compiler_dock"
+  RakeCompilerDock.sh "bundle && rake cross native gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=#{ENV['RUBY_CC_VERSION']}"
+end
 
 # vim: syntax=Ruby

data/appveyor.yml

@@ -0,0 +1,22 @@
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - SET PATH=C:\MinGW\bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+  - ruby --version
+  - gem --version
+  - bundle install
+
+build: off
+
+test_script:
+  - bundle exec rake
+
+environment:
+  matrix:
+    - ruby_version: "22"
+    - ruby_version: "22-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"
+    - ruby_version: "200"
+    - ruby_version: "200-x64"
+    - ruby_version: "193"

data/build_all

@@ -5,43 +5,6 @@
 #  - windows (x86-mingw32 and x64-mingw32)
 #  - jruby
 #
-#  here's what I recommend for building all the gems:
-#
-#  set up a rake-compiler-dev-box as described here:
-#      https://github.com/tjschuck/rake-compiler-dev-box
-#  It is prepared with all the necessary build tools and environments.
-#
-#  or alternatively do:
-#   1. Setup a ubuntu 12.04+ machine
-#   2. install rvm, and install 1.9.3, 2.0.0 and jruby.
-#   3. `sudo apt-get install mingw32 gcc-mingw-w64-i686 gcc-mingw-w64-x86-64`
-#
-#  as you build, you may run into these problems:
-#
-#  - if you're using Virtualbox shared directories, you'll get a mingw
-#    "Protocol error" at linktime. Boo! Either use NFS or a
-#    locally-checked-out repository.
-#
-#  - on ubuntus 11 and later, you may have issues with building
-#    rake-compiler's rubies against openssl v2. Just comment the lines
-#    out from ossl_ssl.c and you'll be fine.
-#
-#  - you may have issues with Pathname conversion to String in
-#    bundler. Add this to the offending bundler file:
-#
-#      class Pathname
-#        def to_str
-#          to_s
-#        end
-#      end
-#
-#  - you may also have to hack rubygems.rb to eliminate a reference to
-#    RUBY_ENGINE (just comment it out)
-#
-
-DEFAULT_RUBY=2.0.0
-
-HOST=
 
 # Load RVM into a shell session *as a function*
 if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
@@ -52,63 +15,17 @@ else
     echo "ERROR: An RVM installation was not found.\n"
 fi
 
-rvm_use () {
-    current_ruby=$1
-    rvm use "${1}@nokogiri" --create
-}
-
-rvm_do () {
-    local ver=$1
-    shift
-    rvm "${ver}@nokogiri" do "$@"
-}
-
-cross_rubies () {
-    grep -v '#' .cross_rubies
-}
-
-ruby_vers () {
-    cross_rubies | while read -r line; do
-        echo "${line%%[-:]*}"
-    done | uniq
-}
-
 set -o errexit
-
-for ver in `ruby_vers`; do
-    rvm_use $ver
-    gem install bundler --conservative
-    bundle install --quiet --local || bundle install
-done
-
-rvm_use $DEFAULT_RUBY
+set -x
 
 rm -rf tmp pkg
-bundle exec rake clean
+bundle exec rake clean clobber
 
 # holding pen
 rm -rf gems
 mkdir -p gems
 
 # windows
-for verspec in `cross_rubies`; do
-    version="${verspec%%:*}"
-    ver="${version%%-*}"
-    host="${verspec#*:}"
-
-    case $ver in
-        1.9.3)
-            # Parallel make does not work in 1.9.3, as it has a
-            # missing dependency problem with main.o.
-            make="make"
-            ;;
-        *)
-            make="$MAKE"
-    esac
-
-    MAKE="$make" rvm_do $ver rake-compiler cross-ruby VERSION=$version HOST=$host debugflags="-g"
-done
-
 bundle exec rake gem:windows
 cp -v pkg/nokogiri*{x86,x64}-mingw32*.gem gems
 
@@ -118,12 +35,11 @@ bundle exec rake gem
 cp -v pkg/nokogiri*.gem gems
 
 # jruby
-rvm_use jruby
-gem install bundler --conservative
-bundle install --quiet --local || bundle install
 bundle exec rake clean clobber
-rvm_use $DEFAULT_RUBY
 bundle exec rake generate
-rvm_use jruby
+
+rvm jruby-1.7.19
+gem install bundler --conservative
+bundle install --quiet --local || bundle install
 bundle exec rake gem
 cp -v pkg/nokogiri*java.gem gems

data/ext/nokogiri/extconf.rb

@@ -148,8 +148,8 @@ def iconv_configure_flags
 
       return [
         '--with-iconv=yes',
-        *("CPPFLAGS=#{idirs.map { |dir| '-I' << dir }.join(' ')}".quote if idirs),
-        *("LDFLAGS=#{ldirs.map { |dir| '-L' << dir }.join(' ')}".quote if ldirs),
+        *("CPPFLAGS=#{idirs.map { |dir| '-I' << dir }.join(' ')}" if idirs),
+        *("LDFLAGS=#{ldirs.map { |dir| '-L' << dir }.join(' ')}" if ldirs),
       ]
     end
   }
@@ -164,22 +164,32 @@ def iconv_configure_flags
 
     return [
       '--with-iconv=yes',
-      "CPPFLAGS=#{cflags}".quote,
-      "LDFLAGS=#{ldflags}".quote,
-      "LIBS=#{libs}".quote,
+      "CPPFLAGS=#{cflags}",
+      "LDFLAGS=#{ldflags}",
+      "LIBS=#{libs}",
     ]
   end
 
   asplode "libiconv"
 end
 
+# 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.
+def chdir_for_build
+  build_dir = ENV['RCD_HOST_RUBY_PLATFORM'].to_s =~ /mingw|mswin|cygwin/ ? '/tmp' : '.'
+  Dir.chdir(build_dir) do
+    yield
+  end
+end
+
 def process_recipe(name, version, static_p, cross_p)
   MiniPortile.new(name, version).tap do |recipe|
     recipe.target = portsdir = File.join(ROOT, "ports")
     # Prefer host_alias over host in order to use i586-mingw32msvc as
     # 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.patch_files = Dir[File.join(portsdir, "patches", name, "*.patch")].sort
+    recipe.patch_files = Dir[File.join(ROOT, "patches", name, "*.patch")].sort
 
     yield recipe
 
@@ -190,7 +200,7 @@ def process_recipe(name, version, static_p, cross_p)
     recipe.configure_options.flatten!
 
     recipe.configure_options.delete_if { |option|
-      case option.shellsplit.first
+      case option
       when /\A(\w+)=(.*)\z/
         env[$1] = $2
         true
@@ -221,14 +231,14 @@ def process_recipe(name, version, static_p, cross_p)
 
     if RbConfig::CONFIG['target_cpu'] == 'universal'
       %w[CFLAGS LDFLAGS].each { |key|
-        unless env[key].shellsplit.include?('-arch')
+        unless env[key].include?('-arch')
           env[key] << ' ' << RbConfig::CONFIG['ARCH_FLAG']
         end
       }
     end
 
     recipe.configure_options += env.map { |key, value|
-      "#{key}=#{value}".shellescape
+      "#{key}=#{value}"
     }
 
     message <<-"EOS"
@@ -275,7 +285,9 @@ versions of libxml2 provided by OS/package vendors.
 
     checkpoint = "#{recipe.target}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
-      recipe.cook
+      chdir_for_build do
+        recipe.cook
+      end
       FileUtils.touch checkpoint
     end
     recipe.activate
@@ -301,19 +313,6 @@ end
 # https://bugs.ruby-lang.org/issues/8074
 @libdir_basename = "lib" if RUBY_VERSION < '2.1.0'
 
-# Workaround for #1102
-def monkey_patch_mini_portile
-  MiniPortile.class_eval do
-    def patch
-      @patch_files.each do |full_path|
-        next unless File.exists?(full_path)
-        output "Running patch with #{full_path}..."
-        execute('patch', %Q(patch -p1 < "#{full_path}"))
-      end
-    end
-  end
-end
-
 #
 # main
 #
@@ -393,7 +392,6 @@ else
   message "Building nokogiri using packaged libraries.\n"
 
   require 'mini_portile'
-  monkey_patch_mini_portile
   require 'yaml'
 
   static_p = enable_config('static', true) or
@@ -443,9 +441,9 @@ else
     libiconv_recipe = process_recipe("libiconv", dependencies["libiconv"], static_p, cross_build_p) do |recipe|
       recipe.files = ["http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz"]
       recipe.configure_options += [
-        "CPPFLAGS='-Wall'",
-        "CFLAGS='-O2 -g'",
-        "CXXFLAGS='-O2 -g'",
+        "CPPFLAGS=-Wall",
+        "CFLAGS=-O2 -g",
+        "CXXFLAGS=-O2 -g",
         "LDFLAGS="
       ]
     end
@@ -473,7 +471,7 @@ EOM
   end
 
   libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"], static_p, cross_build_p) do |recipe|
-    recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
+    recipe.files = ["http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options += [
       "--without-python",
       "--without-readline",
@@ -485,7 +483,7 @@ EOM
   end
 
   libxslt_recipe = process_recipe("libxslt", dependencies["libxslt"], static_p, cross_build_p) do |recipe|
-    recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
+    recipe.files = ["http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options += [
       "--without-python",
       "--without-crypto",
@@ -526,8 +524,8 @@ EOM
       }
 
       # 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
+      $CPPFLAGS << ' ' << "-DNOKOGIRI_#{recipe.name.upcase}_PATH=\"#{recipe.path}\"".inspect
+      $CPPFLAGS << ' ' << "-DNOKOGIRI_#{recipe.name.upcase}_PATCHES=\"#{recipe.patch_files.map { |path| File.basename(path) }.join(' ')}\"".inspect
 
       case libname
       when 'xml2'

data/ext/nokogiri/xml_node.c

@@ -778,11 +778,19 @@ static VALUE namespaced_key_eh(VALUE self, VALUE attribute, VALUE namespace)
  *
  * Set the +property+ to +value+
  */
-static VALUE set(VALUE self, VALUE property, VALUE value)
+static VALUE set(VALUE node_rb, VALUE property_name_rb, VALUE property_value_rb)
 {
   xmlNodePtr node, cur;
-  xmlAttrPtr prop;
-  Data_Get_Struct(self, xmlNode, node);
+  xmlChar*   property_name ;
+  xmlAttrPtr property;
+
+  Data_Get_Struct(node_rb, xmlNode, node);
+
+  if (node->type != XML_ELEMENT_NODE) {
+    return(Qnil); // TODO: would raising an exception be more appropriate?
+  }
+
+  property_name = (xmlChar *)StringValuePtr(property_name_rb);
 
   /* If a matching attribute node already exists, then xmlSetProp will destroy
    * the existing node's children. However, if Nokogiri has a node object
@@ -790,11 +798,9 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
    *
    * We can avoid this by unlinking these nodes first.
    */
-  if (node->type != XML_ELEMENT_NODE)
-    return(Qnil);
-  prop = xmlHasProp(node, (xmlChar *)StringValuePtr(property));
-  if (prop && prop->children) {
-    for (cur = prop->children; cur; cur = cur->next) {
+  property = xmlHasProp(node, property_name);
+  if (property && property->children) {
+    for (cur = property->children; cur; cur = cur->next) {
       if (cur->_private) {
         nokogiri_root_node(cur);
         xmlUnlinkNode(cur);
@@ -802,10 +808,14 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
     }
   }
 
-  xmlSetProp(node, (xmlChar *)StringValuePtr(property),
-      (xmlChar *)StringValuePtr(value));
+  xmlResetLastError();
+  xmlSetStructuredErrorFunc(NULL, Nokogiri_error_silencer);
+
+  xmlSetProp(node, property_name, (xmlChar *)StringValuePtr(property_value_rb));
+
+  xmlSetStructuredErrorFunc(NULL, NULL);
 
-  return value;
+  return property_value_rb;
 }
 
 /*