nokogiri 1.3.3 → 1.4.0

data/test/xml/test_dtd.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
@@ -9,6 +9,45 @@ module Nokogiri
         assert @dtd = @xml.internal_subset
       end
 
+      def test_system_id
+        assert_equal 'staff.dtd', @dtd.system_id
+      end
+
+      def test_external_id
+        xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar" ><foo />')
+        assert dtd = xml.internal_subset
+        assert_equal 'bar', dtd.external_id
+      end
+
+      def test_content
+        assert_raise NoMethodError do
+          @dtd.content
+        end
+      end
+
+      def test_attributes
+        assert_equal ['width'], @dtd.attributes.keys
+        assert_equal '0', @dtd.attributes['width'].default
+      end
+
+      def test_namespace
+        assert_raise NoMethodError do
+          @dtd.namespace
+        end
+      end
+
+      def test_namespace_definitions
+        assert_raise NoMethodError do
+          @dtd.namespace_definitions
+        end
+      end
+
+      def test_line
+        assert_raise NoMethodError do
+          @dtd.line
+        end
+      end
+
       def test_validate
         list = @xml.internal_subset.validate @xml
         assert_equal 44, list.length
@@ -24,10 +63,6 @@ module Nokogiri
         assert_equal %w[ ent1 ent2 ent3 ent4 ent5 ].sort, entities.keys.sort
       end
 
-      def test_attributes
-        assert_nil @dtd.attributes
-      end
-
       def test_elements
         assert elements = @dtd.elements
         assert_equal %w[ br ], elements.keys

data/test/xml/test_dtd_encoding.rb

@@ -1,4 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+# -*- coding: utf-8 -*-
+
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_element_content.rb

@@ -0,0 +1,56 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestElementContent < Nokogiri::TestCase
+      def setup
+        super
+        @xml = Nokogiri::XML(<<-eoxml)
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+<!DOCTYPE staff SYSTEM "staff.dtd" [
+   <!ELEMENT br EMPTY>
+   <!ELEMENT div1 (head, (p | list | note)*, div2*)>
+   <!ELEMENT div2 (tender:love)>
+]>
+</root>
+        eoxml
+        @elements = @xml.internal_subset.children.find_all { |x|
+          x.type == 15
+        }
+        @tree = @elements[1].content
+      end
+
+      def test_allowed_content_not_defined
+        assert_nil @elements.first.content
+      end
+
+      def test_document
+        assert @tree
+        assert_equal @xml, @tree.document
+      end
+
+      def test_type
+        assert_equal ElementContent::SEQ, @tree.type
+      end
+
+      def test_children
+        assert_equal 2, @tree.children.length
+      end
+
+      def test_name
+        assert_nil @tree.name
+        assert_equal 'head', @tree.children.first.name
+        assert_equal 'p', @tree.children[1].children.first.children.first.name
+      end
+
+      def test_occur
+        assert_equal ElementContent::ONCE, @tree.occur
+      end
+
+      def test_prefix
+        assert_nil @tree.prefix
+        assert_equal 'tender', @elements[2].content.prefix
+      end
+    end
+  end
+end

data/test/xml/test_element_decl.rb

@@ -0,0 +1,73 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestElementDecl < Nokogiri::TestCase
+      def setup
+        super
+        @xml = Nokogiri::XML(<<-eoxml)
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+<!DOCTYPE staff SYSTEM "staff.dtd" [
+   <!ELEMENT br EMPTY>
+   <!ELEMENT div1 (head, (p | list | note)*, div2*)>
+   <!ELEMENT my:way EMPTY>
+   <!ATTLIST br width CDATA "0">
+   <!ATTLIST br height CDATA "0">
+]>
+</root>
+        eoxml
+        @elements = @xml.internal_subset.children.find_all { |x|
+          x.type == 15
+        }
+      end
+
+      def test_inspect
+        e = @elements.first
+        assert_equal(
+          "#<#{e.class.name}:#{sprintf("0x%x", e.object_id)} #{e.to_s.inspect}>",
+          e.inspect
+        )
+      end
+
+      def test_prefix
+        assert_nil @elements[1].prefix
+        assert_equal 'my', @elements[2].prefix
+      end
+
+      def test_line
+        assert_raise NoMethodError do
+          @elements.first.line
+        end
+      end
+
+      def test_namespace
+        assert_raise NoMethodError do
+          @elements.first.namespace
+        end
+      end
+
+      def test_namespace_definitions
+        assert_raise NoMethodError do
+          @elements.first.namespace_definitions
+        end
+      end
+
+      def test_element_type
+        assert_equal 1, @elements.first.element_type
+      end
+
+      def test_type
+        assert_equal 15, @elements.first.type
+      end
+
+      def test_class
+        assert_instance_of Nokogiri::XML::ElementDecl, @elements.first
+      end
+
+      def test_attributes
+        assert_equal 2, @elements.first.attribute_nodes.length
+        assert_equal 'width', @elements.first.attribute_nodes.first.name
+      end
+    end
+  end
+end

data/test/xml/test_entity_decl.rb

@@ -0,0 +1,83 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestEntityDecl < Nokogiri::TestCase
+      def setup
+        super
+        @xml = Nokogiri::XML(<<-eoxml)
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+<!DOCTYPE staff SYSTEM "staff.dtd" [
+   <!ENTITY ent1 "es">
+   <!ENTITY nocontent >
+]>
+<root />
+        eoxml
+
+        @entities = @xml.internal_subset.children
+        @entity_decl = @entities.first
+      end
+
+      def test_external_id
+        assert_nil @entity_decl.external_id
+      end
+
+      def test_system_id
+        assert_nil @entity_decl.system_id
+      end
+
+      def test_entity_type
+        assert_equal 1, @entity_decl.entity_type
+      end
+
+      def test_original_content
+        assert_equal "es", @entity_decl.original_content
+        assert_nil @entities[1].original_content
+      end
+
+      def test_content
+        assert_equal "es", @entity_decl.content
+        assert_nil @entities[1].content
+      end
+
+      def test_type
+        assert_equal 17, @entities.first.type
+      end
+
+      def test_class
+        assert_instance_of Nokogiri::XML::EntityDecl, @entities.first
+      end
+
+      def test_attributes
+        assert_raise NoMethodError do
+          @entity_decl.attributes
+        end
+      end
+
+      def test_namespace
+        assert_raise NoMethodError do
+          @entity_decl.namespace
+        end
+      end
+
+      def test_namespace_definitions
+        assert_raise NoMethodError do
+          @entity_decl.namespace_definitions
+        end
+      end
+
+      def test_line
+        assert_raise NoMethodError do
+          @entity_decl.line
+        end
+      end
+
+      def test_inspect
+        assert_equal(
+          "#<#{@entity_decl.class.name}:#{sprintf("0x%x", @entity_decl.object_id)} #{@entity_decl.to_s.inspect}>",
+          @entity_decl.inspect
+        )
+      end
+    end
+  end
+end

data/test/xml/test_entity_reference.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_namespace.rb

@@ -1,9 +1,10 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
     class TestNamespace < Nokogiri::TestCase
       def setup
+        super
         @xml = Nokogiri::XML <<-eoxml
           <root xmlns="http://tenderlovemaking.com/" xmlns:foo="bar">
             <awesome/>
@@ -11,6 +12,25 @@ module Nokogiri
         eoxml
       end
 
+      def test_built_nodes_keep_namespace_decls
+        doc = Document.new
+        e   = Node.new 'element', doc
+        c   = Node.new 'child', doc
+        c.default_namespace = 'woop:de:doo'
+
+        assert c.namespace, 'has a namespace'
+        e.add_child c
+        assert c.namespace, 'has a namespace'
+
+        doc.add_child e
+        assert c.namespace, 'has a namespace'
+      end
+
+      def test_inspect
+        ns = @xml.root.namespace
+        assert_equal "#<#{ns.class.name}:#{sprintf("0x%x", ns.object_id)} href=#{ns.href.inspect}>", ns.inspect
+      end
+
       def test_namespace_is_in_node_cache
         node = @xml.root.namespace
         assert @xml.instance_variable_get(:@node_cache).include?(node)

data/test/xml/test_node.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 require 'stringio'
 
@@ -10,6 +10,44 @@ module Nokogiri
         @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_element?
+        assert @xml.root.element?, 'is an element'
+      end
+
+      def test_slash_search
+        assert_equal 'EMP0001', (@xml/:staff/:employee/:employeeId).first.text
+      end
+
+      def test_append_with_document
+        assert_raises(ArgumentError) do
+          @xml.root << Nokogiri::XML::Document.new
+        end
+      end
+
+      def test_inspect_ns
+        xml = Nokogiri::XML(<<-eoxml) { |c| c.noblanks }
+          <root xmlns="http://tenderlovemaking.com/" xmlns:foo="bar">
+            <awesome/>
+          </root>
+        eoxml
+        ins = xml.inspect
+
+        xml.traverse do |node|
+          assert_match node.class.name, ins
+          if node.respond_to? :attributes
+            node.attributes.each do |k,v|
+              assert_match k, ins
+              assert_match v, ins
+            end
+          end
+
+          if node.respond_to?(:namespace) && node.namespace
+            assert_match node.namespace.class.name, ins
+            assert_match node.namespace.href, ins
+          end
+        end
+      end
+
       def test_namespace_nodes
         xml = Nokogiri::XML <<-eoxml
           <root xmlns="http://tenderlovemaking.com/" xmlns:foo="bar">
@@ -244,6 +282,20 @@ module Nokogiri
         assert_equal node, @xml.xpath('//address').first
       end
 
+      def test_at_xpath
+        node = @xml.at_xpath('//address')
+        nodes = @xml.xpath('//address')
+        assert_equal 5, nodes.size
+        assert_equal node, nodes.first
+      end
+
+      def test_at_css
+        node = @xml.at_css('address')
+        nodes = @xml.css('address')
+        assert_equal 5, nodes.size
+        assert_equal node, nodes.first
+      end
+
       def test_percent
         node = @xml % ('address')
         assert_equal node, @xml.xpath('//address').first
@@ -293,6 +345,23 @@ module Nokogiri
         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
@@ -737,12 +806,9 @@ EOF
         assert_equal 'http://foo.com/', namespaces['xmlns:a']
         assert namespaces.key?('xmlns:b')
         assert_equal 'http://bar.com/', namespaces['xmlns:b']
-        assert namespaces.key?('xmlns:c')
-        assert_equal 'http://bazz.com/', namespaces['xmlns:c']
 
         assert_equal "hello a", xml.search("//a:div", xml.namespaces).first.inner_text
         assert_equal "hello b", xml.search("//b:div", xml.namespaces).first.inner_text
-        assert_equal "hello c", xml.search("//c:div", xml.namespaces).first.inner_text
       end
 
       def test_namespace

data/test/xml/test_node_attributes.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_node_encoding.rb

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