nokogiri 1.11.0.rc3-java → 1.11.4-java

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/reader.rb

@@ -86,7 +86,8 @@ module Nokogiri
       private :initialize
 
       ###
-      # Get a list of attributes for the current node.
+      # Get the attributes of the current node as a Hash
+      # @return [Hash<String, String>] Attribute names and values
       def attributes
         attrs_hash = attribute_nodes.each_with_object({}) do |node, hash|
                        hash[node.name] = node.to_s
@@ -96,14 +97,6 @@ module Nokogiri
         attrs_hash
       end
 
-      ###
-      # Get a list of attributes for the current node
-      def attribute_nodes
-        nodes = attr_nodes
-        nodes.each { |v| v.instance_variable_set(:@_r, self) }
-        nodes
-      end
-
       ###
       # Move the cursor through the document yielding the cursor to the block
       def each

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
 

data/lib/nokogiri/xml/xpath.rb

@@ -3,9 +3,7 @@ require 'nokogiri/xml/xpath/syntax_error'
 
 module Nokogiri
   module XML
-    class XPath
-      # The Nokogiri::XML::Document tied to this XPath instance
-      attr_accessor :document
+    module XPath
     end
   end
 end

data/lib/nokogiri/xml/xpath/syntax_error.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Nokogiri
   module XML
-    class XPath
+    module XPath
       class SyntaxError < XML::SyntaxError
         def to_s
           [super.chomp, str1].compact.join(': ')

metadata

@@ -1,125 +1,80 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.0.rc3
+  version: 1.11.4
 platform: java
 authors:
-- Aaron Patterson
 - Mike Dalessio
+- Aaron Patterson
 - Yoko Harada
-- Tim Elliott
 - Akinori MUSHA
 - John Shahid
+- Karol Bucek
 - Lars Kanis
+- Sergio Arbeo
+- Timothy Elliott
+- Nobuyoshi Nakada
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
-  name: concourse
+        version: '1.4'
+  name: racc
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '1.4'
 - !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
-  prerelease: false
+        version: '2.2'
+  name: bundler
   type: :development
-  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
   prerelease: false
-  type: :development
   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
-  prerelease: false
-  type: :development
-  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
-  prerelease: false
+        version: '0.41'
+  name: concourse
   type: :development
-  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
   prerelease: false
-  type: :development
   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:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
   name: hoe-markdown
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -127,8 +82,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.8'
   name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -139,15 +94,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.14
-  name: racc
-  prerelease: false
+        version: '1.4'
+  name: minitest-reporters
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -155,8 +110,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -169,8 +124,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
   name: rake-compiler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -181,15 +136,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   name: rake-compiler-dock
-  prerelease: false
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -197,8 +152,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.5
   name: rexical
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -209,103 +164,89 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.88'
+        version: '1.7'
   name: rubocop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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
-  prerelease: false
+        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.
-email:
-- aaronp@rubyforge.org
-- mike.dalessio@gmail.com
-- yokolet@gmail.com
-- tle@holymonkey.com
-- knu@idaemons.org
-- jvshahid@gmail.com
-- lars@greiz-reinsdorf.de
+        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/libxml2_backwards_compat.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_cdata.c
 - ext/nokogiri/xml_element_content.c
+- ext/nokogiri/html_entity_lookup.c
+- ext/nokogiri/xml_namespace.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
@@ -401,73 +342,39 @@ files:
 - ext/nokogiri/depend
 - ext/nokogiri/extconf.rb
 - ext/nokogiri/html_document.c
-- ext/nokogiri/html_document.h
 - ext/nokogiri/html_element_description.c
-- ext/nokogiri/html_element_description.h
 - ext/nokogiri/html_entity_lookup.c
-- ext/nokogiri/html_entity_lookup.h
 - ext/nokogiri/html_sax_parser_context.c
-- ext/nokogiri/html_sax_parser_context.h
 - ext/nokogiri/html_sax_push_parser.c
-- ext/nokogiri/html_sax_push_parser.h
+- ext/nokogiri/libxml2_backwards_compat.c
 - ext/nokogiri/nokogiri.c
-- ext/nokogiri/nokogiri.h
+- ext/nokogiri/test_global_handlers.c
 - ext/nokogiri/xml_attr.c
-- ext/nokogiri/xml_attr.h
 - ext/nokogiri/xml_attribute_decl.c
-- ext/nokogiri/xml_attribute_decl.h
 - ext/nokogiri/xml_cdata.c
-- ext/nokogiri/xml_cdata.h
 - ext/nokogiri/xml_comment.c
-- ext/nokogiri/xml_comment.h
 - ext/nokogiri/xml_document.c
-- ext/nokogiri/xml_document.h
 - ext/nokogiri/xml_document_fragment.c
-- ext/nokogiri/xml_document_fragment.h
 - ext/nokogiri/xml_dtd.c
-- ext/nokogiri/xml_dtd.h
 - ext/nokogiri/xml_element_content.c
-- ext/nokogiri/xml_element_content.h
 - ext/nokogiri/xml_element_decl.c
-- ext/nokogiri/xml_element_decl.h
 - ext/nokogiri/xml_encoding_handler.c
-- ext/nokogiri/xml_encoding_handler.h
 - ext/nokogiri/xml_entity_decl.c
-- ext/nokogiri/xml_entity_decl.h
 - ext/nokogiri/xml_entity_reference.c
-- ext/nokogiri/xml_entity_reference.h
-- ext/nokogiri/xml_io.c
-- ext/nokogiri/xml_io.h
-- ext/nokogiri/xml_libxml2_hacks.c
-- ext/nokogiri/xml_libxml2_hacks.h
 - ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_namespace.h
 - ext/nokogiri/xml_node.c
-- ext/nokogiri/xml_node.h
 - ext/nokogiri/xml_node_set.c
-- ext/nokogiri/xml_node_set.h
 - ext/nokogiri/xml_processing_instruction.c
-- ext/nokogiri/xml_processing_instruction.h
 - ext/nokogiri/xml_reader.c
-- ext/nokogiri/xml_reader.h
 - ext/nokogiri/xml_relax_ng.c
-- ext/nokogiri/xml_relax_ng.h
 - ext/nokogiri/xml_sax_parser.c
-- ext/nokogiri/xml_sax_parser.h
 - ext/nokogiri/xml_sax_parser_context.c
-- ext/nokogiri/xml_sax_parser_context.h
 - ext/nokogiri/xml_sax_push_parser.c
-- ext/nokogiri/xml_sax_push_parser.h
 - ext/nokogiri/xml_schema.c
-- ext/nokogiri/xml_schema.h
 - ext/nokogiri/xml_syntax_error.c
-- ext/nokogiri/xml_syntax_error.h
 - ext/nokogiri/xml_text.c
-- ext/nokogiri/xml_text.h
 - ext/nokogiri/xml_xpath_context.c
-- ext/nokogiri/xml_xpath_context.h
 - ext/nokogiri/xslt_stylesheet.c
-- ext/nokogiri/xslt_stylesheet.h
 - lib/isorelax.jar
 - lib/jing.jar
 - lib/nekodtd.jar
@@ -483,6 +390,7 @@ files:
 - lib/nokogiri/css/tokenizer.rex
 - lib/nokogiri/css/xpath_visitor.rb
 - lib/nokogiri/decorators/slop.rb
+- lib/nokogiri/extension.rb
 - lib/nokogiri/html.rb
 - lib/nokogiri/html/builder.rb
 - lib/nokogiri/html/document.rb
@@ -497,6 +405,8 @@ files:
 - lib/nokogiri/nokogiri.jar
 - 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
@@ -560,16 +470,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
+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: []