nokogiri 1.11.6 → 1.12.1

data/lib/nokogiri/xml/parse_options.rb

@@ -71,6 +71,8 @@ module Nokogiri
 
       # the default options used for parsing XML documents
       DEFAULT_XML  = RECOVER | NONET
+      # the default options used for parsing XSLT stylesheets
+      DEFAULT_XSLT = RECOVER | NONET | NOENT | DTDLOAD | DTDATTR | NOCDATA
       # the default options used for parsing HTML documents
       DEFAULT_HTML = RECOVER | NOERROR | NOWARNING | NONET
       # the default options used for parsing XML schemas

data/lib/nokogiri/xml/pp.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
-require 'nokogiri/xml/pp/node'
-require 'nokogiri/xml/pp/character_data'
+require_relative "pp/node"
+require_relative "pp/character_data"

data/lib/nokogiri/xml/sax.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'nokogiri/xml/sax/document'
-require 'nokogiri/xml/sax/parser_context'
-require 'nokogiri/xml/sax/parser'
-require 'nokogiri/xml/sax/push_parser'
+require_relative "sax/document"
+require_relative "sax/parser_context"
+require_relative "sax/parser"
+require_relative "sax/push_parser"

data/lib/nokogiri/xml/sax/document.rb

@@ -2,20 +2,19 @@
 module Nokogiri
   module XML
     ###
-    # SAX Parsers are event driven parsers.  Nokogiri provides two different
-    # event based parsers when dealing with XML.  If you want to do SAX style
-    # parsing using HTML, check out Nokogiri::HTML::SAX.
+    # SAX Parsers are event driven parsers. Nokogiri provides two different event based parsers when
+    # dealing with XML. If you want to do SAX style parsing using HTML, check out
+    # Nokogiri::HTML4::SAX.
     #
-    # The basic way a SAX style parser works is by creating a parser,
-    # telling the parser about the events we're interested in, then giving
-    # the parser some XML to process.  The parser will notify you when
-    # it encounters events you said you would like to know about.
+    # The basic way a SAX style parser works is by creating a parser, telling the parser about the
+    # events we're interested in, then giving the parser some XML to process. The parser will notify
+    # you when it encounters events you said you would like to know about.
     #
-    # To register for events, you simply subclass Nokogiri::XML::SAX::Document,
-    # and implement the methods for which you would like notification.
+    # To register for events, you simply subclass Nokogiri::XML::SAX::Document, and implement the
+    # methods for which you would like notification.
     #
-    # For example, if I want to be notified when a document ends, and when an
-    # element starts, I would write a class like this:
+    # For example, if I want to be notified when a document ends, and when an element starts, I
+    # would write a class like this:
     #
     #   class MyDocument < Nokogiri::XML::SAX::Document
     #     def end_document
@@ -27,8 +26,7 @@ module Nokogiri
     #     end
     #   end
     #
-    # Then I would instantiate a SAX parser with this document, and feed the
-    # parser some XML
+    # Then I would instantiate a SAX parser with this document, and feed the parser some XML
     #
     #   # Create a new parser
     #   parser = Nokogiri::XML::SAX::Parser.new(MyDocument.new)
@@ -36,25 +34,21 @@ module Nokogiri
     #   # Feed the parser some XML
     #   parser.parse(File.open(ARGV[0]))
     #
-    # Now my document handler will be called when each node starts, and when
-    # then document ends.  To see what kinds of events are available, take
-    # a look at Nokogiri::XML::SAX::Document.
+    # Now my document handler will be called when each node starts, and when then document ends. To
+    # see what kinds of events are available, take a look at Nokogiri::XML::SAX::Document.
     #
-    # Two SAX parsers for XML are available, a parser that reads from a string
-    # or IO object as it feels necessary, and a parser that lets you spoon
-    # feed it XML.  If you want to let Nokogiri deal with reading your XML,
-    # use the Nokogiri::XML::SAX::Parser.  If you want to have fine grain
+    # Two SAX parsers for XML are available, a parser that reads from a string or IO object as it
+    # feels necessary, and a parser that lets you spoon feed it XML. If you want to let Nokogiri
+    # deal with reading your XML, use the Nokogiri::XML::SAX::Parser. If you want to have fine grain
     # control over the XML input, use the Nokogiri::XML::SAX::PushParser.
     module SAX
       ###
-      # This class is used for registering types of events you are interested
-      # in handling.  All of the methods on this class are available as
-      # possible events while parsing an XML document.  To register for any
-      # particular event, just subclass this class and implement the methods
-      # you are interested in knowing about.
+      # This class is used for registering types of events you are interested in handling. All of
+      # the methods on this class are available as possible events while parsing an XML document. To
+      # register for any particular event, just subclass this class and implement the methods you
+      # are interested in knowing about.
       #
-      # To only be notified about start and end element events, write a class
-      # like this:
+      # To only be notified about start and end element events, write a class like this:
       #
       #   class MyDocument < Nokogiri::XML::SAX::Document
       #     def start_element name, attrs = []
@@ -66,8 +60,8 @@ module Nokogiri
       #     end
       #   end
       #
-      # You can use this event handler for any SAX style parser included with
-      # Nokogiri.  See Nokogiri::XML::SAX, and Nokogiri::HTML::SAX.
+      # You can use this event handler for any SAX style parser included with Nokogiri. See
+      # Nokogiri::XML::SAX, and Nokogiri::HTML4::SAX.
       class Document
         ###
         # Called when an XML declaration is parsed
@@ -129,7 +123,7 @@ module Nokogiri
         end
 
         ###
-        # Characters read between a tag.  This method might be called multiple
+        # Characters read between a tag. This method might be called multiple
         # times given one contiguous string of characters.
         #
         # +string+ contains the character data

data/lib/nokogiri/xml/xpath.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
-require 'nokogiri/xml/xpath/syntax_error'
-
 module Nokogiri
   module XML
     module XPath
     end
   end
 end
+
+require_relative "xpath/syntax_error"

data/lib/nokogiri/xslt.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'nokogiri/xslt/stylesheet'
-
 module Nokogiri
   class << self
     ###
@@ -22,32 +20,32 @@ module Nokogiri
     class << self
       ###
       # Parse the stylesheet in +string+, register any +modules+
-      def parse string, modules = {}
+      def parse(string, modules = {})
         modules.each do |url, klass|
-          XSLT.register url, klass
+          XSLT.register(url, klass)
         end
 
+        doc = XML::Document.parse(string, nil, nil, XML::ParseOptions::DEFAULT_XSLT)
         if Nokogiri.jruby?
-          Stylesheet.parse_stylesheet_doc(XML.parse(string), string)
+          Stylesheet.parse_stylesheet_doc(doc, string)
         else
-          Stylesheet.parse_stylesheet_doc(XML.parse(string))
+          Stylesheet.parse_stylesheet_doc(doc)
         end
       end
 
       ###
       # Quote parameters in +params+ for stylesheet safety
-      def quote_params params
+      def quote_params(params)
         parray = (params.instance_of?(Hash) ? params.to_a.flatten : params).dup
-        parray.each_with_index do |v,i|
-          if i % 2 > 0
-            parray[i]=
-              if v =~ /'/
-                "concat('#{ v.gsub(/'/, %q{', "'", '}) }')"
-              else
-                "'#{v}'";
-              end
+        parray.each_with_index do |v, i|
+          parray[i] = if i % 2 > 0
+            if v =~ /'/
+              "concat('#{v.gsub(/'/, %q{', "'", '})}')"
+            else
+              "'#{v}'"
+            end
           else
-            parray[i] = v.to_s
+            v.to_s
           end
         end
         parray.flatten
@@ -55,3 +53,5 @@ module Nokogiri
     end
   end
 end
+
+require_relative "xslt/stylesheet"

data/lib/nokogiri/xslt/stylesheet.rb

@@ -18,7 +18,7 @@ module Nokogiri
       # Apply an XSLT stylesheet to an XML::Document.
       # +params+ is an array of strings used as XSLT parameters.
       # returns serialized document
-      def apply_to document, params = []
+      def apply_to(document, params = [])
         serialize(transform(document, params))
       end
     end

data/patches/libxml2/0007-Fix-XPath-recursion-limit.patch

@@ -0,0 +1,31 @@
+From 3e1aad4fe584747fd7d17cc7b2863a78e2d21a77 Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Wed, 2 Jun 2021 17:31:49 +0200
+Subject: [PATCH] Fix XPath recursion limit
+
+Fix accounting of recursion depth when parsing XPath expressions.
+
+This silly bug introduced in commit 804c5297 could lead to spurious
+errors when parsing larger expressions or XSLT documents.
+
+Should fix #264.
+---
+ xpath.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpath.c b/xpath.c
+index 7497ba0..1aa2f1a 100644
+--- a/xpath.c
++++ b/xpath.c
+@@ -10983,7 +10983,7 @@ xmlXPathCompileExpr(xmlXPathParserContextPtr ctxt, int sort) {
+     }
+ 
+     if (xpctxt != NULL)
+-        xpctxt->depth -= 1;
++        xpctxt->depth -= 10;
+ }
+ 
+ /**
+-- 
+2.31.0
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.6
+  version: 1.12.1
 platform: ruby
 authors:
 - Mike Dalessio
@@ -10,6 +10,9 @@ authors:
 - Akinori MUSHA
 - John Shahid
 - Karol Bucek
+- Sam Ruby
+- Craig Barnes
+- Stephen Checkoway
 - Lars Kanis
 - Sergio Arbeo
 - Timothy Elliott
@@ -17,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -39,14 +42,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -61,20 +64,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: concourse
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.41'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: hoe-markdown
   requirement: !ruby/object:Gem::Requirement
@@ -225,40 +214,41 @@ executables:
 extensions:
 - ext/nokogiri/extconf.rb
 extra_rdoc_files:
-- ext/nokogiri/xml_dtd.c
-- ext/nokogiri/xml_xpath_context.c
-- ext/nokogiri/xml_attr.c
+- ext/nokogiri/gumbo.c
+- ext/nokogiri/html4_document.c
+- ext/nokogiri/html4_element_description.c
+- ext/nokogiri/html4_entity_lookup.c
+- ext/nokogiri/html4_sax_parser_context.c
+- ext/nokogiri/html4_sax_push_parser.c
 - ext/nokogiri/libxml2_backwards_compat.c
-- ext/nokogiri/xml_comment.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/test_global_handlers.c
+- ext/nokogiri/xml_attr.c
+- ext/nokogiri/xml_attribute_decl.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_comment.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_dtd.c
+- ext/nokogiri/xml_element_content.c
+- ext/nokogiri/xml_element_decl.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/test_global_handlers.c
-- ext/nokogiri/xml_node.c
 - ext/nokogiri/xml_entity_reference.c
-- ext/nokogiri/xslt_stylesheet.c
-- ext/nokogiri/html_sax_parser_context.c
+- ext/nokogiri/xml_namespace.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_attribute_decl.c
-- ext/nokogiri/html_element_description.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/xslt_stylesheet.c
 - README.md
 files:
 - Gemfile
@@ -269,11 +259,12 @@ files:
 - dependencies.yml
 - ext/nokogiri/depend
 - ext/nokogiri/extconf.rb
-- 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/gumbo.c
+- ext/nokogiri/html4_document.c
+- ext/nokogiri/html4_element_description.c
+- ext/nokogiri/html4_entity_lookup.c
+- ext/nokogiri/html4_sax_parser_context.c
+- ext/nokogiri/html4_sax_push_parser.c
 - ext/nokogiri/libxml2_backwards_compat.c
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/nokogiri.h
@@ -304,6 +295,51 @@ files:
 - ext/nokogiri/xml_text.c
 - ext/nokogiri/xml_xpath_context.c
 - ext/nokogiri/xslt_stylesheet.c
+- gumbo-parser/CHANGES.md
+- gumbo-parser/Makefile
+- gumbo-parser/THANKS
+- gumbo-parser/src/Makefile
+- gumbo-parser/src/README.md
+- gumbo-parser/src/ascii.c
+- gumbo-parser/src/ascii.h
+- gumbo-parser/src/attribute.c
+- gumbo-parser/src/attribute.h
+- gumbo-parser/src/char_ref.c
+- gumbo-parser/src/char_ref.h
+- gumbo-parser/src/char_ref.rl
+- gumbo-parser/src/error.c
+- gumbo-parser/src/error.h
+- gumbo-parser/src/foreign_attrs.c
+- gumbo-parser/src/foreign_attrs.gperf
+- gumbo-parser/src/gumbo.h
+- gumbo-parser/src/insertion_mode.h
+- gumbo-parser/src/macros.h
+- gumbo-parser/src/parser.c
+- gumbo-parser/src/parser.h
+- gumbo-parser/src/replacement.h
+- gumbo-parser/src/string_buffer.c
+- gumbo-parser/src/string_buffer.h
+- gumbo-parser/src/string_piece.c
+- gumbo-parser/src/svg_attrs.c
+- gumbo-parser/src/svg_attrs.gperf
+- gumbo-parser/src/svg_tags.c
+- gumbo-parser/src/svg_tags.gperf
+- gumbo-parser/src/tag.c
+- gumbo-parser/src/tag_lookup.c
+- gumbo-parser/src/tag_lookup.gperf
+- gumbo-parser/src/tag_lookup.h
+- gumbo-parser/src/token_buffer.c
+- gumbo-parser/src/token_buffer.h
+- gumbo-parser/src/token_type.h
+- gumbo-parser/src/tokenizer.c
+- gumbo-parser/src/tokenizer.h
+- gumbo-parser/src/tokenizer_states.h
+- gumbo-parser/src/utf8.c
+- gumbo-parser/src/utf8.h
+- gumbo-parser/src/util.c
+- gumbo-parser/src/util.h
+- gumbo-parser/src/vector.c
+- gumbo-parser/src/vector.h
 - lib/nokogiri.rb
 - lib/nokogiri/css.rb
 - lib/nokogiri/css/node.rb
@@ -316,16 +352,22 @@ files:
 - lib/nokogiri/css/xpath_visitor.rb
 - lib/nokogiri/decorators/slop.rb
 - lib/nokogiri/extension.rb
+- lib/nokogiri/gumbo.rb
 - lib/nokogiri/html.rb
-- lib/nokogiri/html/builder.rb
-- lib/nokogiri/html/document.rb
-- lib/nokogiri/html/document_fragment.rb
-- lib/nokogiri/html/element_description.rb
-- lib/nokogiri/html/element_description_defaults.rb
-- lib/nokogiri/html/entity_lookup.rb
-- lib/nokogiri/html/sax/parser.rb
-- lib/nokogiri/html/sax/parser_context.rb
-- lib/nokogiri/html/sax/push_parser.rb
+- lib/nokogiri/html4.rb
+- lib/nokogiri/html4/builder.rb
+- lib/nokogiri/html4/document.rb
+- lib/nokogiri/html4/document_fragment.rb
+- lib/nokogiri/html4/element_description.rb
+- lib/nokogiri/html4/element_description_defaults.rb
+- lib/nokogiri/html4/entity_lookup.rb
+- lib/nokogiri/html4/sax/parser.rb
+- lib/nokogiri/html4/sax/parser_context.rb
+- lib/nokogiri/html4/sax/push_parser.rb
+- lib/nokogiri/html5.rb
+- lib/nokogiri/html5/document.rb
+- lib/nokogiri/html5/document_fragment.rb
+- lib/nokogiri/html5/node.rb
 - lib/nokogiri/jruby/dependencies.rb
 - lib/nokogiri/syntax_error.rb
 - lib/nokogiri/version.rb
@@ -377,6 +419,7 @@ files:
 - patches/libxml2/0004-use-glibc-strlen.patch
 - patches/libxml2/0005-avoid-isnan-isinf.patch
 - patches/libxml2/0006-update-automake-files-for-arm64.patch
+- patches/libxml2/0007-Fix-XPath-recursion-limit.patch
 - patches/libxslt/0001-update-automake-files-for-arm64.patch
 - patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch
 - ports/archives/libxml2-2.9.12.tar.gz
@@ -407,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby.