nokogiri 1.10.8-x86-mingw32 → 1.11.0.rc3-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 927596a4479504c91f69f29ac2a7221f292b3392de54d6c5391c03c32b7dda2e
-  data.tar.gz: d14c2cb0bafe0256e3ce0ed2d7db08bdb547ee97abee801658c15009d7ba1993
+  metadata.gz: 73055ead317fd398bc0395d57479e5f2ea592e41163244213d765aab7047ba15
+  data.tar.gz: e8ca02fef8812ad4db1e0429b3b5a38199948b848893de01cda747823c67191d
 SHA512:
-  metadata.gz: 0b1e8e9118937dd2d9c1f9f74cfe02cef50ee34d96079d0bc82c76db7568882203868e225dffa2ecd6bd262d7e6ccc2a76c08be58b04e25785fb3012da36bdcc
-  data.tar.gz: 0b32797df0bbcaa9b327c649d60f477a7595d93e77e24289349430ce91d6c1fe69f772a921b77bf82c426f46edfa40476117c93b6ce306f310a4bae8c180bfbd
+  metadata.gz: 9f85f4b8158adf638e9988cfd621e1145b972cc2e3db89d738505f5aec3e87f281b806361db2eb0383c256c93a34ae05cd4deaf3ff2188ada9ad94955b561333
+  data.tar.gz: a1d1749ac88793440c1be4164d260cf16d0e926719c45ea97b18a9955f6a66f87a423fc2d112a9895915246b5aa37c70779535830115d59eeb03d1591195837a

data/README.md

@@ -11,7 +11,7 @@ or CSS3 selectors.
 
 * https://nokogiri.org
 * [Installation Help](https://nokogiri.org/tutorials/installing_nokogiri.html)
-* [Tutorials](https://nokogiri.org)
+* [Tutorials](https://nokogiri.org/tutorials/toc.html)
 * [Cheat Sheet](https://github.com/sparklemotion/nokogiri/wiki/Cheat-sheet)
 * [GitHub](https://github.com/sparklemotion/nokogiri)
 * [Mailing List](https://groups.google.com/group/nokogiri-talk)
@@ -20,14 +20,14 @@ or CSS3 selectors.
 
 ## Status
 
-[![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)
+[![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/cruby-2.7/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri)
 [![Appveyor CI](https://ci.appveyor.com/api/projects/status/xj2pqwvlxwuwgr06/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)
 [![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)
-[![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)
+[![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/package/rubygems/nokogiri)](https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme)
 
 
 ## Features
@@ -71,7 +71,7 @@ help you directly and improve the documentation.
 Binary packages are available for some distributions.
 
 * Debian: https://packages.debian.org/sid/ruby-nokogiri
-* SuSE: https://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/
+* openSUSE/SLE: https://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/
 * Fedora: http://s390.koji.fedoraproject.org/koji/packageinfo?packageID=6756
 
 
@@ -108,7 +108,7 @@ require 'nokogiri'
 require 'open-uri'
 
 # Fetch and parse HTML document
-doc = Nokogiri::HTML(open('https://nokogiri.org/tutorials/installing_nokogiri.html'))
+doc = Nokogiri::HTML(URI.open('https://nokogiri.org/tutorials/installing_nokogiri.html'))
 
 puts "### Search for nodes by css"
 doc.css('nav ul.menu li a', 'article h2').each do |link|
@@ -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

@@ -24,6 +24,10 @@ def openbsd?
   RbConfig::CONFIG['target_os'] =~ /openbsd/
 end
 
+def aix?
+  RbConfig::CONFIG["target_os"] =~ /aix/
+end
+
 def nix?
   ! (windows? || solaris? || darwin?)
 end
@@ -419,7 +423,7 @@ if windows?
   $CFLAGS << " -DXP_WIN -DXP_WIN32 -DUSE_INCLUDED_VASPRINTF"
 end
 
-if solaris?
+if solaris? || aix?
   $CFLAGS << " -DUSE_INCLUDED_VASPRINTF"
 end
 
@@ -466,7 +470,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.4.0'
+  gem 'mini_portile2', '~> 2.5.0'
   require 'mini_portile2'
   message "Using mini_portile version #{MiniPortile::VERSION}\n"
 
@@ -486,50 +490,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 +631,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

@@ -1,6 +1,18 @@
 #ifndef NOKOGIRI_NATIVE
 #define NOKOGIRI_NATIVE
 
+#if _MSC_VER
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif /* WIN32_LEAN_AND_MEAN */
+#ifndef WIN32
+#define WIN32
+#endif /* WIN32 */
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
@@ -29,6 +41,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

@@ -1,6 +1,6 @@
 #include <xml_document.h>
 
-static int dealloc_node_i(xmlNodePtr key, xmlNodePtr node, xmlDocPtr doc)
+static int dealloc_node_i2(xmlNodePtr key, xmlNodePtr node, xmlDocPtr doc)
 {
   switch(node->type) {
   case XML_ATTRIBUTE_NODE:
@@ -20,6 +20,11 @@ static int dealloc_node_i(xmlNodePtr key, xmlNodePtr node, xmlDocPtr doc)
   return ST_CONTINUE;
 }
 
+static int dealloc_node_i(st_data_t key, st_data_t node, st_data_t doc)
+{
+  return dealloc_node_i2((xmlNodePtr)key, (xmlNodePtr)node, (xmlDocPtr)doc);
+}
+
 static void remove_private(xmlNodePtr node)
 {
   xmlNodePtr child;
@@ -38,6 +43,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 +602,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_io.c

@@ -2,12 +2,13 @@
 
 static ID id_read, id_write;
 
-VALUE read_check(VALUE *args) {
+VALUE read_check(VALUE val) {
+  VALUE *args = (VALUE *)val;
   return rb_funcall(args[0], id_read, 1, args[1]);
 }
 
-VALUE read_failed(void) {
-	return Qundef;
+VALUE read_failed(VALUE arg, VALUE exc) {
+  return Qundef;
 }
 
 int io_read_callback(void * ctx, char * buffer, int len) {
@@ -30,12 +31,13 @@ int io_read_callback(void * ctx, char * buffer, int len) {
   return (int)safe_len;
 }
 
-VALUE write_check(VALUE *args) {
+VALUE write_check(VALUE val) {
+  VALUE *args = (VALUE *)val;
   return rb_funcall(args[0], id_write, 1, args[1]);
 }
 
-VALUE write_failed(void) {
-	return Qundef;
+VALUE write_failed(VALUE arg, VALUE exc) {
+  return Qundef;
 }
 
 int io_write_callback(void * ctx, char * buffer, int len) {

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_reader.c

@@ -28,35 +28,24 @@ static int has_attributes(xmlTextReaderPtr reader)
 static void Nokogiri_xml_node_namespaces(xmlNodePtr node, VALUE attr_hash)
 {
   xmlNsPtr ns;
-  static char buffer[XMLNS_BUFFER_LEN] ;
-  char *key ;
-  size_t keylen ;
+  VALUE key;
 
   if (node->type != XML_ELEMENT_NODE) return ;
 
   ns = node->nsDef;
   while (ns != NULL) {
 
-    keylen = XMLNS_PREFIX_LEN + (ns->prefix ? (strlen((const char*)ns->prefix) + 1) : 0) ;
-    if (keylen > XMLNS_BUFFER_LEN) {
-      key = (char*)malloc(keylen) ;
-    } else {
-      key = buffer ;
-    }
-
+    key = rb_enc_str_new_cstr(XMLNS_PREFIX, rb_utf8_encoding());
     if (ns->prefix) {
-      sprintf(key, "%s:%s", XMLNS_PREFIX, ns->prefix);
-    } else {
-      sprintf(key, "%s", XMLNS_PREFIX);
+      rb_str_cat_cstr(key, ":");
+      rb_str_cat_cstr(key, (const char*)ns->prefix);
     }
 
+    key = rb_str_conv_enc(key, rb_utf8_encoding(), rb_default_internal_encoding());
     rb_hash_aset(attr_hash,
-        NOKOGIRI_STR_NEW2(key),
+        key,
         (ns->href ? NOKOGIRI_STR_NEW2(ns->href) : Qnil)
     );
-    if (key != buffer) {
-      free(key);
-    }
     ns = ns->next ;
   }
 }