RubyGems - nokogiri - Versions diffs - 1.10.3 → 1.11.4 - Mend

nokogiri 1.10.3 → 1.11.4

Potentially problematic release.

This version of nokogiri might be problematic. Click here for more details.

Files changed (159) hide show

checksums.yaml +4 -4
data/Gemfile +3 -0
data/LICENSE-DEPENDENCIES.md +1015 -947
data/LICENSE.md +1 -1
data/README.md +173 -94
data/dependencies.yml +28 -26
data/ext/nokogiri/depend +37 -358
data/ext/nokogiri/extconf.rb +611 -391
data/ext/nokogiri/html_document.c +78 -82
data/ext/nokogiri/html_element_description.c +84 -71
data/ext/nokogiri/html_entity_lookup.c +21 -16
data/ext/nokogiri/html_sax_parser_context.c +69 -66
data/ext/nokogiri/html_sax_push_parser.c +42 -34
data/ext/nokogiri/libxml2_backwards_compat.c +121 -0
data/ext/nokogiri/nokogiri.c +192 -87
data/ext/nokogiri/nokogiri.h +181 -89
data/ext/nokogiri/test_global_handlers.c +40 -0
data/ext/nokogiri/xml_attr.c +15 -15
data/ext/nokogiri/xml_attribute_decl.c +18 -18
data/ext/nokogiri/xml_cdata.c +13 -18
data/ext/nokogiri/xml_comment.c +19 -26
data/ext/nokogiri/xml_document.c +255 -183
data/ext/nokogiri/xml_document_fragment.c +13 -15
data/ext/nokogiri/xml_dtd.c +54 -48
data/ext/nokogiri/xml_element_content.c +30 -27
data/ext/nokogiri/xml_element_decl.c +22 -22
data/ext/nokogiri/xml_encoding_handler.c +17 -11
data/ext/nokogiri/xml_entity_decl.c +32 -30
data/ext/nokogiri/xml_entity_reference.c +16 -18
data/ext/nokogiri/xml_namespace.c +56 -49
data/ext/nokogiri/xml_node.c +387 -316
data/ext/nokogiri/xml_node_set.c +168 -156
data/ext/nokogiri/xml_processing_instruction.c +17 -19
data/ext/nokogiri/xml_reader.c +195 -172
data/ext/nokogiri/xml_relax_ng.c +52 -28
data/ext/nokogiri/xml_sax_parser.c +118 -118
data/ext/nokogiri/xml_sax_parser_context.c +103 -86
data/ext/nokogiri/xml_sax_push_parser.c +36 -27
data/ext/nokogiri/xml_schema.c +111 -34
data/ext/nokogiri/xml_syntax_error.c +42 -21
data/ext/nokogiri/xml_text.c +13 -17
data/ext/nokogiri/xml_xpath_context.c +206 -123
data/ext/nokogiri/xslt_stylesheet.c +158 -165
data/lib/nokogiri/css/node.rb +1 -0
data/lib/nokogiri/css/parser.rb +63 -62
data/lib/nokogiri/css/parser.y +2 -2
data/lib/nokogiri/css/parser_extras.rb +39 -36
data/lib/nokogiri/css/syntax_error.rb +1 -0
data/lib/nokogiri/css/tokenizer.rb +105 -103
data/lib/nokogiri/css/xpath_visitor.rb +73 -43
data/lib/nokogiri/css.rb +1 -0
data/lib/nokogiri/decorators/slop.rb +1 -0
data/lib/nokogiri/extension.rb +26 -0
data/lib/nokogiri/html/builder.rb +1 -0
data/lib/nokogiri/html/document.rb +13 -26
data/lib/nokogiri/html/document_fragment.rb +16 -15
data/lib/nokogiri/html/element_description.rb +1 -0
data/lib/nokogiri/html/element_description_defaults.rb +1 -0
data/lib/nokogiri/html/entity_lookup.rb +1 -0
data/lib/nokogiri/html/sax/parser.rb +1 -0
data/lib/nokogiri/html/sax/parser_context.rb +1 -0
data/lib/nokogiri/html/sax/push_parser.rb +1 -0
data/lib/nokogiri/html.rb +1 -0
data/lib/nokogiri/jruby/dependencies.rb +20 -0
data/lib/nokogiri/syntax_error.rb +1 -0
data/lib/nokogiri/version/constant.rb +5 -0
data/lib/nokogiri/version/info.rb +205 -0
data/lib/nokogiri/version.rb +3 -109
data/lib/nokogiri/xml/attr.rb +1 -0
data/lib/nokogiri/xml/attribute_decl.rb +1 -0
data/lib/nokogiri/xml/builder.rb +36 -32
data/lib/nokogiri/xml/cdata.rb +1 -0
data/lib/nokogiri/xml/character_data.rb +1 -0
data/lib/nokogiri/xml/document.rb +92 -41
data/lib/nokogiri/xml/document_fragment.rb +5 -6
data/lib/nokogiri/xml/dtd.rb +1 -0
data/lib/nokogiri/xml/element_content.rb +1 -0
data/lib/nokogiri/xml/element_decl.rb +1 -0
data/lib/nokogiri/xml/entity_decl.rb +1 -0
data/lib/nokogiri/xml/entity_reference.rb +1 -0
data/lib/nokogiri/xml/namespace.rb +1 -0
data/lib/nokogiri/xml/node/save_options.rb +1 -0
data/lib/nokogiri/xml/node.rb +625 -290
data/lib/nokogiri/xml/node_set.rb +1 -0
data/lib/nokogiri/xml/notation.rb +1 -0
data/lib/nokogiri/xml/parse_options.rb +10 -3
data/lib/nokogiri/xml/pp/character_data.rb +1 -0
data/lib/nokogiri/xml/pp/node.rb +1 -0
data/lib/nokogiri/xml/pp.rb +1 -0
data/lib/nokogiri/xml/processing_instruction.rb +1 -0
data/lib/nokogiri/xml/reader.rb +9 -12
data/lib/nokogiri/xml/relax_ng.rb +7 -2
data/lib/nokogiri/xml/sax/document.rb +1 -0
data/lib/nokogiri/xml/sax/parser.rb +1 -0
data/lib/nokogiri/xml/sax/parser_context.rb +1 -0
data/lib/nokogiri/xml/sax/push_parser.rb +1 -0
data/lib/nokogiri/xml/sax.rb +1 -0
data/lib/nokogiri/xml/schema.rb +13 -4
data/lib/nokogiri/xml/searchable.rb +25 -16
data/lib/nokogiri/xml/syntax_error.rb +1 -0
data/lib/nokogiri/xml/text.rb +1 -0
data/lib/nokogiri/xml/xpath/syntax_error.rb +2 -1
data/lib/nokogiri/xml/xpath.rb +2 -3
data/lib/nokogiri/xml/xpath_context.rb +1 -0
data/lib/nokogiri/xml.rb +1 -0
data/lib/nokogiri/xslt/stylesheet.rb +1 -0
data/lib/nokogiri/xslt.rb +1 -0
data/lib/nokogiri.rb +6 -27
data/lib/xsd/xmlparser/nokogiri.rb +1 -0
data/patches/libxml2/{0002-Remove-script-macro-support.patch → 0001-Remove-script-macro-support.patch} +0 -0
data/patches/libxml2/{0003-Update-entities-to-remove-handling-of-ssi.patch → 0002-Update-entities-to-remove-handling-of-ssi.patch} +0 -0
data/patches/libxml2/0003-libxml2.la-is-in-top_builddir.patch +25 -0
data/patches/libxml2/0004-use-glibc-strlen.patch +53 -0
data/patches/libxml2/0005-avoid-isnan-isinf.patch +81 -0
data/patches/libxml2/0006-update-automake-files-for-arm64.patch +2511 -0
data/patches/libxslt/0001-update-automake-files-for-arm64.patch +2511 -0
data/patches/libxslt/0002-Fix-xml2-config-check-in-configure-script.patch +19 -0
data/ports/archives/libxml2-2.9.12.tar.gz +0 -0
data/ports/archives/libxslt-1.1.34.tar.gz +0 -0
metadata +102 -147
data/ext/nokogiri/html_document.h +0 -10
data/ext/nokogiri/html_element_description.h +0 -10
data/ext/nokogiri/html_entity_lookup.h +0 -8
data/ext/nokogiri/html_sax_parser_context.h +0 -11
data/ext/nokogiri/html_sax_push_parser.h +0 -9
data/ext/nokogiri/xml_attr.h +0 -9
data/ext/nokogiri/xml_attribute_decl.h +0 -9
data/ext/nokogiri/xml_cdata.h +0 -9
data/ext/nokogiri/xml_comment.h +0 -9
data/ext/nokogiri/xml_document.h +0 -23
data/ext/nokogiri/xml_document_fragment.h +0 -10
data/ext/nokogiri/xml_dtd.h +0 -10
data/ext/nokogiri/xml_element_content.h +0 -10
data/ext/nokogiri/xml_element_decl.h +0 -9
data/ext/nokogiri/xml_encoding_handler.h +0 -8
data/ext/nokogiri/xml_entity_decl.h +0 -10
data/ext/nokogiri/xml_entity_reference.h +0 -9
data/ext/nokogiri/xml_io.c +0 -61
data/ext/nokogiri/xml_io.h +0 -11
data/ext/nokogiri/xml_libxml2_hacks.c +0 -112
data/ext/nokogiri/xml_libxml2_hacks.h +0 -12
data/ext/nokogiri/xml_namespace.h +0 -14
data/ext/nokogiri/xml_node.h +0 -13
data/ext/nokogiri/xml_node_set.h +0 -12
data/ext/nokogiri/xml_processing_instruction.h +0 -9
data/ext/nokogiri/xml_reader.h +0 -10
data/ext/nokogiri/xml_relax_ng.h +0 -9
data/ext/nokogiri/xml_sax_parser.h +0 -39
data/ext/nokogiri/xml_sax_parser_context.h +0 -10
data/ext/nokogiri/xml_sax_push_parser.h +0 -9
data/ext/nokogiri/xml_schema.h +0 -9
data/ext/nokogiri/xml_syntax_error.h +0 -13
data/ext/nokogiri/xml_text.h +0 -9
data/ext/nokogiri/xml_xpath_context.h +0 -10
data/ext/nokogiri/xslt_stylesheet.h +0 -14
data/patches/libxml2/0001-Revert-Do-not-URI-escape-in-server-side-includes.patch +0 -78
data/patches/libxslt/0001-Fix-security-framework-bypass.patch +0 -120
data/ports/archives/libxml2-2.9.9.tar.gz +0 -0
data/ports/archives/libxslt-1.1.33.tar.gz +0 -0

data/lib/nokogiri/html/document_fragment.rb CHANGED Viewed

@@ -1,28 +1,29 @@
+# frozen_string_literal: true
 module Nokogiri
   module HTML
     class DocumentFragment < Nokogiri::XML::DocumentFragment
       ####
       # Create a Nokogiri::XML::DocumentFragment from +tags+, using +encoding+
-      def self.parse tags, encoding = nil
+      def self.parse(tags, encoding = nil)
         doc = HTML::Document.new
         encoding ||= if tags.respond_to?(:encoding)
-                       encoding = tags.encoding
-                       if encoding == ::Encoding::ASCII_8BIT
-                         'UTF-8'
-                       else
-                         encoding.name
-                       end
-                     else
-                       'UTF-8'
-                     end
+          encoding = tags.encoding
+          if encoding == ::Encoding::ASCII_8BIT
+            'UTF-8'
+          else
+            encoding.name
+          end
+        else
+          'UTF-8'
+        end
         doc.encoding = encoding
         new(doc, tags)
       end
-      def initialize document, tags = nil, ctx = nil
+      def initialize(document, tags = nil, ctx = nil)
         return self unless tags
         if ctx
@@ -32,13 +33,13 @@ module Nokogiri
           self.errors = document.errors - preexisting_errors
         else
           # This is a horrible hack, but I don't care
-          if tags.strip =~ /^<body/i
-            path = "/html/body"
+          path = if /^\s*?<body/i.match?(tags)
+            "/html/body"
           else
-            path = "/html/body/node()"
+            "/html/body/node()"
           end
-          temp_doc = HTML::Document.parse "<html><body>#{tags}", nil, document.encoding
+          temp_doc = HTML::Document.parse("<html><body>#{tags}", nil, document.encoding)
           temp_doc.xpath(path).each { |child| child.parent = self }
           self.errors = temp_doc.errors
         end

data/lib/nokogiri/html/element_description.rb CHANGED Viewed

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

data/lib/nokogiri/html/element_description_defaults.rb CHANGED Viewed

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

data/lib/nokogiri/html/entity_lookup.rb CHANGED Viewed

@@ -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 CHANGED Viewed

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

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

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

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

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

data/lib/nokogiri/html.rb CHANGED Viewed

@@ -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/jruby/dependencies.rb ADDED Viewed

@@ -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 CHANGED Viewed

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

data/lib/nokogiri/version/constant.rb ADDED Viewed

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+module Nokogiri
+  # The version of Nokogiri you are using
+  VERSION = "1.11.4"
+end

data/lib/nokogiri/version/info.rb ADDED Viewed

@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+require "singleton"
+require "shellwords"
+module Nokogiri
+  class VersionInfo # :nodoc:
+    include Singleton
+    def jruby?
+      ::JRUBY_VERSION if ::RUBY_PLATFORM == "java"
+    end
+    def windows?
+      ::RUBY_PLATFORM =~ /mingw|mswin/
+    end
+    def ruby_minor
+      Gem::Version.new(::RUBY_VERSION).segments[0..1].join(".")
+    end
+    def engine
+      defined?(::RUBY_ENGINE) ? ::RUBY_ENGINE : "mri"
+    end
+    def loaded_libxml_version
+      Gem::Version.new(Nokogiri::LIBXML_LOADED_VERSION
+        .scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first
+        .collect(&:to_i)
+        .join("."))
+    end
+    def compiled_libxml_version
+      Gem::Version.new(Nokogiri::LIBXML_COMPILED_VERSION)
+    end
+    def loaded_libxslt_version
+      Gem::Version.new(Nokogiri::LIBXSLT_LOADED_VERSION
+        .scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first
+        .collect(&:to_i)
+        .join("."))
+    end
+    def compiled_libxslt_version
+      Gem::Version.new(Nokogiri::LIBXSLT_COMPILED_VERSION)
+    end
+    def libxml2?
+      defined?(Nokogiri::LIBXML_COMPILED_VERSION)
+    end
+    def libxml2_has_iconv?
+      defined?(Nokogiri::LIBXML_ICONV_ENABLED) && Nokogiri::LIBXML_ICONV_ENABLED
+    end
+    def libxml2_using_packaged?
+      libxml2? && Nokogiri::PACKAGED_LIBRARIES
+    end
+    def libxml2_using_system?
+      libxml2? && !libxml2_using_packaged?
+    end
+    def libxml2_precompiled?
+      libxml2_using_packaged? && Nokogiri::PRECOMPILED_LIBRARIES
+    end
+    def warnings
+      warnings = []
+      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
+      header_directory = File.expand_path(File.join(File.dirname(__FILE__), "../../../ext/nokogiri"))
+      {}.tap do |vi|
+        vi["warnings"] = []
+        vi["nokogiri"] = {}.tap do |nokogiri|
+          nokogiri["version"] = Nokogiri::VERSION
+          unless jruby?
+            #  enable gems like nokogumbo to build with the following in their extconf.rb:
+            #
+            #    append_cflags(Nokogiri::VERSION_INFO["nokogiri"]["cppflags"])
+            #    append_ldflags(Nokogiri::VERSION_INFO["nokogiri"]["ldflags"])
+            #
+            cppflags = ["-I#{header_directory.shellescape}"]
+            ldflags = []
+            if libxml2_using_packaged?
+              cppflags << "-I#{File.join(header_directory, 'include').shellescape}"
+              cppflags << "-I#{File.join(header_directory, 'include/libxml2').shellescape}"
+              if windows?
+                # on windows, nokogumbo needs to link against nokogiri.so to resolve symbols. see #2167
+                lib_directory = File.expand_path(File.join(File.dirname(__FILE__), "../#{ruby_minor}"))
+                unless File.exist?(lib_directory)
+                  lib_directory = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+                end
+                ldflags << "-L#{lib_directory.shellescape}"
+                ldflags << "-l:nokogiri.so"
+              end
+            end
+            nokogiri["cppflags"] = cppflags
+            nokogiri["ldflags"] = ldflags
+          end
+        end
+        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?
+          vi["libxml"] = {}.tap do |libxml|
+            if libxml2_using_packaged?
+              libxml["source"] = "packaged"
+              libxml["precompiled"] = libxml2_precompiled?
+              libxml["patches"] = Nokogiri::LIBXML2_PATCHES
+              # this is for nokogumbo and shouldn't be forever
+              libxml["libxml2_path"] = header_directory
+            else
+              libxml["source"] = "system"
+            end
+            libxml["iconv_enabled"] = libxml2_has_iconv?
+            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["precompiled"] = libxml2_precompiled?
+              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
+        end
+        if defined?(Nokogiri::OTHER_LIBRARY_VERSIONS)
+          # see extconf for how this string is assembled: "lib1name:lib1version,lib2name:lib2version"
+          vi["other_libraries"] = Hash[*Nokogiri::OTHER_LIBRARY_VERSIONS.split(/[,:]/)]
+        elsif jruby?
+          vi["other_libraries"] = {}.tap do |ol|
+            ol["xerces"] = Nokogiri::XERCES_VERSION
+            ol["nekohtml"] = Nokogiri::NEKO_VERSION
+          end
+        end
+      end
+    end
+    def to_markdown
+      begin
+        require "psych"
+      rescue LoadError
+      end
+      require "yaml"
+      "# Nokogiri (#{Nokogiri::VERSION})\n" +
+      YAML.dump(to_hash).each_line.map { |line| "    #{line}" }.join
+    end
+    instance.warnings.each do |warning|
+      warn "WARNING: #{warning}"
+    end
+  end
+  def self.uses_libxml?(requirement = nil) # :nodoc:
+    return false unless VersionInfo.instance.libxml2?
+    return true unless requirement
+    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
+  require "nokogiri/extension"
+  # More complete version information about libxml
+  VERSION_INFO = VersionInfo.instance.to_hash
+end

data/lib/nokogiri/version.rb CHANGED Viewed

@@ -1,109 +1,3 @@
-module Nokogiri
-  # The version of Nokogiri you are using
-  VERSION = "1.10.3"
-  class VersionInfo # :nodoc:
-    def jruby?
-      ::JRUBY_VERSION if RUBY_PLATFORM == "java"
-    end
-    def engine
-      defined?(RUBY_ENGINE) ? RUBY_ENGINE : "mri"
-    end
-    def loaded_parser_version
-      LIBXML_PARSER_VERSION.
-        scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first.
-        collect(&:to_i).
-        join(".")
-    end
-    def compiled_parser_version
-      LIBXML_VERSION
-    end
-    def libxml2?
-      defined?(LIBXML_VERSION)
-    end
-    def libxml2_using_system?
-      !libxml2_using_packaged?
-    end
-    def libxml2_using_packaged?
-      NOKOGIRI_USE_PACKAGED_LIBRARIES
-    end
-    def warnings
-      return [] unless libxml2?
-      if compiled_parser_version != loaded_parser_version
-        ["Nokogiri was built against LibXML version #{compiled_parser_version}, but has dynamically loaded #{loaded_parser_version}"]
-      else
-        []
-      end
-    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?
-      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"
-        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
-      begin
-        require "psych"
-      rescue LoadError
-      end
-      require "yaml"
-      "# Nokogiri (#{Nokogiri::VERSION})\n" +
-      YAML.dump(to_hash).each_line.map { |line| "    #{line}" }.join
-    end
-    # FIXME: maybe switch to singleton?
-    @@instance = new
-    @@instance.warnings.each do |warning|
-      warn "WARNING: #{warning}"
-    end
-    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?
-  end
-  def self.jruby? # :nodoc:
-    VersionInfo.instance.jruby?
-  end
-end
+# frozen_string_literal: true
+require_relative "version/constant"
+require_relative "version/info"

data/lib/nokogiri/xml/attr.rb CHANGED Viewed

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

data/lib/nokogiri/xml/attribute_decl.rb CHANGED Viewed

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

data/lib/nokogiri/xml/builder.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module XML
     ###
@@ -213,7 +214,7 @@ module Nokogiri
     #       xml.foo
     #     end
     #   end
-    #
+    #
     #   puts builder.to_xml
     #
     # Will output this xml:
@@ -244,13 +245,13 @@ 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
       #
-      def self.with root, &block
+      def self.with(root, &block)
         new({}, root, &block)
       end
@@ -263,23 +264,25 @@ module Nokogiri
       #   Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
       #     ...
       #   end
-      def initialize options = {}, root = nil, &block
+      def initialize(options = {}, root = nil, &block)
         if root
-          @doc    = root.document
+          @doc = root.document
           @parent = root
         else
-          namespace     = self.class.name.split('::')
-          namespace[-1] = 'Document'
-          @doc          = eval(namespace.join('::')).new
-          @parent       = @doc
+          klassname = "::" + (self.class.name.split("::")[0..-2] + ["Document"]).join("::")
+          klass = begin
+                    Object.const_get(klassname)
+                  rescue NameError
+                    Nokogiri::XML::Document
+                  end
+          @parent = @doc = klass.new
         end
-        @context  = nil
-        @arity    = nil
-        @ns       = nil
+        @context = nil
+        @arity = nil
+        @ns = nil
-        options.each do |k,v|
+        options.each do |k, v|
           @doc.send(:"#{k}=", v)
         end
@@ -287,7 +290,7 @@ module Nokogiri
         @arity = block.arity
         if @arity <= 0
-          @context = eval('self', block.binding)
+          @context = eval("self", block.binding)
           instance_eval(&block)
         else
           yield self
@@ -298,26 +301,26 @@ module Nokogiri
       ###
       # Create a Text Node with content of +string+
-      def text string
+      def text(string)
         insert @doc.create_text_node(string)
       end
       ###
       # Create a CDATA Node with content of +string+
-      def cdata string
+      def cdata(string)
         insert doc.create_cdata(string)
       end
       ###
       # Create a Comment Node with content of +string+
-      def comment string
+      def comment(string)
         insert doc.create_comment(string)
       end
       ###
       # Build a tag that is associated with namespace +ns+.  Raises an
       # ArgumentError if +ns+ has not been defined higher in the tree.
-      def [] ns
+      def [](ns)
         if @parent != @doc
           @ns = @parent.namespace_definitions.find { |x| x.prefix == ns.to_s }
         end
@@ -348,15 +351,15 @@ module Nokogiri
       ###
       # Append the given raw XML +string+ to the document
-      def << string
+      def <<(string)
         @doc.fragment(string).children.each { |x| insert(x) }
       end
-      def method_missing method, *args, &block # :nodoc:
+      def method_missing(method, *args, &block) # :nodoc:
         if @context && @context.respond_to?(method)
           @context.send(method, *args, &block)
         else
-          node = @doc.create_element(method.to_s.sub(/[_!]$/, ''),*args) { |n|
+          node = @doc.create_element(method.to_s.sub(/[_!]$/, ""), *args) { |n|
             # Set up the namespace
             if @ns.is_a? Nokogiri::XML::Namespace
               n.namespace = @ns
@@ -377,13 +380,14 @@ module Nokogiri
       end
       private
       ###
       # Insert +node+ as a child of the current Node
       def insert(node, &block)
         node = @parent.add_child(node)
         if block_given?
           old_parent = @parent
-          @parent    = node
+          @parent = node
           @arity ||= block.arity
           if @arity <= 0
             instance_eval(&block)
@@ -396,16 +400,16 @@ module Nokogiri
       end
       class NodeBuilder # :nodoc:
-        def initialize node, doc_builder
+        def initialize(node, doc_builder)
           @node = node
           @doc_builder = doc_builder
         end
-        def []= k, v
+        def []=(k, v)
           @node[k] = v
         end
-        def [] k
+        def [](k)
           @node[k]
         end
@@ -413,19 +417,19 @@ module Nokogiri
           opts = args.last.is_a?(Hash) ? args.pop : {}
           case method.to_s
           when /^(.*)!$/
-            @node['id'] = $1
+            @node["id"] = $1
             @node.content = args.first if args.first
           when /^(.*)=/
             @node[$1] = args.first
           else
-            @node['class'] =
-              ((@node['class'] || '').split(/\s/) + [method.to_s]).join(' ')
+            @node["class"] =
+              ((@node["class"] || "").split(/\s/) + [method.to_s]).join(" ")
             @node.content = args.first if args.first
           end
           # Assign any extra options
-          opts.each do |k,v|
-            @node[k.to_s] = ((@node[k.to_s] || '').split(/\s/) + [v]).join(' ')
+          opts.each do |k, v|
+            @node[k.to_s] = ((@node[k.to_s] || "").split(/\s/) + [v]).join(" ")
           end
           if block_given?

data/lib/nokogiri/xml/cdata.rb CHANGED Viewed

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

data/lib/nokogiri/xml/character_data.rb CHANGED Viewed

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