nokogiri 1.4.0 → 1.4.1

data/test/xml/sax/test_parser_context.rb

@@ -50,6 +50,13 @@ module Nokogiri
             ctx.parse_with parser
           end
         end
+
+        def test_parse_with_returns_nil
+          xml = "<root />"
+          ctx = ParserContext.new xml
+          parser = Parser.new Doc.new
+          assert_nil ctx.parse_with(parser)
+        end
       end
     end
   end

data/test/xml/sax/test_push_parser.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require "helper"
 
 module Nokogiri
@@ -100,6 +102,37 @@ module Nokogiri
           @parser.finish
           assert_equal [' This is a comment '], @parser.document.comments
         end
+
+        def test_default_options
+          assert_equal 0, @parser.options
+        end
+
+        def test_recover
+          @parser.options |= XML::ParseOptions::RECOVER
+          @parser.<<(<<-eoxml)
+            <p>
+              Foo
+              <bar>
+              Bar
+            </p>
+          eoxml
+          @parser.finish
+          assert(@parser.document.errors.size >= 1)
+          assert_equal [["p", []], ["bar", []]], @parser.document.start_elements
+          assert_equal "FooBar", @parser.document.data.map { |x|
+            x.gsub(/\s/, '')
+          }.join
+        end
+
+        def test_broken_encoding
+          @parser.options |= XML::ParseOptions::RECOVER
+          # This is ISO_8859-1:
+          @parser.<< "<?xml version='1.0' encoding='UTF-8'?><r>Gau\337</r>"
+          @parser.finish
+          assert(@parser.document.errors.size >= 1)
+          assert_equal "Gau\337", @parser.document.data.join
+          assert_equal [["r"]], @parser.document.end_elements
+        end
       end
     end
   end

data/test/xml/test_document.rb

@@ -10,6 +10,18 @@ module Nokogiri
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_collect_namespaces
+        doc = Nokogiri::XML(<<-eoxml)
+        <xml>
+          <foo xmlns='hello'>
+            <bar xmlns:foo='world' />
+          </foo>
+        </xml>
+        eoxml
+        assert_equal({"xmlns"=>"hello", "xmlns:foo"=>"world"},
+          doc.collect_namespaces)
+      end
+
       def test_subclass_initialize_modify # testing a segv
         Class.new(Nokogiri::XML::Document) {
           def initialize
@@ -96,6 +108,12 @@ module Nokogiri
         assert_equal '1.0', @xml.version
       end
 
+      def test_add_namespace
+        assert_raise NoMethodError do
+          @xml.add_namespace('foo', 'bar')
+        end
+      end
+
       def test_attributes
         assert_raise NoMethodError do
           @xml.attributes
@@ -130,7 +148,7 @@ module Nokogiri
         assert_equal 0, fragment.children.length
       end
 
-      def test_add_child_with_fragment
+      def test_add_child_fragment_with_single_node
         doc = Nokogiri::XML::Document.new
         fragment = doc.fragment('<hello />')
         doc.add_child fragment
@@ -138,6 +156,14 @@ module Nokogiri
         assert_equal 'hello', doc.root.name
       end
 
+      def test_add_child_fragment_with_multiple_nodes
+        doc = Nokogiri::XML::Document.new
+        fragment = doc.fragment('<hello /><goodbye />')
+        assert_raises(RuntimeError) do
+          doc.add_child fragment
+        end
+      end
+
       def test_add_child_with_multiple_roots
         assert_raises(RuntimeError) do
           @xml << Node.new('foo', @xml)

data/test/xml/test_document_fragment.rb

@@ -27,6 +27,12 @@ module Nokogiri
         assert_instance_of Nokogiri::XML::DocumentFragment, fragment
       end
 
+      def test_static_method_with_namespaces
+        # follows different path in FragmentHandler#start_element which blew up after 597195ff
+        fragment = Nokogiri::XML::DocumentFragment.parse("<o:div>a</o:div>")
+        assert_instance_of Nokogiri::XML::DocumentFragment, fragment
+      end
+
       def test_many_fragments
         100.times { Nokogiri::XML::DocumentFragment.new(@xml) }
       end

data/test/xml/test_node.rb

@@ -10,6 +10,69 @@ module Nokogiri
         @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_gt_string_arg
+        node = @xml.at('employee')
+        nodes = (node > 'name')
+        assert_equal 1, nodes.length
+        assert_equal node, nodes.first.parent
+      end
+
+      def test_next_element_when_next_sibling_is_element_should_return_next_sibling
+        doc = Nokogiri::XML "<root><foo /><quux /></root>"
+        node         = doc.at_css("foo")
+        next_element = node.next_element
+        assert next_element.element?
+        assert_equal doc.at_css("quux"), next_element
+      end
+
+      def test_next_element_when_there_is_no_next_sibling_should_return_nil
+        doc = Nokogiri::XML "<root><foo /><quux /></root>"
+        assert_nil doc.at_css("quux").next_element
+      end
+
+      def test_next_element_when_next_sibling_is_not_an_element_should_return_closest_next_element_sibling
+        doc = Nokogiri::XML "<root><foo />bar<quux /></root>"
+        node         = doc.at_css("foo")
+        next_element = node.next_element
+        assert next_element.element?
+        assert_equal doc.at_css("quux"), next_element
+      end
+
+      def test_next_element_when_next_sibling_is_not_an_element_and_no_following_element_should_return_nil
+        doc = Nokogiri::XML "<root><foo />bar</root>"
+        node         = doc.at_css("foo")
+        next_element = node.next_element
+        assert_nil next_element
+      end
+
+      def test_previous_element_when_previous_sibling_is_element_should_return_previous_sibling
+        doc = Nokogiri::XML "<root><foo /><quux /></root>"
+        node             = doc.at_css("quux")
+        previous_element = node.previous_element
+        assert previous_element.element?
+        assert_equal doc.at_css("foo"), previous_element
+      end
+
+      def test_previous_element_when_there_is_no_previous_sibling_should_return_nil
+        doc = Nokogiri::XML "<root><foo /><quux /></root>"
+        assert_nil doc.at_css("foo").previous_element
+      end
+
+      def test_previous_element_when_previous_sibling_is_not_an_element_should_return_closest_previous_element_sibling
+        doc = Nokogiri::XML "<root><foo />bar<quux /></root>"
+        node             = doc.at_css("quux")
+        previous_element = node.previous_element
+        assert previous_element.element?
+        assert_equal doc.at_css("foo"), previous_element
+      end
+
+      def test_previous_element_when_previous_sibling_is_not_an_element_and_no_following_element_should_return_nil
+        doc = Nokogiri::XML "<root>foo<bar /></root>"
+        node             = doc.at_css("bar")
+        previous_element = node.previous_element
+        assert_nil previous_element
+      end
+
       def test_element?
         assert @xml.root.element?, 'is an element'
       end
@@ -93,18 +156,6 @@ module Nokogiri
         assert_nil @xml.at('employee').description
       end
 
-      def test_add_namespace_add_child
-        doc   = Nokogiri::XML::Document.new
-        item  = Nokogiri::XML::Element.new('item', doc)
-        doc.root = item
-
-        entry = Nokogiri::XML::Element.new('entry', doc)
-        entry.add_namespace('tlm', 'http://tenderlovemaking.com')
-        assert_equal 'http://tenderlovemaking.com', entry.namespaces['xmlns:tlm']
-        item.add_child(entry)
-        assert_equal 'http://tenderlovemaking.com', entry.namespaces['xmlns:tlm']
-      end
-
       def test_spaceship
         nodes = @xml.xpath('//employee')
         assert_equal(-1, (nodes.first <=> nodes.last))
@@ -170,13 +221,6 @@ module Nokogiri
         assert_equal 1, fruits.xpath('//xmlns:Apple').length
       end
 
-      def test_add_child_path_following_sequential_text_nodes
-        xml = Nokogiri::XML('<root>text</root>')
-        xml.root.add_child(Nokogiri::XML::Text.new('text', xml))
-        item = xml.root.add_child(Nokogiri::XML::Element.new('item', xml))
-        assert_equal '/root/item', item.path
-      end
-
       def test_new_node_can_have_ancestors
         xml = Nokogiri::XML('<root>text</root>')
         item = Nokogiri::XML::Element.new('item', xml)
@@ -317,51 +361,6 @@ module Nokogiri
         assert visitor.visited
       end
 
-      def test_replace_with_default_namespaces
-        fruits = Nokogiri::XML(<<-eoxml)
-          <fruit xmlns="http://fruits.org">
-            <apple />
-          </fruit>
-        eoxml
-
-        apple = fruits.css('apple').first
-
-        orange = Nokogiri::XML::Node.new('orange', fruits)
-        apple.replace(orange)
-
-        assert_equal orange, fruits.css('orange').first
-      end
-
-      def test_add_child_should_inherit_namespace
-        doc = Nokogiri::XML(<<-eoxml)
-          <root xmlns="http://tenderlovemaking.com/">
-            <first>
-            </first>
-          </root>
-        eoxml
-        assert node = doc.at('//xmlns:first')
-        child = Nokogiri::XML::Node.new('second', doc)
-        node.add_child(child)
-        assert doc.at('//xmlns:second')
-      end
-
-      def test_add_child_should_not_inherit_namespace_if_it_has_one
-        doc = Nokogiri::XML(<<-eoxml)
-          <root xmlns="http://tenderlovemaking.com/" xmlns:foo="http://flavorjon.es/">
-            <first>
-            </first>
-          </root>
-        eoxml
-        assert node = doc.at('//xmlns:first')
-        child = Nokogiri::XML::Node.new('second', doc)
-
-        ns = doc.root.namespace_definitions.detect { |x| x.prefix == "foo" }
-        child.namespace = ns
-
-        node.add_child(child)
-        assert doc.at('//foo:second', "foo" => "http://flavorjon.es/")
-      end
-
       def test_write_to
         io = StringIO.new
         @xml.write_to io
@@ -478,110 +477,12 @@ module Nokogiri
         assert_nil address['domestic']
       end
 
-      def test_add_child_in_same_document
-        child = @xml.css('employee').first
-
-        assert previous_last_child = child.children.last
-        assert new_child = child.children.first
-
-        last = child.children.last
-
-        child.add_child(new_child)
-        assert_equal new_child, child.children.last
-        assert_equal last, child.children.last
-      end
-
-      def test_add_child_from_other_document
-        d1 = Nokogiri::XML("<root><item>1</item><item>2</item></root>")
-        d2 = Nokogiri::XML("<root><item>3</item><item>4</item></root>")
-
-        d2.at('root').search('item').each do |i|
-          d1.at('root').add_child i
-        end
-
-        assert_equal 0, d2.search('item').size
-        assert_equal 4, d1.search('item').size
-      end
-
-      def test_add_child
-        xml = Nokogiri::XML(<<-eoxml)
-        <root>
-          <a>Hello world</a>
-        </root>
-        eoxml
-        text_node = Nokogiri::XML::Text.new('hello', xml)
-        assert_equal Nokogiri::XML::Node::TEXT_NODE, text_node.type
-        xml.root.add_child text_node
-        assert_match 'hello', xml.to_s
-      end
-
-      def test_chevron_works_as_add_child
-        xml = Nokogiri::XML(<<-eoxml)
-        <root>
-          <a>Hello world</a>
-        </root>
-        eoxml
-        text_node = Nokogiri::XML::Text.new('hello', xml)
-        xml.root << text_node
-        assert_match 'hello', xml.to_s
-      end
-
       def test_set_content_with_symbol
         node = @xml.at('//name')
         node.content = :foo
         assert_equal 'foo', node.content
       end
 
-      def test_add_previous_sibling
-        xml = Nokogiri::XML(<<-eoxml)
-        <root>
-          <a>Hello world</a>
-        </root>
-        eoxml
-        b_node = Nokogiri::XML::Node.new('a', xml)
-        assert_equal Nokogiri::XML::Node::ELEMENT_NODE, b_node.type
-        b_node.content = 'first'
-        a_node = xml.xpath('//a').first
-        a_node.add_previous_sibling(b_node)
-        assert_equal('first', xml.xpath('//a').first.text)
-      end
-
-      def test_add_previous_sibling_merge
-        xml = Nokogiri::XML(<<-eoxml)
-        <root>
-          <a>Hello world</a>
-        </root>
-        eoxml
-
-        assert a_tag = xml.css('a').first
-
-        left_space = a_tag.previous
-        right_space = a_tag.next
-        assert left_space.text?
-        assert right_space.text?
-
-        left_space.add_previous_sibling(right_space)
-        assert_equal left_space, right_space
-      end
-
-      def test_add_next_sibling_merge
-        xml = Nokogiri::XML(<<-eoxml)
-        <root>
-          <a>Hello world</a>
-        </root>
-        eoxml
-
-        assert a_tag = xml.css('a').first
-
-        left_space = a_tag.previous
-        right_space = a_tag.next
-        assert left_space.text?
-        assert right_space.text?
-
-        right_space.add_next_sibling(left_space)
-        assert_equal left_space, right_space
-      end
-
       def test_find_by_css_with_tilde_eql
         xml = Nokogiri::XML.parse(<<-eoxml)
         <root>
@@ -715,30 +616,6 @@ module Nokogiri
         assert_equal " ", children[3]
       end
 
-      def test_replace
-        set = @xml.search('//employee')
-        assert 5, set.length
-        assert 0, @xml.search('//form').length
-
-        first = set[0]
-        second = set[1]
-
-        node = Nokogiri::XML::Node.new('form', @xml)
-        first.replace(node)
-
-        assert set = @xml.search('//employee')
-        assert_equal 4, set.length
-        assert 1, @xml.search('//form').length
-
-        assert_equal set[0].to_xml, second.to_xml
-      end
-
-      def test_illegal_replace_of_node_with_doc
-        new_node = Nokogiri::XML.parse('<foo>bar</foo>')
-        old_node = @xml.at('//employee')
-        assert_raises(ArgumentError){ old_node.replace new_node }
-      end
-
       def test_node_equality
         doc1 = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
         doc2 = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
@@ -856,34 +733,6 @@ EOF
         assert_equal 2, node.line
       end
 
-      def test_unlink_then_reparent
-        # see http://github.com/tenderlove/nokogiri/issues#issue/22
-        10.times do
-          STDOUT.putc "."
-          STDOUT.flush
-          begin
-            doc = Nokogiri::XML <<-EOHTML
-              <root>
-                <a>
-                  <b/>
-                  <c/>
-                </a>
-              </root>
-            EOHTML
-
-            root = doc.at("root")
-            a = root.at("a")
-            b = a.at("b")
-            c = a.at("c")
-            a.add_next_sibling(b.unlink)
-            c.unlink
-          end
-
-          GC.start
-        end
-
-      end
-
     end
   end
 end