nokogiri 1.10.8-java → 1.11.0.rc3-java

data/lib/nokogiri/css/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module CSS
     class Node

data/lib/nokogiri/css/parser.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.14
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.4.16
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -333,42 +334,42 @@ Racc_debug_parser = false
 
 def _reduce_1(val, _values, result)
         result = [val.first, val.last].flatten
-      
+
     result
 end
 
 def _reduce_2(val, _values, result)
- result = val.flatten 
+ result = val.flatten
     result
 end
 
 def _reduce_3(val, _values, result)
- result = [val.last].flatten 
+ result = [val.last].flatten
     result
 end
 
 def _reduce_4(val, _values, result)
- result = :DIRECT_ADJACENT_SELECTOR 
+ result = :DIRECT_ADJACENT_SELECTOR
     result
 end
 
 def _reduce_5(val, _values, result)
- result = :CHILD_SELECTOR 
+ result = :CHILD_SELECTOR
     result
 end
 
 def _reduce_6(val, _values, result)
- result = :FOLLOWING_SELECTOR 
+ result = :FOLLOWING_SELECTOR
     result
 end
 
 def _reduce_7(val, _values, result)
- result = :DESCENDANT_SELECTOR 
+ result = :DESCENDANT_SELECTOR
     result
 end
 
 def _reduce_8(val, _values, result)
- result = :CHILD_SELECTOR 
+ result = :CHILD_SELECTOR
     result
 end
 
@@ -378,7 +379,7 @@ def _reduce_9(val, _values, result)
                   else
                     Node.new(:CONDITIONAL_SELECTOR, [val.first, val[1]])
                   end
-      
+
     result
 end
 
@@ -386,13 +387,13 @@ end
 
 def _reduce_11(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
-      
+
     result
 end
 
 def _reduce_12(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
-      
+
     result
 end
 
@@ -400,39 +401,39 @@ def _reduce_13(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR,
           [Node.new(:ELEMENT_NAME, ['*']), val.first]
         )
-      
+
     result
 end
 
 def _reduce_14(val, _values, result)
         result = Node.new(val.first, [nil, val.last])
-      
+
     result
 end
 
 def _reduce_15(val, _values, result)
         result = Node.new(val[1], [val.first, val.last])
-      
+
     result
 end
 
 def _reduce_16(val, _values, result)
         result = Node.new(:DESCENDANT_SELECTOR, [val.first, val.last])
-      
+
     result
 end
 
 # reduce 17 omitted
 
 def _reduce_18(val, _values, result)
- result = Node.new(:CLASS_CONDITION, [unescape_css_identifier(val[1])]) 
+ result = Node.new(:CLASS_CONDITION, [unescape_css_identifier(val[1])])
     result
 end
 
 # reduce 19 omitted
 
 def _reduce_20(val, _values, result)
- result = Node.new(:ELEMENT_NAME, val) 
+ result = Node.new(:ELEMENT_NAME, val)
     result
 end
 
@@ -440,19 +441,19 @@ def _reduce_21(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
-      
+
     result
 end
 
 def _reduce_22(val, _values, result)
         name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
         result = Node.new(:ELEMENT_NAME, [name])
-      
+
     result
 end
 
 def _reduce_23(val, _values, result)
- result = val[0] 
+ result = val[0]
     result
 end
 
@@ -462,7 +463,7 @@ def _reduce_25(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
-      
+
     result
 end
 
@@ -470,7 +471,7 @@ def _reduce_26(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
-      
+
     result
 end
 
@@ -479,7 +480,7 @@ def _reduce_27(val, _values, result)
         result = Node.new(:PSEUDO_CLASS,
           [Node.new(:FUNCTION, ['nth-child(', val[1]])]
         )
-      
+
     result
 end
 
@@ -487,7 +488,7 @@ def _reduce_28(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
-      
+
     result
 end
 
@@ -495,52 +496,52 @@ def _reduce_29(val, _values, result)
         # Default namespace is not applied to attributes.
         # So we don't add prefix "xmlns:" as in namespaced_ident.
         result = Node.new(:ELEMENT_NAME, [val.first])
-      
+
     result
 end
 
 def _reduce_30(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip])
-      
+
     result
 end
 
 def _reduce_31(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+
     result
 end
 
 def _reduce_32(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+
     result
 end
 
 def _reduce_33(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+
     result
 end
 
 def _reduce_34(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+
     result
 end
 
 def _reduce_35(val, _values, result)
- result = [val.first, val.last] 
+ result = [val.first, val.last]
     result
 end
 
 def _reduce_36(val, _values, result)
- result = [val.first, val.last] 
+ result = [val.first, val.last]
     result
 end
 
 def _reduce_37(val, _values, result)
- result = [val.first, val.last] 
+ result = [val.first, val.last]
     result
 end
 
@@ -563,7 +564,7 @@ def _reduce_40(val, _values, result)
           # assert_xpath("//a[foo(., a, 10)]", @parser.parse('a:foo(a, 10)'))
           result = val
         end
-      
+
     result
 end
 
@@ -573,7 +574,7 @@ def _reduce_41(val, _values, result)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
-      
+
     result
 end
 
@@ -589,7 +590,7 @@ def _reduce_42(val, _values, result)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
-      
+
     result
 end
 
@@ -609,18 +610,18 @@ def _reduce_43(val, _values, result)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
-      
+
     result
 end
 
 def _reduce_44(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
-      
+
     result
 end
 
 def _reduce_45(val, _values, result)
- result = Node.new(:PSEUDO_CLASS, [val[1]]) 
+ result = Node.new(:PSEUDO_CLASS, [val[1]])
     result
 end
 
@@ -630,31 +631,31 @@ end
 
 def _reduce_48(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
 def _reduce_49(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
 def _reduce_50(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
 def _reduce_51(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
 def _reduce_52(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
@@ -669,65 +670,65 @@ end
 # reduce 57 omitted
 
 def _reduce_58(val, _values, result)
- result = Node.new(:ID, [unescape_css_identifier(val.first)]) 
+ result = Node.new(:ID, [unescape_css_identifier(val.first)])
     result
 end
 
 def _reduce_59(val, _values, result)
- result = [val.first, unescape_css_identifier(val[1])] 
+ result = [val.first, unescape_css_identifier(val[1])]
     result
 end
 
 def _reduce_60(val, _values, result)
- result = [val.first, unescape_css_string(val[1])] 
+ result = [val.first, unescape_css_string(val[1])]
     result
 end
 
 def _reduce_61(val, _values, result)
- result = [val.first, val[1]] 
+ result = [val.first, val[1]]
     result
 end
 
 # reduce 62 omitted
 
 def _reduce_63(val, _values, result)
- result = :equal 
+ result = :equal
     result
 end
 
 def _reduce_64(val, _values, result)
- result = :prefix_match 
+ result = :prefix_match
     result
 end
 
 def _reduce_65(val, _values, result)
- result = :suffix_match 
+ result = :suffix_match
     result
 end
 
 def _reduce_66(val, _values, result)
- result = :substring_match 
+ result = :substring_match
     result
 end
 
 def _reduce_67(val, _values, result)
- result = :not_equal 
+ result = :not_equal
     result
 end
 
 def _reduce_68(val, _values, result)
- result = :includes 
+ result = :includes
     result
 end
 
 def _reduce_69(val, _values, result)
- result = :dash_match 
+ result = :dash_match
     result
 end
 
 def _reduce_70(val, _values, result)
         result = Node.new(:NOT, [val[1]])
-      
+
     result
 end
 
@@ -746,5 +747,5 @@ def _reduce_none(val, _values, result)
 end
 
     end   # class Parser
-    end   # module CSS
-  end   # module Nokogiri
+  end   # module CSS
+end   # module Nokogiri

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