nokogiri 1.2.1 → 1.2.2

data/test/test_convert_xpath.rb

@@ -11,6 +11,7 @@ end
 class TestConvertXPath < Nokogiri::TestCase
 
   def setup
+    super
     @N = Nokogiri(File.read(HTML_FILE))
     @NH = Nokogiri.Hpricot(File.read(HTML_FILE)) # decorated document
     @H = Hpricot(File.read(HTML_FILE)) if HAS_HPRICOT

data/test/test_css_cache.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 class TestCssCache < Nokogiri::TestCase
 
   def setup
+    super
     @css = "a1 > b2 > c3"
     @parse_result = Nokogiri::CSS.parse(@css)
     @to_xpath_result = @parse_result.map {|ast| ast.to_xpath}

data/test/test_nokogiri.rb

@@ -1,6 +1,14 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
 
 class TestNokogiri < Nokogiri::TestCase
+  def test_version
+    Nokogiri::LIBXML_PARSER_VERSION =~ /(\d)(\d{2})(\d{2})/
+    major = $1.to_i
+    minor = $2.to_i
+    bug   = $3.to_i
+    assert_equal "#{major}.#{minor}.#{bug}", Nokogiri::LIBXML_VERSION
+  end
+
   def test_xml?
     doc = Nokogiri.parse(File.read(XML_FILE))
     assert doc.xml?

data/test/xml/sax/test_parser.rb

@@ -5,6 +5,7 @@ module Nokogiri
     module SAX
       class TestParser < Nokogiri::SAX::TestCase
         def setup
+          super
           @parser = XML::SAX::Parser.new(Doc.new)
         end
 
@@ -14,6 +15,11 @@ module Nokogiri
           assert @parser.document.errors.length > 0
         end
 
+        def test_parser_sets_encoding
+          parser = XML::SAX::Parser.new(Doc.new, 'UTF-8')
+          assert_equal 'UTF-8', parser.encoding
+        end
+
         def test_errors_set_after_parsing_bad_dom
           doc = Nokogiri::XML('<foo><bar></foo>')
           assert doc.errors

data/test/xml/sax/test_push_parser.rb

@@ -5,6 +5,7 @@ module Nokogiri
     module SAX
       class TestPushParser < Nokogiri::SAX::TestCase
         def setup
+          super
           @parser = XML::SAX::PushParser.new(Doc.new)
         end
 

data/test/xml/test_builder.rb

@@ -11,6 +11,15 @@ module Nokogiri
         end
         assert_equal("<?xml version=\"1.0\"?><root><![CDATA[hello world]]></root>", builder.to_xml.gsub(/\n/, ''))
       end
+
+      def test_builder_no_block
+        string = "hello world"
+        builder = Nokogiri::XML::Builder.new
+        builder.root {
+          cdata string
+        }
+        assert_equal("<?xml version=\"1.0\"?><root><![CDATA[hello world]]></root>", builder.to_xml.gsub(/\n/, ''))
+      end
     end
   end
 end

data/test/xml/test_cdata.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module XML
     class TestCDATA < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 

data/test/xml/test_comment.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module XML
     class TestComment < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 

data/test/xml/test_document.rb

@@ -6,9 +6,32 @@ module Nokogiri
   module XML
     class TestDocument < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_namespace_should_not_exist
+        assert_raises(NoMethodError) {
+          @xml.namespace
+        }
+      end
+
+      def test_non_existant_function
+        assert_raises(RuntimeError) {
+          @xml.xpath('//name[foo()]')
+        }
+      end
+
+      def test_ancestors
+        assert_equal [], @xml.ancestors
+      end
+
+      def test_root_node_parent_is_document
+        parent = @xml.root.parent
+        assert_equal @xml, parent
+        assert_instance_of Nokogiri::XML::Document, parent
+      end
+
       def test_xmlns_is_automatically_registered
         doc = Nokogiri::XML(<<-eoxml)
           <root xmlns="http://tenderlovemaking.com/">
@@ -20,6 +43,29 @@ module Nokogiri
         assert_equal 1, doc.css('xmlns|foo').length
         assert_equal 1, doc.css('foo').length
         assert_equal 0, doc.css('|foo').length
+        assert_equal 1, doc.xpath('//xmlns:foo').length
+        assert_equal 1, doc.search('xmlns|foo').length
+        assert_equal 1, doc.search('//xmlns:foo').length
+        assert doc.at('xmlns|foo')
+        assert doc.at('//xmlns:foo')
+        assert doc.at('foo')
+      end
+
+      def test_xmlns_is_registered_for_nodesets
+        doc = Nokogiri::XML(<<-eoxml)
+          <root xmlns="http://tenderlovemaking.com/">
+            <foo>
+              <bar>
+                baz
+              </bar>
+            </foo>
+          </root>
+        eoxml
+        assert_equal 1, doc.css('xmlns|foo').css('xmlns|bar').length
+        assert_equal 1, doc.css('foo').css('bar').length
+        assert_equal 1, doc.xpath('//xmlns:foo').xpath('./xmlns:bar').length
+        assert_equal 1, doc.search('xmlns|foo').search('xmlns|bar').length
+        assert_equal 1, doc.search('//xmlns:foo').search('./xmlns:bar').length
       end
 
       # wtf...  osx's libxml sucks.
@@ -83,6 +129,12 @@ module Nokogiri
         doc = Nokogiri::XML::Document.new
         ns = doc.search('//foo')
         assert_equal 0, ns.length
+
+        ns = doc.css('foo')
+        assert_equal 0, ns.length
+
+        ns = doc.xpath('//foo')
+        assert_equal 0, ns.length
       end
 
       def test_bad_xpath_raises_syntax_error
@@ -172,6 +224,12 @@ module Nokogiri
         assert @xml.to_xml
       end
 
+      def test_dup
+        dup = @xml.dup
+        assert_instance_of Nokogiri::XML::Document, dup
+        assert dup.xml?, 'duplicate should be xml'
+      end
+
       def test_subset_is_decorated
         x = Module.new do
           def awesome!

data/test/xml/test_document_encoding.rb

@@ -2,24 +2,25 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
 
 module Nokogiri
   module XML
-   if RUBY_VERSION =~ /^1\.9/
-    class TestDocumentEncoding < Nokogiri::TestCase
-      def setup
-        @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE, 'UTF-8')
-      end
+    if RUBY_VERSION =~ /^1\.9/
+      class TestDocumentEncoding < Nokogiri::TestCase
+        def setup
+          super
+          @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE, 'UTF-8')
+        end
 
-      def test_url
-        assert_equal @xml.encoding, @xml.url.encoding.name
-      end
+        def test_url
+          assert_equal @xml.encoding, @xml.url.encoding.name
+        end
 
-      def test_encoding
-        assert_equal @xml.encoding, @xml.encoding.encoding.name
-      end
+        def test_encoding
+          assert_equal @xml.encoding, @xml.encoding.encoding.name
+        end
 
-      def test_dotted_version
-        assert_equal 'UTF-8', Nokogiri::LIBXML_VERSION.encoding.name
+        def test_dotted_version
+          assert_equal 'UTF-8', Nokogiri::LIBXML_VERSION.encoding.name
+        end
       end
     end
-   end
   end
 end

data/test/xml/test_document_fragment.rb

@@ -8,6 +8,12 @@ module Nokogiri
         fragment = Nokogiri::XML::DocumentFragment.new(@xml)
       end
 
+      def test_fragment_should_have_document
+        @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
+        fragment = Nokogiri::XML::DocumentFragment.new(@xml)
+        assert_equal @xml, fragment.document
+      end
+
       def test_name
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
         fragment = Nokogiri::XML::DocumentFragment.new(@xml)

data/test/xml/test_dtd.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module HTML
     class TestDTD < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML(File.open(XML_FILE))
         assert @dtd = @xml.internal_subset
       end

data/test/xml/test_dtd_encoding.rb

@@ -5,6 +5,7 @@ module Nokogiri
    if RUBY_VERSION =~ /^1\.9/
     class TestDTDEncoding < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE, 'UTF-8')
         assert @dtd = @xml.internal_subset
       end

data/test/xml/test_entity_reference.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module XML
     class TestEntityReference < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML(File.open(XML_FILE), XML_FILE)
       end
 

data/test/xml/test_node.rb

@@ -6,6 +6,7 @@ module Nokogiri
   module XML
     class TestNode < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
@@ -15,6 +16,19 @@ module Nokogiri
         assert_equal 'http://tenderlovemaking.com', node.namespaces['xmlns:foo']
       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_write_to
         io = StringIO.new
         @xml.write_to io
@@ -22,6 +36,10 @@ module Nokogiri
         assert_equal @xml.to_xml, io.read
       end
 
+      def test_attribute_with_symbol
+        assert_equal 'Yes', @xml.css('address').first[:domestic]
+      end
+
       def test_write_to_with_block
         called = false
         io = StringIO.new
@@ -57,6 +75,20 @@ module Nokogiri
         assert_equal @xml.serialize(nil, conf.options), string
       end
 
+      def test_hold_refence_to_subnode
+        doc = Nokogiri::XML(<<-eoxml)
+          <root>
+            <a>
+              <b />
+            </a>
+          </root>
+        eoxml
+        assert node_a = doc.css('a').first
+        assert node_b = node_a.css('b').first
+        node_a.unlink
+        assert_equal 'b', node_b.name
+      end
+
       def test_values
         assert_equal %w{ Yes Yes }, @xml.xpath('//address')[1].values
       end
@@ -87,7 +119,7 @@ module Nokogiri
       def test_ancestors
         address = @xml.xpath('//address').first
         assert_equal 3, address.ancestors.length
-        assert_equal ['employee', 'staff', nil],
+        assert_equal ['employee', 'staff', 'document'],
           address.ancestors.map { |x| x.name }
       end
 
@@ -112,7 +144,7 @@ module Nokogiri
         assert_nil address['domestic']
       end
 
-      def test_angry_add_child
+      def test_add_child_in_same_document
         child = @xml.css('employee').first
 
         assert previous_last_child = child.children.last
@@ -120,12 +152,23 @@ module Nokogiri
 
         last = child.children.last
 
-        # Magic!  Don't try this at home folks
         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>
@@ -237,7 +280,7 @@ module Nokogiri
         assert node.next_sibling
         node.unlink
         assert !node.parent
-        # assert !node.document # ugh. libxml doesn't clear node->doc pointer, due to xmlDict implementation.
+        #assert !node.document
         assert !node.previous_sibling
         assert !node.next_sibling
         assert_no_match(/Hello world/, xml.to_s)
@@ -312,6 +355,11 @@ module Nokogiri
         assert(node.document)
       end
 
+      def test_encode_special_chars
+        foo = @xml.css('employee').first.encode_special_chars('&')
+        assert_equal '&amp;', foo
+      end
+
       def test_content
         node = Nokogiri::XML::Node.new('form', @xml)
         assert_equal('', node.content)

data/test/xml/test_node_encoding.rb

@@ -5,6 +5,7 @@ module Nokogiri
     if RUBY_VERSION =~ /^1\.9/
       class TestNodeEncoding < Nokogiri::TestCase
         def setup
+          super
           @html = Nokogiri::HTML(File.read(HTML_FILE), HTML_FILE)
         end
 

data/test/xml/test_node_set.rb

@@ -4,9 +4,29 @@ module Nokogiri
   module XML
     class TestNodeSet < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_xmlns_is_automatically_registered
+        doc = Nokogiri::XML(<<-eoxml)
+          <root xmlns="http://tenderlovemaking.com/">
+            <foo>
+              <bar/>
+            </foo>
+          </root>
+        eoxml
+        set = doc.css('foo')
+        assert_equal 1, set.css('xmlns|bar').length
+        assert_equal 0, set.css('|bar').length
+        assert_equal 1, set.xpath('//xmlns:bar').length
+        assert_equal 1, set.search('xmlns|bar').length
+        assert_equal 1, set.search('//xmlns:bar').length
+        assert set.at('//xmlns:bar')
+        assert set.at('xmlns|bar')
+        assert set.at('bar')
+      end
+
       def test_length_size
         assert node_set = @xml.search('//employee')
         assert_equal node_set.length, node_set.size
@@ -72,7 +92,7 @@ module Nokogiri
         set.unlink
         set.each do |node|
           assert !node.parent
-          # assert !node.document # ugh. libxml doesn't clear node->doc pointer, due to xmlDict implementation.
+          #assert !node.document
           assert !node.previous_sibling
           assert !node.next_sibling
         end

data/test/xml/test_processing_instruction.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module XML
     class TestProcessingInstruction < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 

data/test/xml/test_reader_encoding.rb

@@ -6,6 +6,7 @@ module Nokogiri
     if RUBY_VERSION =~ /^1\.9/
       class TestReaderEncoding < Nokogiri::TestCase
         def setup
+          super
           @reader = Nokogiri::XML::Reader(
             File.read(XML_FILE),
             XML_FILE,