nokogiri 1.5.0-x86-mingw32 → 1.5.1.rc1-x86-mingw32

data/test/xml/test_builder.rb

@@ -199,13 +199,34 @@ module Nokogiri
         assert_equal 'hello', builder.doc.at('/root').content
       end
 
+      def test_raw_xml_append
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.root do
+            xml << '<aaa><bbb/><ccc/></aaa>'
+          end
+        end
+
+        assert_equal ["aaa"],       builder.doc.at_css("root").children.collect(&:name)
+        assert_equal ["bbb","ccc"], builder.doc.at_css("aaa").children.collect(&:name)
+      end
+
       def test_cdata
         builder = Nokogiri::XML::Builder.new do
           root {
             cdata "hello world"
           }
         end
-        assert_equal("<?xml version=\"1.0\"?><root><![CDATA[hello world]]></root>", builder.to_xml.gsub(/\n/, ''))
+        assert_equal("<?xml version=\"1.0\"?><root><![CDATA[hello world]]></root>",
+          builder.to_xml.gsub(/\n/, ""))
+      end
+
+      def test_comment
+        builder = Nokogiri::XML::Builder.new do
+          root {
+            comment "this is a comment"
+          }
+        end
+        assert builder.doc.root.children.first.comment?
       end
 
       def test_builder_no_block
@@ -214,7 +235,8 @@ module Nokogiri
         builder.root {
           cdata string
         }
-        assert_equal("<?xml version=\"1.0\"?><root><![CDATA[hello world]]></root>", builder.to_xml.gsub(/\n/, ''))
+        assert_equal("<?xml version=\"1.0\"?><root><![CDATA[hello world]]></root>",
+          builder.to_xml.gsub(/\n/, ''))
       end
 
     private

data/test/xml/test_c14n.rb

@@ -0,0 +1,151 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestC14N < Nokogiri::TestCase
+      # http://www.w3.org/TR/xml-c14n#Example-OutsideDoc
+      def test_3_1
+        doc = Nokogiri.XML <<-eoxml
+<?xml version="1.0"?>
+
+<?xml-stylesheet   href="doc.xsl"
+   type="text/xsl"   ?>
+
+<!DOCTYPE doc SYSTEM "doc.dtd">
+
+<doc>Hello, world!<!-- Comment 1 --></doc>
+
+<?pi-without-data     ?>
+
+<!-- Comment 2 -->
+
+<!-- Comment 3 -->
+        eoxml
+
+        c14n = doc.canonicalize
+        assert_no_match(/version=/, c14n)
+        assert_match(/Hello, world/, c14n)
+        assert_no_match(/Comment/, c14n)
+        c14n = doc.canonicalize(nil, nil, true)
+        assert_match(/Comment/, c14n)
+      end
+
+      def test_exclude_block_params
+        xml = '<a><b></b></a>'
+        doc = Nokogiri.XML xml
+
+        list = []
+        doc.canonicalize do |node, parent|
+          list << [node, parent]
+          true
+        end
+        if Nokogiri.jruby?
+          assert_equal(
+            ['a', 'document', 'document', nil, 'b', 'a'],
+            list.flatten.map { |x| x ? x.name : x }
+          )
+        else
+          assert_equal(
+            ['a', 'document', 'document', nil, 'b', 'a', 'a', 'document'],
+            list.flatten.map { |x| x ? x.name : x }
+          )
+        end
+      end
+
+      def test_exclude_block_true
+        xml = '<a><b></b></a>'
+        doc = Nokogiri.XML xml
+
+        c14n = doc.canonicalize do |node, parent|
+          true
+        end
+        assert_equal xml, c14n
+      end
+
+      def test_exclude_block_false
+        xml = '<a><b></b></a>'
+        doc = Nokogiri.XML xml
+
+        c14n = doc.canonicalize do |node, parent|
+          false
+        end
+        assert_equal '', c14n
+      end
+
+      def test_exclude_block_nil
+        xml = '<a><b></b></a>'
+        doc = Nokogiri.XML xml
+
+        c14n = doc.canonicalize do |node, parent|
+          nil
+        end
+        assert_equal '', c14n
+      end
+
+      def test_exclude_block_object
+        xml = '<a><b></b></a>'
+        doc = Nokogiri.XML xml
+
+        c14n = doc.canonicalize do |node, parent|
+          Object.new
+        end
+        assert_equal xml, c14n
+      end
+
+      def test_c14n_node
+        xml = '<a><b><c></c></b></a>'
+        doc = Nokogiri.XML xml
+        c14n = doc.at_xpath('//b').canonicalize
+        assert_equal '<b><c></c></b>', c14n
+      end
+
+      def test_c14n_modes
+        skip("C14N Exclusive implementation will complete by next version after 1.5.1") if Nokogiri.jruby?
+        # http://www.w3.org/TR/xml-exc-c14n/#sec-Enveloping
+        
+        doc1 = Nokogiri.XML <<-eoxml
+<n0:local xmlns:n0="http://foobar.org" xmlns:n3="ftp://example.org">
+  <n1:elem2 xmlns:n1="http://example.net" xml:lang="en">
+    <n3:stuff xmlns:n3="ftp://example.org"/>
+  </n1:elem2>
+</n0:local>        
+        eoxml
+        doc2 = Nokogiri.XML <<-eoxml
+<n2:pdu xmlns:n1="http://example.com"
+           xmlns:n2="http://foo.example"
+           xml:lang="fr"
+           xml:space="retain">
+  <n1:elem2 xmlns:n1="http://example.net" xml:lang="en">
+    <n3:stuff xmlns:n3="ftp://example.org"/>
+  </n1:elem2>
+</n2:pdu>        
+        eoxml
+
+        c14n = doc1.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize
+        assert_equal '<n1:elem2 xmlns:n0="http://foobar.org" xmlns:n1="http://example.net" xmlns:n3="ftp://example.org" xml:lang="en">
+    <n3:stuff></n3:stuff>
+  </n1:elem2>', c14n
+        c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize
+        assert_equal '<n1:elem2 xmlns:n1="http://example.net" xmlns:n2="http://foo.example" xml:lang="en" xml:space="retain">
+    <n3:stuff xmlns:n3="ftp://example.org"></n3:stuff>
+  </n1:elem2>', c14n
+
+        excl_c14n = '<n1:elem2 xmlns:n1="http://example.net" xml:lang="en">
+    <n3:stuff xmlns:n3="ftp://example.org"></n3:stuff>
+  </n1:elem2>'
+        c14n = doc1.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize(XML::XML_C14N_EXCLUSIVE_1_0)
+        assert_equal excl_c14n, c14n
+        c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize(XML::XML_C14N_EXCLUSIVE_1_0)
+        assert_equal excl_c14n, c14n
+
+        c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize(XML::XML_C14N_EXCLUSIVE_1_0, ['n2'])
+        assert_equal '<n1:elem2 xmlns:n1="http://example.net" xmlns:n2="http://foo.example" xml:lang="en">
+    <n3:stuff xmlns:n3="ftp://example.org"></n3:stuff>
+  </n1:elem2>', c14n
+        
+      end
+
+
+    end
+  end
+end

data/test/xml/test_document.rb

@@ -51,6 +51,14 @@ module Nokogiri
         assert_equal @xml, txt.document
       end
 
+      def test_create_text_node_with_block
+        @xml.create_text_node 'foo' do |txt|
+          assert_instance_of Nokogiri::XML::Text, txt
+          assert_equal 'foo', txt.text
+          assert_equal @xml, txt.document
+        end
+      end
+
       def test_create_element
         elm = @xml.create_element('foo')
         assert_instance_of Nokogiri::XML::Element, elm
@@ -58,6 +66,14 @@ module Nokogiri
         assert_equal @xml, elm.document
       end
 
+      def test_create_element_with_block
+        @xml.create_element('foo') do |elm|
+          assert_instance_of Nokogiri::XML::Element, elm
+          assert_equal 'foo', elm.name
+          assert_equal @xml, elm.document
+        end
+      end
+
       def test_create_element_with_attributes
         elm = @xml.create_element('foo',:a => "1")
         assert_instance_of Nokogiri::XML::Element, elm
@@ -70,6 +86,11 @@ module Nokogiri
         assert_equal 'http://tenderlovemaking.com', elm.namespaces['xmlns:foo']
       end
 
+      def test_create_element_with_hyphenated_namespace
+        elm = @xml.create_element('foo',:'xmlns:SOAP-ENC' => 'http://tenderlovemaking.com')
+        assert_equal 'http://tenderlovemaking.com', elm.namespaces['xmlns:SOAP-ENC']
+      end
+
       def test_create_element_with_content
         elm = @xml.create_element('foo',"needs more xml/violence")
         assert_equal "needs more xml/violence", elm.content
@@ -81,6 +102,26 @@ module Nokogiri
         assert_equal "abc", cdata.content
       end
 
+      def test_create_cdata_with_block
+        @xml.create_cdata("abc") do |cdata|
+          assert_instance_of Nokogiri::XML::CDATA, cdata
+          assert_equal "abc", cdata.content
+        end
+      end
+
+      def test_create_comment
+        comment = @xml.create_comment("abc")
+        assert_instance_of Nokogiri::XML::Comment, comment
+        assert_equal "abc", comment.content
+      end
+
+      def test_create_comment_with_block
+        @xml.create_comment("abc") do |comment|
+          assert_instance_of Nokogiri::XML::Comment, comment
+          assert_equal "abc", comment.content
+        end
+      end
+
       def test_pp
         out = StringIO.new('')
         assert_nothing_raised do
@@ -204,6 +245,13 @@ module Nokogiri
         end
       end
 
+      def test_add_child_with_string
+        doc = Nokogiri::XML::Document.new
+        doc.add_child "<div>quack!</div>"
+        assert_equal 1, doc.root.children.length
+        assert_equal "quack!", doc.root.children.first.content
+      end
+
       def test_move_root_to_document_with_no_root
         sender = Nokogiri::XML('<root>foo</root>')
         newdoc = Nokogiri::XML::Document.new

data/test/xml/test_namespace.rb

@@ -65,6 +65,11 @@ module Nokogiri
         ns = @xml.root.add_namespace_definition('baz', 'bar')
         assert_equal 'baz', ns.prefix
       end
+
+      def test_remove_entity_namespace
+        s = %q{<?xml version='1.0'?><!DOCTYPE schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" [<!ENTITY % p ''>]>}
+        Nokogiri::XML(s).remove_namespaces!
+      end
     end
   end
 end

data/test/xml/test_node.rb

@@ -125,6 +125,13 @@ module Nokogiri
         @xml.root.parse('<hello>')
         assert(error_count < @xml.errors.length, "errors should have increased")
       end
+      
+      def test_parse_error_on_fragment_with_empty_document
+        doc = Document.new
+        fragment = DocumentFragment.new(doc, '<foo><bar/></foo>')
+        node = fragment%'bar'
+        node.parse('<baz><</baz>')
+      end
 
       def test_subclass_dup
         subclass = Class.new(Nokogiri::XML::Node)
@@ -209,6 +216,13 @@ module Nokogiri
         end
       end
 
+      def test_append_with_attr
+        r = Nokogiri.XML('<r a="1" />').root
+        assert_raises(ArgumentError) do
+          r << r.at_xpath('@a')
+        end
+      end
+
       def test_inspect_ns
         xml = Nokogiri::XML(<<-eoxml) { |c| c.noblanks }
           <root xmlns="http://tenderlovemaking.com/" xmlns:foo="bar">
@@ -592,6 +606,19 @@ module Nokogiri
         assert_nil address['domestic']
       end
 
+      def test_attribute_setter_accepts_non_string
+        address = @xml.xpath("/staff/employee/address").first
+        assert_equal "Yes", address[:domestic]
+        address[:domestic] = "Altered Yes"
+        assert_equal "Altered Yes", address[:domestic]
+      end
+
+      def test_attribute_accessor_accepts_non_string
+        address = @xml.xpath("/staff/employee/address").first
+        assert_equal "Yes", address["domestic"]
+        assert_equal "Yes", address[:domestic]
+      end
+
       def test_delete
         address = @xml.xpath('/staff/employee/address').first
         assert_equal 'Yes', address['domestic']
@@ -807,6 +834,46 @@ module Nokogiri
         assert_equal 1, tires.length
       end
 
+      def test_namespaced_attribute_search_with_xpath
+        # from #593
+        xmlContent = <<-EOXML
+<?xml version="1.0"?>
+<ns1:el1 xmlns:ns1="http://blabla.com" >
+  <ns1:el2 ns1:att="123">with namespace</ns1:el2 >
+  <ns1:el2 att="noNameSpace">no namespace</ns1:el2 >
+</ns1:el1>
+EOXML
+        xml_doc = Nokogiri::XML(xmlContent)
+
+        no_ns = xml_doc.xpath("//*[@att]")
+        assert_equal no_ns.length, 1
+        assert_equal no_ns.first.content, "no namespace"
+
+        with_ns = xml_doc.xpath("//*[@ns1:att]")
+        assert_equal with_ns.length, 1
+        assert_equal with_ns.first.content, "with namespace"
+      end
+
+      def test_namespaced_attribute_search_with_css
+        # from #593
+        xmlContent = <<-EOXML
+<?xml version="1.0"?>
+<ns1:el1 xmlns:ns1="http://blabla.com" >
+  <ns1:el2 ns1:att="123">with namespace</ns1:el2 >
+  <ns1:el2 att="noNameSpace">no namespace</ns1:el2 >
+</ns1:el1>
+EOXML
+        xml_doc = Nokogiri::XML(xmlContent)
+
+        no_ns = xml_doc.css('*[att]')
+        assert_equal no_ns.length, 1
+        assert_equal no_ns.first.content, "no namespace"
+
+        with_ns = xml_doc.css('*[ns1|att]')
+        assert_equal with_ns.length, 1
+        assert_equal with_ns.first.content, "with namespace"
+      end
+
       def test_namespaces_should_include_all_namespace_definitions
         xml = Nokogiri::XML.parse(<<-EOF)
         <x xmlns="http://quux.com/" xmlns:a="http://foo.com/" xmlns:b="http://bar.com/">
@@ -854,7 +921,7 @@ module Nokogiri
             <b:div>hello b</b:div>
             <c:div>hello c</c:div>
             <div>hello moon</div>
-          </y>  
+          </y>
         </x>
         EOF
         set = xml.search("//y/*")
@@ -912,6 +979,20 @@ module Nokogiri
         assert_equal @xml, node_set.document
         assert node_set.respond_to?(:awesome!)
       end
+
+      def test_blank
+        doc = Nokogiri::XML('')
+        assert_equal false, doc.blank?
+      end
+
+      def test_to_xml_allows_to_serialize_with_as_xml_save_option
+        xml = Nokogiri::XML("<root><ul><li>Hello world</li></ul></root>")
+        set = xml.search("//ul")
+        node = set.first
+
+        assert_no_match("<ul>\n  <li>", xml.to_xml(:save_with => XML::Node::SaveOptions::AS_XML))
+        assert_no_match("<ul>\n  <li>", node.to_xml(:save_with => XML::Node::SaveOptions::AS_XML))
+      end
     end
   end
 end

data/test/xml/test_node_attributes.rb

@@ -29,6 +29,25 @@ module Nokogiri
         assert node.namespaced_key?('foo', nil)
         assert !node.namespaced_key?('foo', 'foo')
       end
+
+      def test_set_attribute_frees_nodes # testing a segv
+        skip("JRuby doesn't do GC.") if Nokogiri.jruby?
+        document = Nokogiri::XML.parse("<foo></foo>")
+
+        node = document.root
+        node['visible'] = 'foo'
+        attribute = node.attribute('visible')
+        text = Nokogiri::XML::Text.new 'bar', document
+        attribute.add_child(text)
+
+        begin
+          gc_previous = GC.stress
+          GC.stress = true
+          node['visible'] = 'attr'
+        ensure
+          GC.stress = gc_previous
+        end
+      end
     end
   end
 end

data/test/xml/test_node_inheritance.rb

@@ -0,0 +1,32 @@
+# issue#560
+
+require 'helper'
+
+module Nokogiri
+  module XML
+    class TestNodeInheritance < Nokogiri::TestCase
+      MyNode = Class.new Nokogiri::XML::Node
+      def setup
+        super
+        @node = MyNode.new 'foo', Nokogiri::XML::Document.new
+        @node['foo'] = 'bar' 
+      end
+
+      def test_node_name
+        assert @node.name == 'foo'
+      end
+
+      def test_node_writing_an_attribute_accessing_via_attributes 
+        assert @node.attributes['foo']
+      end
+
+      def test_node_writing_an_attribute_accessing_via_key 
+        assert @node.key? 'foo'
+      end
+
+      def test_node_writing_an_attribute_accessing_via_brackets 
+        assert @node['foo'] == 'bar'
+      end
+    end
+  end
+end