RubyGems - nokogiri - Versions diffs - 1.6.7.2-java → 1.6.8-java - Mend

nokogiri 1.6.7.2-java → 1.6.8-java

Potentially problematic release.

This version of nokogiri might be problematic. Click here for more details.

Files changed (107) hide show

checksums.yaml +4 -4
data/.cross_rubies +2 -0
data/.travis.yml +19 -9
data/CHANGELOG.rdoc +73 -5
data/CONTRIBUTING.md +42 -0
data/Gemfile +10 -9
data/LICENSE.txt +1 -1
data/Manifest.txt +7 -2
data/README.md +23 -27
data/ROADMAP.md +11 -1
data/Rakefile +36 -17
data/bin/nokogiri +2 -2
data/dependencies.yml +29 -4
data/ext/java/nokogiri/HtmlElementDescription.java +5 -2
data/ext/java/nokogiri/NokogiriService.java +19 -0
data/ext/java/nokogiri/XmlAttr.java +3 -1
data/ext/java/nokogiri/XmlDocumentFragment.java +0 -14
data/ext/java/nokogiri/XmlNode.java +106 -63
data/ext/java/nokogiri/XmlXpathContext.java +12 -12
data/ext/java/nokogiri/XsltStylesheet.java +11 -4
data/ext/java/nokogiri/internals/HtmlDomParserContext.java +8 -1
data/ext/java/nokogiri/internals/NokogiriErrorHandler.java +1 -2
data/ext/java/nokogiri/internals/NokogiriHelpers.java +7 -7
data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java +1 -1
data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java +0 -1
data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.java +3 -3
data/ext/java/nokogiri/internals/ParserContext.java +4 -0
data/ext/java/nokogiri/internals/SaveContextVisitor.java +18 -13
data/ext/nokogiri/extconf.rb +163 -79
data/ext/nokogiri/html_document.c +6 -6
data/ext/nokogiri/html_element_description.c +1 -1
data/ext/nokogiri/html_entity_lookup.c +1 -1
data/ext/nokogiri/html_sax_parser_context.c +4 -4
data/ext/nokogiri/html_sax_push_parser.c +2 -2
data/ext/nokogiri/nokogiri.c +0 -7
data/ext/nokogiri/nokogiri.h +1 -34
data/ext/nokogiri/xml_attr.c +2 -2
data/ext/nokogiri/xml_comment.c +1 -1
data/ext/nokogiri/xml_document.c +20 -22
data/ext/nokogiri/xml_encoding_handler.c +3 -3
data/ext/nokogiri/xml_entity_reference.c +1 -1
data/ext/nokogiri/xml_namespace.c +56 -17
data/ext/nokogiri/xml_node.c +73 -67
data/ext/nokogiri/xml_node_set.c +164 -146
data/ext/nokogiri/xml_node_set.h +3 -4
data/ext/nokogiri/xml_processing_instruction.c +2 -2
data/ext/nokogiri/xml_reader.c +5 -18
data/ext/nokogiri/xml_sax_parser.c +9 -12
data/ext/nokogiri/xml_sax_parser_context.c +1 -1
data/ext/nokogiri/xml_sax_push_parser.c +1 -1
data/ext/nokogiri/xml_schema.c +1 -1
data/ext/nokogiri/xml_syntax_error.c +0 -4
data/ext/nokogiri/xml_syntax_error.h +0 -1
data/ext/nokogiri/xml_text.c +1 -1
data/ext/nokogiri/xml_xpath_context.c +15 -24
data/ext/nokogiri/xslt_stylesheet.c +6 -6
data/lib/nekohtml.jar +0 -0
data/lib/nokogiri.rb +14 -7
data/lib/nokogiri/css/parser.rb +8 -2
data/lib/nokogiri/css/parser.y +7 -2
data/lib/nokogiri/html/document.rb +4 -2
data/lib/nokogiri/nokogiri.jar +0 -0
data/lib/nokogiri/version.rb +1 -1
data/lib/nokogiri/xml/document.rb +7 -1
data/lib/nokogiri/xml/dtd.rb +4 -4
data/lib/nokogiri/xml/node.rb +6 -10
data/lib/nokogiri/xml/node_set.rb +3 -3
data/lib/nokogiri/xml/parse_options.rb +22 -0
data/lib/serializer.jar +0 -0
data/lib/xalan.jar +0 -0
data/lib/xercesImpl.jar +0 -0
data/lib/xml-apis.jar +0 -0
data/tasks/test.rb +5 -0
data/test/css/test_parser.rb +7 -1
data/test/files/GH_1042.html +18 -0
data/test/files/namespace_pressure_test.xml +1684 -0
data/test/files/tlm.html +2 -1
data/test/helper.rb +4 -0
data/test/html/sax/test_parser.rb +2 -2
data/test/html/test_document.rb +47 -11
data/test/html/test_document_encoding.rb +55 -58
data/test/html/test_document_fragment.rb +27 -23
data/test/html/test_node.rb +16 -0
data/test/html/test_node_encoding.rb +71 -13
data/test/namespaces/test_namespaces_in_parsed_doc.rb +14 -0
data/test/test_css_cache.rb +1 -1
data/test/test_encoding_handler.rb +2 -0
data/test/test_xslt_transforms.rb +38 -3
data/test/xml/sax/test_parser.rb +54 -53
data/test/xml/test_document.rb +7 -2
data/test/xml/test_document_encoding.rb +19 -16
data/test/xml/test_document_fragment.rb +12 -0
data/test/xml/test_dtd_encoding.rb +0 -2
data/test/xml/test_namespace.rb +2 -2
data/test/xml/test_node.rb +15 -4
data/test/xml/test_node_attributes.rb +6 -0
data/test/xml/test_node_encoding.rb +49 -87
data/test/xml/test_node_reparenting.rb +193 -18
data/test/xml/test_node_set.rb +1 -1
data/test/xml/test_reader.rb +589 -0
data/test/xml/test_reader_encoding.rb +100 -102
data/test/xml/test_unparented_node.rb +14 -1
data/test/xslt/test_exception_handling.rb +1 -1
data/test_all +47 -33
metadata +38 -36
data/CHANGELOG.ja.rdoc +0 -1057
data/test/test_reader.rb +0 -558

data/test/namespaces/test_namespaces_in_parsed_doc.rb CHANGED

@@ -61,6 +61,20 @@ module Nokogiri
         ns_attrs = n.to_xml.scan(/\bxmlns(?::.+?)?=/)
         assert_equal 3, ns_attrs.length
       end
+      def test_namespaces_under_memory_pressure_issue1155
+        skip("JRuby doesn't do GC.") if Nokogiri.jruby?
+        # this test is here to emit warnings when run under valgrind
+        # see https://github.com/sparklemotion/nokogiri/issues/1155 for background
+        filename = File.join ASSETS_DIR, 'namespace_pressure_test.xml'
+        doc = Nokogiri::XML File.open(filename)
+        # bizarrely, can't repro without the call to #to_a
+        doc.xpath('//namespace::*').to_a.each do |ns|
+          ns.inspect
+        end
+      end
     end
   end
 end

data/test/test_css_cache.rb CHANGED

@@ -6,7 +6,7 @@ class TestCssCache < Nokogiri::TestCase
     super
     @css = "a1 > b2 > c3"
     @parse_result = Nokogiri::CSS.parse(@css)
-    @to_xpath_result = @parse_result.map {|ast| ast.to_xpath}
+    @to_xpath_result = @parse_result.map(&:to_xpath)
     Nokogiri::CSS::Parser.class_eval do
       class << @cache
         alias :old_bracket :[]

data/test/test_encoding_handler.rb CHANGED

@@ -5,6 +5,8 @@ require "helper"
 class TestEncodingHandler < Nokogiri::TestCase
   def teardown
     Nokogiri::EncodingHandler.clear_aliases!
+    #Replace default aliases removed by clear_aliases!
+    Nokogiri.install_default_aliases
   end
   def test_get

data/test/test_xslt_transforms.rb CHANGED

@@ -32,7 +32,40 @@ class TestXsltTransforms < Nokogiri::TestCase
     assert_match %r{<h1>Grandma</h1>}, result
     assert result = style.apply_to(@doc)
-    assert_match %r{<h1></h1>}, result
+    assert_match %r{<h1></h1>|<h1/>}, result
+  end
+  def test_xml_declaration
+    input_xml = <<-EOS
+<?xml version="1.0" encoding="utf-8"?>
+<report>
+  <title>My Report</title>
+</report>
+EOS
+    input_xsl = <<-EOS
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:output method="xml" version="1.0" encoding="utf-8" indent="yes"/>
+  <xsl:template match="/">
+    <html>
+      <head>
+        <title><xsl:value-of select="report/title"/></title>
+      </head>
+      <body>
+        <h1><xsl:value-of select="report/title"/></h1>
+      </body>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>
+EOS
+    require 'nokogiri'
+    xml = ::Nokogiri::XML(input_xml)
+    xsl = ::Nokogiri::XSLT(input_xsl)
+    assert_includes xsl.apply_to(xml), '<?xml version="1.0" encoding="utf-8"?>'
   end
   def test_transform_with_output_style
@@ -95,7 +128,9 @@ encoding="iso-8859-1" indent="yes"/>
 </xsl:stylesheet>
       eoxslt
     end
-    assert_no_match(/<td>/, xslt.apply_to(@doc, ['title', 'foo']))
+    result = xslt.apply_to(@doc, ['title', 'foo'])
+    assert_no_match(/<td>/, result)
+    assert_match(/This is an adjacent/, result)
   end
   def test_transform_arg_error
@@ -268,7 +303,7 @@ encoding="iso-8859-1" indent="yes"/>
         <xsl:output encoding="UTF-8" indent="yes" method="xml" />
         <xsl:template match="/">
-          <xsl:value-of select="/a" />
+          <a><xsl:value-of select="/a" /></a>
         </xsl:template>
       </xsl:stylesheet>
     EOXSL

data/test/xml/sax/test_parser.rb CHANGED

@@ -44,13 +44,21 @@ module Nokogiri
         end
         def test_xml_decl
-          {
-            ''          => nil,
-            '<?xml version="1.0" ?>'                  => ['1.0'],
-            '<?xml version="1.0" encoding="UTF-8" ?>' => ['1.0', 'UTF-8'],
-            '<?xml version="1.0" standalone="yes"?>'  => ['1.0', 'yes'],
-            '<?xml version="1.0" standalone="no"?>'   => ['1.0', 'no'],
-          }.each do |decl,value|
+          [
+            ['', nil],
+            ['<?xml version="1.0" ?>',
+              ['1.0']],
+            ['<?xml version="1.0" encoding="UTF-8" ?>',
+              ['1.0', 'UTF-8']],
+            ['<?xml version="1.0" standalone="yes"?>',
+              ['1.0', 'yes']],
+            ['<?xml version="1.0" standalone="no"?>',
+              ['1.0', 'no']],
+            ['<?xml version="1.0" encoding="UTF-8" standalone="no"?>',
+              ['1.0', "UTF-8", 'no']],
+            ['<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>',
+              ['1.0', "ISO-8859-1", 'yes']]
+          ].each do |decl, value|
             parser = XML::SAX::Parser.new(Doc.new)
             xml = "#{decl}\n<root />"
@@ -136,12 +144,8 @@ module Nokogiri
 </root>
           eoxml
           assert_equal 5, @parser.document.start_elements.length
-          assert @parser.document.start_elements.map { |se|
-            se.first
-          }.include?('foo:bar')
-          assert @parser.document.end_elements.map { |se|
-            se.first
-          }.include?('foo:bar')
+          assert @parser.document.start_elements.map(&:first).include?('foo:bar')
+          assert @parser.document.end_elements.map(&:first).include?('foo:bar')
         end
         def test_start_is_called_without_namespace
@@ -151,7 +155,7 @@ module Nokogiri
 </root>
           eoxml
           assert_equal ['root', 'foo:f', 'bar'],
-            @parser.document.start_elements.map { |x| x.first }
+            @parser.document.start_elements.map(&:first)
         end
         def test_parser_sets_encoding
@@ -167,10 +171,8 @@ module Nokogiri
           assert @parser.document.errors
           assert @parser.document.errors.length > 0
-          if RUBY_VERSION =~ /^1\.9/
-            doc.errors.each do |error|
-              assert_equal 'UTF-8', error.message.encoding.name
-            end
+          doc.errors.each do |error|
+            assert_equal 'UTF-8', error.message.encoding.name
           end
           # when using JRuby Nokogiri, more errors will be generated as the DOM
@@ -207,42 +209,41 @@ module Nokogiri
             @parser.parse_io(f, encoding)
           }
           assert(@parser.document.cdata_blocks.length > 0)
-          if RUBY_VERSION =~ /^1\.9/
-            called = false
-            @parser.document.start_elements.flatten.each do |thing|
-              assert_equal 'UTF-8', thing.encoding.name
-              called = true
-            end
-            assert called
-            called = false
-            @parser.document.end_elements.flatten.each do |thing|
-              assert_equal 'UTF-8', thing.encoding.name
-              called = true
-            end
-            assert called
-            called = false
-            @parser.document.data.each do |thing|
-              assert_equal 'UTF-8', thing.encoding.name
-              called = true
-            end
-            assert called
-            called = false
-            @parser.document.comments.flatten.each do |thing|
-              assert_equal 'UTF-8', thing.encoding.name
-              called = true
-            end
-            assert called
-            called = false
-            @parser.document.cdata_blocks.flatten.each do |thing|
-              assert_equal 'UTF-8', thing.encoding.name
-              called = true
-            end
-            assert called
+          called = false
+          @parser.document.start_elements.flatten.each do |thing|
+            assert_equal 'UTF-8', thing.encoding.name
+            called = true
+          end
+          assert called
+          called = false
+          @parser.document.end_elements.flatten.each do |thing|
+            assert_equal 'UTF-8', thing.encoding.name
+            called = true
+          end
+          assert called
+          called = false
+          @parser.document.data.each do |thing|
+            assert_equal 'UTF-8', thing.encoding.name
+            called = true
+          end
+          assert called
+          called = false
+          @parser.document.comments.flatten.each do |thing|
+            assert_equal 'UTF-8', thing.encoding.name
+            called = true
+          end
+          assert called
+          called = false
+          @parser.document.cdata_blocks.flatten.each do |thing|
+            assert_equal 'UTF-8', thing.encoding.name
+            called = true
           end
+          assert called
         end
         def test_parse_file

data/test/xml/test_document.rb CHANGED

@@ -28,8 +28,13 @@ module Nokogiri
       # issue #1005
       def test_strict_parsing_empty_doc_should_raise_exception
-        assert_raises(SyntaxError) do
-          Nokogiri::XML(StringIO.new('')) { |c| c.strict }
+        ["", " "].each do |empty_string|
+          assert_raises(SyntaxError, "empty string '#{empty_string}' should raise a SyntaxError") do
+            Nokogiri::XML(empty_string) { |c| c.strict }
+          end
+          assert_raises(SyntaxError, "StringIO of '#{empty_string}' should raise a SyntaxError") do
+            Nokogiri::XML(StringIO.new(empty_string)) { |c| c.strict }
+          end
         end
       end

data/test/xml/test_document_encoding.rb CHANGED

@@ -2,27 +2,30 @@ require "helper"
 module Nokogiri
   module XML
-    if RUBY_VERSION =~ /^1\.9/
-      class TestDocumentEncoding < Nokogiri::TestCase
-        def setup
-          super
-          @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE, 'UTF-8')
-        end
+    class TestDocumentEncoding < Nokogiri::TestCase
+      def setup
+        super
+        @xml = Nokogiri::XML(File.read(SHIFT_JIS_XML), SHIFT_JIS_XML)
+      end
-        def test_url
-          assert_equal @xml.encoding, @xml.url.encoding.name
-        end
+      def test_url
+        assert_equal 'UTF-8', @xml.url.encoding.name
+      end
-        def test_encoding
-          assert_equal @xml.encoding, @xml.encoding.encoding.name
-        end
+      def test_encoding
+        assert_equal 'UTF-8', @xml.encoding.encoding.name
+      end
-        def test_dotted_version
-          if Nokogiri.uses_libxml?
-            assert_equal 'UTF-8', Nokogiri::LIBXML_VERSION.encoding.name
-          end
+      def test_dotted_version
+        if Nokogiri.uses_libxml?
+          assert_equal 'UTF-8', Nokogiri::LIBXML_VERSION.encoding.name
         end
       end
+      def test_empty_doc_encoding
+        encoding = 'US-ASCII'
+        assert_equal encoding, Nokogiri::XML(nil, nil, encoding).encoding
+      end
     end
   end
 end

data/test/xml/test_document_fragment.rb CHANGED

@@ -224,6 +224,18 @@ module Nokogiri
         Nokogiri::XML::Comment.new(frag,'moo')
       end
+      def test_issue_1077_parsing_of_frozen_strings
+        input = <<-EOS
+<?xml version="1.0" encoding="utf-8"?>
+<library>
+  <book title="I like turtles"/>
+</library>
+EOS
+        input.freeze
+        Nokogiri::XML::DocumentFragment.parse(input) # assert_nothing_raised
+      end
       if Nokogiri.uses_libxml?
         def test_for_libxml_in_context_fragment_parsing_bug_workaround
           10.times do

data/test/xml/test_dtd_encoding.rb CHANGED

@@ -4,7 +4,6 @@ require "helper"
 module Nokogiri
   module XML
-   if RUBY_VERSION =~ /^1\.9/
     class TestDTDEncoding < Nokogiri::TestCase
       def setup
         super
@@ -28,6 +27,5 @@ module Nokogiri
         end
       end
     end
-   end
   end
 end

data/test/xml/test_namespace.rb CHANGED

@@ -40,7 +40,7 @@ module Nokogiri
       def test_namespace_node_prefix
         namespaces = @xml.root.namespace_definitions
-        assert_equal [nil, 'foo'], namespaces.map { |x| x.prefix }
+        assert_equal [nil, 'foo'], namespaces.map(&:prefix)
       end
       def test_namespace_node_href
@@ -48,7 +48,7 @@ module Nokogiri
         assert_equal [
           'http://tenderlovemaking.com/',
           'bar'
-        ], namespaces.map { |x| x.href }
+        ], namespaces.map(&:href)
       end
       def test_equality

data/test/xml/test_node.rb CHANGED

@@ -19,7 +19,7 @@ module Nokogiri
       def test_element_children
         nodes = @xml.root.element_children
         assert_equal @xml.root.first_element_child, nodes.first
-        assert nodes.all? { |node| node.element? }, 'all nodes are elements'
+        assert nodes.all?(&:element?), 'all nodes are elements'
       end
       def test_last_element_child
@@ -622,7 +622,7 @@ module Nokogiri
         address = @xml.xpath('//address').first
         assert_equal 3, address.ancestors.length
         assert_equal ['employee', 'staff', 'document'],
-          address.ancestors.map { |x| x.name }
+          address.ancestors.map(&:name)
       end
       def test_read_only?
@@ -714,7 +714,7 @@ b"></div>
         eoxml
         set = xml.css('a[@class~="bar"]')
         assert_equal 4, set.length
-        assert_equal ['Bar'], set.map { |node| node.content }.uniq
+        assert_equal ['Bar'], set.map(&:content).uniq
       end
       def test_unlink
@@ -892,7 +892,7 @@ b"></div>
       def test_whitespace_nodes
         doc = Nokogiri::XML.parse("<root><b>Foo</b>\n<i>Bar</i> <p>Bazz</p></root>")
-        children = doc.at('//root').children.collect{|j| j.to_s}
+        children = doc.at('//root').children.collect(&:to_s)
         assert_equal "\n", children[1]
         assert_equal " ", children[3]
       end
@@ -1228,6 +1228,17 @@ eoxml
         subject.lang = "fr"
         assert_equal "fr", subject.lang
       end
+      def test_text_node_robustness_gh1426
+        # notably, the original bug report was about libxml-ruby interactions
+        # this test should blow up under valgrind if we regress on libxml-ruby workarounds
+        message = "<h2>BOOM!</h2>"
+        10_000.times do
+          node = Nokogiri::HTML::DocumentFragment.parse(message)
+          node.add_previous_sibling(Nokogiri::XML::Text.new('before', node.document))
+          node.add_next_sibling(Nokogiri::XML::Text.new('after', node.document))
+        end
+      end
     end
   end
 end

data/test/xml/test_node_attributes.rb CHANGED

@@ -26,6 +26,12 @@ module Nokogiri
         assert_equal nil, node['lang']
       end
+      def test_unknown_namespace_prefix_should_not_be_removed
+        doc = Nokogiri::XML ''
+        elem = doc.create_element 'foo', 'bar:attr' => 'something'
+        assert_equal elem.attribute_nodes.first.name, 'bar:attr'
+      end
       def test_set_prefixed_attributes
         doc = Nokogiri::XML %Q{<root xmlns:foo="x"/>}

data/test/xml/test_node_encoding.rb CHANGED

@@ -1,105 +1,67 @@
+# encoding: UTF-8
 require "helper"
 module Nokogiri
   module XML
-    if RUBY_VERSION =~ /^1\.9/
-      class TestNodeEncoding < Nokogiri::TestCase
-        def setup
-          super
-          @html = Nokogiri::HTML(File.read(HTML_FILE), HTML_FILE)
-        end
-        def test_get_attribute
-          node = @html.css('a').first
-          assert_equal @html.encoding, node['href'].encoding.name
-        end
-        def test_text_encoding_is_utf_8
-          @html = Nokogiri::HTML(File.open(NICH_FILE))
-          assert_equal 'UTF-8', @html.text.encoding.name
-        end
+    class TestNodeEncoding < Nokogiri::TestCase
+      def test_serialize_encoding_xml
+        @xml = Nokogiri::XML(File.open(SHIFT_JIS_XML))
+        assert_equal @xml.encoding.downcase,
+          @xml.serialize.encoding.name.downcase
-        def test_serialize_encoding_html
-          @html = Nokogiri::HTML(File.open(NICH_FILE))
-          assert_equal @html.encoding.downcase,
-            @html.serialize.encoding.name.downcase
+        @doc = Nokogiri::XML(@xml.serialize)
+        assert_equal @xml.serialize, @doc.serialize
+      end
-          @doc = Nokogiri::HTML(@html.serialize)
-          assert_equal @html.serialize, @doc.serialize
-        end
+      def test_encoding_GH_1113
+        utf8 = '<frag>shahid ὡ 𐄣 𢂁</frag>'
+        hex = '<frag>shahid &#x1f61; &#x10123; &#x22081;</frag>'
+        decimal = '<frag>shahid &#8033; &#65827; &#139393;</frag>'
+        expected = Nokogiri.jruby? ? hex : decimal
-        def test_serialize_encoding_xml
-          @xml = Nokogiri::XML(File.open(SHIFT_JIS_XML))
-          assert_equal @xml.encoding.downcase,
-            @xml.serialize.encoding.name.downcase
+        frag = Nokogiri::XML(utf8, nil, 'UTF-8', Nokogiri::XML::ParseOptions::STRICT)
+        assert_equal utf8, frag.to_xml.sub(/^<.xml[^>]*>\n/m, '').strip
-          @doc = Nokogiri::XML(@xml.serialize)
-          assert_equal @xml.serialize, @doc.serialize
-        end
+        frag = Nokogiri::XML(expected, nil, 'UTF-8', Nokogiri::XML::ParseOptions::STRICT)
+        assert_equal utf8, frag.to_xml.sub(/^<.xml[^>]*>\n/m, '').strip
-        def test_encode_special_chars
-          foo = @html.css('a').first.encode_special_chars('foo')
-          assert_equal @html.encoding, foo.encoding.name
-        end
+        frag = Nokogiri::XML(expected, nil, 'US-ASCII', Nokogiri::XML::ParseOptions::STRICT)
+        assert_equal expected, frag.to_xml.sub(/^<.xml[^>]*>\n/m, '').strip
+      end
-        def test_content
-          node = @html.css('a').first
-          assert_equal @html.encoding, node.content.encoding.name
-        end
+      VEHICLE_XML = <<-eoxml
+        <root>
+          <car xmlns:part="http://general-motors.com/">
+            <part:tire>Michelin Model XGV</part:tire>
+          </car>
+          <bicycle xmlns:part="http://schwinn.com/">
+            <part:tire>I'm a bicycle tire!</part:tire>
+          </bicycle>
+        </root>
+      eoxml
-        def test_name
-          node = @html.css('a').first
-          assert_equal @html.encoding, node.name.encoding.name
-        end
+      def test_namespace
+        doc = Nokogiri::XML(VEHICLE_XML.encode('Shift_JIS'), nil, 'Shift_JIS')
+        assert_equal 'Shift_JIS', doc.encoding
+        n = doc.xpath('//part:tire', { 'part' => 'http://schwinn.com/' }).first
+        assert n
+        assert_equal 'UTF-8', n.namespace.href.encoding.name
+        assert_equal 'UTF-8', n.namespace.prefix.encoding.name
+      end
-        def test_path
-          node = @html.css('a').first
-          assert_equal @html.encoding, node.path.encoding.name
-        end
+      def test_namespace_as_hash
+        doc = Nokogiri::XML(VEHICLE_XML.encode('Shift_JIS'), nil, 'Shift_JIS')
+        assert_equal 'Shift_JIS', doc.encoding
+        assert n = doc.xpath('//car').first
-        def test_namespace
-          xml = <<-eoxml
-<root>
- <car xmlns:part="http://general-motors.com/">
-  <part:tire>Michelin Model XGV</part:tire>
- </car>
- <bicycle xmlns:part="http://schwinn.com/">
-  <part:tire>I'm a bicycle tire!</part:tire>
- </bicycle>
-</root>
-          eoxml
-          doc = Nokogiri::XML(xml, nil, 'UTF-8')
-          assert_equal 'UTF-8', doc.encoding
-          n = doc.xpath('//part:tire', { 'part' => 'http://schwinn.com/' }).first
-          assert n
-          assert_equal doc.encoding, n.namespace.href.encoding.name
-          assert_equal doc.encoding, n.namespace.prefix.encoding.name
+        n.namespace_definitions.each do |nd|
+          assert_equal 'UTF-8', nd.href.encoding.name
+          assert_equal 'UTF-8', nd.prefix.encoding.name
         end
-        def test_namespace_as_hash
-          xml = <<-eoxml
-<root>
- <car xmlns:part="http://general-motors.com/">
-  <part:tire>Michelin Model XGV</part:tire>
- </car>
- <bicycle xmlns:part="http://schwinn.com/">
-  <part:tire>I'm a bicycle tire!</part:tire>
- </bicycle>
-</root>
-          eoxml
-          doc = Nokogiri::XML(xml, nil, 'UTF-8')
-          assert_equal 'UTF-8', doc.encoding
-          assert n = doc.xpath('//car').first
-          n.namespace_definitions.each do |nd|
-            assert_equal doc.encoding, nd.href.encoding.name
-            assert_equal doc.encoding, nd.prefix.encoding.name
-          end
-          n.namespaces.each do |k,v|
-            assert_equal doc.encoding, k.encoding.name
-            assert_equal doc.encoding, v.encoding.name
-          end
+        n.namespaces.each do |k,v|
+          assert_equal 'UTF-8', k.encoding.name
+          assert_equal 'UTF-8', v.encoding.name
         end
       end
     end