nokogiri 1.4.2.1-x86-mingw32 → 1.4.3-x86-mingw32

data/test/html/sax/test_parser_context.rb

@@ -8,13 +8,13 @@ module Nokogiri
       class TestParserContext < Nokogiri::SAX::TestCase
         def test_from_io
           assert_nothing_raised do
-            ctx = ParserContext.new StringIO.new('fo'), 'UTF-8'
+            ParserContext.new StringIO.new('fo'), 'UTF-8'
           end
         end
 
         def test_from_string
           assert_nothing_raised do
-            ctx = ParserContext.new 'blah blah'
+            ParserContext.new 'blah blah'
           end
         end
 

data/test/html/test_document.rb

@@ -160,7 +160,7 @@ module Nokogiri
       end
 
       def test_parse_io
-        assert doc = File.open(HTML_FILE, 'rb') { |f|
+        assert File.open(HTML_FILE, 'rb') { |f|
           Document.read_io(f, nil, 'UTF-8',
                            XML::ParseOptions::NOERROR | XML::ParseOptions::NOWARNING
                           )
@@ -261,7 +261,7 @@ module Nokogiri
       end
 
       def test_find_with_function
-        found = @html.css("div:awesome() h1", Class.new {
+        assert @html.css("div:awesome() h1", Class.new {
           def awesome divs
             [divs.first]
           end

data/test/html/test_document_fragment.rb

@@ -9,18 +9,46 @@ module Nokogiri
         @html = Nokogiri::HTML.parse(File.read(HTML_FILE), HTML_FILE)
       end
 
-      def test_no_contextual_parsing_on_unlinked_nodes
-        node = @html.css('body').first
-        node.unlink
-        assert_raises(RuntimeError) do
-          node.parse('<br />')
+      if RUBY_VERSION >= '1.9'
+        def test_inspect_encoding
+          fragment = "<div>こんにちは！</div>".encode('EUC-JP')
+          f = Nokogiri::HTML::DocumentFragment.parse fragment
+          assert_equal "こんにちは！", f.content
         end
+
+        def test_html_parse_encoding
+          fragment = "<div>こんにちは！</div>".encode 'EUC-JP'
+          f = Nokogiri::HTML.fragment fragment
+          assert_equal 'EUC-JP', f.document.encoding
+          assert_equal "こんにちは！", f.content
+        end
+      end
+
+      def test_parse_encoding
+        fragment = "<div>hello world</div>"
+        f = Nokogiri::HTML::DocumentFragment.parse fragment, 'ISO-8859-1'
+        assert_equal 'ISO-8859-1', f.document.encoding
+        assert_equal "hello world", f.content
+      end
+
+      def test_html_parse_with_encoding
+        fragment = "<div>hello world</div>"
+        f = Nokogiri::HTML.fragment fragment, 'ISO-8859-1'
+        assert_equal 'ISO-8859-1', f.document.encoding
+        assert_equal "hello world", f.content
       end
 
       def test_parse_in_context
         assert_equal('<br>', @html.root.parse('<br />').to_s)
       end
 
+      def test_inner_html=
+        fragment = Nokogiri::HTML.fragment '<hr />'
+
+        fragment.inner_html = "hello"
+        assert_equal 'hello', fragment.inner_html
+      end
+
       def test_ancestors_search
         html = %q{
           <div>
@@ -43,7 +71,7 @@ module Nokogiri
       end
 
       def test_new
-        fragment = Nokogiri::HTML::DocumentFragment.new(@html)
+        assert Nokogiri::HTML::DocumentFragment.new(@html)
       end
 
       def test_fragment_should_have_document

data/test/test_memory_leak.rb

@@ -8,8 +8,8 @@ class TestMemoryLeak < Nokogiri::TestCase
       content = File.open("#{File.dirname(__FILE__)}/files/dont_hurt_em_why.xml").read
       ndoc = Nokogiri::XML(content)
       2.times do
-        info = ndoc.search('status text').first.inner_text
-        url = ndoc.search('user name').first.inner_text
+        ndoc.search('status text').first.inner_text
+        ndoc.search('user name').first.inner_text
         GC.start
       end
     end

data/test/test_reader.rb

@@ -8,6 +8,32 @@ class TestReader < Nokogiri::TestCase
     assert_equal io, reader.source
   end
 
+  def test_empty_element?
+    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
+<xml><city>Paris</city><state/></xml>
+    eoxml
+
+    results = reader.map do |node|
+      if node.node_type == Nokogiri::XML::Node::ELEMENT_NODE
+        node.empty_element?
+      end
+    end
+    assert_equal [false, false, nil, nil, true, nil], results
+  end
+
+  def test_self_closing?
+    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
+<xml><city>Paris</city><state/></xml>
+    eoxml
+
+    results = reader.map do |node|
+      if node.node_type == Nokogiri::XML::Node::ELEMENT_NODE
+        node.self_closing?
+      end
+    end
+    assert_equal [false, false, nil, nil, true, nil], results
+  end
+
   def test_reader_takes_block
     options = nil
     Nokogiri::XML::Reader(File.read(XML_FILE), XML_FILE) do |cfg|
@@ -57,7 +83,7 @@ class TestReader < Nokogiri::TestCase
   end
 
   def test_in_memory
-    reader = Nokogiri::XML::Reader(<<-eoxml)
+    assert Nokogiri::XML::Reader(<<-eoxml)
     <x xmlns:tenderlove='http://tenderlovemaking.com/'>
       <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
     </x>
@@ -108,13 +134,9 @@ class TestReader < Nokogiri::TestCase
       <foo>
     </x>
     eoxml
-    error_happened = false
-    begin
+    assert_raises(Nokogiri::XML::SyntaxError) do
       reader.each { |node| }
-    rescue Nokogiri::XML::SyntaxError => ex
-      error_happened = true
     end
-    assert error_happened
     assert 1, reader.errors.length
   end
 

data/test/test_xslt_transforms.rb

@@ -6,8 +6,7 @@ class TestXsltTransforms < Nokogiri::TestCase
     @doc = Nokogiri::XML(File.open(XML_FILE))
   end
 
-  if Nokogiri::VERSION_INFO['libxml']['loaded'] > '2.6.16'
-
+  if Nokogiri.uses_libxml?
     def test_class_methods
       style = Nokogiri::XSLT(File.read(XSLT_FILE))
 
@@ -130,33 +129,35 @@ encoding="iso-8859-1" indent="yes"/>
       assert_equal  result_array, result_hash
     end
 
-    def test_exslt
-      assert doc = Nokogiri::XML.parse(File.read(EXML_FILE))
-      assert doc.xml?
-
-      assert style = Nokogiri::XSLT.parse(File.read(EXSLT_FILE))
-      params = {
-        :p1 => 'xxx',
-        :p2 => "x'x'x",
-        :p3 => 'x"x"x',
-        :p4 => '"xxx"'
-      }
-      result_doc = Nokogiri::XML.parse(style.apply_to(doc,
-          Nokogiri::XSLT.quote_params(params)))
-
-      assert_equal 'func-result', result_doc.at('/root/function').content
-      assert_equal 3, result_doc.at('/root/max').content.to_i
-      assert_match(
-        /\d{4}-\d\d-\d\d([-|+]\d\d:\d\d)?/,
-        result_doc.at('/root/date').content
-        )
-      result_doc.xpath('/root/params/*').each do  |p|
-        assert_equal p.content, params[p.name.intern]
+    if Nokogiri.uses_libxml? # By now, cannot get it working on JRuby.
+      def test_exslt
+        assert doc = Nokogiri::XML.parse(File.read(EXML_FILE))
+        assert doc.xml?
+
+        assert style = Nokogiri::XSLT.parse(File.read(EXSLT_FILE))
+        params = {
+          :p1 => 'xxx',
+          :p2 => "x'x'x",
+          :p3 => 'x"x"x',
+          :p4 => '"xxx"'
+        }
+        result_doc = Nokogiri::XML.parse(style.apply_to(doc,
+            Nokogiri::XSLT.quote_params(params)))
+
+        assert_equal 'func-result', result_doc.at('/root/function').content
+        assert_equal 3, result_doc.at('/root/max').content.to_i
+        assert_match(
+          /\d{4}-\d\d-\d\d([-|+]\d\d:\d\d)?/,
+          result_doc.at('/root/date').content
+          )
+        result_doc.xpath('/root/params/*').each do  |p|
+          assert_equal p.content, params[p.name.intern]
+        end
+        check_params result_doc, params
+        result_doc = Nokogiri::XML.parse(style.apply_to(doc,
+            Nokogiri::XSLT.quote_params(params.to_a.flatten)))
+        check_params result_doc, params
       end
-      check_params result_doc, params
-      result_doc = Nokogiri::XML.parse(style.apply_to(doc,
-          Nokogiri::XSLT.quote_params(params.to_a.flatten)))
-      check_params result_doc, params
     end
 
     def test_xslt_parse_error

data/test/xml/test_attr.rb

@@ -4,10 +4,12 @@ module Nokogiri
   module XML
     class TestAttr < Nokogiri::TestCase
       def test_new
-        100.times {
-          doc = Nokogiri::XML::Document.new
-          attribute = Nokogiri::XML::Attr.new(doc, 'foo')
-        }
+        assert_nothing_raised do
+          100.times {
+            doc = Nokogiri::XML::Document.new
+            Nokogiri::XML::Attr.new(doc, 'foo')
+          }
+        end
       end
 
       def test_content=
@@ -33,6 +35,31 @@ module Nokogiri
         address.attribute_nodes.first.unlink
         assert_nil address['domestic']
       end
+
+      def test_parsing_attribute_namespace
+        doc = Nokogiri::XML <<-EOXML
+<root xmlns='http://google.com/' xmlns:f='http://flavorjon.es/'>
+  <div f:myattr='foo'></div>
+</root>
+        EOXML
+
+        node = doc.at_css "div"
+        attr = node.attributes["myattr"]
+        assert_equal "http://flavorjon.es/", attr.namespace.href
+      end
+
+      def test_setting_attribute_namespace
+        doc = Nokogiri::XML <<-EOXML
+<root xmlns='http://google.com/' xmlns:f='http://flavorjon.es/'>
+  <div f:myattr='foo'></div>
+</root>
+        EOXML
+
+        node = doc.at_css "div"
+        attr = node.attributes["myattr"]
+        attr.add_namespace("fizzle", "http://fizzle.com/")
+        assert_equal "http://fizzle.com/", attr.namespace.href
+      end
     end
   end
 end

data/test/xml/test_builder.rb

@@ -83,8 +83,8 @@ module Nokogiri
           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
+        assert_equal 'bar', doc.at('foo|bar', 'foo' => 'bar').namespace.href
+        assert_equal 'bar', doc.at('foo|baz', 'foo' => 'bar').namespace.href
       end
 
       def test_specify_namespace_nested
@@ -100,12 +100,12 @@ module Nokogiri
           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
+        assert_equal 'bar', doc.at('foo|bar', 'foo' => 'bar').namespace.href
+        assert_equal 'bar', doc.at('foo|baz', 'foo' => 'bar').namespace.href
       end
 
       def test_specified_namespace_undeclared
-        b = Nokogiri::XML::Builder.new { |xml|
+        Nokogiri::XML::Builder.new { |xml|
           xml.root do
             assert_raises(ArgumentError) do
               xml[:foo]

data/test/xml/test_cdata.rb

@@ -29,9 +29,9 @@ module Nokogiri
       end
 
       def test_lots_of_new_cdata
-        100.times {
-          node = CDATA.new(@xml, "asdfasdf")
-        }
+        assert_nothing_raised do
+          100.times { CDATA.new(@xml, "asdfasdf") }
+        end
       end
 
       def test_content=

data/test/xml/test_document.rb

@@ -21,12 +21,6 @@ module Nokogiri
         assert_equal nil, @xml.root
       end
 
-      def test_parse_should_not_exist
-        assert_raises(NoMethodError) do
-          @xml.parse("foo")
-        end
-      end
-
       def test_collect_namespaces
         doc = Nokogiri::XML(<<-eoxml)
         <xml>
@@ -617,7 +611,11 @@ module Nokogiri
           </root>
         EOX
 
+        namespaces = doc.root.namespaces
+
         # assert on setup
+        assert_equal 2, doc.root.namespaces.length
+        assert_equal 3, doc.at_xpath("//container").namespaces.length
         assert_equal 0, doc.xpath("//foo").length
         assert_equal 1, doc.xpath("//a:foo").length
         assert_equal 1, doc.xpath("//a:foo").length
@@ -625,9 +623,11 @@ module Nokogiri
 
         doc.remove_namespaces!
 
+        assert_equal 0, doc.root.namespaces.length
+        assert_equal 0, doc.at_xpath("//container").namespaces.length
         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("//a:foo", namespaces).length
+        assert_equal 0, doc.xpath("//a:foo", namespaces).length
         assert_equal 0, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
       end
 

data/test/xml/test_document_fragment.rb

@@ -20,7 +20,7 @@ module Nokogiri
 
       def test_node_fragment_is_relative
         doc      = Nokogiri::XML('<root><a xmlns="blah" /></root>')
-        ctx      = doc.root.child
+        assert doc.root.child
         fragment = doc.root.child.fragment('<hello />')
         hello    = fragment.child
 
@@ -29,7 +29,7 @@ module Nokogiri
       end
 
       def test_new
-        fragment = Nokogiri::XML::DocumentFragment.new(@xml)
+        assert Nokogiri::XML::DocumentFragment.new(@xml)
       end
 
       def test_fragment_should_have_document

data/test/xml/test_node.rb

@@ -385,7 +385,7 @@ module Nokogiri
       def test_add_namespace_does_not_associate_node
         node = @xml.at('address')
         assert_nil node.namespace
-        definition = node.add_namespace_definition 'foo', 'http://tlm.com/'
+        assert node.add_namespace_definition 'foo', 'http://tlm.com/'
         assert_nil node.namespace
       end
 

data/test/xml/test_node_reparenting.rb

@@ -134,19 +134,19 @@ module Nokogiri
               end
             end
           end
+        end
 
-          describe "text node merging" do
-            describe "#add_child" do
-              it "merges the Text node with adjacent Text nodes" do
-                @doc.at_xpath("/root/a1").add_child Nokogiri::XML::Text.new('hello', @doc)
-                @doc.at_xpath("/root/a1/text()").content.must_equal "First nodehello"
-              end
+        describe "text node merging" do
+          describe "#add_child" do
+            it "merges the Text node with adjacent Text nodes" do
+              @doc.at_xpath("/root/a1").add_child Nokogiri::XML::Text.new('hello', @doc)
+              @doc.at_xpath("/root/a1/text()").content.must_equal "First nodehello"
             end
-            describe "#replace" do
-              it "merges the Text node with adjacent Text nodes" do
-                @doc.at_xpath("/root/a3/bx").replace Nokogiri::XML::Text.new('hello', @doc)
-                @doc.at_xpath("/root/a3/text()").content.must_equal "Third hellonode"
-              end
+          end
+          describe "#replace" do
+            it "merges the Text node with adjacent Text nodes" do
+              @doc.at_xpath("/root/a3/bx").replace Nokogiri::XML::Text.new('hello', @doc)
+              @doc.at_xpath("/root/a3/text()").content.must_equal "Third hellonode"
             end
           end
         end
@@ -272,6 +272,21 @@ module Nokogiri
           end
         end
 
+        describe "replace-merging text nodes" do
+          [
+            ['<root>a<br/></root>',  'afoo'],
+            ['<root>a<br/>b</root>', 'afoob'],
+            ['<root><br/>b</root>',  'foob']
+          ].each do |xml, result|
+            it "doesn't blow up on #{xml}" do
+              doc = Nokogiri::XML.parse(xml)
+              saved_nodes = doc.root.children
+              doc.at_xpath("/root/br").replace(Nokogiri::XML::Text.new('foo', doc))
+              saved_nodes.each { |child| child.inspect } # try to cause a crash
+              assert_equal result, doc.at_xpath("/root/text()").inner_text
+            end
+          end
+        end
       end
     end
   end