nokogiri 1.11.0.rc4-java → 1.11.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a182d09ad7210fe2a8742dde28ab1024213def7b188e23b1791d8e8b087b324
-  data.tar.gz: f82d5fc3380688961c8712df3061303dd27a821f033f2fcf27ecee07f8f721d0
+  metadata.gz: 7d85f8024902ba0c8e8000b2e697368ccd2b5f3cb24daa6d2696baf09ca8efeb
+  data.tar.gz: a34653303414cf3670c64ba5e820d804efa566575b6e6fd0372c587da253e96f
 SHA512:
-  metadata.gz: f748183ad8608e7720923692435b594035dd8ee1736c1f0282d5d65a8e329efdb19db80d6372b4fbd52195595ea70c2d7c9aec93e7b29e9a311c6fd2dd5b64f2
-  data.tar.gz: cb4f27a1b144f3071f9849292f0056c77771d2c75285d54944f1ae4a99089ddd86f6ceafc9816664bcccbd85205840db7bc24ed0a7c9ef000ea3f6b9abd0490a
+  metadata.gz: d402f90c16cfbecb8746b9afa8b918735c083b1d6363a86d313911a3329fc936ac9fc2ac12122d2fe21c49d212ba95d7b09d2309dd69ea713afb16e7e5f79814
+  data.tar.gz: ec647fdf9fe11f57374ed845cd5cafded912b3ec239cf72cf7a08621772166bb5c9386b271e5513925f0d6ee63d0877629d0c83b721a66fa872df3500c548c69

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/README.md

@@ -1,21 +1,27 @@
+<div><img src="https://nokogiri.org/images/nokogiri-serif-black.png" align="right"/></div>
+
 # Nokogiri
 
-## Description
+Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby. It provides a sensible, easy-to-understand API for reading, writing, modifying, and querying documents. It is fast and standards-compliant by relying on native parsers like libxml2 (C) and xerces (Java).
+
+## Guiding Principles
+
+Some guiding principles Nokogiri tries to follow:
 
-Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
-Nokogiri's many features is the ability to search documents via XPath
-or CSS3 selectors.
+- be secure-by-default by treating all documents as **untrusted** by default
+- be a **thin-as-reasonable layer** on top of the underlying parsers, and don't attempt to fix behavioral differences between the parsers
 
 
-## Links
+## Features Overview
 
-* https://nokogiri.org
-* [Installation Help](https://nokogiri.org/tutorials/installing_nokogiri.html)
-* [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)
-* [Chat/Gitter](https://gitter.im/sparklemotion/nokogiri)
+- DOM Parser for XML and HTML4
+- SAX Parser for XML and HTML4
+- Push Parser for XML and HTML4
+- Document search via XPath 1.0
+- Document search via CSS3 selectors, with some jquery-like extensions
+- XSD Schema validation
+- XSLT transformation
+- "Builder" DSL for XML and HTML documents
 
 
 ## Status
@@ -30,76 +36,118 @@ or CSS3 selectors.
 [![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
+## Support and Help
 
-* XML/HTML DOM parser which handles broken HTML
-* XML/HTML SAX parser
-* XML/HTML Push parser
-* XPath 1.0 support for document searching
-* CSS3 selector support for document searching
-* XML/HTML builder
-* XSLT transformer
+All official documentation is posted at https://nokogiri.org (the source for which is at https://github.com/sparklemotion/nokogiri.org/, and we welcome contributions).
 
-Nokogiri parses and searches XML/HTML using native libraries (either C
-or Java, depending on your Ruby), which means it's fast and
-standards-compliant.
+### Reading
 
+Your first stops for API documentation should be:
 
-## Installation
+- RDocs: https://nokogiri.org/rdoc/index.html
+- An excellent community-maintained [Cheat Sheet](https://github.com/sparklemotion/nokogiri/wiki/Cheat-sheet)
 
-If this doesn't work:
 
-```
-gem install nokogiri
-```
+### Questions
+
+If you'd like to talk to a human:
+
+- The Discord chat channel is `#nokogiri-💎` at https://discord.gg/UyQnKrT
+- The Gitter chat channel is https://gitter.im/sparklemotion/nokogiri
+- The IRC chat channel is `#nokogiri` on freenode.
+- The Nokogiri mailing list is active at https://groups.google.com/group/nokogiri-talk
+- The Nokogiri bug tracker is at https://github.com/sparklemotion/nokogiri/issues
 
-then please start troubleshooting here:
+Consider subscribing to [Tidelift][tidelift] which provides license assurances and timely security notifications for your open source dependencies, including Nokogiri. [Tidelift][tidelift] subscriptions also help the Nokogiri maintainers fund our [automated testing](https://ci.nokogiri.org) which in turn allows us to ship releases, bugfixes, and security updates more often.
 
-> https://nokogiri.org/tutorials/installing_nokogiri.html
+  [tidelift]: https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme
 
-There are currently 1,237 Stack Overflow questions about Nokogiri
-installation. The vast majority of them are out of date and therefore
-incorrect. __Please do not use Stack Overflow.__
 
-Instead, [tell us](https://nokogiri.org/tutorials/getting_help.html)
-when the above instructions don't work for you. This allows us to both
-help you directly and improve the documentation.
+### Security and Vulnerability Reporting
 
+Please report vulnerabilities at https://hackerone.com/nokogiri
 
-### Binary packages
+Full information and description of our security policy is in [`SECURITY.md`](SECURITY.md)
 
-Binary packages are available for some distributions.
 
-* Debian: https://packages.debian.org/sid/ruby-nokogiri
-* openSUSE/SLE: https://download.opensuse.org/repositories/devel:/languages:/ruby:/extensions/
-* Fedora: http://s390.koji.fedoraproject.org/koji/packageinfo?packageID=6756
+### Semantic Versioning Policy
 
+Nokogiri follows [Semantic Versioning](https://semver.org/) (since 2017 or so). [![Dependabot's SemVer compatibility score for Nokogiri](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)
 
-## Support
+We bump `Major.Minor.Patch` versions following this guidance:
 
-All official documentation is posted at https://nokogiri.org (the source for which is at https://github.com/sparklemotion/nokogiri.org/, and we welcome contributions).
+`Major`: (we've never done this)
 
-* The Nokogiri mailing list is active: https://groups.google.com/group/nokogiri-talk
-* The Nokogiri bug tracker is here: https://github.com/sparklemotion/nokogiri/issues
-* Before filing a bug report, please read our submission guidelines: http://nokogiri.org/tutorials/getting_help.html
-* The IRC channel is `#nokogiri` on freenode.
-* The project's GitHub wiki has an excellent community-maintained [Cheat Sheet](https://github.com/sparklemotion/nokogiri/wiki/Cheat-sheet) which might be useful.
+- Significant backwards-incompatible changes to the public API that would require rewriting existing application code.
+- Some examples of backwards-incompatible changes we might someday consider for a Major release are at [`ROADMAP.md`](ROADMAP.md).
 
-Consider subscribing to [Tidelift][tidelift] which provides license assurances and timely security notifications for your open source dependencies, including Nokogiri. [Tidelift][tidelift] subscriptions also help the Nokogiri maintainers fund our [automated testing](https://ci.nokogiri.org) which in turn allows us to ship releases, bugfixes, and security updates more often.
+`Minor`:
 
-  [tidelift]: https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme
+- Features and bugfixes.
+- Updating packaged libraries for non-security-related reasons.
+- Dropping support for EOLed Ruby versions. [Some folks find this objectionable](https://github.com/sparklemotion/nokogiri/issues/1568), but [SemVer says this is OK if the public API hasn't changed](https://semver.org/#what-should-i-do-if-i-update-my-own-dependencies-without-changing-the-public-api).
+- Backwards-incompatible changes to internal or private methods and constants. These are detailed in the "Changes" section of each changelog entry.
 
+`Patch`:
 
-## Security and Vulnerability Reporting
+- Bugfixes.
+- Security updates.
+- Updating packaged libraries for security-related reasons.
 
-Please report vulnerabilities at https://hackerone.com/nokogiri
 
-Full information and description of our security policy is in [`SECURITY.md`](SECURITY.md)
+## Installation
+
+Requirements:
+
+- Ruby >= 2.5
+- JRuby >= 9.2.0.0
+
+
+### Native Gems: Faster, more reliable installation
+
+"Native gems" contain pre-compiled libraries for a specific machine architecture. On supported platforms, this removes the need for compiling the C extension and the packaged libraries, or for system dependencies to exist. This results in **much faster installation** and **more reliable installation**, which as you probably know are the biggest headaches for Nokogiri users.
+
+### Supported Platforms
+
+As of v1.11.0, Nokogiri ships pre-compiled, "native" gems for the following platforms:
+
+- Linux: `x86-linux` and `x86_64-linux` (req: `glibc >= 2.17`), including musl platforms like Alpine
+- Darwin/MacOS: `x86_64-darwin` and `arm64-darwin`
+- Windows: `x86-mingw32` and `x64-mingw32`
+- Java: any platform running JRuby 9.2 or higher
+
+To determine whether your system supports one of these gems, look at the output of `bundle platform` or `ruby -e 'puts Gem::Platform.local.to_s'`.
+
+If you're on a supported platform, either `gem install` or `bundle install` should install a native gem without any additional action on your part. This installation should only take a few seconds, and your output should look something like:
+
+``` sh
+$ gem install nokogiri
+Fetching nokogiri-1.11.0-x86_64-linux.gem
+Successfully installed nokogiri-1.11.0-x86_64-linux
+1 gem installed
+```
+
+
+### Other Installation Options
+
+Because Nokogiri is a C extension, it requires that you have a C compiler toolchain, Ruby development header files, and some system dependencies installed.
+
+The following may work for you if you have an appropriately-configured system:
+
+``` bash
+gem install nokogiri
+```
 
+If you have any issues, please visit [Installing Nokogiri](https://nokogiri.org/tutorials/installing_nokogiri.html) for more complete instructions and troubleshooting.
 
-## Synopsis
 
-Nokogiri is a large library, but here is example usage for parsing and examining a document:
+## How To Use Nokogiri
+
+Nokogiri is a large library, and so it's challenging to briefly summarize it. We've tried to provide long, real-world examples at [Tutorials](https://nokogiri.org/tutorials/toc.html).
+
+### Parsing and Querying
+
+Here is example usage for parsing and querying a document:
 
 ```ruby
 #! /usr/bin/env ruby
@@ -110,45 +158,24 @@ require 'open-uri'
 # Fetch and parse HTML document
 doc = Nokogiri::HTML(URI.open('https://nokogiri.org/tutorials/installing_nokogiri.html'))
 
-puts "### Search for nodes by css"
+# Search for nodes by css
 doc.css('nav ul.menu li a', 'article h2').each do |link|
   puts link.content
 end
 
-puts "### Search for nodes by xpath"
+# Search for nodes by xpath
 doc.xpath('//nav//ul//li/a', '//article//h2').each do |link|
   puts link.content
 end
 
-puts "### Or mix and match."
+# Or mix and match
 doc.search('nav ul.menu li a', '//article//h2').each do |link|
   puts link.content
 end
 ```
 
 
-## Requirements
-
-Ruby 2.5.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:
-
-* 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.)
-
-* 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)
-
-
-## Encoding
+### Encoding
 
 Strings are always stored as UTF-8 internally.  Methods that return
 text values will always return UTF-8 encoded strings.  Methods that
@@ -174,11 +201,43 @@ explicitly setting the encoding to EUC-JP on the parser:
 ```
 
 
-## Development
+## Technical Overview
+
+### Guiding Principles
+
+As noted above, two guiding principles of the software are:
+
+- be secure-by-default by treating all documents as **untrusted** by default
+- be a **thin-as-reasonable layer** on top of the underlying parsers, and don't attempt to fix behavioral differences between the parsers
+
+Notably, despite all parsers being standards-compliant, there are behavioral inconsistencies between the parsers used in the CRuby and JRuby implementations, and Nokogiri does not and should not attempt to remove these inconsistencies. Instead, we surface these differences in the test suite when they are important/semantic; or we intentionally write tests to depend only on the important/semantic bits (omitting whitespace from regex matchers on results, for example).
+
+
+### CRuby
+
+The Ruby (a.k.a., CRuby, MRI, YARV) implementation is a C extension that depends on libxml2 and libxslt (which in turn depend on zlib and possibly libiconv).
+
+These dependencies are met by default by Nokogiri's packaged versions of the libxml2 and libxslt source code, but a configuration option `--use-system-libraries` is provided to allow specification of alternative library locations. See [Installing Nokogiri](https://nokogiri.org/tutorials/installing_nokogiri.html) for full documentation.
+
+We provide native gems by pre-compiling libxml2 and libxslt (and potentially zlib and libiconv) and packaging them into the gem file. In this case, no compilation is necessary at installation time, which leads to faster and more reliable installation.
+
+See [`LICENSE-DEPENDENCIES.md`](LICENSE-DEPENDENCIES.md) for more information on which dependencies are provided in which native and source gems.
+
+
+### JRuby
+
+The Java (a.k.a. JRuby) implementation is a Java extension that depends primarily on Xerces and NekoHTML for parsing, though additional dependencies are on `isorelax`, `nekodtd`, `jing`, `serializer`, `xalan-j`, and `xml-apis`.
+
+These dependencies are provided by pre-compiled jar files packaged in the `java` platform gem.
+
+See [`LICENSE-DEPENDENCIES.md`](LICENSE-DEPENDENCIES.md) for more information on which dependencies are provided in which native and source gems.
+
+
+## Contributing
 
 ```bash
-  bundle install
-  bundle exec rake compile test
+bundle install
+bundle exec rake compile test
 ```
 
 
@@ -187,14 +246,27 @@ 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.
 
 See this license at [`LICENSE.md`](LICENSE.md).
+
+
+### Dependencies
+
+Some additional libraries may be distributed with your version of Nokogiri. Please see [`LICENSE-DEPENDENCIES.md`](LICENSE-DEPENDENCIES.md) for a discussion of the variations as well as the licenses thereof.
+
+
+## Authors
+
+- Mike Dalessio
+- Aaron Patterson
+- Yoko Harada
+- Akinori MUSHA
+- John Shahid
+- Karol Bucek
+- Lars Kanis
+- Sergio Arbeo
+- Timothy Elliott
+- Nobuyoshi Nakada

data/ext/nokogiri/extconf.rb

@@ -33,6 +33,10 @@ NOKOGIRI_HELP_MESSAGE = <<~HELP
       --disable-clean
           Do not clean out intermediate files after successful build
 
+      --prevent-strip
+          Take steps to prevent stripping the symbol table and debugging info from the shared
+          library, potentially overriding RbConfig's CFLAGS/LDFLAGS/DLDFLAGS.
+
 
     Flags only used when using system libraries:
 
@@ -81,6 +85,7 @@ NOKOGIRI_HELP_MESSAGE = <<~HELP
       --enable-cross-build
           Enable cross-build mode. (You probably do not want to set this manually.)
 
+
     Environment variables used:
 
       NOKOGIRI_USE_SYSTEM_LIBRARIES
@@ -513,10 +518,22 @@ end
 # use same c compiler for libxml and libxslt
 ENV['CC'] = RbConfig::CONFIG['CC']
 
+if arg_config('--prevent-strip')
+  old_cflags = $CFLAGS.split.join(" ")
+  old_ldflags = $LDFLAGS.split.join(" ")
+  old_dldflags = $DLDFLAGS.split.join(" ")
+  $CFLAGS = $CFLAGS.split.reject { |flag| flag == "-s" }.join(" ")
+  $LDFLAGS = $LDFLAGS.split.reject { |flag| flag == "-s" }.join(" ")
+  $DLDFLAGS = $DLDFLAGS.split.reject { |flag| flag == "-s" }.join(" ")
+  puts "Prevent stripping by removing '-s' from $CFLAGS" if old_cflags != $CFLAGS
+  puts "Prevent stripping by removing '-s' from $LDFLAGS" if old_ldflags != $LDFLAGS
+  puts "Prevent stripping by removing '-s' from $DLDFLAGS" if old_dldflags != $DLDFLAGS
+end
+
 # adopt environment config
-append_cflags(ENV["CFLAGS"].split(/\s+/)) if !ENV["CFLAGS"].nil?
-append_cppflags(ENV["CPPFLAGS"].split(/\s+/)) if !ENV["CPPFLAGS"].nil?
-append_ldflags(ENV["LDFLAGS"].split(/\s+/)) if !ENV["LDFLAGS"].nil?
+append_cflags(ENV["CFLAGS"].split) if !ENV["CFLAGS"].nil?
+append_cppflags(ENV["CPPFLAGS"].split) if !ENV["CPPFLAGS"].nil?
+append_ldflags(ENV["LDFLAGS"].split) if !ENV["LDFLAGS"].nil?
 $LIBS = concat_flags($LIBS, ENV["LIBS"])
 
 append_cflags("-g") # always include debugging information

data/ext/nokogiri/html_sax_parser_context.c

@@ -92,6 +92,8 @@ parse_with(VALUE self, VALUE sax_handler)
     ctxt->sax = sax;
     ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
 
+    xmlSetStructuredErrorFunc(NULL, NULL);
+
     rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
 
     return self;

data/ext/nokogiri/html_sax_push_parser.c

@@ -9,9 +9,10 @@
 static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
 {
   xmlParserCtxtPtr ctx;
-  const char * chunk  = NULL;
-  int size            = 0;
-
+  const char * chunk = NULL;
+  int size = 0;
+  int status = 0;
+  libxmlStructuredErrorHandlerState handler_state;
 
   Data_Get_Struct(self, xmlParserCtxt, ctx);
 
@@ -20,11 +21,16 @@ static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
     size = (int)RSTRING_LEN(_chunk);
   }
 
-  if(htmlParseChunk(ctx, chunk, size, Qtrue == _last_chunk ? 1 : 0)) {
-    if (!(ctx->options & XML_PARSE_RECOVER)) {
-      xmlErrorPtr e = xmlCtxtGetLastError(ctx);
-      Nokogiri_error_raise(NULL, e);
-    }
+  Nokogiri_structured_error_func_save_and_set(&handler_state, NULL, NULL);
+
+  status = htmlParseChunk(ctx, chunk, size, Qtrue == _last_chunk ? 1 : 0);
+
+  Nokogiri_structured_error_func_restore(&handler_state);
+
+  if ((status != 0) && !(ctx->options & XML_PARSE_RECOVER)) {
+    // TODO: there appear to be no tests for this block
+    xmlErrorPtr e = xmlCtxtGetLastError(ctx);
+    Nokogiri_error_raise(NULL, e);
   }
 
   return self;

data/ext/nokogiri/nokogiri.c

@@ -1,5 +1,7 @@
 #include <nokogiri.h>
 
+void init_test_global_handlers(); /* in lieu of test_global_handlers.h */
+
 VALUE mNokogiri ;
 VALUE mNokogiriXml ;
 VALUE mNokogiriHtml ;
@@ -132,4 +134,5 @@ void Init_nokogiri()
   init_xml_relax_ng();
   init_nokogiri_io();
   init_xml_encoding_handler();
+  init_test_global_handlers();
 }

data/ext/nokogiri/test_global_handlers.c

@@ -0,0 +1,41 @@
+#include <nokogiri.h>
+#include "libxml/xmlerror.h"
+
+static VALUE foreign_error_handler_block = Qnil;
+
+static void foreign_error_handler(void* user_data, xmlErrorPtr c_error)
+{
+  rb_funcall(foreign_error_handler_block, rb_intern("call"), 0);
+}
+
+/*
+ * call-seq:
+ *   __foreign_error_handler { ... } -> nil
+ *
+ * Override libxml2's global error handlers to call the block. This method thus has very little
+ * value except to test that Nokogiri is properly setting error handlers elsewhere in the code. See
+ * test/helper.rb for how this is being used.
+ */
+static VALUE
+rb_foreign_error_handler(VALUE klass)
+{
+  rb_need_block();
+  foreign_error_handler_block = rb_block_proc();
+  xmlSetStructuredErrorFunc(NULL, foreign_error_handler);
+  return Qnil;
+}
+
+/*
+ *  Document-module: Nokogiri::Test
+ *
+ *  The Nokogiri::Test module should only be used for testing Nokogiri.
+ *  Do NOT use this outside of the Nokogiri test suite.
+ */
+void
+init_test_global_handlers()
+{
+  VALUE mNokogiri = rb_define_module("Nokogiri");
+  VALUE mNokogiriTest = rb_define_module_under(mNokogiri, "Test");
+
+  rb_define_singleton_method(mNokogiriTest, "__foreign_error_handler", rb_foreign_error_handler, 0);
+}

data/ext/nokogiri/xml_sax_parser_context.c

@@ -120,6 +120,8 @@ parse_with(VALUE self, VALUE sax_handler)
     ctxt->sax = sax;
     ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
 
+    xmlSetStructuredErrorFunc(NULL, NULL);
+
     rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
 
     return Qnil;

data/ext/nokogiri/xml_sax_push_parser.c

@@ -35,6 +35,8 @@ static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
     size = (int)RSTRING_LEN(_chunk);
   }
 
+  xmlSetStructuredErrorFunc(NULL, NULL);
+
   if (xmlParseChunk(ctx, chunk, size, Qtrue == _last_chunk ? 1 : 0)) {
     if (!(ctx->options & XML_PARSE_RECOVER)) {
       xmlErrorPtr e = xmlCtxtGetLastError(ctx);

data/ext/nokogiri/xml_syntax_error.c

@@ -1,5 +1,28 @@
 #include <xml_syntax_error.h>
 
+void
+Nokogiri_structured_error_func_save(libxmlStructuredErrorHandlerState *handler_state)
+{
+  /* this method is tightly coupled to the implementation of xmlSetStructuredErrorFunc */
+  handler_state->user_data = xmlStructuredErrorContext;
+  handler_state->handler = xmlStructuredError;
+}
+
+void
+Nokogiri_structured_error_func_save_and_set(libxmlStructuredErrorHandlerState *handler_state,
+                                            void *user_data,
+                                            xmlStructuredErrorFunc handler)
+{
+  Nokogiri_structured_error_func_save(handler_state);
+  xmlSetStructuredErrorFunc(user_data, handler);
+}
+
+void
+Nokogiri_structured_error_func_restore(libxmlStructuredErrorHandlerState *handler_state)
+{
+  xmlSetStructuredErrorFunc(handler_state->user_data, handler_state->handler);
+}
+
 void Nokogiri_error_array_pusher(void * ctx, xmlErrorPtr error)
 {
   VALUE list = (VALUE)ctx;

data/lib/nokogiri.rb

@@ -11,7 +11,24 @@ end
 begin
   RUBY_VERSION =~ /(\d+\.\d+)/
   require "nokogiri/#{$1}/nokogiri"
-rescue LoadError
+rescue LoadError => e
+  if e.message =~ /GLIBC/
+    warn <<~EOM
+
+      ERROR: It looks like you're trying to use Nokogiri as a precompiled native gem on a system with glibc < 2.17:
+
+        #{e.message}
+
+        If that's the case, then please install Nokogiri via the `ruby` platform gem:
+            gem install nokogiri --platform=ruby
+        or:
+            bundle config set force_ruby_platform true
+
+        Please visit https://nokogiri.org/tutorials/installing_nokogiri.html for more help.
+
+    EOM
+    raise e
+  end
   require 'nokogiri/nokogiri'
 end
 require 'nokogiri/version'

data/lib/nokogiri/version/constant.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.11.0.rc4"
+  VERSION = "1.11.1"
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc4
+  version: 1.11.1
 platform: java
 authors:
 - Mike Dalessio
 - Aaron Patterson
-- John Shahid
 - Yoko Harada
 - Akinori MUSHA
+- John Shahid
+- Karol Bucek
 - Lars Kanis
-- Tim Elliott
+- Sergio Arbeo
+- Timothy Elliott
+- Nobuyoshi Nakada
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -35,91 +38,29 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
-  name: concourse
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.41'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.22'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.22.1
-  name: hoe
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.22'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.22.1
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  name: hoe-bundler
+        version: '2.2'
+  name: bundler
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  name: hoe-debugging
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  name: hoe-gemspec
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  name: hoe-git
+        version: '0.41'
+  name: concourse
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -223,7 +164,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.88'
+        version: '1.7'
   name: rubocop
   type: :development
   prerelease: false
@@ -231,13 +172,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.88'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.20'
   name: simplecov
   type: :development
   prerelease: false
@@ -245,74 +186,68 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
-  name: rdoc
+        version: '0.9'
+  name: yard
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
-description: |-
-  Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
-  Nokogiri's many features is the ability to search documents via XPath
-  or CSS3 selectors.
+        version: '0.9'
+description: |
+  Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby. It provides a
+  sensible, easy-to-understand API for reading, writing, modifying, and querying documents. It is
+  fast and standards-compliant by relying on native parsers like libxml2 (C) and xerces (Java).
 email: nokogiri-talk@googlegroups.com
 executables:
 - nokogiri
 extensions: []
 extra_rdoc_files:
-- LICENSE-DEPENDENCIES.md
-- LICENSE.md
-- README.md
-- ext/nokogiri/html_document.c
-- ext/nokogiri/html_element_description.c
-- ext/nokogiri/html_entity_lookup.c
-- ext/nokogiri/html_sax_parser_context.c
-- ext/nokogiri/html_sax_push_parser.c
-- ext/nokogiri/nokogiri.c
+- ext/nokogiri/xml_dtd.c
+- ext/nokogiri/xml_xpath_context.c
 - ext/nokogiri/xml_attr.c
-- ext/nokogiri/xml_attribute_decl.c
-- ext/nokogiri/xml_cdata.c
 - ext/nokogiri/xml_comment.c
-- ext/nokogiri/xml_document.c
-- ext/nokogiri/xml_document_fragment.c
-- ext/nokogiri/xml_dtd.c
+- ext/nokogiri/nokogiri.c
+- ext/nokogiri/xml_sax_parser_context.c
+- ext/nokogiri/xml_node_set.c
+- ext/nokogiri/xml_reader.c
+- ext/nokogiri/xml_libxml2_hacks.c
+- ext/nokogiri/xml_cdata.c
 - ext/nokogiri/xml_element_content.c
+- ext/nokogiri/html_entity_lookup.c
+- ext/nokogiri/xml_namespace.c
+- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_document.c
 - ext/nokogiri/xml_element_decl.c
+- ext/nokogiri/xml_schema.c
+- ext/nokogiri/html_document.c
+- ext/nokogiri/xml_processing_instruction.c
+- ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_syntax_error.c
+- ext/nokogiri/xml_document_fragment.c
+- ext/nokogiri/xml_sax_push_parser.c
 - ext/nokogiri/xml_encoding_handler.c
+- ext/nokogiri/html_sax_push_parser.c
+- ext/nokogiri/xml_relax_ng.c
 - ext/nokogiri/xml_entity_decl.c
-- ext/nokogiri/xml_entity_reference.c
-- ext/nokogiri/xml_io.c
-- ext/nokogiri/xml_libxml2_hacks.c
-- ext/nokogiri/xml_namespace.c
+- ext/nokogiri/test_global_handlers.c
 - ext/nokogiri/xml_node.c
-- ext/nokogiri/xml_node_set.c
-- ext/nokogiri/xml_processing_instruction.c
-- ext/nokogiri/xml_reader.c
-- ext/nokogiri/xml_relax_ng.c
-- ext/nokogiri/xml_sax_parser.c
-- ext/nokogiri/xml_sax_parser_context.c
-- ext/nokogiri/xml_sax_push_parser.c
-- ext/nokogiri/xml_schema.c
-- ext/nokogiri/xml_syntax_error.c
-- ext/nokogiri/xml_text.c
-- ext/nokogiri/xml_xpath_context.c
+- ext/nokogiri/xml_entity_reference.c
 - ext/nokogiri/xslt_stylesheet.c
+- ext/nokogiri/html_sax_parser_context.c
+- ext/nokogiri/xml_sax_parser.c
+- ext/nokogiri/xml_attribute_decl.c
+- ext/nokogiri/html_element_description.c
+- README.md
 files:
+- Gemfile
 - LICENSE-DEPENDENCIES.md
 - LICENSE.md
 - README.md
@@ -413,6 +348,7 @@ files:
 - ext/nokogiri/html_sax_parser_context.c
 - ext/nokogiri/html_sax_push_parser.c
 - ext/nokogiri/nokogiri.c
+- ext/nokogiri/test_global_handlers.c
 - ext/nokogiri/xml_attr.c
 - ext/nokogiri/xml_attribute_decl.c
 - ext/nokogiri/xml_cdata.c
@@ -538,12 +474,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
-summary: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser
+summary: Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby.
 test_files: []