nokogiri 1.10.10 → 1.11.0.rc1

data/lib/nokogiri/xml/pp.rb

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

data/lib/nokogiri/xml/pp/character_data.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     module PP

data/lib/nokogiri/xml/pp/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     module PP

data/lib/nokogiri/xml/processing_instruction.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     class ProcessingInstruction < Node

data/lib/nokogiri/xml/reader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     ###
@@ -87,9 +88,12 @@ module Nokogiri
       ###
       # Get a list of attributes for the current node.
       def attributes
-        Hash[attribute_nodes.map { |node|
-          [node.name, node.to_s]
-        }].merge(namespaces || {})
+        attrs_hash = attribute_nodes.each_with_object({}) do |node, hash|
+                       hash[node.name] = node.to_s
+                     end
+        ns = namespaces
+        attrs_hash.merge!(ns) if ns
+        attrs_hash
       end
 
       ###

data/lib/nokogiri/xml/relax_ng.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     class << self

data/lib/nokogiri/xml/sax.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/xml/sax/document'
 require 'nokogiri/xml/sax/parser_context'
 require 'nokogiri/xml/sax/parser'

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     ###

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     module SAX

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     module SAX

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     module SAX

data/lib/nokogiri/xml/schema.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     class << self

data/lib/nokogiri/xml/searchable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     #

data/lib/nokogiri/xml/syntax_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     ###

data/lib/nokogiri/xml/text.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     class Text < Nokogiri::XML::CharacterData

data/lib/nokogiri/xml/xpath.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/xml/xpath/syntax_error'
 
 module Nokogiri

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     class XPath

data/lib/nokogiri/xml/xpath_context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     class XPathContext

data/lib/nokogiri/xslt.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/xslt/stylesheet'
 
 module Nokogiri

data/lib/nokogiri/xslt/stylesheet.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XSLT
     ###

data/lib/xsd/xmlparser/nokogiri.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri'
 
 module XSD # :nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.10.10
+  version: 1.11.0.rc1
 platform: ruby
 authors:
 - Aaron Patterson
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -36,14 +36,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.30'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: '0.30'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
 - !ruby/object:Gem::Dependency
   name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,28 +148,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
@@ -232,20 +246,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.22'
 description: |-
   Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
   Nokogiri's many features is the ability to search documents via XPath
@@ -397,6 +397,7 @@ files:
 - lib/nokogiri/html/sax/parser.rb
 - lib/nokogiri/html/sax/parser_context.rb
 - lib/nokogiri/html/sax/push_parser.rb
+- lib/nokogiri/jruby/dependencies.rb
 - lib/nokogiri/syntax_error.rb
 - lib/nokogiri/version.rb
 - lib/nokogiri/xml.rb
@@ -443,7 +444,6 @@ files:
 - patches/libxml2/0002-Remove-script-macro-support.patch
 - patches/libxml2/0003-Update-entities-to-remove-handling-of-ssi.patch
 - patches/libxml2/0004-libxml2.la-is-in-top_builddir.patch
-- patches/libxml2/0005-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch
 - ports/archives/libxml2-2.9.10.tar.gz
 - ports/archives/libxslt-1.1.34.tar.gz
 homepage: https://nokogiri.org
@@ -465,14 +465,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser

data/patches/libxml2/0005-Fix-infinite-loop-in-xmlStringLenDecodeEntities.patch

@@ -1,32 +0,0 @@
-From 0e1a49c8907645d2e155f0d89d4d9895ac5112b5 Mon Sep 17 00:00:00 2001
-From: Zhipeng Xie <xiezhipeng1@huawei.com>
-Date: Thu, 12 Dec 2019 17:30:55 +0800
-Subject: [PATCH] Fix infinite loop in xmlStringLenDecodeEntities
-
-When ctxt->instate == XML_PARSER_EOF,xmlParseStringEntityRef
-return NULL which cause a infinite loop in xmlStringLenDecodeEntities
-
-Found with libFuzzer.
-
-Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
----
- parser.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/parser.c b/parser.c
-index d1c3196..a34bb6c 100644
---- a/parser.c
-+++ b/parser.c
-@@ -2646,7 +2646,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
-     else
-         c = 0;
-     while ((c != 0) && (c != end) && /* non input consuming loop */
--	   (c != end2) && (c != end3)) {
-+           (c != end2) && (c != end3) &&
-+           (ctxt->instate != XML_PARSER_EOF)) {
- 
- 	if (c == 0) break;
-         if ((c == '&') && (str[1] == '#')) {
--- 
-2.17.1
-