nokogiri 1.4.0 → 1.4.1

data/test/xml/test_node_reparenting.rb

@@ -0,0 +1,261 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNodeReparenting < Nokogiri::TestCase
+
+      def setup
+        super
+        @xml = Nokogiri::XML "<root><a1>First node</a1><a2>Second node</a2><a3>Third node</a3></root>"
+      end
+
+      def test_add_child_should_insert_at_end_of_children
+        node = Nokogiri::XML::Node.new('x', @xml)
+        @xml.root.add_child node
+        assert_equal ["a1", "a2", "a3", "x"], @xml.root.children.collect {|n| n.name}
+      end
+
+      def test_add_child_fragment_should_insert_fragment_roots_at_end_of_children
+        fragment = Nokogiri::XML.fragment("<b1>foo</b1><b2>bar</b2>")
+        @xml.root.add_child fragment
+        assert_equal ["a1", "a2", "a3", "b1", "b2"], @xml.root.children.collect {|n| n.name}
+      end
+
+      def test_chevron_works_as_add_child
+        text_node = Nokogiri::XML::Text.new('hello', @xml)
+        assert_equal Nokogiri::XML::Node::TEXT_NODE, text_node.type
+
+        @xml.root << text_node
+
+        assert_equal @xml.root.children.last.content, 'hello'
+      end
+
+      def test_add_child_already_in_the_document_should_move_the_node
+        third_node = @xml.root.children.last
+        first_node = @xml.root.children.first
+
+        @xml.root.add_child(first_node)
+
+        assert_equal 2, @xml.root.children.index(first_node)
+        assert_equal 1, @xml.root.children.index(third_node)
+      end
+
+      def test_add_child_from_other_document_should_remove_from_old_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 |item|
+          d1.at('root').add_child item
+        end
+
+        assert_equal 0, d2.search('item').size
+        assert_equal 4, d1.search('item').size
+      end
+
+      def test_add_child_text_node_should_merge_with_adjacent_text_nodes
+        node = @xml.root.children.first
+        old_child = node.children.first
+        new_child = Nokogiri::XML::Text.new('text', @xml)
+
+        node.add_child new_child
+
+        assert_equal "First nodetext", node.children.first.content
+        assert_equal "First nodetext", new_child.content
+        assert_equal "First nodetext", old_child.content
+      end
+
+      def test_add_child_node_following_sequential_text_nodes_should_have_right_path
+        node = @xml.root.children.first
+        node.add_child(Nokogiri::XML::Text.new('text', @xml))
+
+        item = node.add_child(Nokogiri::XML::Element.new('item', @xml))
+
+        assert_equal '/root/a1/item', item.path
+      end
+
+      def test_add_child_node_with_namespace_should_keep_namespace
+        doc   = Nokogiri::XML::Document.new
+        item  = Nokogiri::XML::Element.new('item', doc)
+        doc.root = item
+
+        entry = Nokogiri::XML::Element.new('entry', doc)
+        entry.add_namespace('tlm', 'http://tenderlovemaking.com')
+        assert_equal 'http://tenderlovemaking.com', entry.namespaces['xmlns:tlm']
+        item.add_child(entry)
+        assert_equal 'http://tenderlovemaking.com', entry.namespaces['xmlns:tlm']
+      end
+
+      def test_add_child_node_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_add_child_node_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_replace_node_should_remove_previous_node_and_insert_new_node
+        second_node = @xml.root.children[1]
+
+        new_node = Nokogiri::XML::Node.new('foo', @xml)
+        second_node.replace(new_node)
+
+        assert_equal @xml.root.children[1], new_node
+        assert_nil second_node.parent
+      end
+
+      def test_replace_fragment_should_replace_node_with_fragment_roots
+        node = @xml.root.children[1]
+        fragment = Nokogiri::XML.fragment("<b1>foo</b1><b2>bar</b2>")
+        fc1 = fragment.children[0]
+        fc2 = fragment.children[1]
+
+        node.replace fragment
+
+        assert_equal 4, @xml.root.children.length
+        assert_equal fc1, @xml.root.children[1]
+        assert_equal fc2, @xml.root.children[2]
+      end
+
+      def test_replace_with_default_namespaces
+        fruits = Nokogiri::XML(<<-eoxml)
+          <fruit xmlns="http://fruits.org">
+            <apple />
+          </fruit>
+        eoxml
+
+        apple = fruits.css('apple').first
+
+        orange = Nokogiri::XML::Node.new('orange', fruits)
+        apple.replace(orange)
+
+        assert_equal orange, fruits.css('orange').first
+      end
+
+      def test_illegal_replace_of_node_with_doc
+        new_node = Nokogiri::XML.parse('<foo>bar</foo>')
+        old_node = @xml.at_css('a1')
+        assert_raises(ArgumentError){ old_node.replace new_node }
+      end
+
+      def test_replace_with_node_from_different_docs
+        xml1 = "<test> <caption>Original caption</caption> </test>"
+        xml2 = "<test> <caption>Replacement caption</caption> </test>"
+        doc1 = Nokogiri::XML(xml1)
+        doc2 = Nokogiri::XML(xml2)
+        caption1 = doc1.xpath("//caption")[0]
+        caption2 = doc2.xpath("//caption")[0]
+        caption1.replace(caption2) # this segfaulted under 1.4.0 and earlier
+        assert_equal "Replacement caption", doc1.css("caption").inner_text
+      end
+
+      def test_add_next_sibling_should_insert_after
+        node = Nokogiri::XML::Node.new('x', @xml)
+        @xml.root.children[1].add_next_sibling node
+        assert_equal ["a1", "a2", "x", "a3"], @xml.root.children.collect {|n| n.name}
+      end
+
+      def test_next_equals_should_insert_after
+        node = Nokogiri::XML::Node.new('x', @xml)
+        @xml.root.children[1].next = node
+        assert_equal ["a1", "a2", "x", "a3"], @xml.root.children.collect {|n| n.name}
+      end
+
+      def test_add_next_sibling_fragment_should_insert_fragment_roots_after
+        fragment = Nokogiri::XML.fragment("<b1>foo</b1><b2>bar</b2>")
+        @xml.root.children[1].add_next_sibling fragment
+        assert_equal ["a1", "a2", "b1", "b2", "a3"], @xml.root.children.collect {|n| n.name}
+      end
+
+      def test_add_next_sibling_text_node_should_merge_with_adjacent_text_nodes
+        node = @xml.root.children.first
+        text = node.children.first
+        new_text = Nokogiri::XML::Text.new('text', @xml)
+
+        text.add_next_sibling new_text
+
+        assert_equal "First nodetext", node.children.first.content
+        assert_equal "First nodetext", text.content
+        assert_equal "First nodetext", new_text.content
+      end
+
+      def test_add_previous_sibling_should_insert_before
+        node = Nokogiri::XML::Node.new('x', @xml)
+        @xml.root.children[1].add_previous_sibling node
+        assert_equal ["a1", "x", "a2", "a3"], @xml.root.children.collect {|n| n.name}
+      end
+
+      def test_previous_equals_should_insert_before
+        node = Nokogiri::XML::Node.new('x', @xml)
+        @xml.root.children[1].previous = node
+        assert_equal ["a1", "x", "a2", "a3"], @xml.root.children.collect {|n| n.name}
+      end
+
+      def test_add_previous_sibling_fragment_should_insert_fragment_roots_before
+        fragment = Nokogiri::XML.fragment("<b1>foo</b1><b2>bar</b2>")
+        @xml.root.children[1].add_previous_sibling fragment
+        assert_equal ["a1", "b1", "b2", "a2", "a3"], @xml.root.children.collect {|n| n.name}
+      end
+
+      def test_add_previous_sibling_text_node_should_merge_with_adjacent_text_nodes
+        node = @xml.root.children.first
+        text = node.children.first
+        new_text = Nokogiri::XML::Text.new('text', @xml)
+
+        text.add_previous_sibling new_text
+
+        assert_equal "textFirst node", node.children.first.content
+        assert_equal "textFirst node", text.content
+        assert_equal "textFirst node", new_text.content
+      end
+
+      def test_unlink_then_reparent
+        # see http://github.com/tenderlove/nokogiri/issues#issue/22
+        10.times do
+          STDOUT.putc "."
+          STDOUT.flush
+          begin
+            doc = Nokogiri::XML <<-EOHTML
+              <root>
+                <a>
+                  <b/>
+                  <c/>
+                </a>
+              </root>
+            EOHTML
+
+            root = doc.at("root")
+            a = root.at("a")
+            b = a.at("b")
+            c = a.at("c")
+            a.add_next_sibling(b.unlink)
+            c.unlink
+          end
+          GC.start
+        end
+      end
+
+    end
+  end
+end

data/test/xml/test_node_set.rb

@@ -9,6 +9,11 @@ module Nokogiri
         @list = @xml.css('employee')
       end
 
+      def test_filter
+        list = @xml.css('address').filter('*[domestic="Yes"]')
+        assert_equal(%w{ Yes } * 4, list.map { |n| n['domestic'] })
+      end
+
       def test_remove_attr
         @list.each { |x| x['class'] = 'blah' }
         assert_equal @list, @list.remove_attr('class')
@@ -526,6 +531,52 @@ module Nokogiri
           inspected
       end
 
+      def test_should_not_splode_when_accessing_namespace_declarations_in_a_node_set
+        xml = Nokogiri::XML "<foo></foo>"
+        node_set = xml.xpath("//namespace::*")
+        assert_equal 1, node_set.size
+        node = node_set.first
+        node.to_s # segfaults in 1.4.0 and earlier
+
+        # if we haven't segfaulted, let's make sure we handled it correctly
+        assert_instance_of Nokogiri::XML::Namespace, node
+      end
+
+      def test_should_not_splode_when_arrayifying_node_set_containing_namespace_declarations
+        xml = Nokogiri::XML "<foo></foo>"
+        node_set = xml.xpath("//namespace::*")
+        assert_equal 1, node_set.size
+
+        node_array = node_set.to_a
+        node = node_array.first
+        node.to_s # segfaults in 1.4.0 and earlier
+
+        # if we haven't segfaulted, let's make sure we handled it correctly
+        assert_instance_of Nokogiri::XML::Namespace, node
+      end
+
+      def test_should_not_splode_when_unlinking_node_set_containing_namespace_declarations
+        xml = Nokogiri::XML "<foo></foo>"
+        node_set = xml.xpath("//namespace::*")
+        assert_equal 1, node_set.size
+
+        node_set.unlink
+      end
+
+      def test_reverse
+        xml = Nokogiri::XML "<root><a />b<c />d<e /></root>"
+        children = xml.root.children
+        assert_instance_of Nokogiri::XML::NodeSet, children
+
+        reversed = children.reverse
+        assert_equal reversed[0], children[4]
+        assert_equal reversed[1], children[3]
+        assert_equal reversed[2], children[2]
+        assert_equal reversed[3], children[1]
+        assert_equal reversed[4], children[0]
+
+        assert_equal children, children.reverse.reverse
+      end
     end
   end
 end

data/test/xml/test_syntax_error.rb

@@ -7,21 +7,6 @@ module Nokogiri
         error = Nokogiri::XML::SyntaxError.new 'hello'
         assert_equal 'hello', error.message
       end
-
-      def test_exception
-        error = Nokogiri::XML::SyntaxError.new 'hello'
-        dup = error.exception 'world'
-        assert_equal 'hello', dup.message
-        assert_not_equal error.message.object_id, dup.message.object_id
-      end
-
-      def test_initialize_copy
-        error = Nokogiri::XML::SyntaxError.new 'hello'
-        dup = error.dup
-        assert_equal 'hello', dup.message
-        assert_not_equal error.object_id, dup.object_id
-        assert_not_equal error.message.object_id, dup.message.object_id
-      end
     end
   end
 end

metadata

@@ -1,16 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Aaron Patterson
 - Mike Dalessio
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ8wDQYDVQQDDAZhYXJv
+  bnAxGTAXBgoJkiaJk/IsZAEZFglydWJ5Zm9yZ2UxEzARBgoJkiaJk/IsZAEZFgNv
+  cmcwHhcNMDkxMTA1MDAwNDQ4WhcNMTAxMTA1MDAwNDQ4WjBBMQ8wDQYDVQQDDAZh
+  YXJvbnAxGTAXBgoJkiaJk/IsZAEZFglydWJ5Zm9yZ2UxEzARBgoJkiaJk/IsZAEZ
+  FgNvcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNSD14Gb2mCX/5
+  fE85uW/jT7fcYI8XolrzdpzfvxD3y+Pt/yA5eciBiE+hNAWU2PM1ZMOq4MOV9EqR
+  hYzupp/zFoC7ZZ3PF8nJBFKgfKNf0sp9o3XCUviaZjoSYNIvGQocrakQo+h3x3Od
+  NqZWtVsLz9P/G1foUBpc95gGGBodbj/CZVc32F+xVvmejqe3RaMLGI70ZOuTcsRi
+  t8V4T7okmUbLi6VmPYlH/9mKvU7ObRHXMYNhkkife5phh8vjsiCd8Q397+jFaL0f
+  Cd23idNV7lbvdjIuYLV+9u5cPkDjANLAnGRaRS1x2SEfH/8g0Te6/jeKfzBH83D0
+  5v5HTx+HAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBTs3LnPhoi2m7BTf9tHvNQYsOG7aTANBgkqhkiG9w0BAQUFAAOCAQEAVH7G+nSf
+  WMPz7Iwcnd+WrWWq/mr5ke0qQoiz4tk0h7bsa3fEnUDBiMfmQhv/uBzA4Gkw9zxB
+  IfKljsZq0yE+du/1u2Mph7dMIg2oiwMurpduPpx9sfaqsqSBBOzggxiUEmHDNrPT
+  uTzaid0gdOx/TacZ4RwrEnx6XNkhxC2YaTH2Y68hoJzSzRGtdU2Kk6mT4YraCP+u
+  ETP5hCJAiB5l4jC8U6wwvKQDHTMoaUu3eu/txe1PDjoe3GICzs/e6bzYBWYmKu7J
+  5YM3l5J4rDvIPAGH4VRr5nSs+qbZh+kCdE1khvTxH51xkR3qAfEEogAd2VlnjELM
+  f9Gw8x3RwgLvkA==
+  -----END CERTIFICATE-----
 
-date: 2009-10-30 00:00:00 -07:00
+date: 2009-12-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +100,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/nokogiri
+- deps.rip
 - ext/nokogiri/extconf.rb
 - ext/nokogiri/html_document.c
 - ext/nokogiri/html_document.h
@@ -108,6 +130,8 @@ files:
 - ext/nokogiri/xml_element_content.h
 - ext/nokogiri/xml_element_decl.c
 - ext/nokogiri/xml_element_decl.h
+- ext/nokogiri/xml_encoding_handler.c
+- ext/nokogiri/xml_encoding_handler.h
 - ext/nokogiri/xml_entity_decl.c
 - ext/nokogiri/xml_entity_decl.h
 - ext/nokogiri/xml_entity_reference.c
@@ -156,6 +180,7 @@ files:
 - lib/nokogiri/css/tokenizer.rex
 - lib/nokogiri/css/xpath_visitor.rb
 - lib/nokogiri/decorators/slop.rb
+- lib/nokogiri/ffi/encoding_handler.rb
 - lib/nokogiri/ffi/html/document.rb
 - lib/nokogiri/ffi/html/element_description.rb
 - lib/nokogiri/ffi/html/entity_lookup.rb
@@ -169,6 +194,7 @@ files:
 - lib/nokogiri/ffi/structs/xml_attr.rb
 - lib/nokogiri/ffi/structs/xml_attribute.rb
 - lib/nokogiri/ffi/structs/xml_buffer.rb
+- lib/nokogiri/ffi/structs/xml_char_encoding_handler.rb
 - lib/nokogiri/ffi/structs/xml_document.rb
 - lib/nokogiri/ffi/structs/xml_dtd.rb
 - lib/nokogiri/ffi/structs/xml_element.rb
@@ -302,10 +328,11 @@ files:
 - test/html/test_node_encoding.rb
 - test/test_convert_xpath.rb
 - test/test_css_cache.rb
-- test/test_gc.rb
+- test/test_encoding_handler.rb
 - test/test_memory_leak.rb
 - test/test_nokogiri.rb
 - test/test_reader.rb
+- test/test_soap4r_sax.rb
 - test/test_xslt_transforms.rb
 - test/xml/node/test_save_options.rb
 - test/xml/node/test_subclass.rb
@@ -330,6 +357,7 @@ files:
 - test/xml/test_node.rb
 - test/xml/test_node_attributes.rb
 - test/xml/test_node_encoding.rb
+- test/xml/test_node_reparenting.rb
 - test/xml/test_node_set.rb
 - test/xml/test_parse_options.rb
 - test/xml/test_processing_instruction.rb
@@ -388,10 +416,11 @@ test_files:
 - test/html/test_node_encoding.rb
 - test/test_convert_xpath.rb
 - test/test_css_cache.rb
-- test/test_gc.rb
+- test/test_encoding_handler.rb
 - test/test_memory_leak.rb
 - test/test_nokogiri.rb
 - test/test_reader.rb
+- test/test_soap4r_sax.rb
 - test/test_xslt_transforms.rb
 - test/xml/node/test_save_options.rb
 - test/xml/node/test_subclass.rb
@@ -416,6 +445,7 @@ test_files:
 - test/xml/test_node.rb
 - test/xml/test_node_attributes.rb
 - test/xml/test_node_encoding.rb
+- test/xml/test_node_reparenting.rb
 - test/xml/test_node_set.rb
 - test/xml/test_parse_options.rb
 - test/xml/test_processing_instruction.rb