nokogiri 1.4.7 → 1.5.0.beta.1

data/lib/nokogiri/html/sax/parser.rb

@@ -31,9 +31,7 @@ module Nokogiri
         def parse_memory data, encoding = 'UTF-8'
           raise ArgumentError unless data
           return unless data.length > 0
-          ctx = ParserContext.memory(data, encoding)
-          yield ctx if block_given?
-          ctx.parse_with self
+          ParserContext.memory(data, encoding).parse_with self
         end
 
         ###
@@ -42,9 +40,7 @@ module Nokogiri
           raise ArgumentError unless filename
           raise Errno::ENOENT unless File.exists?(filename)
           raise Errno::EISDIR if File.directory?(filename)
-          ctx = ParserContext.file(filename, encoding)
-          yield ctx if block_given?
-          ctx.parse_with self
+          ParserContext.file(filename, encoding).parse_with self
         end
       end
     end

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.4.7'
+  VERSION = '1.5.0.beta.1'
 
   # More complete version information about libxml
   VERSION_INFO = {}
@@ -9,8 +9,7 @@ module Nokogiri
   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']              = {}
@@ -29,15 +28,11 @@ module Nokogiri
     !Nokogiri::VERSION_INFO['libxml'].nil?
   end
 
-  def self.ffi? # :nodoc:
-    uses_libxml? && Nokogiri::VERSION_INFO['libxml']['binding'] == 'ffi'
-  end
-
   def self.jruby?
-    false # for 1.5 compatibility
+    !Nokogiri::VERSION_INFO['ruby']['jruby'].nil?
   end
 
   def self.is_2_6_16? # :nodoc:
-    Nokogiri::VERSION_INFO['libxml']['loaded'] <= '2.6.16'
+    Nokogiri::VERSION_INFO['ruby']['platform'] !~ /java/ && Nokogiri::VERSION_INFO['libxml']['loaded'] <= '2.6.16'
   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

@@ -251,7 +251,7 @@ module Nokogiri
       #   end
       #
       def self.with root, &block
-        new({}, root, &block)
+        builder = self.new({}, root, &block)
       end
 
       ###

data/lib/nokogiri/xml/document.rb

@@ -7,7 +7,7 @@ module Nokogiri
     #
     # For searching a Document, see Nokogiri::XML::Node#css and
     # Nokogiri::XML::Node#xpath
-    class Document < Nokogiri::XML::Node
+    class Document < Node
       ##
       # Parse an XML file.  +thing+ may be a String, or any object that
       # responds to _read_ and _close_ such as an IO, or StringIO.
@@ -113,13 +113,6 @@ module Nokogiri
       #   </root>
       #
       # The hash returned will look like this: { 'xmlns:foo' => 'bar' }
-      #
-      # Non-prefixed default namespaces (as in "xmlns=") are not included
-      # in the hash.
-      #
-      # Note this is a very expensive operation in current implementation, as it
-      # traverses the entire graph, and also has to bring each node accross the
-      # libxml bridge into a ruby object.
       def collect_namespaces
         ns = {}
         traverse { |j| ns.merge!(j.namespaces) }
@@ -141,21 +134,7 @@ module Nokogiri
       end
 
       ##
-      # Explore a document with shortcut methods. See Nokogiri::Slop for details.
-      #
-      # Note that any nodes that have been instantiated before #slop!
-      # is called will not be decorated with sloppy behavior. So, if you're in
-      # irb, the preferred idiom is:
-      #
-      #   irb> doc = Nokogiri::Slop my_markup
-      #
-      # and not
-      #
-      #   irb> doc = Nokogiri::HTML my_markup
-      #   ... followed by irb's implicit inspect (and therefore instantiation of every node) ...
-      #   irb> doc.slop!
-      #   ... which does absolutely nothing.
-      #
+      # Explore a document with shortcut methods.
       def slop!
         unless decorators(XML::Node).include? Nokogiri::Decorators::Slop
           decorators(XML::Node) << Nokogiri::Decorators::Slop
@@ -193,6 +172,7 @@ module Nokogiri
       undef_method :swap, :parent, :namespace, :default_namespace=
       undef_method :add_namespace_definition, :attributes
       undef_method :namespace_definitions, :line, :add_namespace
+      undef_method :parse, :in_context
 
       def add_child child
         raise "Document already has a root node" if root
@@ -206,10 +186,6 @@ module Nokogiri
       alias :<< :add_child
 
       private
-      def implied_xpath_context
-        "/"
-      end
-
       def inspect_attributes
         [:name, :children]
       end

data/lib/nokogiri/xml/document_fragment.rb

@@ -11,9 +11,9 @@ module Nokogiri
         return self unless tags
 
         children = if ctx
-                     ctx.parse(tags)
+                     ctx.parse(tags.strip)
                    else
-                     XML::Document.parse("<root>#{tags}</root>") \
+                     XML::Document.parse("<root>#{tags.strip}</root>") \
                        .xpath("/root/node()")
                    end
         children.each { |child| child.parent = self }
@@ -72,13 +72,6 @@ module Nokogiri
         end
       end
 
-      private
-
-      def coerce data
-        return super unless String === data
-
-        document.fragment(data).children
-      end
     end
   end
 end

data/lib/nokogiri/xml/dtd.rb

@@ -2,21 +2,10 @@ module Nokogiri
   module XML
     class DTD < Nokogiri::XML::Node
       undef_method :attribute_nodes
-      undef_method :values
       undef_method :content
       undef_method :namespace
       undef_method :namespace_definitions
-      undef_method :line
-
-      def keys
-        attributes.keys
-      end
-
-      def each &block
-        attributes.each { |key, value|
-          block.call([key, value])
-        }
-      end
+      undef_method :line if method_defined?(:line)
     end
   end
 end

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

@@ -95,17 +95,13 @@ module Nokogiri
       # optional hash of namespaces may be appended.
       # See Node#xpath and Node#css.
       def search *paths
-        # TODO use         paths, handler, ns, binds = extract_params(paths)
         ns = paths.last.is_a?(Hash) ? paths.pop :
           (document.root ? document.root.namespaces : {})
-
-        prefix = "#{implied_xpath_context}/"
-
         xpath(*(paths.map { |path|
           path = path.to_s
-          path =~ /^(\.\/|\/|\.\.)/ ? path : CSS.xpath_for(
+          path =~ /^(\.\/|\/)/ ? path : CSS.xpath_for(
             path,
-            :prefix => prefix,
+            :prefix => ".//",
             :ns     => ns
           )
         }.flatten.uniq) + [ns])
@@ -113,28 +109,16 @@ module Nokogiri
       alias :/ :search
 
       ###
-      # call-seq: xpath *paths, [namespace-bindings, variable-bindings, custom-handler-class]
-      #
       # Search this node for XPath +paths+. +paths+ must be one or more XPath
-      # queries.
+      # queries.  A hash of namespaces may be appended.  For example:
       #
       #   node.xpath('.//title')
-      #
-      # A hash of namespace bindings may be appended. For example:
-      #
-      #   node.xpath('.//foo:name', {'foo' => 'http://example.org/'})
+      #   node.xpath('.//foo:name', { 'foo' => 'http://example.org/' })
       #   node.xpath('.//xmlns:name', node.root.namespaces)
       #
-      # A hash of variable bindings may also be appended to the namespace bindings. For example:
-      #
-      #   node.xpath('.//address[@domestic=$value]', nil, {:value => 'Yes'})
-      #
-      # Custom XPath functions may also be defined.  To define custom
-      # functions create a class and implement the function you want
-      # to define.  The first argument to the method will be the
-      # current matching NodeSet.  Any other arguments are ones that
-      # you pass in.  Note that this class may appear anywhere in the
-      # argument list.  For example:
+      # Custom XPath functions may also be defined.  To define custom functions
+      # create a class and implement the # function you want to define.
+      # For example:
       #
       #   node.xpath('.//title[regex(., "\w+")]', Class.new {
       #     def regex node_set, regex
@@ -143,18 +127,20 @@ module Nokogiri
       #   }.new)
       #
       def xpath *paths
-        return NodeSet.new(document) unless document
+        # Pop off our custom function handler if it exists
+        handler = ![
+          Hash, String, Symbol
+        ].include?(paths.last.class) ? paths.pop : nil
+
+        ns = paths.last.is_a?(Hash) ? paths.pop :
+          (document.root ? document.root.namespaces : {})
 
-        paths, handler, ns, binds = extract_params(paths)
+        return NodeSet.new(document) unless document
 
         sets = paths.map { |path|
           ctx = XPathContext.new(self)
           ctx.register_namespaces(ns)
-
-          binds.each do |key,value|
-            ctx.register_variable key.to_s, value
-          end if binds
-
+          path = path.gsub(/\/xmlns:/,'/:') unless Nokogiri.uses_libxml?
           ctx.evaluate(path, handler)
         }
         return sets.first if sets.length == 1
@@ -169,24 +155,18 @@ module Nokogiri
       end
 
       ###
-      # call-seq: css *rules, [namespace-bindings, custom-pseudo-class]
-      #
       # Search this node for CSS +rules+. +rules+ must be one or more CSS
-      # selectors. For example:
+      # selectors.  For example:
       #
       #   node.css('title')
       #   node.css('body h1.bold')
       #   node.css('div + p.green', 'div#one')
       #
-      # A hash of namespace bindings may be appended. For example:
-      #
-      #   node.css('bike|tire', {'bike' => 'http://schwinn.com/'})
-      #
-      # Custom CSS pseudo classes may also be defined.  To define
-      # custom pseudo classes, create a class and implement the custom
-      # pseudo class you want defined.  The first argument to the
-      # method will be the current matching NodeSet.  Any other
-      # arguments are ones that you pass in.  For example:
+      # Custom CSS pseudo classes may also be defined.  To define custom pseudo
+      # classes, create a class and implement the custom pseudo class you
+      # want defined.  The first argument to the method will be the current
+      # matching NodeSet.  Any other arguments are ones that you pass in.
+      # For example:
       #
       #   node.css('title:regex("\w+")', Class.new {
       #     def regex node_set, regex
@@ -194,21 +174,18 @@ module Nokogiri
       #     end
       #   }.new)
       #
-      # Note that the CSS query string is case-sensitive with regards
-      # to your document type. That is, if you're looking for "H1" in
-      # an HTML document, you'll never find anything, since HTML tags
-      # will match only lowercase CSS queries. However, "H1" might be
-      # found in an XML document, where tags names are case-sensitive
-      # (e.g., "H1" is distinct from "h1").
-      #
       def css *rules
-        rules, handler, ns, binds = extract_params(rules)
+        # Pop off our custom function handler if it exists
+        handler = ![
+          Hash, String, Symbol
+        ].include?(rules.last.class) ? rules.pop : nil
 
-        prefix = "#{implied_xpath_context}/"
+        ns = rules.last.is_a?(Hash) ? rules.pop :
+          (document.root ? document.root.namespaces : {})
 
         rules = rules.map { |rule|
-          CSS.xpath_for(rule, :prefix => prefix, :ns => ns)
-        }.flatten.uniq + [ns, handler, binds].compact
+          xpath_rule = CSS.xpath_for(rule, :prefix => ".//", :ns => ns)
+        }.flatten.uniq + [ns, handler].compact
 
         xpath(*rules)
       end
@@ -258,7 +235,7 @@ module Nokogiri
       # 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 the reparented node (if +node_or_tags+ is a Node), or NodeSet (if +node_or_tags+ is a DocumentFragment, NodeSet, or string).
+      # Returns the new child node.
       def add_child node_or_tags
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
@@ -266,55 +243,42 @@ module Nokogiri
         else
           add_child_node node_or_tags
         end
-        node_or_tags
       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.
       #
-      # Returns the reparented node (if +node_or_tags+ is a Node), or NodeSet (if +node_or_tags+ is a DocumentFragment, NodeSet, or string).
+      # Returns the new sibling node.
       #
       # Also see related method +before+.
       def add_previous_sibling node_or_tags
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
-          if text?
-            pivot = Nokogiri::XML::Node.new 'dummy', document
-            add_previous_sibling_node pivot
-          else
-            pivot = self
-          end
-          node_or_tags.each { |n| pivot.send :add_previous_sibling_node, n }
-          pivot.unlink if text?
+          node_or_tags.each { |n| add_previous_sibling_node n }
         else
           add_previous_sibling_node node_or_tags
         end
-        node_or_tags
       end
 
       ###
       # Insert +node_or_tags+ after this Node (as a sibling).
       # +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).
+      # Returns the new sibling node.
       #
       # Also see related method +after+.
       def add_next_sibling node_or_tags
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
-          if text?
-            pivot = Nokogiri::XML::Node.new 'dummy', document
-            add_next_sibling_node pivot
+          if '1.8.6' == RUBY_VERSION
+            node_or_tags.reverse.each { |n| add_next_sibling_node n }
           else
-            pivot = self
+            node_or_tags.reverse_each { |n| add_next_sibling_node n }
           end
-          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
         end
-        node_or_tags
       end
 
       ####
@@ -342,25 +306,11 @@ module Nokogiri
       end
 
       ####
-      # Set the inner html for this Node to +node_or_tags+
+      # Set the inner_html for this Node to +node_or_tags+
       # +node_or_tags+ can be a Nokogiri::XML::Node, a Nokogiri::XML::DocumentFragment, or a string containing markup.
       #
       # Returns self.
-      #
-      # Also see related method +children=+
       def inner_html= node_or_tags
-        self.children = node_or_tags
-        self
-      end
-
-      ####
-      # Set the inner html for this Node +node_or_tags+
-      # +node_or_tags+ can be a Nokogiri::XML::Node, a Nokogiri::XML::DocumentFragment, 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 +inner_html=+
-      def children= node_or_tags
         node_or_tags = coerce(node_or_tags)
         children.unlink
         if node_or_tags.is_a?(XML::NodeSet)
@@ -368,32 +318,24 @@ module Nokogiri
         else
           add_child node_or_tags
         end
-        node_or_tags
+        self
       end
 
       ####
       # Replace this Node with +node_or_tags+.
       # +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).
+      # Returns the new child node.
       #
       # Also see related method +swap+.
       def replace node_or_tags
         node_or_tags = coerce(node_or_tags)
         if node_or_tags.is_a?(XML::NodeSet)
-          if text?
-            replacee = Nokogiri::XML::Node.new 'dummy', document
-            add_previous_sibling_node replacee
-            unlink
-          else
-            replacee = self
-          end
-          node_or_tags.each { |n| replacee.add_previous_sibling n }
-          replacee.unlink
+          node_or_tags.each { |n| add_previous_sibling n }
+          unlink
         else
           replace_node node_or_tags
         end
-        node_or_tags
       end
 
       ####
@@ -434,10 +376,8 @@ module Nokogiri
 
       ####
       # Returns a hash containing the node's attributes.  The key is
-      # the attribute name without any namespace, the value is a Nokogiri::XML::Attr
+      # the attribute name, the value is a Nokogiri::XML::Attr
       # representing the attribute.
-      # If you need to distinguish attributes with the same name, with different namespaces
-      # use #attribute_nodes instead.
       def attributes
         Hash[*(attribute_nodes.map { |node|
           [node.node_name, node]
@@ -489,8 +429,7 @@ module Nokogiri
       # Parse +string_or_io+ as a document fragment within the context of
       # *this* node.  Returns a XML::NodeSet containing the nodes parsed from
       # +string_or_io+.
-      def parse string_or_io, options = nil
-        options ||= (document.html? ? ParseOptions::DEFAULT_HTML : ParseOptions::DEFAULT_XML)
+      def parse string_or_io, options = ParseOptions::DEFAULT_XML
         if Fixnum === options
           options = Nokogiri::XML::ParseOptions.new(options)
         end
@@ -502,16 +441,7 @@ module Nokogiri
           string_or_io
 
         return Nokogiri::XML::NodeSet.new(document) if contents.empty?
-
-        ##
-        # This is a horrible hack, but I don't care. See #313 for background.
-        error_count = document.errors.length
-        node_set = in_context(contents, options.to_i)
-        if node_set.empty? and document.errors.length > error_count and options.recover?
-          fragment = Nokogiri::HTML::DocumentFragment.parse contents
-          node_set = fragment.children
-        end
-        node_set
+        in_context(contents, options.to_i)
       end
 
       ####
@@ -528,19 +458,7 @@ module Nokogiri
       end
 
       ###
-      # Returns a Hash of {prefix => value} for all namespaces on this
-      # node and its ancestors.
-      #
-      # This method returns the same namespaces as #namespace_scopes.
-      #
-      # Returns namespaces in scope for self -- those defined on self
-      # element directly or any ancestor node -- as a Hash of
-      # attribute-name/value pairs. Note that the keys in this hash
-      # XML attributes that would be used to define this namespace,
-      # such as "xmlns:prefix", not just the prefix. Default namespace
-      # set on self will be included with key "xmlns". However,
-      # default namespaces set on ancestor will NOT be, even if self
-      # has no explicit default namespace.
+      # Get a hash containing the Namespace definitions for this Node
       def namespaces
         Hash[*namespace_scopes.map { |nd|
           key = ['xmlns', nd.prefix].compact.join(':')
@@ -648,22 +566,14 @@ module Nokogiri
       end
 
       ###
-      # Adds a default namespace supplied as a string +url+ href, to self.
-      # The consequence is as an xmlns attribute with supplied argument were
-      # present in parsed XML.  A default namespace set with this method will
-      # now show up in #attributes, but when this node is serialized to XML an
-      # "xmlns" attribute will appear. See also #namespace and #namespace=
+      # Set the default namespace for this node to +url+
       def default_namespace= url
         add_namespace_definition(nil, url)
       end
       alias :add_namespace :add_namespace_definition
 
       ###
-      # Set the default namespace on this node (as would be defined with an
-      # "xmlns=" attribute in XML source), as a Namespace object +ns+. Note that
-      # a Namespace added this way will NOT be serialized as an xmlns attribute
-      # for this node. You probably want #default_namespace= instead, or perhaps
-      # #add_namespace_definition with a nil prefix argument.
+      # Set the namespace for this node to +ns+
       def namespace= ns
         return set_namespace(ns) unless ns
 
@@ -738,9 +648,13 @@ 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::FORMAT |
+                                SaveOptions::NO_DECLARATION |
+                                SaveOptions::NO_EMPTY_TAGS |
+                                SaveOptions::AS_HTML
 
-        options[:save_with] ||= SaveOptions::DEFAULT_HTML
         serialize(options)
       end
 
@@ -751,7 +665,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::FORMAT | SaveOptions::AS_XML
+
         serialize(options)
       end
 
@@ -763,9 +678,13 @@ 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::FORMAT |
+                                SaveOptions::NO_DECLARATION |
+                                SaveOptions::NO_EMPTY_TAGS |
+                                SaveOptions::AS_XHTML
 
-        options[:save_with] ||= SaveOptions::DEFAULT_XHTML
         serialize(options)
       end
 
@@ -794,7 +713,7 @@ module Nokogiri
         indent_times  = options[:indent] || 2
 
 
-        config = SaveOptions.new(save_options.to_i)
+        config = SaveOptions.new(save_options)
         yield config if block_given?
 
         native_write_to(io, encoding, indent_text * indent_times, config.options)
@@ -806,9 +725,12 @@ 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
+        options[:save_with] ||= SaveOptions::FORMAT |
+          SaveOptions::NO_DECLARATION |
+          SaveOptions::NO_EMPTY_TAGS |
+          SaveOptions::AS_HTML
         write_to io, options
       end
 
@@ -818,9 +740,12 @@ 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
+        options[:save_with] ||= SaveOptions::FORMAT |
+          SaveOptions::NO_DECLARATION |
+          SaveOptions::NO_EMPTY_TAGS |
+          SaveOptions::AS_XHTML
         write_to io, options
       end
 
@@ -831,7 +756,7 @@ module Nokogiri
       #
       # See Node#write_to for a list of options
       def write_xml_to io, options = {}
-        options[:save_with] ||= SaveOptions::DEFAULT_XML
+        options[:save_with] ||= SaveOptions::FORMAT | SaveOptions::AS_XML
         write_to io, options
       end
 
@@ -846,25 +771,7 @@ module Nokogiri
 
       private
 
-      def extract_params params # :nodoc:
-        # Pop off our custom function handler if it exists
-        handler = params.find { |param|
-          ![Hash, String, Symbol].include?(param.class)
-        }
-
-        params -= [handler] if handler
-
-        hashes = []
-        hashes << params.pop while Hash === params.last || params.last.nil?
-
-        ns, binds = hashes.reverse
-
-        ns ||= document.root ? document.root.namespaces : {}
-
-        [params, handler, ns, binds]
-      end
-
-      def coerce data # :nodoc:
+      def coerce(data) # :nodoc:
         return data                    if data.is_a?(XML::NodeSet)
         return data.children           if data.is_a?(XML::DocumentFragment)
         return fragment(data).children if data.is_a?(String)
@@ -879,10 +786,6 @@ Requires a Node, NodeSet or String argument, and cannot accept a #{data.class}.
         data
       end
 
-      def implied_xpath_context
-        "./"
-      end
-
       def inspect_attributes
         [:name, :namespace, :attribute_nodes, :children]
       end