DocumentFragment.new when not provided a context node will parse the …

…tags within the context of a new document, to avoid the "invalid tag" problem.
sparklemotion · Apr 23, 2010 · 2100f99 · 2100f99
1 parent 49d427f
commit 2100f99
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 19 deletions.
diff --git a/lib/nokogiri/html/document.rb b/lib/nokogiri/html/document.rb
@@ -49,7 +49,7 @@ def serialize options = {}, &block
       ####
       # Create a Nokogiri::XML::DocumentFragment from +tags+
       def fragment tags = nil
-        DocumentFragment.new(self, tags)
+        DocumentFragment.new(self, tags, self.root)
       end
 
       class << self

diff --git a/lib/nokogiri/xml/document.rb b/lib/nokogiri/xml/document.rb
@@ -166,7 +166,7 @@ def namespaces
       # Create a Nokogiri::XML::DocumentFragment from +tags+
       # Returns an empty fragment if +tags+ is nil.
       def fragment tags = nil
-        DocumentFragment.new(self, tags)
+        DocumentFragment.new(self, tags, self.root)
       end
 
       undef_method :swap, :parent, :namespace, :default_namespace=

diff --git a/lib/nokogiri/xml/document_fragment.rb b/lib/nokogiri/xml/document_fragment.rb
@@ -1,25 +1,31 @@
 module Nokogiri
   module XML
     class DocumentFragment < Nokogiri::XML::Node
-      def initialize document, tags = nil, ctx = document.root
+      ##
+      #  Create a new DocumentFragment from +tags+.
+      #
+      #  If +ctx+ is present, it is used as a context node for the
+      #  subtree created, e.g., namespaces will be resolved relative
+      #  to +ctx+.
+      def initialize document, tags = nil, ctx = nil
         return self unless tags
 
-        has_root = document.root
-        unless ctx
-          ctx = document.root = Nokogiri::XML::Element.new('div', document)
-        end
-
-        if document.html?
-          ctx.parse("<div>#{tags.strip}</div>").first.children.each do |tag|
-            tag.parent = self
-          end
-        else
-          ctx.parse(tags.strip).each do |tag|
-            tag.parent = self
-          end
-        end
-
-        document.root = nil unless has_root
+        children = if ctx
+                     if document.html?
+                       ctx.parse("<div>#{tags.strip}</div>").first.children
+                     else
+                       ctx.parse(tags.strip)
+                     end
+                   else
+                     if document.html?
+                       Nokogiri::HTML::Document.parse("<html><body>#{tags.strip}</body></html>") \
+                                               .xpath("/html/body/node()")
+                     else
+                       Nokogiri::XML::Document.parse("<root>#{tags.strip}</root>") \
+                                              .xpath("/root/node()")
+                     end
+                   end
+        children.each { |child| child.parent = self }
       end
 
       ###

diff --git a/test/xml/test_node.rb b/test/xml/test_node.rb
@@ -82,6 +82,14 @@ def test_parse_with_empty_string
         assert_equal 0, list.length
       end
 
+      # descriptive, not prescriptive.
+      def test_parse_invalid_html_markup_results_in_empty_nodeset
+        doc = Nokogiri::HTML("<html></html>")
+        nodeset = doc.root.parse "<div><div>a</div><snippet>b</snippet></div>"
+        assert_equal 1, doc.errors.length # "Tag snippet invalid"
+        assert_equal 0, nodeset.length
+      end
+
       def test_parse_error_list
         error_count = @xml.errors.length
         list = @xml.root.parse('<hello>')