nokogiri 1.10.10-x64-mingw32 → 1.11.0.rc1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d60b52d7f07bfb0187de2cca88833a70498f002f463ac82f08b8359908df80b
-  data.tar.gz: 169b48cd81195b892ddd0976956ffdf7c1be89d486cdeb78bbbf87bfeb0c4cb1
+  metadata.gz: 8ce7fb87f24cd35d7a9a649cabe5cc1ce48d5e8f67411584911223bfe53935c0
+  data.tar.gz: '09b812276bd345594649f6c1c1fc840b26c4402b384983f9f9e014084900cac1'
 SHA512:
-  metadata.gz: ab637fb1527d865c3ce13130c363a3969abd7d6dfe2e5ca769956a89572990ca078cc27c06831337d2433a94a776bcad87b9a986303f4cd1955551663aedae3f
-  data.tar.gz: 5f5009a359ef8984f3b8ba817af06efdb56c9071c9e459155a5d4b96059ac3c8e5bf19b3c8d116a1b9fa5432e6b5eb2fe59e12a9e5aa0d2b8eaa447623860ce9
+  metadata.gz: 8684e860a4e799e9806184b2366f2fb7742428323849a3f66012f9e0145a55d945c3f71df208e67d22c3d871aff8f30fe81f2621ac50ab3014c45f1284ed2ca0
+  data.tar.gz: f26d82e26577abff0f6da8547a14e570452b7a6b15ba17925f9dbffa349c15cee561de9c2a90058e856ccf4cde3b1ebb69b96849727e144fc08f2b1541f91473

data/README.md

@@ -26,7 +26,7 @@ or CSS3 selectors.
 [![Test Coverage](https://api.codeclimate.com/v1/badges/59c67b0e8976027a45ad/test_coverage)](https://codeclimate.com/github/sparklemotion/nokogiri/test_coverage)
 
 [![Gem Version](https://badge.fury.io/rb/nokogiri.svg)](https://rubygems.org/gems/nokogiri)
-[![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=nokogiri&package-manager=bundler&version-scheme=semver)
+[![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score/?dependency-name=nokogiri&package-manager=bundler)
 [![Tidelift dependencies](https://tidelift.com/badges/github/sparklemotion/nokogiri)](https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme)
 
 
@@ -129,27 +129,23 @@ end
 
 ## Requirements
 
-* Ruby 2.3.0 or higher, including any development packages necessary
-  to compile native extensions.
+Ruby 2.4.0 or higher, including any development packages necessary to compile native extensions.
 
-* In Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the
-  gem, but if you want to use the system versions:
+In Nokogiri 1.6.0 and later libxml2 and libxslt are bundled with the gem, but if you want to use the system versions:
 
-  * First, check out [the long list](http://www.xmlsoft.org/news.html)
-    of fixes and changes between releases before deciding to use any
-    version older than is bundled with Nokogiri.
+* First, check out [the long list](http://www.xmlsoft.org/news.html)
+  of fixes and changes between releases before deciding to use any
+  version older than is bundled with Nokogiri.
 
-  * At install time, set the environment variable
-    `NOKOGIRI_USE_SYSTEM_LIBRARIES` or else use the
-    `--use-system-libraries` argument. (See
-    https://nokogiri.org/tutorials/installing_nokogiri.html#install-with-system-libraries
-    for specifics.)
+* At install time, set the environment variable
+  `NOKOGIRI_USE_SYSTEM_LIBRARIES` or else use the
+  `--use-system-libraries` argument. (See
+  https://nokogiri.org/tutorials/installing_nokogiri.html#install-with-system-libraries
+  for specifics.)
 
-  * libxml2 >=2.6.21 with iconv support
-    (libxml2-dev/-devel is also required)
+* libxml2 >=2.6.21 with iconv support (libxml2-dev/-devel is also required)
 
-  * libxslt, built with and supported by the given libxml2
-    (libxslt-dev/-devel is also required)
+* libxslt, built with and supported by the given libxml2 (libxslt-dev/-devel is also required)
 
 
 ## Encoding
@@ -191,6 +187,12 @@ explicitly setting the encoding to EUC-JP on the parser:
 We've adopted the Contributor Covenant code of conduct, which you can read in full in [`CODE_OF_CONDUCT.md`](CODE_OF_CONDUCT.md).
 
 
+## Semantic Versioning
+
+[![SemVer compatibility](https://api.dependabot.com/badges/compatibility_score?dependency-name=nokogiri&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score/?dependency-name=nokogiri&package-manager=bundler)
+
+Nokogiri follows [Semantic Versioning](https://semver.org/). See [`CHANGELOG.md`](CHANGELOG.md) for more details.
+
 ## License
 
 This project is licensed under the terms of the MIT license.

data/ext/nokogiri/extconf.rb

@@ -486,50 +486,60 @@ else
           url: "http://zlib.net/fossils/#{recipe.name}-#{recipe.version}.tar.gz",
           sha256: dependencies["zlib"]["sha256"]
         }]
-      class << recipe
-        attr_accessor :cross_build_p
-
-        def configure
-          Dir.chdir work_path do
-            mk = File.read 'win32/Makefile.gcc'
-            File.open 'win32/Makefile.gcc', 'wb' do |f|
-              f.puts "BINARY_PATH = #{path}/bin"
-              f.puts "LIBRARY_PATH = #{path}/lib"
-              f.puts "INCLUDE_PATH = #{path}/include"
-              mk.sub!(/^PREFIX\s*=\s*$/, "PREFIX = #{host}-") if cross_build_p
-              f.puts mk
+      if windows?
+        class << recipe
+          attr_accessor :cross_build_p
+
+          def configure
+            Dir.chdir work_path do
+              mk = File.read 'win32/Makefile.gcc'
+              File.open 'win32/Makefile.gcc', 'wb' do |f|
+                f.puts "BINARY_PATH = #{path}/bin"
+                f.puts "LIBRARY_PATH = #{path}/lib"
+                f.puts "INCLUDE_PATH = #{path}/include"
+                mk.sub!(/^PREFIX\s*=\s*$/, "PREFIX = #{host}-") if cross_build_p
+                f.puts mk
+              end
             end
           end
-        end
 
-        def configured?
-          Dir.chdir work_path do
-            !! (File.read('win32/Makefile.gcc') =~ /^BINARY_PATH/)
+          def configured?
+            Dir.chdir work_path do
+              !! (File.read('win32/Makefile.gcc') =~ /^BINARY_PATH/)
+            end
           end
-        end
 
-        def compile
-          execute "compile", "make -f win32/Makefile.gcc"
-        end
+          def compile
+            execute "compile", "make -f win32/Makefile.gcc"
+          end
 
-        def install
-          execute "install", "make -f win32/Makefile.gcc install"
+          def install
+            execute "install", "make -f win32/Makefile.gcc install"
+          end
+        end
+        recipe.cross_build_p = cross_build_p
+      else
+        class << recipe
+          def configure
+            execute "configure", ["env", "CHOST=#{host}", "CFLAGS=-fPIC #{ENV['CFLAGS']}", "./configure", "--static", configure_prefix]
+          end
         end
       end
-      recipe.cross_build_p = cross_build_p
     end
 
-    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",
-          sha256: dependencies["libiconv"]["sha256"]
-        }]
-      recipe.configure_options += [
-        "CPPFLAGS=-Wall",
-        "CFLAGS=-O2 -g",
-        "CXXFLAGS=-O2 -g",
-        "LDFLAGS="
-      ]
+    unless nix?
+      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",
+            sha256: dependencies["libiconv"]["sha256"]
+          }]
+        recipe.configure_options += [
+          "CPPFLAGS=-Wall",
+          "CFLAGS=-O2 -g",
+          "CXXFLAGS=-O2 -g",
+          "LDFLAGS="
+        ]
+      end
     end
   else
     if darwin? && !have_header('iconv.h')
@@ -617,7 +627,6 @@ EOM
       end
 
       # Defining a macro that expands to a C string; double quotes are significant.
-      $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

data/ext/nokogiri/nokogiri.c

@@ -76,24 +76,30 @@ void Init_nokogiri()
   mNokogiriHtmlSax  = rb_define_module_under(mNokogiriHtml, "SAX");
 
   rb_const_set( mNokogiri,
-                rb_intern("LIBXML_VERSION"),
+                rb_intern("LIBXML_COMPILED_VERSION"),
                 NOKOGIRI_STR_NEW2(LIBXML_DOTTED_VERSION)
               );
   rb_const_set( mNokogiri,
-                rb_intern("LIBXML_PARSER_VERSION"),
+                rb_intern("LIBXML_LOADED_VERSION"),
                 NOKOGIRI_STR_NEW2(xmlParserVersion)
               );
 
+
+  rb_const_set( mNokogiri,
+                rb_intern("LIBXSLT_COMPILED_VERSION"),
+                NOKOGIRI_STR_NEW2(LIBXSLT_DOTTED_VERSION)
+              );
+  rb_const_set( mNokogiri,
+                rb_intern("LIBXSLT_LOADED_VERSION"),
+                NOKOGIRI_STR_NEW2(xsltEngineVersion)
+              );
+
 #ifdef NOKOGIRI_USE_PACKAGED_LIBRARIES
   rb_const_set(mNokogiri, rb_intern("NOKOGIRI_USE_PACKAGED_LIBRARIES"), Qtrue);
-  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXML2_PATH"), NOKOGIRI_STR_NEW2(NOKOGIRI_LIBXML2_PATH));
-  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXSLT_PATH"), NOKOGIRI_STR_NEW2(NOKOGIRI_LIBXSLT_PATH));
   rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXML2_PATCHES"), rb_str_split(NOKOGIRI_STR_NEW2(NOKOGIRI_LIBXML2_PATCHES), " "));
   rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXSLT_PATCHES"), rb_str_split(NOKOGIRI_STR_NEW2(NOKOGIRI_LIBXSLT_PATCHES), " "));
 #else
   rb_const_set(mNokogiri, rb_intern("NOKOGIRI_USE_PACKAGED_LIBRARIES"), Qfalse);
-  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXML2_PATH"), Qnil);
-  rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXSLT_PATH"), Qnil);
   rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXML2_PATCHES"), Qnil);
   rb_const_set(mNokogiri, rb_intern("NOKOGIRI_LIBXSLT_PATCHES"), Qnil);
 #endif

data/ext/nokogiri/nokogiri.h

@@ -29,6 +29,7 @@ int vasprintf (char **strp, const char *fmt, va_list ap);
 #include <libxml/relaxng.h>
 #include <libxml/xinclude.h>
 #include <libxslt/extensions.h>
+#include <libxslt/xsltconfig.h>
 #include <libxml/c14n.h>
 #include <ruby.h>
 #include <ruby/st.h>

data/ext/nokogiri/xml_document.c

@@ -38,6 +38,15 @@ static void remove_private(xmlNodePtr node)
   node->_private = NULL;
 }
 
+static void mark(xmlDocPtr doc)
+{
+  nokogiriTuplePtr tuple = (nokogiriTuplePtr)doc->_private;
+  if(tuple) {
+      rb_gc_mark(tuple->doc);
+      rb_gc_mark(tuple->node_cache);
+  }
+}
+
 static void dealloc(xmlDocPtr doc)
 {
   st_table *node_hash;
@@ -588,7 +597,7 @@ VALUE Nokogiri_wrap_xml_document(VALUE klass, xmlDocPtr doc)
 
   VALUE rb_doc = Data_Wrap_Struct(
       klass ? klass : cNokogiriXmlDocument,
-      0,
+      mark,
       dealloc,
       doc
   );

data/ext/nokogiri/xml_node.c

@@ -1332,6 +1332,25 @@ static VALUE line(VALUE self)
   return INT2NUM(xmlGetLineNo(node));
 }
 
+/*
+ * call-seq:
+ *  line=(num)
+ *
+ * Sets the line for this Node. num must be less than 65535.
+ */
+static VALUE set_line(VALUE self, VALUE num)
+{
+  xmlNodePtr node;
+  Data_Get_Struct(self, xmlNode, node);
+
+  int value = NUM2INT(num);
+  if (value < 65535) {
+    node->line = value;
+  }
+
+  return num;
+}
+
 /*
  * call-seq:
  *  add_namespace_definition(prefix, href)
@@ -1728,6 +1747,7 @@ void init_xml_node()
   rb_define_method(klass, "create_external_subset", create_external_subset, 3);
   rb_define_method(klass, "pointer_id", pointer_id, 0);
   rb_define_method(klass, "line", line, 0);
+  rb_define_method(klass, "line=", set_line, 1);
   rb_define_method(klass, "content", get_native_content, 0);
   rb_define_method(klass, "native_content=", set_native_content, 1);
   rb_define_method(klass, "lang", get_lang, 0);

data/ext/nokogiri/xml_schema.c

@@ -133,31 +133,6 @@ static VALUE read_memory(VALUE klass, VALUE content)
   return rb_schema;
 }
 
-/* Schema creation will remove and deallocate "blank" nodes.
- * If those blank nodes have been exposed to Ruby, they could get freed
- * out from under the VALUE pointer.  This function checks to see if any of
- * those nodes have been exposed to Ruby, and if so we should raise an exception.
- */
-static int has_blank_nodes_p(VALUE cache)
-{
-    long i;
-
-    if (NIL_P(cache)) {
-        return 0;
-    }
-
-    for (i = 0; i < RARRAY_LEN(cache); i++) {
-        xmlNodePtr node;
-        VALUE element = rb_ary_entry(cache, i);
-        Data_Get_Struct(element, xmlNode, node);
-        if (xmlIsBlankNode(node)) {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 /*
  * call-seq:
  *  from_document(doc)
@@ -177,10 +152,6 @@ static VALUE from_document(VALUE klass, VALUE document)
   /* In case someone passes us a node. ugh. */
   doc = doc->doc;
 
-  if (has_blank_nodes_p(DOC_NODE_CACHE(doc))) {
-    rb_raise(rb_eArgError, "Creating a schema from a document that has blank nodes exposed to Ruby is dangerous");
-  }
-
   ctx = xmlSchemaNewDocParserCtxt(doc);
 
   errors = rb_ary_new();

data/ext/nokogiri/xslt_stylesheet.c

@@ -109,10 +109,6 @@ static VALUE serialize(VALUE self, VALUE xmlobj)
     return rval ;
 }
 
-static void swallow_superfluous_xml_errors(void * userdata, xmlErrorPtr error, ...)
-{
-}
-
 /*
  *  call-seq:
  *    transform(document, params = [])

data/lib/nokogiri.rb

@@ -1,28 +1,11 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 # Modify the PATH on windows so that the external DLLs will get loaded.
 
 require 'rbconfig'
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-  # The line below caused a problem on non-GAE rack environment.
-  # unless defined?(JRuby::Rack::VERSION) || defined?(AppEngine::ApiProxy)
-  #
-  # However, simply cutting defined?(JRuby::Rack::VERSION) off resulted in
-  # an unable-to-load-nokogiri problem. Thus, now, Nokogiri checks the presense
-  # of appengine-rack.jar in $LOAD_PATH. If Nokogiri is on GAE, Nokogiri
-  # should skip loading xml jars. This is because those are in WEB-INF/lib and
-  # already set in the classpath.
-  unless $LOAD_PATH.to_s.include?("appengine-rack")
-    require 'stringio'
-    require 'isorelax.jar'
-    require 'jing.jar'
-    require 'nekohtml.jar'
-    require 'nekodtd.jar'
-    require 'xercesImpl.jar'
-    require 'serializer.jar'
-    require 'xalan.jar'
-    require 'xml-apis.jar'
-  end
+  require 'nokogiri/jruby/dependencies'
 end
 
 begin

data/lib/nokogiri/css.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/css/node'
 require 'nokogiri/css/xpath_visitor'
 x = $-w

data/lib/nokogiri/css/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module CSS
     class Node

data/lib/nokogiri/css/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
 # This file is automatically generated by Racc 1.4.14

data/lib/nokogiri/css/parser_extras.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'thread'
 
 module Nokogiri

data/lib/nokogiri/css/syntax_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/syntax_error'
 module Nokogiri
   module CSS

data/lib/nokogiri/css/tokenizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # DO NOT MODIFY!!!!
 # This file is automatically generated by rex 1.0.7

data/lib/nokogiri/css/xpath_visitor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module CSS
     class XPathVisitor # :nodoc:
@@ -51,7 +52,8 @@ module Nokogiri
         when /^comment\(/
           "comment()"
         when /^has\(/
-          ".//#{node.value[1].accept(self)}"
+          is_direct = node.value[1].value[0].nil? # e.g. "has(> a)", "has(~ a)", "has(+ a)"
+          ".#{"//" if !is_direct}#{node.value[1].accept(self)}"
         else
           args = ['.'] + node.value[1..-1]
           "#{node.value.first}#{args.join(', ')})"

data/lib/nokogiri/decorators/slop.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module Decorators
     ###

data/lib/nokogiri/html.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/html/entity_lookup'
 require 'nokogiri/html/document'
 require 'nokogiri/html/document_fragment'

data/lib/nokogiri/html/builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module HTML
     ###

data/lib/nokogiri/html/document.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module HTML
     class Document < Nokogiri::XML::Document