nokogiri 1.7.2 → 1.8.0

data/{LICENSE.txt → LICENSE.md}

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2008 - 2016:
+Copyright (c) 2008 - 2017:
 
 * [Aaron Patterson](http://tenderlovemaking.com)
 * [Mike Dalessio](http://mike.daless.io)

data/Manifest.txt

@@ -7,7 +7,9 @@ CHANGELOG.md
 CONTRIBUTING.md
 C_CODING_STYLE.rdoc
 Gemfile
-LICENSE.txt
+Gemfile-libxml-ruby
+LICENSE-DEPENDENCIES.md
+LICENSE.md
 Manifest.txt
 README.md
 ROADMAP.md
@@ -54,7 +56,6 @@ ext/java/nokogiri/internals/ClosedStreamException.java
 ext/java/nokogiri/internals/HtmlDomParserContext.java
 ext/java/nokogiri/internals/IgnoreSchemaErrorsErrorHandler.java
 ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java
-ext/java/nokogiri/internals/NokogiriDocumentCache.java
 ext/java/nokogiri/internals/NokogiriDomParser.java
 ext/java/nokogiri/internals/NokogiriEncodingReaderWrapper.java
 ext/java/nokogiri/internals/NokogiriEntityResolver.java
@@ -75,10 +76,10 @@ ext/java/nokogiri/internals/ReaderNode.java
 ext/java/nokogiri/internals/SaveContextVisitor.java
 ext/java/nokogiri/internals/SchemaErrorHandler.java
 ext/java/nokogiri/internals/UncloseableInputStream.java
+ext/java/nokogiri/internals/XalanDTMManagerPatch.java
 ext/java/nokogiri/internals/XmlDeclHandler.java
 ext/java/nokogiri/internals/XmlDomParserContext.java
 ext/java/nokogiri/internals/XmlSaxParser.java
-ext/java/nokogiri/internals/XsltExtensionFunction.java
 ext/java/nokogiri/internals/c14n/AttrCompare.java
 ext/java/nokogiri/internals/c14n/C14nHelper.java
 ext/java/nokogiri/internals/c14n/CanonicalFilter.java
@@ -106,6 +107,7 @@ ext/java/nokogiri/internals/c14n/NameSpaceSymbTable.java
 ext/java/nokogiri/internals/c14n/NodeFilter.java
 ext/java/nokogiri/internals/c14n/UtfHelpper.java
 ext/java/nokogiri/internals/c14n/XMLUtils.java
+ext/java/org/apache/xml/dtm/ref/dom2dtm/DOM2DTMExt.java
 ext/nokogiri/depend
 ext/nokogiri/extconf.rb
 ext/nokogiri/html_document.c
@@ -253,10 +255,6 @@ patches/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch
 patches/libxslt/0002-Check-for-integer-overflow-in-xsltAddTextString.patch
 patches/sort-patches-by-date
 suppressions/README.txt
-suppressions/nokogiri_ree-1.8.7.358.supp
-suppressions/nokogiri_ruby-1.8.7.370.supp
-suppressions/nokogiri_ruby-1.9.2.320.supp
-suppressions/nokogiri_ruby-1.9.3.327.supp
 tasks/test.rb
 test/css/test_nthiness.rb
 test/css/test_parser.rb
@@ -366,4 +364,3 @@ test/xml/test_xinclude.rb
 test/xml/test_xpath.rb
 test/xslt/test_custom_functions.rb
 test/xslt/test_exception_handling.rb
-test_all

data/README.md

@@ -10,10 +10,13 @@
 
 ## Status
 
-[![Travis Build Status](https://travis-ci.org/sparklemotion/nokogiri.svg?branch=master)](https://travis-ci.org/sparklemotion/nokogiri)
-[![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/sparklemotion/nokogiri?branch=master&svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri?branch=master)
-[![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri)
-[![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri)
+|System|Status|
+|--|--|
+| Concourse | [![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/ruby-2.4-system/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri?groups=master) |
+| Travis | [![Travis Build Status](https://travis-ci.org/sparklemotion/nokogiri.svg?branch=master)](https://travis-ci.org/sparklemotion/nokogiri) |
+| Appveyor | [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/sparklemotion/nokogiri?branch=master&svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri?branch=master) |
+| Code Climate | [![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri) |
+| Version Eye | [![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri) |
 
 
 ## Description
@@ -167,4 +170,4 @@ explicitly setting the encoding to EUC-JP on the parser:
 
 ## License
 
-MIT. See the `LICENSE.txt` file.
+MIT. See the `LICENSE.md` file.

data/Rakefile

@@ -125,25 +125,29 @@ HOE = Hoe.spec 'nokogiri' do
 
   unless java?
     self.extra_deps += [
-      ["mini_portile2",    "~> 2.1.0"], # keep version in sync with extconf.rb
+      ["mini_portile2",    "~> 2.2.0"], # keep version in sync with extconf.rb
     ]
   end
 
   self.extra_dev_deps += [
     ["hoe-bundler",        "~> 1.2.0"],
-    ["hoe-debugging",      "~> 1.2.1"],
+    ["hoe-debugging",      "~> 1.3.0"],
     ["hoe-gemspec",        "~> 1.0.0"],
     ["hoe-git",            "~> 1.6.0"],
     ["minitest",           "~> 5.8.4"],
-    ["rake",               "~> 10.5.0"],
-    ["rake-compiler",      "~> 0.9.2"],
-    ["rake-compiler-dock", "~> 0.5.1"],
+    ["rake",               "~> 12.0"],
+    ["rake-compiler",      "~> 1.0.3"],
+    ["rake-compiler-dock", "~> 0.6.0"],
     ["racc",               "~> 1.4.14"],
-    ["rexical",            "~> 1.0.5"]
+    ["rexical",            "~> 1.0.5"],
+    ["concourse",          "~> 0.11"],
   ]
 
   if java?
-    self.spec_extras = { :platform => 'java' }
+    self.spec_extras = {
+        :platform => 'java',
+        :required_ruby_version => '>= 1.9.3' # JRuby >= 1.7
+    }
   else
     self.spec_extras = {
       :extensions => ["ext/nokogiri/extconf.rb"],
@@ -230,11 +234,6 @@ else
       ext.cross_compiling do |spec|
         libs = dependencies.map { |name, dep| "#{name}-#{dep["version"]}" }.join(', ')
 
-        spec.required_ruby_version = [
-          '>= 2.1.0',
-          "< #{CROSS_RUBIES.max_by(&:ver).minor_ver.succ}"
-        ]
-
         spec.post_install_message = <<-EOS
 Nokogiri is built with the packaged libraries: #{libs}.
         EOS
@@ -259,7 +258,7 @@ task 'bundler:gemfile' do
   old_gemfile_task.invoke if old_gemfile_task
 
   lines = File.open('Gemfile', 'r') { |f| f.readlines }.map do |line|
-    line =~ /racc|rexical/ ? "#{line.strip}, :platform => :ruby" : line
+    line =~ /racc|rexical/ ? "#{line.strip}, :platform => [:ruby, :mingw, :x64_mingw]" : line
   end
   File.open('Gemfile', 'w') { |f| lines.each { |line| f.puts line } }
 end
@@ -314,23 +313,8 @@ 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
+require 'concourse'
+Concourse.new("nokogiri").create_tasks!
 
 # ----------------------------------------
 
@@ -352,7 +336,7 @@ end
 task :cross do
   rake_compiler_config_path = File.expand_path("~/.rake-compiler/config.yml")
   unless File.exists? rake_compiler_config_path
-    raise "rake-compiler has not installed any cross rubies. Try using rake-compiler-dev-box for building binary windows gems.'"
+    raise "rake-compiler has not installed any cross rubies. Use rake-compiler-dock or 'rake gem:windows' for building binary windows gems."
   end
 
   CROSS_RUBIES.each do |cross_ruby|

data/appveyor.yml

@@ -13,6 +13,8 @@ test_script:
 
 environment:
   matrix:
+    - ruby_version: "23"
+    - ruby_version: "23-x64"
     - ruby_version: "22"
     - ruby_version: "22-x64"
     - ruby_version: "21"

data/dependencies.yml

@@ -1,6 +1,6 @@
 libxml2:
   version: "2.9.4"
-  md5: "ae249165c173b1ff386ee8ad676815f5" # manually confirmed via `gpg --verify`
+  sha256: "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c" # manually confirmed via `gpg --verify`
   # gpg: Signature made Mon 23 May 2016 04:02:13 AM EDT using DSA key ID DE95BC1F
   # gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
   # gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
@@ -10,7 +10,7 @@ libxml2:
 
 libxslt:
   version: "1.1.29"
-  md5: "a129d3c44c022de3b9dcf6d6f288d72e"
+  sha256: "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"
   # gpg: Signature made Mon 23 May 2016 09:58:52 PM EDT using DSA key ID DE95BC1F
   # gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
   # gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
@@ -20,10 +20,15 @@ libxslt:
 
 zlib:
   version: "1.2.11"
-  md5: "1c9f62f0778697a09d36121ead88e08e"
+  sha256: "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1"
+  # SHA-256 hash provided on http://zlib.net/
 
 libiconv:
-  version: "1.14"
-  md5: "e34509b1623cec449dfeb73d7ce9c6c6"
-  # gpg: Signature made Sun 07 Aug 2011 01:58:18 PM EDT using DSA key ID F059B1D1
-  # gpg: BAD signature from "Bruno Haible (Open Source Development) <bruno@clisp.org>"
+  version: "1.15"
+  sha256: "ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178"
+  # gpg: Signature made Fri Feb  3 00:38:12 2017 CET
+  # 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.
+  # Primary key fingerprint: 68D9 4D8A AEEA D48A E7DC  5B90 4F49 4A94 2E46 16C2

data/ext/nokogiri/extconf.rb

@@ -223,8 +223,8 @@ def iconv_configure_flags
 
       return [
         '--with-iconv=yes',
-        *("CPPFLAGS=#{idirs.map { |dir| '-I' << dir }.join(' ')}" if idirs),
-        *("LDFLAGS=#{ldirs.map { |dir| '-L' << dir }.join(' ')}" if ldirs),
+        *("CPPFLAGS=#{idirs.map { |dir| '-I' + dir }.join(' ')}" if idirs),
+        *("LDFLAGS=#{ldirs.map { |dir| '-L' + dir }.join(' ')}" if ldirs),
       ]
     end
   end
@@ -260,11 +260,12 @@ end
 
 def process_recipe(name, version, static_p, cross_p)
   MiniPortile.new(name, version).tap do |recipe|
-    recipe.target = portsdir = File.join(ROOT, "ports")
+    recipe.target = 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(ROOT, "patches", name, "*.patch")].sort
+    recipe.configure_options << "--libdir=#{File.join(recipe.path, "lib")}"
 
     yield recipe
 
@@ -307,7 +308,7 @@ def process_recipe(name, version, static_p, cross_p)
     if RbConfig::CONFIG['target_cpu'] == 'universal'
       %w[CFLAGS LDFLAGS].each do |key|
         unless env[key].include?('-arch')
-          env[key] << ' ' << RbConfig::CONFIG['ARCH_FLAG']
+          env[key] += ' ' + RbConfig::CONFIG['ARCH_FLAG']
         end
       end
     end
@@ -391,7 +392,7 @@ when arg_config('--clean')
   do_clean
 end
 
-if openbsd?
+if openbsd? && !using_system_libraries?
   ENV['CC'] ||= find_executable('egcc') or
     abort "Please install gcc 4.9+ from ports using `pkg_add -v gcc`"
 end
@@ -456,7 +457,7 @@ else
   # 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 'mini_portile2', '~> 2.1.0'
+  gem 'mini_portile2', '~> 2.2.0'
   require 'mini_portile2'
   message "Using mini_portile version #{MiniPortile::VERSION}\n"
 
@@ -473,8 +474,8 @@ 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/#{recipe.name}-#{recipe.version}.tar.gz",
-          md5: dependencies["zlib"]["md5"]
+          url: "http://zlib.net/fossils/#{recipe.name}-#{recipe.version}.tar.gz",
+          sha256: dependencies["zlib"]["sha256"]
         }]
       class << recipe
         attr_accessor :cross_build_p
@@ -512,7 +513,7 @@ 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",
-          md5: dependencies["libiconv"]["md5"]
+          sha256: dependencies["libiconv"]["sha256"]
         }]
       recipe.configure_options += [
         "CPPFLAGS=-Wall",
@@ -547,7 +548,7 @@ EOM
   libxml2_recipe = process_recipe("libxml2", dependencies["libxml2"]["version"], static_p, cross_build_p) do |recipe|
     recipe.files = [{
         url: "http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz",
-        md5: dependencies["libxml2"]["md5"]
+        sha256: dependencies["libxml2"]["sha256"]
       }]
     recipe.configure_options += [
       "--without-python",
@@ -563,7 +564,7 @@ EOM
   libxslt_recipe = process_recipe("libxslt", dependencies["libxslt"]["version"], static_p, cross_build_p) do |recipe|
     recipe.files = [{
         url: "http://xmlsoft.org/sources/#{recipe.name}-#{recipe.version}.tar.gz",
-        md5: dependencies["libxslt"]["md5"]
+        sha256: dependencies["libxslt"]["sha256"]
       }]
     recipe.configure_options += [
       "--without-python",
@@ -657,12 +658,6 @@ have_func('xmlRelaxNGSetValidStructuredErrors')
 have_func('xmlSchemaSetValidStructuredErrors')
 have_func('xmlSchemaSetParserStructuredErrors')
 
-if ENV['CPUPROFILE']
-  unless find_library('profiler', 'ProfilerEnable', *LIB_DIRS)
-    abort "google performance tools are not installed"
-  end
-end
-
 create_makefile('nokogiri/nokogiri')
 
 if enable_config('clean', true)

data/ext/nokogiri/nokogiri.h

@@ -34,16 +34,6 @@ int vasprintf (char **strp, const char *fmt, va_list ap);
 #include <ruby/st.h>
 #include <ruby/encoding.h>
 
-#ifndef UNUSED
-# if defined(__GNUC__)
-#  define MAYBE_UNUSED(name) name __attribute__((unused))
-#  define UNUSED(name) MAYBE_UNUSED(UNUSED_ ## name)
-# else
-#  define MAYBE_UNUSED(name) name
-#  define UNUSED(name) name
-# endif
-#endif
-
 #ifndef NORETURN
 # if defined(__GNUC__)
 #  define NORETURN(name) __attribute__((noreturn)) name

data/ext/nokogiri/xml_attr.c

@@ -11,11 +11,11 @@ static VALUE set_value(VALUE self, VALUE content)
   xmlAttrPtr attr;
   Data_Get_Struct(self, xmlAttr, attr);
 
-  if(attr->children) xmlFreeNodeList(attr->children);
+  if (attr->children) { xmlFreeNodeList(attr->children); }
 
   attr->children = attr->last = NULL;
 
-  if(content) {
+  if (content) {
     xmlChar *buffer;
     xmlNode *tmp;
 
@@ -30,7 +30,7 @@ static VALUE set_value(VALUE self, VALUE content)
     for(tmp = attr->children; tmp; tmp = tmp->next) {
       tmp->parent = (xmlNode *)attr;
       tmp->doc = attr->doc;
-      if(tmp->next == NULL) attr->last = tmp;
+      if (tmp->next == NULL) { attr->last = tmp; }
     }
 
     /* Free up memory */
@@ -57,20 +57,24 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
 
   rb_scan_args(argc, argv, "2*", &document, &name, &rest);
 
+  if (! rb_obj_is_kind_of(document, cNokogiriXmlDocument)) {
+    rb_raise(rb_eArgError, "parameter must be a Nokogiri::XML::Document");
+  }
+
   Data_Get_Struct(document, xmlDoc, xml_doc);
 
   node = xmlNewDocProp(
-      xml_doc,
-      (const xmlChar *)StringValueCStr(name),
-      NULL
-  );
+           xml_doc,
+           (const xmlChar *)StringValueCStr(name),
+           NULL
+         );
 
   nokogiri_root_node((xmlNodePtr)node);
 
   rb_node = Nokogiri_wrap_xml_node(klass, (xmlNodePtr)node);
   rb_obj_call_init(rb_node, argc, argv);
 
-  if(rb_block_given_p()) rb_yield(rb_node);
+  if (rb_block_given_p()) { rb_yield(rb_node); }
 
   return rb_node;
 }

data/ext/nokogiri/xml_node.c

@@ -833,37 +833,40 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
 static VALUE get(VALUE self, VALUE rattribute)
 {
   xmlNodePtr node;
-  xmlChar* value = 0;
-  VALUE rvalue ;
-  char* attribute = 0;
-  char *colon = 0, *attr_name = 0, *prefix = 0;
+  const xmlChar *value = 0;
+  VALUE rvalue;
+  xmlChar *colon;
+  const xmlChar *attribute, *attr_name, *prefix;
   xmlNsPtr ns;
 
   if (NIL_P(rattribute)) return Qnil;
 
   Data_Get_Struct(self, xmlNode, node);
-  attribute = strdup(StringValueCStr(rattribute));
+  attribute = xmlCharStrdup(StringValueCStr(rattribute));
 
-  colon = strchr(attribute, ':');
+  colon = (xmlChar *)xmlStrchr(attribute, (const xmlChar)':');
   if (colon) {
-    (*colon) = 0 ; /* create two null-terminated strings of the prefix and attribute name */
-    prefix = attribute ;
-    attr_name = colon + 1 ;
-    ns = xmlSearchNs(node->doc, node, (const xmlChar *)(prefix));
+    /* split the attribute string into separate prefix and name by
+     * null-terminating the prefix at the colon */
+    prefix = attribute;
+    attr_name = colon + 1;
+    (*colon) = 0;
+
+    ns = xmlSearchNs(node->doc, node, prefix);
     if (ns) {
-      value = xmlGetNsProp(node, (xmlChar*)(attr_name), ns->href);
+      value = xmlGetNsProp(node, attr_name, ns->href);
     } else {
       value = xmlGetProp(node, (xmlChar*)StringValueCStr(rattribute));
     }
   } else {
-    value = xmlGetNoNsProp(node, (xmlChar*)attribute);
+    value = xmlGetNoNsProp(node, attribute);
   }
 
-  free(attribute);
+  xmlFree((void *)attribute);
   if (!value) return Qnil;
 
   rvalue = NOKOGIRI_STR_NEW2(value);
-  xmlFree(value);
+  xmlFree((void *)value);
 
   return rvalue ;
 }