nokogiri 1.10.8-x64-mingw32 → 1.11.0.rc3-x64-mingw32

data/lib/nokogiri/css/parser_extras.rb

@@ -1,63 +1,66 @@
-require 'thread'
+# frozen_string_literal: true
+require "thread"
 
 module Nokogiri
   module CSS
     class Parser < Racc::Parser
-      @cache_on = true
-      @cache    = {}
-      @mutex    = Mutex.new
+      CACHE_SWITCH_NAME = :nokogiri_css_parser_cache_is_off
+
+      @cache = {}
+      @mutex = Mutex.new
 
       class << self
-        # Turn on CSS parse caching
-        attr_accessor :cache_on
-        alias :cache_on? :cache_on
-        alias :set_cache :cache_on=
+        # Return a thread-local boolean indicating whether the CSS-to-XPath cache is active. (Default is `true`.)
+        def cache_on?
+          !Thread.current[CACHE_SWITCH_NAME]
+        end
+
+        # Set a thread-local boolean to turn cacheing on and off. Truthy values turn the cache on, falsey values turn the cache off.
+        def set_cache(value)
+          Thread.current[CACHE_SWITCH_NAME] = !value
+        end
 
         # Get the css selector in +string+ from the cache
-        def [] string
-          return unless @cache_on
+        def [](string)
+          return unless cache_on?
           @mutex.synchronize { @cache[string] }
         end
 
         # Set the css selector in +string+ in the cache to +value+
-        def []= string, value
-          return value unless @cache_on
+        def []=(string, value)
+          return value unless cache_on?
           @mutex.synchronize { @cache[string] = value }
         end
 
         # Clear the cache
-        def clear_cache
-          @mutex.synchronize { @cache = {} }
+        def clear_cache(create_new_object = false)
+          @mutex.synchronize do
+            if create_new_object
+              @cache = {}
+            else
+              @cache.clear
+            end
+          end
         end
 
         # Execute +block+ without cache
-        def without_cache &block
-          tmp = @cache_on
-          @cache_on = false
+        def without_cache(&block)
+          original_cache_setting = cache_on?
+          set_cache false
           block.call
-          @cache_on = tmp
-        end
-
-        ###
-        # Parse this CSS selector in +selector+.  Returns an AST.
-        def parse selector
-          @warned ||= false
-          unless @warned
-            $stderr.puts('Nokogiri::CSS::Parser.parse is deprecated, call Nokogiri::CSS.parse(), this will be removed August 1st or version 1.4.0 (whichever is first)')
-            @warned = true
-          end
-          new.parse selector
+        ensure
+          set_cache original_cache_setting
         end
       end
 
       # Create a new CSS parser with respect to +namespaces+
-      def initialize namespaces = {}
-        @tokenizer  = Tokenizer.new
+      def initialize(namespaces = {})
+        @tokenizer = Tokenizer.new
         @namespaces = namespaces
         super()
       end
 
-      def parse string
+      def parse(string)
         @tokenizer.scan_setup string
         do_parse
       end
@@ -67,14 +70,14 @@ module Nokogiri
       end
 
       # Get the xpath for +string+ using +options+
-      def xpath_for string, options={}
+      def xpath_for(string, options = {})
         key = "#{string}#{options[:ns]}#{options[:prefix]}"
         v = self.class[key]
         return v if v
 
         args = [
-          options[:prefix] || '//',
-          options[:visitor] || XPathVisitor.new
+          options[:prefix] || "//",
+          options[:visitor] || XPathVisitor.new,
         ]
         self.class[key] = parse(string).map { |ast|
           ast.to_xpath(*args)
@@ -82,7 +85,7 @@ module Nokogiri
       end
 
       # On CSS parser error, raise an exception
-      def on_error error_token_id, error_value, value_stack
+      def on_error(error_token_id, error_value, value_stack)
         after = value_stack.compact.last
         raise SyntaxError.new("unexpected '#{error_value}' after '#{after}'")
       end

data/lib/nokogiri/css/syntax_error.rb

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

data/lib/nokogiri/css/tokenizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #--
 # DO NOT MODIFY!!!!
 # This file is automatically generated by rex 1.0.7

data/lib/nokogiri/css/xpath_visitor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module CSS
     class XPathVisitor # :nodoc:
@@ -51,7 +52,8 @@ module Nokogiri
         when /^comment\(/
           "comment()"
         when /^has\(/
-          ".//#{node.value[1].accept(self)}"
+          is_direct = node.value[1].value[0].nil? # e.g. "has(> a)", "has(~ a)", "has(+ a)"
+          ".#{"//" if !is_direct}#{node.value[1].accept(self)}"
         else
           args = ['.'] + node.value[1..-1]
           "#{node.value.first}#{args.join(', ')})"

data/lib/nokogiri/decorators/slop.rb

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

data/lib/nokogiri/html.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/html/entity_lookup'
 require 'nokogiri/html/document'
 require 'nokogiri/html/document_fragment'

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.8"
+  VERSION = "1.11.0.rc3"
 
   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,63 @@ 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["gem_platform"] = ::Gem::Platform.local.to_s
+          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 +124,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 - see #1896
+  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
     ###
@@ -244,8 +245,8 @@ module Nokogiri
       #
       # For example:
       #
-      #   doc = Nokogiri::XML(open('somedoc.xml'))
-      #   Nokogiri::XML::Builder.with(doc.at('some_tag')) do |xml|
+      #   doc = Nokogiri::XML(File.read('somedoc.xml'))
+      #   Nokogiri::XML::Builder.with(doc.at_css('some_tag')) do |xml|
       #     # ... Use normal builder methods here ...
       #     xml.awesome # add the "awesome" tag below "some_tag"
       #   end