nokogiri 1.3.3 → 1.4.0

data/test/xml/sax/test_push_parser.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
@@ -9,6 +9,16 @@ module Nokogiri
           @parser = XML::SAX::PushParser.new(Doc.new)
         end
 
+        def test_exception
+          assert_raises(SyntaxError) do
+            @parser << "<foo /><foo />"
+          end
+
+          assert_raises(SyntaxError) do
+            @parser << nil
+          end
+        end
+
         def test_end_document_called
           @parser.<<(<<-eoxml)
             <p id="asdfasdf">

data/test/xml/test_attr.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_attribute_decl.rb

@@ -0,0 +1,82 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestAttributeDecl < Nokogiri::TestCase
+      def setup
+        super
+        @xml = Nokogiri::XML(<<-eoxml)
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+<!DOCTYPE staff SYSTEM "staff.dtd" [
+   <!ATTLIST br width CDATA "0">
+   <!ATTLIST a width CDATA >
+   <!ATTLIST payment type (check|cash) "cash">
+]>
+<root />
+        eoxml
+        @attrs = @xml.internal_subset.children
+        @attr_decl = @attrs.first
+      end
+
+      def test_inspect
+        assert_equal(
+          "#<#{@attr_decl.class.name}:#{sprintf("0x%x", @attr_decl.object_id)} #{@attr_decl.to_s.inspect}>",
+          @attr_decl.inspect
+        )
+      end
+
+      def test_type
+        assert_equal 16, @attr_decl.type
+      end
+
+      def test_class
+        assert_instance_of Nokogiri::XML::AttributeDecl, @attr_decl
+      end
+
+      def test_content
+        assert_raise NoMethodError do
+          @attr_decl.content
+        end
+      end
+
+      def test_attributes
+        assert_raise NoMethodError do
+          @attr_decl.attributes
+        end
+      end
+
+      def test_namespace
+        assert_raise NoMethodError do
+          @attr_decl.namespace
+        end
+      end
+
+      def test_namespace_definitions
+        assert_raise NoMethodError do
+          @attr_decl.namespace_definitions
+        end
+      end
+
+      def test_line
+        assert_raise NoMethodError do
+          @attr_decl.line
+        end
+      end
+
+      def test_attribute_type
+        assert_equal 1, @attr_decl.attribute_type
+      end
+
+      def test_default
+        assert_equal '0', @attr_decl.default
+        assert_nil @attrs[1].default
+      end
+
+      def test_enumeration
+        assert_equal [], @attr_decl.enumeration
+        assert_equal ['check', 'cash'], @attrs[2].enumeration
+      end
+    end
+  end
+end
+

data/test/xml/test_builder.rb

@@ -1,8 +1,82 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
     class TestBuilder < Nokogiri::TestCase
+      def test_with_root
+        doc = Nokogiri::XML(File.read(XML_FILE))
+        Nokogiri::XML::Builder.with(doc.at('employee')) do |xml|
+          xml.foo
+        end
+        assert_equal 1, doc.xpath('//employee/foo').length
+      end
+
+      def test_root_namespace_default_decl
+        b = Nokogiri::XML::Builder.new { |xml| xml.root(:xmlns => 'one:two') }
+        doc = b.doc
+        assert_equal 'one:two', doc.root.namespace.href
+        assert_equal({ 'xmlns' => 'one:two' }, doc.root.namespaces)
+      end
+
+      def test_root_namespace_multi_decl
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root(:xmlns => 'one:two', 'xmlns:foo' => 'bar') do
+            xml.hello
+          end
+        }
+        doc = b.doc
+        assert_equal 'one:two', doc.root.namespace.href
+        assert_equal({ 'xmlns' => 'one:two', 'xmlns:foo' => 'bar' }, doc.root.namespaces)
+
+        assert_equal 'one:two', doc.at('hello').namespace.href
+      end
+
+      def test_non_root_namespace
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root { xml.hello(:xmlns => 'one') }
+        }
+        assert_equal 'one', b.doc.at('hello', 'xmlns' => 'one').namespace.href
+      end
+
+      def test_specify_namespace
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root('xmlns:foo' => 'bar') do
+            xml[:foo].bar
+            xml['foo'].baz
+          end
+        }
+        doc = b.doc
+        assert_equal 'bar', b.doc.at('foo|bar', 'foo' => 'bar').namespace.href
+        assert_equal 'bar', b.doc.at('foo|baz', 'foo' => 'bar').namespace.href
+      end
+
+      def test_specify_namespace_nested
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root('xmlns:foo' => 'bar') do
+            xml.yay do
+              xml[:foo].bar
+
+              xml.yikes do
+                xml['foo'].baz
+              end
+            end
+          end
+        }
+        doc = b.doc
+        assert_equal 'bar', b.doc.at('foo|bar', 'foo' => 'bar').namespace.href
+        assert_equal 'bar', b.doc.at('foo|baz', 'foo' => 'bar').namespace.href
+      end
+
+      def test_specified_namespace_undeclared
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root do
+            assert_raises(ArgumentError) do
+              xml[:foo]
+            end
+          end
+        }
+      end
+
       def test_set_encoding
         builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
           xml.root do
@@ -51,6 +125,26 @@ module Nokogiri
         assert_equal 'hello', builder.doc.at('baz').content
       end
 
+      def test_raw_append
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.root do
+            xml << 'hello'
+          end
+        end
+
+        assert_equal 'hello', builder.doc.at('/root').content
+      end
+
+      def test_raw_append_with_instance_eval
+        builder = Nokogiri::XML::Builder.new do
+          root do
+            self << 'hello'
+          end
+        end
+
+        assert_equal 'hello', builder.doc.at('/root').content
+      end
+
       def test_cdata
         builder = Nokogiri::XML::Builder.new do
           root {

data/test/xml/test_cdata.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_comment.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
@@ -13,6 +13,12 @@ module Nokogiri
         assert_equal('<!--hello world-->', comment.to_s)
       end
 
+      def test_comment?
+        comment = Nokogiri::XML::Comment.new(@xml, 'hello world')
+        assert(comment.comment?)
+        assert(!@xml.root.comment?)
+      end
+
       def test_many_comments
         100.times {
           Nokogiri::XML::Comment.new(@xml, 'hello world')

data/test/xml/test_document.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 require 'uri'
 
@@ -10,11 +10,126 @@ module Nokogiri
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_subclass_initialize_modify # testing a segv
+        Class.new(Nokogiri::XML::Document) {
+          def initialize
+            super
+            body_node = Nokogiri::XML::Node.new "body", self
+            body_node.content = "stuff"
+            self.root = body_node
+          end
+        }.new
+      end
+
+      def test_create_text_node
+        txt = @xml.create_text_node 'foo'
+        assert_instance_of Nokogiri::XML::Text, txt
+        assert_equal 'foo', txt.text
+        assert_equal @xml, txt.document
+      end
+
+      def test_create_element
+        elm = @xml.create_element('foo')
+        assert_instance_of Nokogiri::XML::Element, elm
+        assert_equal 'foo', elm.name
+        assert_equal @xml, elm.document
+      end
+
+      def test_pp
+        out = StringIO.new('')
+        assert_nothing_raised do
+          ::PP.pp @xml, out
+        end
+      end
+
+      def test_create_internal_subset_on_existing_subset
+        assert_not_nil @xml.internal_subset
+        assert_raises(RuntimeError) do
+          @xml.create_internal_subset('staff', nil, 'staff.dtd')
+        end
+      end
+
+      def test_create_internal_subset
+        xml = Nokogiri::XML('<root />')
+        assert_nil xml.internal_subset
+
+        xml.create_internal_subset('name', nil, 'staff.dtd')
+        ss = xml.internal_subset
+        assert_equal 'name', ss.name
+        assert_nil ss.external_id
+        assert_equal 'staff.dtd', ss.system_id
+      end
+
+      def test_external_subset
+        assert_nil @xml.external_subset
+        Dir.chdir(ASSETS_DIR) do
+          @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) { |cfg|
+            cfg.dtdload
+          }
+        end
+        assert @xml.external_subset
+      end
+
+      def test_create_external_subset_fails_with_existing_subset
+        assert_nil @xml.external_subset
+        Dir.chdir(ASSETS_DIR) do
+          @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) { |cfg|
+            cfg.dtdload
+          }
+        end
+        assert @xml.external_subset
+
+        assert_raises(RuntimeError) do
+          @xml.create_external_subset('staff', nil, 'staff.dtd')
+        end
+      end
+
+      def test_create_external_subset
+        dtd = @xml.create_external_subset('staff', nil, 'staff.dtd')
+        assert_nil dtd.external_id
+        assert_equal 'staff.dtd', dtd.system_id
+        assert_equal 'staff', dtd.name
+        assert_equal dtd, @xml.external_subset
+      end
+
+      def test_version
+        assert_equal '1.0', @xml.version
+      end
+
+      def test_attributes
+        assert_raise NoMethodError do
+          @xml.attributes
+        end
+      end
+
+      def test_namespace
+        assert_raise NoMethodError do
+          @xml.namespace
+        end
+      end
+
+      def test_namespace_definitions
+        assert_raise NoMethodError do
+          @xml.namespace_definitions
+        end
+      end
+
+      def test_line
+        assert_raise NoMethodError do
+          @xml.line
+        end
+      end
+
       def test_empty_node_converted_to_html_is_not_self_closing
         doc = Nokogiri::XML('<a></a>')
         assert_equal "<a></a>", doc.inner_html
       end
 
+      def test_fragment
+        fragment = @xml.fragment
+        assert_equal 0, fragment.children.length
+      end
+
       def test_add_child_with_fragment
         doc = Nokogiri::XML::Document.new
         fragment = doc.fragment('<hello />')
@@ -259,6 +374,12 @@ module Nokogiri
             cfg.strict
           }
         }
+
+        assert_raises(Nokogiri::XML::SyntaxError) {
+          Nokogiri::XML(StringIO.new('<foo><bar></foo>')) { |cfg|
+            cfg.strict
+          }
+        }
       end
 
       def test_XML_function
@@ -311,11 +432,6 @@ module Nokogiri
         }
       end
 
-      def test_new_document_collect_namespaces
-        doc = Nokogiri::XML::Document.new
-        assert_equal({}, doc.collect_namespaces)
-      end
-
       def test_find_with_namespace
         doc = Nokogiri::XML.parse(<<-eoxml)
         <x xmlns:tenderlove='http://tenderlovemaking.com/'>
@@ -456,6 +572,31 @@ module Nokogiri
         assert_equal(node, doc.root)
       end
 
+      def test_remove_namespaces
+        doc = Nokogiri::XML <<-EOX
+          <root xmlns:a="http://a.flavorjon.es/" xmlns:b="http://b.flavorjon.es/">
+            <a:foo>hello from a</a:foo>
+            <b:foo>hello from b</b:foo>
+            <container xmlns:c="http://c.flavorjon.es/">
+              <c:foo>hello from c</c:foo>
+            </container>
+          </root>
+        EOX
+
+        # assert on setup
+        assert_equal 0, doc.xpath("//foo").length
+        assert_equal 1, doc.xpath("//a:foo").length
+        assert_equal 1, doc.xpath("//a:foo").length
+        assert_equal 1, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
+
+        doc.remove_namespaces!
+
+        assert_equal 3, doc.xpath("//foo").length
+        assert_equal 0, doc.xpath("//a:foo").length
+        assert_equal 0, doc.xpath("//a:foo").length
+        assert_equal 0, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
+      end
+
       def util_decorate(document, x)
         document.decorators(XML::Node) << x
         document.decorators(XML::NodeSet) << x

data/test/xml/test_document_encoding.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_document_fragment.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
@@ -49,21 +49,20 @@ module Nokogiri
       end
 
       def test_xml_fragment_has_multiple_toplevel_children
-        # TODO: this is lame. xml fragment() should support multiple top-level children
         doc = "<div>b</div><div>e</div>"
         fragment = Nokogiri::XML::Document.new.fragment(doc)
-        assert_equal "<div>b</div>", fragment.to_s
+        assert_equal "<div>b</div><div>e</div>", fragment.to_s
       end
 
       def test_xml_fragment_has_outer_text
         # this test is descriptive, not prescriptive.
         doc = "a<div>b</div>"
         fragment = Nokogiri::XML::Document.new.fragment(doc)
-        assert_equal "", fragment.to_s
+        assert_equal "a<div>b</div>", fragment.to_s
 
         doc = "<div>b</div>c"
         fragment = Nokogiri::XML::Document.new.fragment(doc)
-        assert_equal "<div>b</div>", fragment.to_s
+        assert_equal "<div>b</div>c", fragment.to_s
       end
 
       def test_xml_fragment_case_sensitivity
@@ -83,6 +82,57 @@ module Nokogiri
         fragment = Nokogiri::XML::Document.new.fragment(doc)
         assert_equal "<div>b</div>", fragment.to_s
       end
+
+      def test_fragment_children_search
+        fragment = Nokogiri::XML::Document.new.fragment(
+          '<div><p id="content">hi</p></div>'
+        )
+        css     = fragment.children.css('p')
+        xpath   = fragment.children.xpath('.//p')
+        assert_equal css, xpath
+      end
+
+      def test_fragment_search
+        frag = Nokogiri::XML::Document.new.fragment '<p id="content">hi</p>'
+
+        p_tag = frag.css('#content').first
+        assert_equal 'p', p_tag.name
+
+        assert_equal p_tag, frag.xpath('./*[@id = \'content\']').first
+      end
+
+      def test_fragment_without_a_namespace_does_not_get_a_namespace
+        doc = Nokogiri::XML <<-EOX
+          <root xmlns="http://tenderlovemaking.com/" xmlns:foo="http://flavorjon.es/" xmlns:bar="http://google.com/">
+            <foo:existing></foo:existing>
+          </root>
+        EOX
+        frag = doc.fragment "<newnode></newnode>"
+        assert_nil frag.namespace
+      end
+
+      def test_fragment_namespace_resolves_against_document_root
+        doc = Nokogiri::XML <<-EOX
+          <root xmlns:foo="http://flavorjon.es/" xmlns:bar="http://google.com/">
+            <foo:existing></foo:existing>
+          </root>
+        EOX
+        ns = doc.root.namespace_definitions.detect { |x| x.prefix == "bar" }
+
+        frag = doc.fragment "<bar:newnode></bar:newnode>"
+        assert frag.children.first.namespace
+        assert_equal ns, frag.children.first.namespace
+      end
+
+      def test_fragment_invalid_namespace_is_silently_ignored
+        doc = Nokogiri::XML <<-EOX
+          <root xmlns:foo="http://flavorjon.es/" xmlns:bar="http://google.com/">
+            <foo:existing></foo:existing>
+          </root>
+        EOX
+        frag = doc.fragment "<baz:newnode></baz:newnode>"
+        assert_nil frag.children.first.namespace
+      end
     end
   end
 end