nokogiri 1.1.1 → 1.2.0

data/test/xml/test_cdata.rb

@@ -11,7 +11,7 @@ module Nokogiri
         name = @xml.xpath('//employee[2]/name').first
         assert cdata = name.children[1]
         assert cdata.cdata?
-        assert_equal 'cdata-section', cdata.name
+        assert_equal '#cdata-section', cdata.name
       end
     end
   end

data/test/xml/test_document.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
 
+require 'uri'
+
 module Nokogiri
   module XML
     class TestDocument < Nokogiri::TestCase
@@ -7,11 +9,54 @@ module Nokogiri
         @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
+        assert_equal 1, doc.css('xmlns|foo').length
+        assert_equal 1, doc.css('foo').length
+        assert_equal 0, doc.css('|foo').length
+      end
+
+      # wtf...  osx's libxml sucks.
+      unless Nokogiri::LIBXML_VERSION =~ /^2\.6\./
+        def test_encoding
+          xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE, 'UTF-8')
+          assert_equal 'UTF-8', xml.encoding
+        end
+      end
+
+      def test_document_has_errors
+        doc = Nokogiri::XML(<<-eoxml)
+          <foo><bar></foo>
+        eoxml
+        assert doc.errors.length > 0
+        doc.errors.each do |error|
+          assert_match error.message, error.inspect
+          assert_match error.message, error.to_s
+        end
+      end
+
+      def test_strict_document_throws_syntax_error
+        assert_raises(Nokogiri::XML::SyntaxError) {
+          Nokogiri::XML('<foo><bar></foo>', nil, nil, 0)
+        }
+      end
+
       def test_XML_function
         xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE)
         assert xml.xml?
       end
 
+      def test_url
+        assert @xml.url
+        assert_equal XML_FILE, URI.unescape(@xml.url).sub('file:///', '')
+      end
+
       def test_document_parent
         xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE)
         assert_raises(NoMethodError) {

data/test/xml/test_document_fragment.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+module Nokogiri
+  module XML
+    class TestDocumentFragment < Nokogiri::TestCase
+      def test_new
+        @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
+        fragment = Nokogiri::XML::DocumentFragment.new(@xml)
+      end
+
+      def test_name
+        @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
+        fragment = Nokogiri::XML::DocumentFragment.new(@xml)
+        assert_equal '#document-fragment', fragment.name
+      end
+    end
+  end
+end

data/test/xml/test_dtd.rb

@@ -4,7 +4,7 @@ module Nokogiri
   module HTML
     class TestDTD < Nokogiri::TestCase
       def setup
-        @xml = Nokogiri::XML.parse(File.read(XML_FILE))
+        @xml = Nokogiri::XML(File.open(XML_FILE))
         assert @dtd = @xml.internal_subset
       end
 
@@ -19,9 +19,7 @@ module Nokogiri
       end
 
       def test_attributes
-        assert attributes = @dtd.attributes
-        assert_equal %w[ width ], attributes.keys
-        assert_equal 'width', attributes['width'].name
+        assert_nil @dtd.attributes
       end
 
       def test_elements

data/test/xml/test_entity_reference.rb

@@ -0,0 +1,16 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+module Nokogiri
+  module XML
+    class TestEntityReference < Nokogiri::TestCase
+      def setup
+        @xml = Nokogiri::XML(File.open(XML_FILE), XML_FILE)
+      end
+
+      def test_new
+        assert ref = EntityReference.new(@xml, 'ent4')
+        assert_instance_of EntityReference, ref
+      end
+    end
+  end
+end

data/test/xml/test_node.rb

@@ -1,44 +1,121 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
 
+require 'stringio'
+
 module Nokogiri
   module XML
     class TestNode < Nokogiri::TestCase
+      def setup
+        @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
+      end
+
+      def test_add_namespace
+        node = @xml.at('address')
+        node.add_namespace('foo', 'http://tenderlovemaking.com')
+        assert_equal 'http://tenderlovemaking.com', node.namespaces['xmlns:foo']
+      end
+
+      def test_write_to
+        io = StringIO.new
+        @xml.write_to io
+        io.rewind
+        assert_equal @xml.to_xml, io.read
+      end
+
+      def test_write_to_with_block
+        called = false
+        io = StringIO.new
+        conf = nil
+        @xml.write_to io do |config|
+          called = true
+          conf = config
+          config.format.as_html.no_empty_tags
+        end
+        io.rewind
+        assert called
+        assert_equal @xml.serialize(nil, conf.options), io.read
+      end
+
+      %w{ xml html xhtml }.each do |type|
+        define_method(:"test_write_#{type}_to") do
+          io = StringIO.new
+          assert @xml.send(:"write_#{type}_to", io)
+          io.rewind
+          assert_match @xml.send(:"to_#{type}"), io.read
+        end
+      end
+
+      def test_serialize_with_block
+        called = false
+        conf = nil
+        string = @xml.serialize do |config|
+          called = true
+          conf = config
+          config.format.as_html.no_empty_tags
+        end
+        assert called
+        assert_equal @xml.serialize(nil, conf.options), string
+      end
+
+      def test_values
+        assert_equal %w{ Yes Yes }, @xml.xpath('//address')[1].values
+      end
+
+      def test_keys
+        assert_equal %w{ domestic street }, @xml.xpath('//address')[1].keys
+      end
+
+      def test_each
+        attributes = []
+        @xml.xpath('//address')[1].each do |key, value|
+          attributes << [key, value]
+        end
+        assert_equal [['domestic', 'Yes'], ['street', 'Yes']], attributes
+      end
+
+      def test_new
+        assert node = Nokogiri::XML::Node.new('input', @xml)
+        assert_equal 1, node.node_type
+      end
+
+      def test_to_str
+        name = @xml.xpath('//name').first
+        assert_match(/Margaret/, '' + name)
+        assert_equal('Margaret Martin', '' + name.children.first)
+      end
+
       def test_ancestors
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        address = xml.xpath('//address').first
+        address = @xml.xpath('//address').first
         assert_equal 3, address.ancestors.length
         assert_equal ['employee', 'staff', nil],
           address.ancestors.map { |x| x.name }
       end
 
       def test_read_only?
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert entity_decl = xml.internal_subset.children.find { |x|
+        assert entity_decl = @xml.internal_subset.children.find { |x|
           x.type == Node::ENTITY_DECL
         }
         assert entity_decl.read_only?
       end
 
       def test_remove_attribute
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        address = xml.xpath('/staff/employee/address').first
+        address = @xml.xpath('/staff/employee/address').first
         assert_equal 'Yes', address['domestic']
         address.remove_attribute 'domestic'
         assert_nil address['domestic']
       end
 
       def test_delete
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        address = xml.xpath('/staff/employee/address').first
+        address = @xml.xpath('/staff/employee/address').first
         assert_equal 'Yes', address['domestic']
         address.delete 'domestic'
         assert_nil address['domestic']
       end
 
       def test_angry_add_child
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        child = xml.css('employee').first
+        child = @xml.css('employee').first
 
+        assert previous_last_child = child.children.last
         assert new_child = child.children.first
 
         last = child.children.last
@@ -166,91 +243,48 @@ module Nokogiri
         assert_no_match(/Hello world/, xml.to_s)
       end
 
-      def test_dup_shallow
-        html = Nokogiri::HTML.parse(File.read(HTML_FILE), HTML_FILE)
-        found = html.search('//div/a').first
-        dup = found.dup(0)
-        assert dup
-        assert_equal '', dup.content
-      end
-
-      def test_dup
-        html = Nokogiri::HTML.parse(File.read(HTML_FILE), HTML_FILE)
-        found = html.search('//div/a').first
-        dup = found.dup
-        assert dup
-        assert_equal found.content, dup.content
-      end
-
-      def test_search_can_handle_xpath_and_css
-        html = Nokogiri::HTML.parse(File.read(HTML_FILE), HTML_FILE)
-        found = html.search('//div/a', 'div > p')
-        length = html.xpath('//div/a').length +
-          html.css('div > p').length
-        assert_equal length, found.length
-      end
-
-      def test_find_by_xpath
-        html = Nokogiri::HTML.parse(File.read(HTML_FILE), HTML_FILE)
-        found = html.xpath('//div/a')
-        assert_equal 3, found.length
-      end
-
-      def test_find_by_css
-        html = Nokogiri::HTML.parse(File.read(HTML_FILE), HTML_FILE)
-        found = html.css('div > a')
-        assert_equal 3, found.length
-      end
-
       def test_next_sibling
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert node = xml.root
+        assert node = @xml.root
         assert sibling = node.child.next_sibling
         assert_equal('employee', sibling.name)
       end
 
       def test_previous_sibling
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert node = xml.root
+        assert node = @xml.root
         assert sibling = node.child.next_sibling
         assert_equal('employee', sibling.name)
         assert_equal(sibling.previous_sibling, node.child)
       end
 
       def test_name=
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert node = xml.root
+        assert node = @xml.root
         node.name = 'awesome'
         assert_equal('awesome', node.name)
       end
 
       def test_child
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert node = xml.root
+        assert node = @xml.root
         assert child = node.child
         assert_equal('text', child.name)
       end
 
       def test_key?
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert node = xml.search('//address').first
+        assert node = @xml.search('//address').first
         assert(!node.key?('asdfasdf'))
       end
 
       def test_set_property
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert node = xml.search('//address').first
+        assert node = @xml.search('//address').first
         node['foo'] = 'bar'
         assert_equal('bar', node['foo'])
       end
 
       def test_attributes
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert node = xml.search('//address').first
+        assert node = @xml.search('//address').first
         assert_nil(node['asdfasdfasdf'])
         assert_equal('Yes', node['domestic'])
 
-        assert node = xml.search('//address')[2]
+        assert node = @xml.search('//address')[2]
         attr = node.attributes
         assert_equal 2, attr.size
         assert_equal 'Yes', attr['domestic'].value
@@ -259,31 +293,27 @@ module Nokogiri
       end
 
       def test_path
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert set = xml.search('//employee')
+        assert set = @xml.search('//employee')
         assert node = set.first
         assert_equal('/staff/employee[1]', node.path)
       end
 
       def test_search_by_symbol
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        assert set = xml.search(:employee)
+        assert set = @xml.search(:employee)
         assert 5, set.length
 
-        assert node = xml.at(:employee)
+        assert node = @xml.at(:employee)
         assert node.text =~ /EMP0001/
       end
 
       def test_new_node
-        xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
-        node = Nokogiri::XML::Node.new('form', xml)
+        node = Nokogiri::XML::Node.new('form', @xml)
         assert_equal('form', node.name)
         assert(node.document)
       end
 
       def test_content
-        xml = Nokogiri::XML.parse(File.read(XML_FILE))
-        node = Nokogiri::XML::Node.new('form', xml)
+        node = Nokogiri::XML::Node.new('form', @xml)
         assert_equal('', node.content)
 
         node.content = 'hello world!'
@@ -298,33 +328,42 @@ module Nokogiri
       end
 
       def test_replace
-        xml = Nokogiri::XML.parse(File.read(XML_FILE))
-        set = xml.search('//employee')
+        set = @xml.search('//employee')
         assert 5, set.length
-        assert 0, xml.search('//form').length
+        assert 0, @xml.search('//form').length
 
         first = set[0]
         second = set[1]
 
-        node = Nokogiri::XML::Node.new('form', xml)
+        node = Nokogiri::XML::Node.new('form', @xml)
         first.replace(node)
 
-        assert set = xml.search('//employee')
+        assert set = @xml.search('//employee')
         assert_equal 4, set.length
-        assert 1, xml.search('//form').length
+        assert 1, @xml.search('//form').length
 
         assert_equal set[0].to_xml, second.to_xml
-        assert_equal set[0].to_xml(5), second.to_xml(5)
-        assert_not_equal set[0].to_xml, set[0].to_xml(5)
       end
 
       def test_illegal_replace_of_node_with_doc
-        xml = Nokogiri::XML.parse(File.read(XML_FILE))
         new_node = Nokogiri::XML.parse('<foo>bar</foo>')
-        old_node = xml.at('//employee')
+        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)
+        
+        address1_1 = doc1.xpath('//address').first
+        address1_2 = doc1.xpath('//address').first
+        
+        address2 = doc2.xpath('//address').first
+        
+        assert_not_equal address1_1, address2 # two references to very, very similar nodes
+        assert_equal address1_1, address1_2 # two references to the exact same node
+      end
+
       def test_namespace_as_hash
         xml = Nokogiri::XML.parse(<<-eoxml)
 <root>
@@ -341,6 +380,22 @@ module Nokogiri
         assert_equal 1, tires.length
       end
 
+      def test_namespace_search_with_css
+        xml = Nokogiri::XML.parse(<<-eoxml)
+<root>
+ <car xmlns:part="http://general-motors.com/">
+  <part:tire>Michelin Model XGV</part:tire>
+ </car>
+ <bicycle xmlns:part="http://schwinn.com/">
+  <part:tire>I'm a bicycle tire!</part:tire>
+ </bicycle>
+</root>
+        eoxml
+
+        tires = xml.css('bike|tire', 'bike' => 'http://schwinn.com/')
+        assert_equal 1, tires.length
+      end
+
       def test_namespaces
         xml = Nokogiri::XML.parse(<<-EOF)
 <x xmlns:a='http://foo.com/' xmlns:b='http://bar.com/'>
@@ -389,6 +444,20 @@ EOF
         assert_equal nil, set[3].namespace
       end
 
+      def test_line
+        xml = Nokogiri::XML(<<-eoxml)
+        <root>
+          <a>
+            Hello world
+          </a>
+        </root>
+        eoxml
+
+        set = xml.search("//a")
+        node = set.first
+        assert_equal 2, node.line
+      end
+
     end
   end
 end