nokogiri 1.11.0.rc3-java → 1.11.0.rc4-java

data/lib/nokogiri/xml/document_fragment.rb

@@ -141,6 +141,10 @@ module Nokogiri
         document.errors = things
       end
 
+      def fragment(data)
+        document.fragment(data)
+      end
+
       private
 
       # fix for issue 770
@@ -150,12 +154,6 @@ module Nokogiri
           %Q{xmlns#{prefix}="#{namespace.href}"}
         end.join ' '
       end
-
-      def coerce data
-        return super unless String === data
-
-        document.fragment(data).children
-      end
     end
   end
 end

data/lib/nokogiri/xml/node.rb

@@ -267,6 +267,8 @@ module Nokogiri
       #
       # Also see related method +swap+.
       def replace(node_or_tags)
+        raise("Cannot replace a node with no parent") unless parent
+
         # We cannot replace a text node directly, otherwise libxml will return
         # an internal error at parser.c:13031, I don't know exactly why
         # libxml is trying to find a parent node that is an element or document
@@ -278,7 +280,7 @@ module Nokogiri
           return replacee.replace node_or_tags
         end
 
-        node_or_tags = coerce(node_or_tags)
+        node_or_tags = parent.coerce(node_or_tags)
 
         if node_or_tags.is_a?(XML::NodeSet)
           node_or_tags.each { |n| add_previous_sibling n }
@@ -819,13 +821,30 @@ module Nokogiri
 
         return Nokogiri::XML::NodeSet.new(document) if contents.empty?
 
-        ##
-        # This is a horrible hack, but I don't care. See #313 for background.
+        # libxml2 does not obey the `recover` option after encountering errors during `in_context`
+        # parsing, and so this horrible hack is here to try to emulate recovery behavior.
+        #
+        # Unfortunately, this means we're no longer parsing "in context" and so namespaces that
+        # would have been inherited from the context node won't be handled correctly. This hack was
+        # written in 2010, and I regret it, because it's silently degrading functionality in a way
+        # that's not easily prevented (or even detected).
+        #
+        # I think preferable behavior would be to either:
+        #
+        # a. add an error noting that we "fell back" and pointing the user to turning off the `recover` option
+        # b. don't recover, but raise a sensible exception
+        #
+        # For context and background: https://github.com/sparklemotion/nokogiri/issues/313
+        # FIXME bug report: https://github.com/sparklemotion/nokogiri/issues/2092
         error_count = document.errors.length
         node_set = in_context(contents, options.to_i)
-        if node_set.empty? and document.errors.length > error_count and options.recover?
-          fragment = Nokogiri::HTML::DocumentFragment.parse contents
-          node_set = fragment.children
+        if (node_set.empty? && (document.errors.length > error_count))
+          if options.recover?
+            fragment = Nokogiri::HTML::DocumentFragment.parse contents
+            node_set = fragment.children
+          else
+            raise document.errors[error_count]
+          end
         end
         node_set
       end
@@ -1128,6 +1147,28 @@ module Nokogiri
 
       # @!endgroup
 
+      protected
+
+      def coerce(data)
+        case data
+        when XML::NodeSet
+          return data
+        when XML::DocumentFragment
+          return data.children
+        when String
+          return fragment(data).children
+        when Document, XML::Attr
+          # unacceptable
+        when XML::Node
+          return data
+        end
+
+        raise ArgumentError, <<-EOERR
+Requires a Node, NodeSet or String argument, and cannot accept a #{data.class}.
+(You probably want to select a node from the Document with at() or search(), or create a new Node via Node.new().)
+        EOERR
+      end
+
       private
 
       def keywordify(keywords)
@@ -1142,10 +1183,12 @@ module Nokogiri
       end
 
       def add_sibling(next_or_previous, node_or_tags)
+        raise("Cannot add sibling to a node with no parent") unless parent
+
         impl = (next_or_previous == :next) ? :add_next_sibling_node : :add_previous_sibling_node
         iter = (next_or_previous == :next) ? :reverse_each : :each
 
-        node_or_tags = coerce node_or_tags
+        node_or_tags = parent.coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
           if text?
             pivot = Nokogiri::XML::Node.new "dummy", document
@@ -1182,26 +1225,6 @@ module Nokogiri
         [:name, :namespace, :attribute_nodes, :children]
       end
 
-      def coerce(data)
-        case data
-        when XML::NodeSet
-          return data
-        when XML::DocumentFragment
-          return data.children
-        when String
-          return fragment(data).children
-        when Document, XML::Attr
-          # unacceptable
-        when XML::Node
-          return data
-        end
-
-        raise ArgumentError, <<-EOERR
-Requires a Node, NodeSet or String argument, and cannot accept a #{data.class}.
-(You probably want to select a node from the Document with at() or search(), or create a new Node via Node.new().)
-        EOERR
-      end
-
       # @private
       IMPLIED_XPATH_CONTEXTS = [".//".freeze].freeze
 

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: java
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
-  name: concourse
+        version: '1.4'
+  name: racc
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    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.34'
+        version: '0.41'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -40,8 +54,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.22.1
   name: hoe
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -57,8 +71,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
   name: hoe-bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -71,8 +85,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
   name: hoe-debugging
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -85,8 +99,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
   name: hoe-gemspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -99,8 +113,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
   name: hoe-git
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -113,8 +127,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
   name: hoe-markdown
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -127,8 +141,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 +153,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 +169,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 +183,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 +195,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 +211,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:
     - - "~>"
@@ -211,8 +225,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.88'
   name: rubocop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -225,8 +239,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.17.0
   name: simplecov
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -242,8 +256,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7'
   name: rdoc
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -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: []
@@ -401,73 +408,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/nokogiri.c
-- ext/nokogiri/nokogiri.h
 - 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
@@ -497,6 +470,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,15 +535,14 @@ 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
 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