nokogiri 1.6.0 → 1.13.2

data/lib/nokogiri/class_resolver.rb

@@ -0,0 +1,67 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+require "set"
+
+module Nokogiri
+  #
+  # Some classes in Nokogiri are namespaced as a group, for example
+  # Document, DocumentFragment, and Builder.
+  #
+  # It's sometimes necessary to look up the related class, e.g.:
+  #
+  #   XML::Builder → XML::Document
+  #   HTML4::Builder → HTML4::Document
+  #   HTML5::Document → HTML5::DocumentFragment
+  #
+  # This module is included into those key classes who need to do this.
+  #
+  module ClassResolver
+    # #related_class restricts matching namespaces to those matching this set.
+    VALID_NAMESPACES = Set.new(["HTML", "HTML4", "HTML5", "XML"])
+
+    # :call-seq:
+    #   related_class(class_name) → Class
+    #
+    # Find a class constant within the
+    #
+    # Some examples:
+    #
+    #   Nokogiri::XML::Document.new.related_class("DocumentFragment")
+    #   # => Nokogiri::XML::DocumentFragment
+    #   Nokogiri::HTML4::Document.new.related_class("DocumentFragment")
+    #   # => Nokogiri::HTML4::DocumentFragment
+    #
+    # Note this will also work for subclasses that follow the same convention, e.g.:
+    #
+    #   Loofah::HTML::Document.new.related_class("DocumentFragment")
+    #   # => Loofah::HTML::DocumentFragment
+    #
+    # And even if it's a subclass, this will iterate through the superclasses:
+    #
+    #   class ThisIsATopLevelClass < Nokogiri::HTML4::Builder ; end
+    #   ThisIsATopLevelClass.new.related_class("Document")
+    #   # => Nokogiri::HTML4::Document
+    #
+    def related_class(class_name)
+      klass = nil
+      inspecting = self.class
+
+      while inspecting
+        namespace_path = inspecting.name.split("::")[0..-2]
+        inspecting = inspecting.superclass
+
+        next unless VALID_NAMESPACES.include?(namespace_path.last)
+
+        related_class_name = (namespace_path << class_name).join("::")
+        klass = begin
+          Object.const_get(related_class_name)
+        rescue NameError
+          nil
+        end
+        break if klass
+      end
+      klass
+    end
+  end
+end

data/lib/nokogiri/css/node.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Nokogiri
   module CSS
-    class Node
+    class Node # :nodoc:
       ALLOW_COMBINATOR_ON_SELF = [:DIRECT_ADJACENT_SELECTOR, :FOLLOWING_SELECTOR, :CHILD_SELECTOR]
 
       # Get the type of this node
@@ -9,75 +11,25 @@ module Nokogiri
       attr_accessor :value
 
       # Create a new Node with +type+ and +value+
-      def initialize type, value
+      def initialize(type, value)
         @type = type
         @value = value
       end
 
       # Accept +visitor+
-      def accept visitor
+      def accept(visitor)
         visitor.send(:"visit_#{type.to_s.downcase}", self)
       end
 
       ###
       # Convert this CSS node to xpath with +prefix+ using +visitor+
-      def to_xpath prefix = '//', visitor = XPathVisitor.new
-        self.preprocess!
-        prefix = '.' if ALLOW_COMBINATOR_ON_SELF.include?(type) && value.first.nil?
+      def to_xpath(prefix, visitor)
+        prefix = "." if ALLOW_COMBINATOR_ON_SELF.include?(type) && value.first.nil?
         prefix + visitor.accept(self)
       end
 
-      # Preprocess this node tree
-      def preprocess!
-        ### Deal with nth-child
-        matches = find_by_type(
-          [:CONDITIONAL_SELECTOR,
-            [:ELEMENT_NAME],
-            [:PSEUDO_CLASS,
-              [:FUNCTION]
-            ]
-          ]
-        )
-        matches.each do |match|
-          if match.value[1].value[0].value[0] =~ /^nth-(last-)?child/
-            tag_name = match.value[0].value.first
-            match.value[0].value = ['*']
-            match.value[1] = Node.new(:COMBINATOR, [
-              match.value[1].value[0],
-              Node.new(:FUNCTION, ['self(', tag_name])
-            ])
-          end
-        end
-
-        ### Deal with first-child, last-child
-        matches = find_by_type(
-          [:CONDITIONAL_SELECTOR,
-            [:ELEMENT_NAME], [:PSEUDO_CLASS]
-        ])
-        matches.each do |match|
-          if ['first-child', 'last-child'].include?(match.value[1].value.first)
-            which = match.value[1].value.first.gsub(/-\w*$/, '')
-            tag_name = match.value[0].value.first
-            match.value[0].value = ['*']
-            match.value[1] = Node.new(:COMBINATOR, [
-              Node.new(:FUNCTION, ["#{which}("]),
-              Node.new(:FUNCTION, ['self(', tag_name])
-            ])
-          elsif 'only-child' == match.value[1].value.first
-            tag_name = match.value[0].value.first
-            match.value[0].value = ['*']
-            match.value[1] = Node.new(:COMBINATOR, [
-              Node.new(:FUNCTION, ["#{match.value[1].value.first}("]),
-              Node.new(:FUNCTION, ['self(', tag_name])
-            ])
-          end
-        end
-
-        self
-      end
-
       # Find a node by type using +types+
-      def find_by_type types
+      def find_by_type(types)
         matches = []
         matches << self if to_type == types
         @value.each do |v|
@@ -88,9 +40,9 @@ module Nokogiri
 
       # Convert to_type
       def to_type
-        [@type] + @value.map { |n|
+        [@type] + @value.map do |n|
           n.to_type if n.respond_to?(:to_type)
-        }.compact
+        end.compact
       end
 
       # Convert to array