parsing in the context of a document is OK

sparklemotion · Jun 18, 2010 · 7db0429 · 7db0429
1 parent d4df96e
commit 7db0429
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -3,6 +3,7 @@
 * Bugfixes
 
   * XML::NodeSet#{include?,delete,push} accept an XML::Namespace
+  * XML::Document#parse added for parsing in the context of a document
 
 === 1.4.2 / 2010/05/22
 

diff --git a/lib/nokogiri/html/document_fragment.rb b/lib/nokogiri/html/document_fragment.rb
@@ -6,7 +6,7 @@ class DocumentFragment < Nokogiri::XML::DocumentFragment
       def self.parse tags
         doc = HTML::Document.new
         doc.encoding = 'UTF-8'
-        self.new(doc, tags)
+        new(doc, tags)
       end
 
       def initialize document, tags = nil, ctx = nil

diff --git a/lib/nokogiri/xml/document.rb b/lib/nokogiri/xml/document.rb
@@ -7,7 +7,7 @@ module XML
     #
     # For searching a Document, see Nokogiri::XML::Node#css and
     # Nokogiri::XML::Node#xpath
-    class Document < Node
+    class Document < Nokogiri::XML::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.
@@ -172,7 +172,6 @@ def fragment tags = nil
       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

diff --git a/test/xml/test_document.rb b/test/xml/test_document.rb
@@ -21,12 +21,6 @@ def test_root_set_to_nil
         assert_equal nil, @xml.root
       end
 
-      def test_parse_should_not_exist
-        assert_raises(NoMethodError) do
-          @xml.parse("foo")
-        end
-      end
-
       def test_collect_namespaces
         doc = Nokogiri::XML(<<-eoxml)
         <xml>