nokogiri 1.10.10-x86-mingw32 → 1.11.0.rc1-x86-mingw32

data/lib/nokogiri/html/builder.rb

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

data/lib/nokogiri/html/document.rb

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

data/lib/nokogiri/html/document_fragment.rb

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

data/lib/nokogiri/html/element_description.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module HTML
     class ElementDescription

data/lib/nokogiri/html/element_description_defaults.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module HTML
     class ElementDescription

data/lib/nokogiri/html/entity_lookup.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module HTML
     class EntityDescription < Struct.new(:value, :name, :description); end

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

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

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

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

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

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

data/lib/nokogiri/jruby/dependencies.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+# The line below caused a problem on non-GAE rack environment.
+# unless defined?(JRuby::Rack::VERSION) || defined?(AppEngine::ApiProxy)
+#
+# However, simply cutting defined?(JRuby::Rack::VERSION) off resulted in
+# an unable-to-load-nokogiri problem. Thus, now, Nokogiri checks the presense
+# of appengine-rack.jar in $LOAD_PATH. If Nokogiri is on GAE, Nokogiri
+# should skip loading xml jars. This is because those are in WEB-INF/lib and
+# already set in the classpath.
+unless $LOAD_PATH.to_s.include?("appengine-rack")
+  require 'stringio'
+  require 'isorelax.jar'
+  require 'jing.jar'
+  require 'nekohtml.jar'
+  require 'nekodtd.jar'
+  require 'xercesImpl.jar'
+  require 'serializer.jar'
+  require 'xalan.jar'
+  require 'xml-apis.jar'
+end

data/lib/nokogiri/syntax_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   class SyntaxError < ::StandardError
   end

data/lib/nokogiri/version.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.10.10"
+  VERSION = "1.11.0.rc1"
 
   class VersionInfo # :nodoc:
     def jruby?
@@ -11,19 +12,30 @@ module Nokogiri
       defined?(RUBY_ENGINE) ? RUBY_ENGINE : "mri"
     end
 
-    def loaded_parser_version
-      LIBXML_PARSER_VERSION.
+    def loaded_libxml_version
+      Gem::Version.new(LIBXML_LOADED_VERSION.
         scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first.
         collect(&:to_i).
-        join(".")
+        join("."))
     end
 
-    def compiled_parser_version
-      LIBXML_VERSION
+    def compiled_libxml_version
+      Gem::Version.new LIBXML_COMPILED_VERSION
+    end
+
+    def loaded_libxslt_version
+      Gem::Version.new(LIBXSLT_LOADED_VERSION.
+        scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first.
+        collect(&:to_i).
+        join("."))
+    end
+
+    def compiled_libxslt_version
+      Gem::Version.new LIBXSLT_COMPILED_VERSION
     end
 
     def libxml2?
-      defined?(LIBXML_VERSION)
+      defined?(LIBXML_COMPILED_VERSION)
     end
 
     def libxml2_using_system?
@@ -35,47 +47,62 @@ module Nokogiri
     end
 
     def warnings
-      return [] unless libxml2?
+      warnings = []
 
-      if compiled_parser_version != loaded_parser_version
-        ["Nokogiri was built against LibXML version #{compiled_parser_version}, but has dynamically loaded #{loaded_parser_version}"]
-      else
-        []
+      if libxml2?
+        if compiled_libxml_version != loaded_libxml_version
+          warnings << "Nokogiri was built against libxml version #{compiled_libxml_version}, but has dynamically loaded #{loaded_libxml_version}"
+        end
+
+        if compiled_libxslt_version != loaded_libxslt_version
+          warnings << "Nokogiri was built against libxslt version #{compiled_libxslt_version}, but has dynamically loaded #{loaded_libxslt_version}"
+        end
       end
+
+      warnings
     end
 
     def to_hash
-      hash_info = {}
-      hash_info["warnings"] = []
-      hash_info["nokogiri"] = Nokogiri::VERSION
-      hash_info["ruby"] = {}
-      hash_info["ruby"]["version"] = ::RUBY_VERSION
-      hash_info["ruby"]["platform"] = ::RUBY_PLATFORM
-      hash_info["ruby"]["description"] = ::RUBY_DESCRIPTION
-      hash_info["ruby"]["engine"] = engine
-      hash_info["ruby"]["jruby"] = jruby? if jruby?
+      {}.tap do |vi|
+        vi["warnings"] = []
+        vi["nokogiri"] = Nokogiri::VERSION
+        vi["ruby"] = {}.tap do |ruby|
+          ruby["version"] = ::RUBY_VERSION
+          ruby["platform"] = ::RUBY_PLATFORM
+          ruby["description"] = ::RUBY_DESCRIPTION
+          ruby["engine"] = engine
+          ruby["jruby"] = jruby? if jruby?
+        end
 
-      if libxml2?
-        hash_info["libxml"] = {}
-        hash_info["libxml"]["binding"] = "extension"
-        if libxml2_using_packaged?
-          hash_info["libxml"]["source"] = "packaged"
-          hash_info["libxml"]["libxml2_path"] = NOKOGIRI_LIBXML2_PATH
-          hash_info["libxml"]["libxslt_path"] = NOKOGIRI_LIBXSLT_PATH
-          hash_info["libxml"]["libxml2_patches"] = NOKOGIRI_LIBXML2_PATCHES
-          hash_info["libxml"]["libxslt_patches"] = NOKOGIRI_LIBXSLT_PATCHES
-        else
-          hash_info["libxml"]["source"] = "system"
+        if libxml2?
+          vi["libxml"] = {}.tap do |libxml|
+            if libxml2_using_packaged?
+              libxml["source"] = "packaged"
+              libxml["patches"] = NOKOGIRI_LIBXML2_PATCHES
+            else
+              libxml["source"] = "system"
+            end
+            libxml["compiled"] = compiled_libxml_version.to_s
+            libxml["loaded"] = loaded_libxml_version.to_s
+          end
+
+          vi["libxslt"] = {}.tap do |libxslt|
+            if libxml2_using_packaged?
+              libxslt["source"] = "packaged"
+              libxslt["patches"] = NOKOGIRI_LIBXSLT_PATCHES
+            else
+              libxslt["source"] = "system"
+            end
+            libxslt["compiled"] = compiled_libxslt_version.to_s
+            libxslt["loaded"] = loaded_libxslt_version.to_s
+          end
+
+          vi["warnings"] = warnings
+        elsif jruby?
+          vi["xerces"] = Nokogiri::XERCES_VERSION
+          vi["nekohtml"] = Nokogiri::NEKO_VERSION
         end
-        hash_info["libxml"]["compiled"] = compiled_parser_version
-        hash_info["libxml"]["loaded"] = loaded_parser_version
-        hash_info["warnings"] = warnings
-      elsif jruby?
-        hash_info["xerces"] = Nokogiri::XERCES_VERSION
-        hash_info["nekohtml"] = Nokogiri::NEKO_VERSION
       end
-
-      hash_info
     end
 
     def to_markdown
@@ -96,14 +123,27 @@ module Nokogiri
     def self.instance; @@instance; end
   end
 
-  # More complete version information about libxml
-  VERSION_INFO = VersionInfo.instance.to_hash
-
-  def self.uses_libxml? # :nodoc:
-    VersionInfo.instance.libxml2?
+  def self.uses_libxml?(requirement = nil) # :nodoc:
+    return false unless VersionInfo.instance.libxml2?
+    return true unless requirement
+    return Gem::Requirement.new(requirement).satisfied_by?(VersionInfo.instance.loaded_libxml_version)
   end
 
   def self.jruby? # :nodoc:
     VersionInfo.instance.jruby?
   end
+
+  # Ensure constants used in this file are loaded
+  if Nokogiri.jruby?
+    require "nokogiri/jruby/dependencies"
+  end
+  begin
+    RUBY_VERSION =~ /(\d+\.\d+)/
+    require "nokogiri/#{$1}/nokogiri"
+  rescue LoadError
+    require "nokogiri/nokogiri"
+  end
+
+  # More complete version information about libxml
+  VERSION_INFO = VersionInfo.instance.to_hash
 end

data/lib/nokogiri/xml.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/xml/pp'
 require 'nokogiri/xml/parse_options'
 require 'nokogiri/xml/sax'

data/lib/nokogiri/xml/attr.rb

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

data/lib/nokogiri/xml/attribute_decl.rb

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

data/lib/nokogiri/xml/builder.rb

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

data/lib/nokogiri/xml/cdata.rb

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

data/lib/nokogiri/xml/character_data.rb

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

data/lib/nokogiri/xml/document.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     ##
@@ -254,18 +255,12 @@ module Nokogiri
       ##
       # +JRuby+
       # Wraps Java's org.w3c.dom.document and returns Nokogiri::XML::Document
-      def self.wrap document
-        raise "JRuby only method" unless Nokogiri.jruby?
-        return wrapJavaDocument(document)
-      end
+      def self.wrap(document) end if false # native-ext provides Document.wrap
 
       ##
       # +JRuby+
       # Returns Java's org.w3c.dom.document of this Document.
-      def to_java
-        raise "JRuby only method" unless Nokogiri.jruby?
-        return toJavaDocument()
-      end
+      def to_java; end if false # JRuby provides #to_java
 
       private
       def self.empty_doc? string_or_io

data/lib/nokogiri/xml/document_fragment.rb

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

data/lib/nokogiri/xml/dtd.rb

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

data/lib/nokogiri/xml/element_content.rb

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

data/lib/nokogiri/xml/element_decl.rb

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

data/lib/nokogiri/xml/entity_decl.rb

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

data/lib/nokogiri/xml/entity_reference.rb

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

data/lib/nokogiri/xml/namespace.rb

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

data/lib/nokogiri/xml/node.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 require 'stringio'
 require 'nokogiri/xml/node/save_options'
 
@@ -337,9 +338,9 @@ module Nokogiri
       # If you need to distinguish attributes with the same name, with different namespaces
       # use #attribute_nodes instead.
       def attributes
-        Hash[attribute_nodes.map { |node|
-          [node.node_name, node]
-        }]
+        attribute_nodes.each_with_object({}) do |node, hash|
+          hash[node.node_name] = node
+        end
       end
 
       ###
@@ -348,6 +349,12 @@ module Nokogiri
         attribute_nodes.map(&:value)
       end
 
+      ###
+      # Does this Node's attributes include <value>
+      def value?(value)
+        values.include? value
+      end
+
       ###
       # Get the attribute names for this Node.
       def keys
@@ -509,10 +516,11 @@ module Nokogiri
       # default namespaces set on ancestor will NOT be, even if self
       # has no explicit default namespace.
       def namespaces
-        Hash[namespace_scopes.map { |nd|
-          key = ['xmlns', nd.prefix].compact.join(':')
-          [key, nd.href]
-        }]
+        namespace_scopes.each_with_object({}) do |ns, hash|
+          prefix = ns.prefix
+          key = prefix ? "xmlns:#{prefix}" : "xmlns"
+          hash[key] = ns.href
+        end
       end
 
       # Returns true if this is a Comment
@@ -761,10 +769,15 @@ module Nokogiri
         end
         indent_text   = options[:indent_text] || ' '
 
+        # Any string times 0 returns an empty string. Therefore, use the same
+        # string instead of generating a new empty string for every node with
+        # zero indentation.
+        indentation = indent_times.zero? ? '' : (indent_text * indent_times)
+
         config = SaveOptions.new(save_options.to_i)
         yield config if block_given?
 
-        native_write_to(io, encoding, indent_text * indent_times, config.options)
+        native_write_to(io, encoding, indentation, config.options)
       end
 
       ###
@@ -847,17 +860,18 @@ module Nokogiri
         node_or_tags
       end
 
+      USING_LIBXML_WITH_BROKEN_SERIALIZATION = Nokogiri.uses_libxml?("~> 2.6.0").freeze
+      private_constant :USING_LIBXML_WITH_BROKEN_SERIALIZATION
+
       def to_format save_option, options
-        # FIXME: this is a hack around broken libxml versions
-        return dump_html if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+        return dump_html if USING_LIBXML_WITH_BROKEN_SERIALIZATION
 
         options[:save_with] = save_option unless options[:save_with]
         serialize(options)
       end
 
       def write_format_to save_option, io, options
-        # FIXME: this is a hack around broken libxml versions
-        return (io << dump_html) if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+        return (io << dump_html) if USING_LIBXML_WITH_BROKEN_SERIALIZATION
 
         options[:save_with] ||= save_option
         write_to io, options