nokogiri 1.11.0.rc3-x86-linux → 1.11.0.rc4-x86-linux

data/lib/nokogiri/xml/parse_options.rb

@@ -73,6 +73,8 @@ module Nokogiri
       DEFAULT_XML  = RECOVER | NONET
       # the default options used for parsing HTML documents
       DEFAULT_HTML = RECOVER | NOERROR | NOWARNING | NONET
+      # the default options used for parsing XML schemas
+      DEFAULT_SCHEMA = NONET
 
       attr_accessor :options
       def initialize options = STRICT
@@ -107,6 +109,10 @@ module Nokogiri
         @options & RECOVER == STRICT
       end
 
+      def ==(other)
+        other.to_i == to_i
+      end
+
       alias :to_i :options
 
       def inspect

data/lib/nokogiri/xml/relax_ng.rb

@@ -5,8 +5,8 @@ module Nokogiri
       ###
       # Create a new Nokogiri::XML::RelaxNG document from +string_or_io+.
       # See Nokogiri::XML::RelaxNG for an example.
-      def RelaxNG string_or_io
-        RelaxNG.new(string_or_io)
+      def RelaxNG(string_or_io, options = ParseOptions::DEFAULT_SCHEMA)
+        RelaxNG.new(string_or_io, options)
       end
     end
 
@@ -27,6 +27,10 @@ module Nokogiri
     #   end
     #
     # The list of errors are Nokogiri::XML::SyntaxError objects.
+    #
+    # NOTE: RelaxNG input is always treated as TRUSTED documents, meaning that they will cause the
+    # underlying parsing libraries to access network resources. This is counter to Nokogiri's
+    # "untrusted by default" security policy, but is a limitation of the underlying libraries.
     class RelaxNG < Nokogiri::XML::Schema
     end
   end

data/lib/nokogiri/xml/schema.rb

@@ -5,8 +5,8 @@ module Nokogiri
       ###
       # Create a new Nokogiri::XML::Schema object using a +string_or_io+
       # object.
-      def Schema string_or_io
-        Schema.new(string_or_io)
+      def Schema(string_or_io, options = ParseOptions::DEFAULT_SCHEMA)
+        Schema.new(string_or_io, options)
       end
     end
 
@@ -27,15 +27,23 @@ module Nokogiri
     #   end
     #
     # The list of errors are Nokogiri::XML::SyntaxError objects.
+    #
+    # NOTE: As of v1.11.0, Schema treats inputs as UNTRUSTED by default, and so external entities
+    # are not resolved from the network (`http://` or `ftp://`). Previously, parsing treated
+    # documents as "trusted" by default which was counter to Nokogiri's "untrusted by default"
+    # security policy. If a document is trusted, then the caller may turn off the NONET option via
+    # the ParseOptions to re-enable external entity resolution over a network connection.
     class Schema
       # Errors while parsing the schema file
       attr_accessor :errors
+      # The Nokogiri::XML::ParseOptions used to parse the schema
+      attr_accessor :parse_options
 
       ###
       # Create a new Nokogiri::XML::Schema object using a +string_or_io+
       # object.
-      def self.new string_or_io
-        from_document Nokogiri::XML(string_or_io)
+      def self.new string_or_io, options = ParseOptions::DEFAULT_SCHEMA
+        from_document(Nokogiri::XML(string_or_io), options)
       end
 
       ###

data/lib/nokogiri/xml/searchable.rb

@@ -210,8 +210,10 @@ module Nokogiri
       end
 
       def xpath_query_from_css_rule(rule, ns)
+        visitor = Nokogiri::CSS::XPathVisitorOptimallyUseBuiltins.new
         self.class::IMPLIED_XPATH_CONTEXTS.map do |implied_xpath_context|
-          CSS.xpath_for(rule.to_s, :prefix => implied_xpath_context, :ns => ns)
+          CSS.xpath_for(rule.to_s, {:prefix => implied_xpath_context, :ns => ns,
+                                    :visitor => visitor})
         end.join(" | ")
       end
 

metadata

@@ -1,35 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc3
+  version: 1.11.0.rc4
 platform: x86-linux
 authors:
-- Aaron Patterson
 - Mike Dalessio
+- Aaron Patterson
+- John Shahid
 - Yoko Harada
-- Tim Elliott
 - Akinori MUSHA
-- John Shahid
 - Lars Kanis
+- Tim Elliott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: concourse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.41'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -135,19 +149,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.8'
 - !ruby/object:Gem::Dependency
-  name: racc
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.14
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.14
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -182,14 +196,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rexical
   requirement: !ruby/object:Gem::Requirement
@@ -256,14 +270,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.
-email:
-- aaronp@rubyforge.org
-- mike.dalessio@gmail.com
-- yokolet@gmail.com
-- tle@holymonkey.com
-- knu@idaemons.org
-- jvshahid@gmail.com
-- lars@greiz-reinsdorf.de
+email: nokogiri-talk@googlegroups.com
 executables:
 - nokogiri
 extensions: []
@@ -323,6 +330,77 @@ files:
 - ext/nokogiri/html_sax_parser_context.h
 - ext/nokogiri/html_sax_push_parser.c
 - ext/nokogiri/html_sax_push_parser.h
+- ext/nokogiri/include/libexslt/exslt.h
+- ext/nokogiri/include/libexslt/exsltconfig.h
+- ext/nokogiri/include/libexslt/exsltexports.h
+- ext/nokogiri/include/libxml2/libxml/DOCBparser.h
+- ext/nokogiri/include/libxml2/libxml/HTMLparser.h
+- ext/nokogiri/include/libxml2/libxml/HTMLtree.h
+- ext/nokogiri/include/libxml2/libxml/SAX.h
+- ext/nokogiri/include/libxml2/libxml/SAX2.h
+- ext/nokogiri/include/libxml2/libxml/c14n.h
+- ext/nokogiri/include/libxml2/libxml/catalog.h
+- ext/nokogiri/include/libxml2/libxml/chvalid.h
+- ext/nokogiri/include/libxml2/libxml/debugXML.h
+- ext/nokogiri/include/libxml2/libxml/dict.h
+- ext/nokogiri/include/libxml2/libxml/encoding.h
+- ext/nokogiri/include/libxml2/libxml/entities.h
+- ext/nokogiri/include/libxml2/libxml/globals.h
+- ext/nokogiri/include/libxml2/libxml/hash.h
+- ext/nokogiri/include/libxml2/libxml/list.h
+- ext/nokogiri/include/libxml2/libxml/nanoftp.h
+- ext/nokogiri/include/libxml2/libxml/nanohttp.h
+- ext/nokogiri/include/libxml2/libxml/parser.h
+- ext/nokogiri/include/libxml2/libxml/parserInternals.h
+- ext/nokogiri/include/libxml2/libxml/pattern.h
+- ext/nokogiri/include/libxml2/libxml/relaxng.h
+- ext/nokogiri/include/libxml2/libxml/schemasInternals.h
+- ext/nokogiri/include/libxml2/libxml/schematron.h
+- ext/nokogiri/include/libxml2/libxml/threads.h
+- ext/nokogiri/include/libxml2/libxml/tree.h
+- ext/nokogiri/include/libxml2/libxml/uri.h
+- ext/nokogiri/include/libxml2/libxml/valid.h
+- ext/nokogiri/include/libxml2/libxml/xinclude.h
+- ext/nokogiri/include/libxml2/libxml/xlink.h
+- ext/nokogiri/include/libxml2/libxml/xmlIO.h
+- ext/nokogiri/include/libxml2/libxml/xmlautomata.h
+- ext/nokogiri/include/libxml2/libxml/xmlerror.h
+- ext/nokogiri/include/libxml2/libxml/xmlexports.h
+- ext/nokogiri/include/libxml2/libxml/xmlmemory.h
+- ext/nokogiri/include/libxml2/libxml/xmlmodule.h
+- ext/nokogiri/include/libxml2/libxml/xmlreader.h
+- ext/nokogiri/include/libxml2/libxml/xmlregexp.h
+- ext/nokogiri/include/libxml2/libxml/xmlsave.h
+- ext/nokogiri/include/libxml2/libxml/xmlschemas.h
+- ext/nokogiri/include/libxml2/libxml/xmlschemastypes.h
+- ext/nokogiri/include/libxml2/libxml/xmlstring.h
+- ext/nokogiri/include/libxml2/libxml/xmlunicode.h
+- ext/nokogiri/include/libxml2/libxml/xmlversion.h
+- ext/nokogiri/include/libxml2/libxml/xmlwriter.h
+- ext/nokogiri/include/libxml2/libxml/xpath.h
+- ext/nokogiri/include/libxml2/libxml/xpathInternals.h
+- ext/nokogiri/include/libxml2/libxml/xpointer.h
+- ext/nokogiri/include/libxslt/attributes.h
+- ext/nokogiri/include/libxslt/documents.h
+- ext/nokogiri/include/libxslt/extensions.h
+- ext/nokogiri/include/libxslt/extra.h
+- ext/nokogiri/include/libxslt/functions.h
+- ext/nokogiri/include/libxslt/imports.h
+- ext/nokogiri/include/libxslt/keys.h
+- ext/nokogiri/include/libxslt/namespaces.h
+- ext/nokogiri/include/libxslt/numbersInternals.h
+- ext/nokogiri/include/libxslt/pattern.h
+- ext/nokogiri/include/libxslt/preproc.h
+- ext/nokogiri/include/libxslt/security.h
+- ext/nokogiri/include/libxslt/templates.h
+- ext/nokogiri/include/libxslt/transform.h
+- ext/nokogiri/include/libxslt/variables.h
+- ext/nokogiri/include/libxslt/xslt.h
+- ext/nokogiri/include/libxslt/xsltInternals.h
+- ext/nokogiri/include/libxslt/xsltconfig.h
+- ext/nokogiri/include/libxslt/xsltexports.h
+- ext/nokogiri/include/libxslt/xsltlocale.h
+- ext/nokogiri/include/libxslt/xsltutils.h
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/nokogiri.h
 - ext/nokogiri/xml_attr.c
@@ -382,10 +460,10 @@ files:
 - ext/nokogiri/xslt_stylesheet.c
 - ext/nokogiri/xslt_stylesheet.h
 - lib/nokogiri.rb
-- lib/nokogiri/2.4/nokogiri.so
 - lib/nokogiri/2.5/nokogiri.so
 - lib/nokogiri/2.6/nokogiri.so
 - lib/nokogiri/2.7/nokogiri.so
+- lib/nokogiri/3.0/nokogiri.so
 - lib/nokogiri/css.rb
 - lib/nokogiri/css/node.rb
 - lib/nokogiri/css/parser.rb
@@ -409,6 +487,8 @@ files:
 - lib/nokogiri/jruby/dependencies.rb
 - lib/nokogiri/syntax_error.rb
 - lib/nokogiri/version.rb
+- lib/nokogiri/version/constant.rb
+- lib/nokogiri/version/info.rb
 - lib/nokogiri/xml.rb
 - lib/nokogiri/xml/attr.rb
 - lib/nokogiri/xml/attribute_decl.rb
@@ -458,10 +538,7 @@ metadata:
   documentation_uri: https://nokogiri.org/rdoc/index.html
   changelog_uri: https://nokogiri.org/CHANGELOG.html
   source_code_uri: https://github.com/sparklemotion/nokogiri
-post_install_message: 'Nokogiri is built with the packaged libraries: libxml2-2.9.10,
-  libxslt-1.1.34, zlib-1.2.11, libiconv-1.15.
-
-'
+post_install_message: 
 rdoc_options:
 - "--main"
 - README.md
@@ -471,17 +548,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
-      version: 2.8.dev
+      version: 3.1.dev
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser