RubyGems - nokogiri - Versions diffs - 1.11.0.rc1-java → 1.11.2-java - Mend

nokogiri 1.11.0.rc1-java → 1.11.2-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (188) hide show

checksums.yaml +4 -4
data/Gemfile +3 -0
data/LICENSE-DEPENDENCIES.md +1015 -947
data/LICENSE.md +1 -1
data/README.md +171 -94
data/ext/java/nokogiri/EncodingHandler.java +78 -59
data/ext/java/nokogiri/HtmlDocument.java +137 -114
data/ext/java/nokogiri/HtmlElementDescription.java +104 -87
data/ext/java/nokogiri/HtmlEntityLookup.java +31 -26
data/ext/java/nokogiri/HtmlSaxParserContext.java +220 -192
data/ext/java/nokogiri/HtmlSaxPushParser.java +164 -139
data/ext/java/nokogiri/NokogiriService.java +597 -526
data/ext/java/nokogiri/XmlAttr.java +120 -96
data/ext/java/nokogiri/XmlAttributeDecl.java +97 -76
data/ext/java/nokogiri/XmlCdata.java +35 -26
data/ext/java/nokogiri/XmlComment.java +48 -37
data/ext/java/nokogiri/XmlDocument.java +642 -540
data/ext/java/nokogiri/XmlDocumentFragment.java +127 -107
data/ext/java/nokogiri/XmlDtd.java +450 -384
data/ext/java/nokogiri/XmlElement.java +25 -18
data/ext/java/nokogiri/XmlElementContent.java +345 -286
data/ext/java/nokogiri/XmlElementDecl.java +126 -95
data/ext/java/nokogiri/XmlEntityDecl.java +121 -97
data/ext/java/nokogiri/XmlEntityReference.java +51 -42
data/ext/java/nokogiri/XmlNamespace.java +177 -145
data/ext/java/nokogiri/XmlNode.java +1843 -1590
data/ext/java/nokogiri/XmlNodeSet.java +361 -299
data/ext/java/nokogiri/XmlProcessingInstruction.java +49 -39
data/ext/java/nokogiri/XmlReader.java +513 -418
data/ext/java/nokogiri/XmlRelaxng.java +92 -72
data/ext/java/nokogiri/XmlSaxParserContext.java +330 -280
data/ext/java/nokogiri/XmlSaxPushParser.java +229 -190
data/ext/java/nokogiri/XmlSchema.java +335 -210
data/ext/java/nokogiri/XmlSyntaxError.java +113 -87
data/ext/java/nokogiri/XmlText.java +57 -46
data/ext/java/nokogiri/XmlXpathContext.java +242 -178
data/ext/java/nokogiri/XsltStylesheet.java +282 -239
data/ext/java/nokogiri/internals/ClosedStreamException.java +5 -2
data/ext/java/nokogiri/internals/HtmlDomParserContext.java +203 -160
data/ext/java/nokogiri/internals/IgnoreSchemaErrorsErrorHandler.java +17 -10
data/ext/java/nokogiri/internals/NokogiriBlockingQueueInputStream.java +43 -16
data/ext/java/nokogiri/internals/NokogiriDomParser.java +65 -50
data/ext/java/nokogiri/internals/NokogiriEntityResolver.java +107 -88
data/ext/java/nokogiri/internals/NokogiriErrorHandler.java +25 -18
data/ext/java/nokogiri/internals/NokogiriHandler.java +316 -254
data/ext/java/nokogiri/internals/NokogiriHelpers.java +738 -622
data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java +186 -143
data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java +81 -59
data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java +66 -49
data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java +86 -69
data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java +44 -29
data/ext/java/nokogiri/internals/NokogiriXPathFunction.java +121 -48
data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java +34 -22
data/ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java +25 -17
data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.java +57 -42
data/ext/java/nokogiri/internals/ParserContext.java +206 -179
data/ext/java/nokogiri/internals/ReaderNode.java +478 -371
data/ext/java/nokogiri/internals/SaveContextVisitor.java +822 -707
data/ext/java/nokogiri/internals/SchemaErrorHandler.java +28 -19
data/ext/java/nokogiri/internals/XalanDTMManagerPatch.java +129 -123
data/ext/java/nokogiri/internals/XmlDeclHandler.java +5 -4
data/ext/java/nokogiri/internals/XmlDomParserContext.java +208 -177
data/ext/java/nokogiri/internals/XmlSaxParser.java +24 -17
data/ext/java/nokogiri/internals/c14n/AttrCompare.java +71 -68
data/ext/java/nokogiri/internals/c14n/C14nHelper.java +137 -118
data/ext/java/nokogiri/internals/c14n/CanonicalFilter.java +27 -21
data/ext/java/nokogiri/internals/c14n/CanonicalizationException.java +74 -61
data/ext/java/nokogiri/internals/c14n/Canonicalizer.java +230 -205
data/ext/java/nokogiri/internals/c14n/Canonicalizer11.java +572 -547
data/ext/java/nokogiri/internals/c14n/Canonicalizer11_OmitComments.java +17 -10
data/ext/java/nokogiri/internals/c14n/Canonicalizer11_WithComments.java +17 -10
data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315.java +323 -302
data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315Excl.java +232 -219
data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclOmitComments.java +22 -15
data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315ExclWithComments.java +23 -16
data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315OmitComments.java +23 -16
data/ext/java/nokogiri/internals/c14n/Canonicalizer20010315WithComments.java +22 -15
data/ext/java/nokogiri/internals/c14n/CanonicalizerBase.java +575 -545
data/ext/java/nokogiri/internals/c14n/CanonicalizerPhysical.java +141 -120
data/ext/java/nokogiri/internals/c14n/CanonicalizerSpi.java +39 -38
data/ext/java/nokogiri/internals/c14n/Constants.java +13 -10
data/ext/java/nokogiri/internals/c14n/ElementProxy.java +279 -247
data/ext/java/nokogiri/internals/c14n/HelperNodeList.java +66 -53
data/ext/java/nokogiri/internals/c14n/IgnoreAllErrorHandler.java +44 -37
data/ext/java/nokogiri/internals/c14n/InclusiveNamespaces.java +135 -120
data/ext/java/nokogiri/internals/c14n/InvalidCanonicalizerException.java +59 -48
data/ext/java/nokogiri/internals/c14n/NameSpaceSymbTable.java +384 -334
data/ext/java/nokogiri/internals/c14n/NodeFilter.java +25 -24
data/ext/java/nokogiri/internals/c14n/UtfHelpper.java +151 -140
data/ext/java/nokogiri/internals/c14n/XMLUtils.java +456 -423
data/ext/java/nokogiri/internals/dom2dtm/DOM2DTM.java +1466 -1500
data/ext/java/nokogiri/internals/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java +626 -570
data/ext/nokogiri/depend +37 -358
data/ext/nokogiri/extconf.rb +585 -374
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 -93
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 +225 -163
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 +338 -286
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 -161
data/lib/nokogiri.rb +4 -8
data/lib/nokogiri/css/parser.rb +62 -62
data/lib/nokogiri/css/parser.y +2 -2
data/lib/nokogiri/css/parser_extras.rb +38 -36
data/lib/nokogiri/css/xpath_visitor.rb +70 -42
data/lib/nokogiri/extension.rb +26 -0
data/lib/nokogiri/html/document.rb +12 -26
data/lib/nokogiri/html/document_fragment.rb +15 -15
data/lib/nokogiri/nokogiri.jar +0 -0
data/lib/nokogiri/version.rb +2 -148
data/lib/nokogiri/version/constant.rb +5 -0
data/lib/nokogiri/version/info.rb +205 -0
data/lib/nokogiri/xml/builder.rb +2 -2
data/lib/nokogiri/xml/document.rb +48 -18
data/lib/nokogiri/xml/document_fragment.rb +4 -6
data/lib/nokogiri/xml/node.rb +599 -279
data/lib/nokogiri/xml/parse_options.rb +6 -0
data/lib/nokogiri/xml/reader.rb +2 -9
data/lib/nokogiri/xml/relax_ng.rb +6 -2
data/lib/nokogiri/xml/schema.rb +12 -4
data/lib/nokogiri/xml/searchable.rb +24 -16
data/lib/nokogiri/xml/xpath.rb +1 -3
data/lib/nokogiri/xml/xpath/syntax_error.rb +1 -1
metadata +87 -158
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/nokogiri.h +0 -122
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/lib/nokogiri/html/document_fragment.rb CHANGED Viewed

@@ -4,26 +4,26 @@ module Nokogiri
     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
@@ -33,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/nokogiri.jar CHANGED Viewed

Binary file

data/lib/nokogiri/version.rb CHANGED Viewed

@@ -1,149 +1,3 @@
 # frozen_string_literal: true
-module Nokogiri
-  # The version of Nokogiri you are using
-  VERSION = "1.11.0.rc1"
-  class VersionInfo # :nodoc:
-    def jruby?
-      ::JRUBY_VERSION if RUBY_PLATFORM == "java"
-    end
-    def engine
-      defined?(RUBY_ENGINE) ? RUBY_ENGINE : "mri"
-    end
-    def loaded_libxml_version
-      Gem::Version.new(LIBXML_LOADED_VERSION.
-        scan(/^(\d+)(\d\d)(\d\d)(?!\d)/).first.
-        collect(&:to_i).
-        join("."))
-    end
-    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_COMPILED_VERSION)
-    end
-    def libxml2_using_system?
-      !libxml2_using_packaged?
-    end
-    def libxml2_using_packaged?
-      NOKOGIRI_USE_PACKAGED_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
-      {}.tap do |vi|
-        vi["warnings"] = []
-        vi["nokogiri"] = Nokogiri::VERSION
-        vi["ruby"] = {}.tap do |ruby|
-          ruby["version"] = ::RUBY_VERSION
-          ruby["platform"] = ::RUBY_PLATFORM
-          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["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
-      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
-    # FIXME: maybe switch to singleton?
-    @@instance = new
-    @@instance.warnings.each do |warning|
-      warn "WARNING: #{warning}"
-    end
-    def self.instance; @@instance; end
-  end
-  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
-  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
+require_relative "version/constant"
+require_relative "version/info"

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.2"
+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/xml/builder.rb CHANGED Viewed

@@ -245,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

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

@@ -1,4 +1,8 @@
+# coding: utf-8
 # frozen_string_literal: true
+require 'pathname'
 module Nokogiri
   module XML
     ##
@@ -44,9 +48,11 @@ module Nokogiri
       #
       def self.parse string_or_io, url = nil, encoding = nil, options = ParseOptions::DEFAULT_XML
         options = Nokogiri::XML::ParseOptions.new(options) if Integer === options
-        # Give the options to the user
         yield options if block_given?
+        url ||= string_or_io.respond_to?(:path) ? string_or_io.path : nil
         if empty_doc?(string_or_io)
           if options.strict?
             raise Nokogiri::XML::SyntaxError.new("Empty document")
@@ -56,12 +62,17 @@ module Nokogiri
         end
         doc = if string_or_io.respond_to?(:read)
-          url ||= string_or_io.respond_to?(:path) ? string_or_io.path : nil
-          read_io(string_or_io, url, encoding, options.to_i)
-        else
-          # read_memory pukes on empty docs
-          read_memory(string_or_io, url, encoding, options.to_i)
-        end
+                if string_or_io.is_a?(Pathname)
+                  # resolve the Pathname to the file and open it as an IO object, see #2110
+                  string_or_io = string_or_io.expand_path.open
+                  url ||= string_or_io.path
+                end
+                read_io(string_or_io, url, encoding, options.to_i)
+              else
+                # read_memory pukes on empty docs
+                read_memory(string_or_io, url, encoding, options.to_i)
+              end
         # do xinclude processing
         doc.do_xinclude(options) if options.xinclude?
@@ -69,6 +80,35 @@ module Nokogiri
         return doc
       end
+      ##
+      # @!method wrap(java_document)
+      # @!scope class
+      #
+      # Create a {Document} using an existing Java DOM document object.
+      #
+      # The returned {Document} shares the same underlying data structure as the Java object, so
+      # changes in one are reflected in the other.
+      #
+      # @param java_document [Java::OrgW3cDom::Document]
+      # @return [Nokogiri::XML::Document]
+      # @note This method is only available when running JRuby.
+      # @note The class +Java::OrgW3cDom::Document+ is also accessible as +org.w3c.dom.Document+.
+      # @see #to_java
+      ##
+      # @!method to_java()
+      #
+      # Returns the underlying Java DOM document object for the {Document}.
+      #
+      # The returned Java object shares the same underlying data structure as the {Document}, so
+      # changes in one are reflected in the other.
+      #
+      # @return [Java::OrgW3cDom::Document]
+      # @note This method is only available when running JRuby.
+      # @note The class +Java::OrgW3cDom::Document+ is also accessible as +org.w3c.dom.Document+.
+      # @see .wrap
       # A list of Nokogiri::XML::SyntaxError found when parsing a document
       attr_accessor :errors
@@ -252,24 +292,14 @@ module Nokogiri
       end
       alias :<< :add_child
-      ##
-      # +JRuby+
-      # Wraps Java's org.w3c.dom.document and returns Nokogiri::XML::Document
-      def self.wrap(document) end if false # native-ext provides Document.wrap
-      ##
-      # +JRuby+
-      # Returns Java's org.w3c.dom.document of this Document.
-      def to_java; end if false # JRuby provides #to_java
       private
       def self.empty_doc? string_or_io
         string_or_io.nil? ||
           (string_or_io.respond_to?(:empty?) && string_or_io.empty?) ||
           (string_or_io.respond_to?(:eof?) && string_or_io.eof?)
       end
-      # @private
       IMPLIED_XPATH_CONTEXTS = [ '//'.freeze ].freeze # :nodoc:
       def inspect_attributes