nokogiri 1.12.4-java → 1.13.2-java

data/lib/nokogiri/xslt.rb

@@ -1,4 +1,6 @@
+# coding: utf-8
 # frozen_string_literal: true
+
 module Nokogiri
   class << self
     ###
@@ -8,7 +10,7 @@ module Nokogiri
     #
     #   xslt = Nokogiri::XSLT(File.read(ARGV[0]))
     #
-    def XSLT stylesheet, modules = {}
+    def XSLT(stylesheet, modules = {})
       XSLT.parse(stylesheet, modules)
     end
   end
@@ -33,22 +35,28 @@ module Nokogiri
         end
       end
 
-      ###
-      # Quote parameters in +params+ for stylesheet safety
+      # :call-seq:
+      #   quote_params(params) → Array
+      #
+      # Quote parameters in +params+ for stylesheet safety.
+      # See Nokogiri::XSLT::Stylesheet.transform for example usage.
+      #
+      # [Parameters]
+      # - +params+ (Hash, Array) XSLT parameters (key->value, or tuples of [key, value])
+      #
+      # [Returns] Array of string parameters, with quotes correctly escaped for use with XSLT::Stylesheet.transform
+      #
       def quote_params(params)
-        parray = (params.instance_of?(Hash) ? params.to_a.flatten : params).dup
-        parray.each_with_index do |v, i|
-          parray[i] = if i % 2 > 0
-            if v =~ /'/
-              "concat('#{v.gsub(/'/, %q{', "'", '})}')"
-            else
-              "'#{v}'"
-            end
+        params.flatten.each_slice(2).each_with_object([]) do |kv, quoted_params|
+          key, value = kv.map(&:to_s)
+          value = if /'/.match?(value)
+            "concat('#{value.gsub(/'/, %q{', "'", '})}')"
           else
-            v.to_s
+            "'#{value}'"
           end
+          quoted_params << key
+          quoted_params << value
         end
-        parray.flatten
       end
     end
   end

data/lib/nokogiri.rb

@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
+# coding: utf-8
 # frozen_string_literal: true
-# Modify the PATH on windows so that the external DLLs will get loaded.
 
 require "rbconfig"
 
@@ -19,30 +18,32 @@ require_relative "nokogiri/extension"
 #
 # Here is an example:
 #
-#   require 'nokogiri'
-#   require 'open-uri'
+#     require 'nokogiri'
+#     require 'open-uri'
 #
-#   # Get a Nokogiri::HTML4::Document for the page we’re interested in...
+#     # Get a Nokogiri::HTML4::Document for the page we’re interested in...
 #
-#   doc = Nokogiri::HTML4(URI.open('http://www.google.com/search?q=tenderlove'))
+#     doc = Nokogiri::HTML4(URI.open('http://www.google.com/search?q=tenderlove'))
 #
-#   # Do funky things with it using Nokogiri::XML::Node methods...
+#     # Do funky things with it using Nokogiri::XML::Node methods...
 #
-#   ####
-#   # Search for nodes by css
-#   doc.css('h3.r a.l').each do |link|
-#     puts link.content
-#   end
+#     ####
+#     # Search for nodes by css
+#     doc.css('h3.r a.l').each do |link|
+#       puts link.content
+#     end
 #
-# See Nokogiri::XML::Searchable#css for more information about CSS searching.
-# See Nokogiri::XML::Searchable#xpath for more information about XPath searching.
+# See also:
+#
+# - Nokogiri::XML::Searchable#css for more information about CSS searching
+# - Nokogiri::XML::Searchable#xpath for more information about XPath searching
 module Nokogiri
   class << self
     ###
     # Parse an HTML or XML document.  +string+ contains the document.
     def parse(string, url = nil, encoding = nil, options = nil)
       if string.respond_to?(:read) ||
-          /^\s*<(?:!DOCTYPE\s+)?html[\s>]/i === string[0, 512]
+          /^\s*<(?:!DOCTYPE\s+)?html[\s>]/i.match?(string[0, 512])
         # Expect an HTML indicator to appear within the first 512
         # characters of a document. (<?xml ?> + <?xml-stylesheet ?>
         # shouldn't be that long)
@@ -85,6 +86,7 @@ module Nokogiri
       Nokogiri(*args, &block).slop!
     end
 
+    # :nodoc:
     def install_default_aliases
       # Make sure to support some popular encoding aliases not known by
       # all iconv implementations.
@@ -105,7 +107,7 @@ end
 #
 # To specify the type of document, use {Nokogiri.XML}, {Nokogiri.HTML4}, or {Nokogiri.HTML5}.
 def Nokogiri(*args, &block)
-  if block_given?
+  if block
     Nokogiri::HTML4::Builder.new(&block).doc.root
   else
     Nokogiri.parse(*args)
@@ -113,6 +115,7 @@ def Nokogiri(*args, &block)
 end
 
 require_relative "nokogiri/version"
+require_relative "nokogiri/class_resolver"
 require_relative "nokogiri/syntax_error"
 require_relative "nokogiri/xml"
 require_relative "nokogiri/xslt"

data/lib/xsd/xmlparser/nokogiri.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-require 'nokogiri'
 
-module XSD # :nodoc:
-  module XMLParser # :nodoc:
+require "nokogiri"
+
+module XSD
+  module XMLParser
     ###
     # Nokogiri XML parser for soap4r.
     #
@@ -27,40 +28,40 @@ module XSD # :nodoc:
     class Nokogiri < XSD::XMLParser::Parser
       ###
       # Create a new XSD parser with +host+ and +opt+
-      def initialize host, opt = {}
+      def initialize(host, opt = {})
         super
-        @parser = ::Nokogiri::XML::SAX::Parser.new(self, @charset || 'UTF-8')
+        @parser = ::Nokogiri::XML::SAX::Parser.new(self, @charset || "UTF-8")
       end
 
       ###
       # Start parsing +string_or_readable+
-      def do_parse string_or_readable
+      def do_parse(string_or_readable)
         @parser.parse(string_or_readable)
       end
 
       ###
       # Handle the start_element event with +name+ and +attrs+
-      def start_element name, attrs = []
+      def start_element(name, attrs = [])
         super(name, Hash[*attrs.flatten])
       end
 
       ###
       # Handle the end_element event with +name+
-      def end_element name
+      def end_element(name)
         super
       end
 
       ###
       # Handle errors with message +msg+
-      def error msg
-        raise ParseError.new(msg)
+      def error(msg)
+        raise ParseError, msg
       end
-      alias :warning :error
+      alias_method :warning, :error
 
       ###
       # Handle cdata_blocks containing +string+
-      def cdata_block string
-        characters string
+      def cdata_block(string)
+        characters(string)
       end
 
       ###
@@ -70,16 +71,16 @@ module XSD # :nodoc:
       # +prefix+ is the namespace prefix for the element
       # +uri+ is the associated namespace URI
       # +ns+ is a hash of namespace prefix:urls associated with the element
-      def start_element_namespace name, attrs = [], prefix = nil, uri = nil, ns = []
+      def start_element_namespace(name, attrs = [], prefix = nil, uri = nil, ns = [])
         ###
         # Deal with SAX v1 interface
-        name = [prefix, name].compact.join(':')
-        attributes = ns.map { |ns_prefix,ns_uri|
-          [['xmlns', ns_prefix].compact.join(':'), ns_uri]
-        } + attrs.map { |attr|
-          [[attr.prefix, attr.localname].compact.join(':'), attr.value]
-        }.flatten
-        start_element name, attributes
+        name = [prefix, name].compact.join(":")
+        attributes = ns.map do |ns_prefix, ns_uri|
+          [["xmlns", ns_prefix].compact.join(":"), ns_uri]
+        end + attrs.map do |attr|
+          [[attr.prefix, attr.localname].compact.join(":"), attr.value]
+        end.flatten
+        start_element(name, attributes)
       end
 
       ###
@@ -87,13 +88,13 @@ module XSD # :nodoc:
       # +name+ is the element's name
       # +prefix+ is the namespace prefix associated with the element
       # +uri+ is the associated namespace URI
-      def end_element_namespace name, prefix = nil, uri = nil
+      def end_element_namespace(name, prefix = nil, uri = nil)
         ###
         # Deal with SAX v1 interface
-        end_element [prefix, name].compact.join(':')
+        end_element([prefix, name].compact.join(":"))
       end
 
-      %w{ xmldecl start_document end_document comment }.each do |name|
+      ["xmldecl", "start_document", "end_document", "comment"].each do |name|
         class_eval %{ def #{name}(*args); end }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.13.2
 platform: java
 authors:
 - Mike Dalessio
@@ -20,7 +20,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2022-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -29,8 +29,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
   name: racc
-  type: :runtime
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -43,8 +43,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
   name: bundler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -57,8 +57,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
   name: hoe-markdown
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -69,15 +69,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.15'
   name: minitest
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -85,8 +85,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
   name: minitest-reporters
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -99,8 +99,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '13.0'
   name: rake
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -109,87 +109,157 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.7
   name: rake-compiler
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   name: rake-compiler-dock
+  prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
+  name: rdoc
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.7
   name: rexical
-  type: :development
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.23'
   name: rubocop
+  prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+  name: rubocop-minitest
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
-  name: simplecov
+        version: '1.12'
+  name: rubocop-performance
+  prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  name: rubocop-rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-  name: yard
+        version: '2.3'
+  name: rubocop-shopify
+  prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  name: ruby_memcheck
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  name: simplecov
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.21'
 description: |
   Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby. It provides a
   sensible, easy-to-understand API for reading, writing, modifying, and querying documents. It is
@@ -374,6 +444,7 @@ files:
 - lib/nekodtd.jar
 - lib/nekohtml.jar
 - lib/nokogiri.rb
+- lib/nokogiri/class_resolver.rb
 - lib/nokogiri/css.rb
 - lib/nokogiri/css/node.rb
 - lib/nokogiri/css/parser.rb
@@ -460,6 +531,7 @@ metadata:
   documentation_uri: https://nokogiri.org/rdoc/index.html
   changelog_uri: https://nokogiri.org/CHANGELOG.html
   source_code_uri: https://github.com/sparklemotion/nokogiri
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
 - "--main"
@@ -470,14 +542,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.29
 signing_key:
 specification_version: 4
 summary: Nokogiri (鋸) makes it easy and painless to work with XML and HTML from Ruby.