nokogiri 1.4.7-x86-mingw32 → 1.5.0-x86-mingw32

data/lib/nokogiri/version.rb

@@ -1,43 +1,88 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.4.7'
+  VERSION = '1.5.0'
 
-  # More complete version information about libxml
-  VERSION_INFO = {}
-  VERSION_INFO['warnings']              = []
-  VERSION_INFO['nokogiri']              = Nokogiri::VERSION
-  VERSION_INFO['ruby']                  = {}
-  VERSION_INFO['ruby']['version']       = ::RUBY_VERSION
-  VERSION_INFO['ruby']['platform']      = ::RUBY_PLATFORM
-  VERSION_INFO['ruby']['description']   = ::RUBY_DESCRIPTION if defined? ::RUBY_DESCRIPTION
-  VERSION_INFO['ruby']['engine']        = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'mri'
-  VERSION_INFO['ruby']['jruby']         = ::JRUBY_VERSION if RUBY_PLATFORM == "java"
-  if defined?(LIBXML_VERSION)
-    VERSION_INFO['libxml']              = {}
-    VERSION_INFO['libxml']['binding']   = 'extension'
-    VERSION_INFO['libxml']['compiled']  = LIBXML_VERSION
-    VERSION_INFO['libxml']['loaded']    = LIBXML_PARSER_VERSION.scan(/^(.*)(..)(..)$/).first.collect{|j|j.to_i}.join(".")
-
-    if VERSION_INFO['libxml']['compiled'] != VERSION_INFO['libxml']['loaded']
-      warning = "Nokogiri was built against LibXML version #{VERSION_INFO['libxml']['compiled']}, but has dynamically loaded #{VERSION_INFO['libxml']['loaded']}"
-      VERSION_INFO['warnings'] << warning
-      warn "WARNING: #{warning}"
+  class VersionInfo # :nodoc:
+    def jruby?
+      ::JRUBY_VERSION if RUBY_PLATFORM == "java"
     end
-  end
 
-  def self.uses_libxml? # :nodoc:
-    !Nokogiri::VERSION_INFO['libxml'].nil?
-  end
+    def engine
+      defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'mri'
+    end
+
+    def loaded_parser_version
+      LIBXML_PARSER_VERSION.scan(/^(.*)(..)(..)$/).first.collect{ |j|
+        j.to_i
+      }.join(".")
+    end
+
+    def compiled_parser_version
+      LIBXML_VERSION
+    end
+
+    def libxml2?
+      defined?(LIBXML_VERSION)
+    end
+
+    def warnings
+      return [] unless libxml2?
 
-  def self.ffi? # :nodoc:
-    uses_libxml? && Nokogiri::VERSION_INFO['libxml']['binding'] == 'ffi'
+      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'
+        hash_info['libxml']['compiled']  = compiled_parser_version
+        hash_info['libxml']['loaded']    = loaded_parser_version
+        hash_info['warnings']            = warnings
+      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
 
-  def self.jruby?
-    false # for 1.5 compatibility
+  # More complete version information about libxml
+  VERSION_INFO = VersionInfo.instance.to_hash
+
+  def self.uses_libxml? # :nodoc:
+    VersionInfo.instance.libxml2?
   end
 
-  def self.is_2_6_16? # :nodoc:
-    Nokogiri::VERSION_INFO['libxml']['loaded'] <= '2.6.16'
+  def self.jruby? # :nodoc:
+    VersionInfo.instance.jruby?
   end
 end

data/lib/nokogiri/xml/attribute_decl.rb

@@ -8,7 +8,7 @@ module Nokogiri
       undef_method :content
       undef_method :namespace
       undef_method :namespace_definitions
-      undef_method :line
+      undef_method :line if method_defined?(:line)
 
       def inspect
         "#<#{self.class.name}:#{sprintf("0x%x", object_id)} #{to_s.inspect}>"

data/lib/nokogiri/xml/builder.rb

@@ -327,6 +327,13 @@ module Nokogiri
       ###
       # Convert this Builder object to XML
       def to_xml(*args)
+        if Nokogiri.jruby?
+          options = args.first.is_a?(Hash) ? args.shift : {}
+          if !options[:save_with]
+            options[:save_with] = Node::SaveOptions::AS_BUILDER
+          end
+          args.insert(0, options)
+        end
         @doc.to_xml(*args)
       end
 

data/lib/nokogiri/xml/document.rb

@@ -9,7 +9,7 @@ module Nokogiri
     # Nokogiri::XML::Node#xpath
     class Document < Nokogiri::XML::Node
       ##
-      # Parse an XML file.  +thing+ may be a String, or any object that
+      # Parse an XML file.  +string_or_io+ may be a String, or any object that
       # responds to _read_ and _close_ such as an IO, or StringIO.
       # +url+ is resource where this document is located.  +encoding+ is the
       # encoding that should be used when processing the document. +options+
@@ -205,6 +205,22 @@ module Nokogiri
       end
       alias :<< :add_child
 
+      ##
+      # +JRuby+
+      # Wraps Java's org.w3c.dom.document and returns Nokogiri::XML::Document
+      def self.wrap document
+        raise "JRuby only method" unless Nokogiri.jruby?
+        return wrapJavaDocument(document)
+      end
+
+      ##
+      # +JRuby+
+      # Returns Java's org.w3c.dom.document of this Document.
+      def to_java
+        raise "JRuby only method" unless Nokogiri.jruby?
+        return toJavaDocument()
+      end
+
       private
       def implied_xpath_context
         "/"

data/lib/nokogiri/xml/document_fragment.rb

@@ -35,6 +35,13 @@ module Nokogiri
       # Convert this DocumentFragment to html
       # See Nokogiri::XML::NodeSet#to_html
       def to_html *args
+        if Nokogiri.jruby?
+          options = args.first.is_a?(Hash) ? args.shift : {}
+          if !options[:save_with]
+            options[:save_with] = Node::SaveOptions::NO_DECLARATION | Node::SaveOptions::NO_EMPTY_TAGS | Node::SaveOptions::AS_HTML
+          end
+          args.insert(0, options)
+        end
         children.to_html(*args)
       end
 
@@ -42,6 +49,13 @@ module Nokogiri
       # Convert this DocumentFragment to xhtml
       # See Nokogiri::XML::NodeSet#to_xhtml
       def to_xhtml *args
+        if Nokogiri.jruby?
+          options = args.first.is_a?(Hash) ? args.shift : {}
+          if !options[:save_with]
+            options[:save_with] = Node::SaveOptions::NO_DECLARATION | Node::SaveOptions::NO_EMPTY_TAGS | Node::SaveOptions::AS_XHTML
+          end
+          args.insert(0, options)
+        end
         children.to_xhtml(*args)
       end
 

data/lib/nokogiri/xml/dtd.rb

@@ -6,7 +6,7 @@ module Nokogiri
       undef_method :content
       undef_method :namespace
       undef_method :namespace_definitions
-      undef_method :line
+      undef_method :line if method_defined?(:line)
 
       def keys
         attributes.keys

data/lib/nokogiri/xml/element_decl.rb

@@ -3,7 +3,7 @@ module Nokogiri
     class ElementDecl < Nokogiri::XML::Node
       undef_method :namespace
       undef_method :namespace_definitions
-      undef_method :line
+      undef_method :line if method_defined?(:line)
 
       def inspect
         "#<#{self.class.name}:#{sprintf("0x%x", object_id)} #{to_s.inspect}>"

data/lib/nokogiri/xml/entity_decl.rb

@@ -5,7 +5,7 @@ module Nokogiri
       undef_method :attributes
       undef_method :namespace
       undef_method :namespace_definitions
-      undef_method :line
+      undef_method :line if method_defined?(:line)
 
       def self.new name, doc, *args
         doc.create_entity(name, *args)

data/lib/nokogiri/xml/node.rb

@@ -150,6 +150,7 @@ module Nokogiri
         sets = paths.map { |path|
           ctx = XPathContext.new(self)
           ctx.register_namespaces(ns)
+          path = path.gsub(/\/xmlns:/,'/:') unless Nokogiri.uses_libxml?
 
           binds.each do |key,value|
             ctx.register_variable key.to_s, value
@@ -259,6 +260,8 @@ module Nokogiri
       # +node_or_tags+ can be a Nokogiri::XML::Node, a ::DocumentFragment, a ::NodeSet, or a string containing markup.
       #
       # Returns the reparented node (if +node_or_tags+ is a Node), or NodeSet (if +node_or_tags+ is a DocumentFragment, NodeSet, or string).
+      #
+      # Also see related method +<<+.
       def add_child node_or_tags
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
@@ -269,6 +272,17 @@ module Nokogiri
         node_or_tags
       end
 
+      ###
+      # Add +node_or_tags+ as a child of this Node.
+      # +node_or_tags+ can be a Nokogiri::XML::Node, a ::DocumentFragment, a ::NodeSet, or a string containing markup.
+      #
+      # Returns self, to support chaining of calls (e.g., root << child1 << child2)
+      #
+      # Also see related method +add_child+.
+      def << node_or_tags
+        add_child node_or_tags
+        self
+      end
       ###
       # Insert +node_or_tags+ before this Node (as a sibling).
       # +node_or_tags+ can be a Nokogiri::XML::Node, a ::DocumentFragment, a ::NodeSet, or a string containing markup.
@@ -309,7 +323,7 @@ module Nokogiri
           else
             pivot = self
           end
-          node_or_tags.reverse.each { |n| pivot.send :add_next_sibling_node, n }
+          node_or_tags.reverse_each { |n| pivot.send :add_next_sibling_node, n }
           pivot.unlink if text?
         else
           add_next_sibling_node node_or_tags
@@ -366,7 +380,7 @@ module Nokogiri
         if node_or_tags.is_a?(XML::NodeSet)
           node_or_tags.each { |n| add_child_node n }
         else
-          add_child node_or_tags
+          add_child_node node_or_tags
         end
         node_or_tags
       end
@@ -424,7 +438,6 @@ module Nokogiri
       alias :text           :content
       alias :inner_text     :content
       alias :has_attribute? :key?
-      alias :<<             :add_child
       alias :name           :node_name
       alias :name=          :node_name=
       alias :type           :node_type
@@ -715,10 +728,11 @@ module Nokogiri
       def serialize *args, &block
         options = args.first.is_a?(Hash) ? args.shift : {
           :encoding   => args[0],
-          :save_with  => args[1] || SaveOptions::FORMAT
+          :save_with  => args[1]
         }
 
         encoding = options[:encoding] || document.encoding
+        options[:encoding] = encoding
 
         outstring = ""
         if encoding && outstring.respond_to?(:force_encoding)
@@ -738,9 +752,10 @@ module Nokogiri
       # use Node#to_xhtml instead.
       def to_html options = {}
         # FIXME: this is a hack around broken libxml versions
-        return dump_html if %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+        return dump_html if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
 
-        options[:save_with] ||= SaveOptions::DEFAULT_HTML
+        options[:save_with] |= SaveOptions::DEFAULT_HTML if options[:save_with]
+        options[:save_with] = SaveOptions::DEFAULT_HTML unless options[:save_with]
         serialize(options)
       end
 
@@ -751,7 +766,8 @@ module Nokogiri
       #
       # See Node#write_to for a list of +options+
       def to_xml options = {}
-        options[:save_with] ||= SaveOptions::DEFAULT_XML
+        options[:save_with] |= SaveOptions::DEFAULT_XML if options[:save_with]
+        options[:save_with] = SaveOptions::DEFAULT_XML unless options[:save_with]
         serialize(options)
       end
 
@@ -763,9 +779,10 @@ module Nokogiri
       # See Node#write_to for a list of +options+
       def to_xhtml options = {}
         # FIXME: this is a hack around broken libxml versions
-        return dump_html if %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+        return dump_html if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
 
-        options[:save_with] ||= SaveOptions::DEFAULT_XHTML
+        options[:save_with] |= SaveOptions::DEFAULT_XHTML if options[:save_with]
+        options[:save_with] = SaveOptions::DEFAULT_XHTML unless options[:save_with]
         serialize(options)
       end
 
@@ -789,10 +806,14 @@ module Nokogiri
       def write_to io, *options
         options       = options.first.is_a?(Hash) ? options.shift : {}
         encoding      = options[:encoding] || options[0]
-        save_options  = options[:save_with] || options[1] || SaveOptions::FORMAT
+        if Nokogiri.jruby?
+          save_options  = options[:save_with] || options[1]
+          indent_times  = options[:indent] || 0
+        else
+          save_options  = options[:save_with] || options[1] || SaveOptions::FORMAT
+          indent_times  = options[:indent] || 2
+        end
         indent_text   = options[:indent_text] || ' '
-        indent_times  = options[:indent] || 2
-
 
         config = SaveOptions.new(save_options.to_i)
         yield config if block_given?
@@ -806,7 +827,7 @@ module Nokogiri
       # See Node#write_to for a list of +options+
       def write_html_to io, options = {}
         # FIXME: this is a hack around broken libxml versions
-        return (io << dump_html) if %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+        return (io << dump_html) if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
 
         options[:save_with] ||= SaveOptions::DEFAULT_HTML
         write_to io, options
@@ -818,7 +839,7 @@ module Nokogiri
       # See Node#write_to for a list of +options+
       def write_xhtml_to io, options = {}
         # FIXME: this is a hack around broken libxml versions
-        return (io << dump_html) if %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+        return (io << dump_html) if Nokogiri.uses_libxml? && %w[2 6] === LIBXML_VERSION.split('.')[0..1]
 
         options[:save_with] ||= SaveOptions::DEFAULT_XHTML
         write_to io, options
@@ -855,7 +876,10 @@ module Nokogiri
         params -= [handler] if handler
 
         hashes = []
-        hashes << params.pop while Hash === params.last || params.last.nil?
+        while Hash === params.last || params.last.nil?
+          hashes << params.pop
+          break if params.empty?
+        end
 
         ns, binds = hashes.reverse
 

data/lib/nokogiri/xml/node/save_options.rb

@@ -6,7 +6,7 @@ module Nokogiri
       class SaveOptions
         # Format serialized xml
         FORMAT          = 1
-        # Do not include delcarations
+        # Do not include declarations
         NO_DECLARATION  = 2
         # Do not include empty tags
         NO_EMPTY_TAGS   = 4
@@ -19,10 +19,19 @@ module Nokogiri
         # Save as HTML
         AS_HTML         = 64
 
-        # the default for XML documents
-        DEFAULT_XML  = FORMAT | AS_XML
-        # the default for HTML document
-        DEFAULT_HTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
+        if Nokogiri.jruby?
+          # Save builder created document
+          AS_BUILDER    = 128
+          # the default for XML documents
+          DEFAULT_XML  = AS_XML # https://github.com/tenderlove/nokogiri/issues/#issue/415
+          # the default for HTML document
+          DEFAULT_HTML = NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
+        else
+          # the default for XML documents
+          DEFAULT_XML  = FORMAT | AS_XML
+          # the default for HTML document
+          DEFAULT_HTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
+        end
         # the default for XHTML document
         DEFAULT_XHTML = FORMAT | NO_DECLARATION | NO_EMPTY_TAGS | AS_XHTML
 

data/lib/nokogiri/xml/node_set.rb

@@ -273,6 +273,13 @@ module Nokogiri
       ###
       # Convert this NodeSet to HTML
       def to_html *args
+        if Nokogiri.jruby?
+          options = args.first.is_a?(Hash) ? args.shift : {}
+          if !options[:save_with]
+            options[:save_with] = Node::SaveOptions::NO_DECLARATION | Node::SaveOptions::NO_EMPTY_TAGS | Node::SaveOptions::AS_HTML
+          end
+          args.insert(0, options)
+        end
         map { |x| x.to_html(*args) }.join
       end
 

data/lib/nokogiri/xml/reader.rb

@@ -87,9 +87,9 @@ module Nokogiri
       ###
       # Get a list of attributes for the current node.
       def attributes
-        Hash[*attribute_nodes.map { |node|
+        Hash[attribute_nodes.map { |node|
           [node.name, node.to_s]
-        }.flatten].merge(namespaces || {})
+        }].merge(namespaces || {})
       end
 
       ###