nokogiri 1.6.7.2 → 1.6.8.rc1

data/test/xml/test_document.rb

@@ -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

@@ -2,25 +2,23 @@ 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(XML_FILE), XML_FILE, 'UTF-8')
+      end
 
-        def test_url
-          assert_equal @xml.encoding, @xml.url.encoding.name
-        end
+      def test_url
+        assert_equal @xml.encoding, @xml.url.encoding.name
+      end
 
-        def test_encoding
-          assert_equal @xml.encoding, @xml.encoding.encoding.name
-        end
+      def test_encoding
+        assert_equal @xml.encoding, @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
     end

data/test/xml/test_dtd_encoding.rb

@@ -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_node_encoding.rb

@@ -2,104 +2,102 @@ 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
+    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_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
+      def test_text_encoding_is_utf_8
+        @html = Nokogiri::HTML(File.open(NICH_FILE))
+        assert_equal 'UTF-8', @html.text.encoding.name
+      end
 
-        def test_serialize_encoding_html
-          @html = Nokogiri::HTML(File.open(NICH_FILE))
-          assert_equal @html.encoding.downcase,
-            @html.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::HTML(@html.serialize)
-          assert_equal @html.serialize, @doc.serialize
-        end
+        @doc = Nokogiri::HTML(@html.serialize)
+        assert_equal @html.serialize, @doc.serialize
+      end
 
-        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_xml
+        @xml = Nokogiri::XML(File.open(SHIFT_JIS_XML))
+        assert_equal @xml.encoding.downcase,
+          @xml.serialize.encoding.name.downcase
 
-          @doc = Nokogiri::XML(@xml.serialize)
-          assert_equal @xml.serialize, @doc.serialize
-        end
+        @doc = Nokogiri::XML(@xml.serialize)
+        assert_equal @xml.serialize, @doc.serialize
+      end
 
-        def test_encode_special_chars
-          foo = @html.css('a').first.encode_special_chars('foo')
-          assert_equal @html.encoding, foo.encoding.name
-        end
+      def test_encode_special_chars
+        foo = @html.css('a').first.encode_special_chars('foo')
+        assert_equal @html.encoding, foo.encoding.name
+      end
 
-        def test_content
-          node = @html.css('a').first
-          assert_equal @html.encoding, node.content.encoding.name
-        end
+      def test_content
+        node = @html.css('a').first
+        assert_equal @html.encoding, node.content.encoding.name
+      end
 
-        def test_name
-          node = @html.css('a').first
-          assert_equal @html.encoding, node.name.encoding.name
-        end
+      def test_name
+        node = @html.css('a').first
+        assert_equal @html.encoding, node.name.encoding.name
+      end
 
-        def test_path
-          node = @html.css('a').first
-          assert_equal @html.encoding, node.path.encoding.name
-        end
+      def test_path
+        node = @html.css('a').first
+        assert_equal @html.encoding, node.path.encoding.name
+      end
 
-        def test_namespace
-          xml = <<-eoxml
+      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>
+  <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
-        end
+        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
+      end
 
-        def test_namespace_as_hash
-          xml = <<-eoxml
+      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>
+  <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
+        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.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 doc.encoding, k.encoding.name
+          assert_equal doc.encoding, v.encoding.name
         end
       end
     end

data/test/xml/test_reader_encoding.rb

@@ -3,131 +3,129 @@ require "helper"
 
 module Nokogiri
   module XML
-    if RUBY_VERSION =~ /^1\.9/
-      class TestReaderEncoding < Nokogiri::TestCase
-        def setup
-          super
-          @reader = Nokogiri::XML::Reader(
-            File.read(XML_FILE),
-            XML_FILE,
-            'UTF-8'
-          )
-        end
+    class TestReaderEncoding < Nokogiri::TestCase
+      def setup
+        super
+        @reader = Nokogiri::XML::Reader(
+          File.read(XML_FILE),
+          XML_FILE,
+          'UTF-8'
+        )
+      end
 
-        def test_attribute_at
-          @reader.each do |node|
-            next unless attribute = node.attribute_at(0)
-            assert_equal @reader.encoding, attribute.encoding.name
-          end
+      def test_attribute_at
+        @reader.each do |node|
+          next unless attribute = node.attribute_at(0)
+          assert_equal @reader.encoding, attribute.encoding.name
         end
+      end
 
-        def test_attributes
-          @reader.each do |node|
-            node.attributes.each do |k,v|
-              assert_equal @reader.encoding, k.encoding.name
-              assert_equal @reader.encoding, v.encoding.name
-            end
+      def test_attributes
+        @reader.each do |node|
+          node.attributes.each do |k,v|
+            assert_equal @reader.encoding, k.encoding.name
+            assert_equal @reader.encoding, v.encoding.name
           end
         end
+      end
 
-        def test_attribute
-          xml = <<-eoxml
-    <x xmlns:tenderlove='http://tenderlovemaking.com/'>
-      <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
-    </x>
-          eoxml
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless attribute = node.attribute('awesome')
-            assert_equal reader.encoding, attribute.encoding.name
-          end
+      def test_attribute
+        xml = <<-eoxml
+          <x xmlns:tenderlove='http://tenderlovemaking.com/'>
+            <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
+          </x>
+        eoxml
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless attribute = node.attribute('awesome')
+          assert_equal reader.encoding, attribute.encoding.name
         end
+      end
 
-        def test_xml_version
-          @reader.each do |node|
-            next unless version = node.xml_version
-            assert_equal @reader.encoding, version.encoding.name
-          end
+      def test_xml_version
+        @reader.each do |node|
+          next unless version = node.xml_version
+          assert_equal @reader.encoding, version.encoding.name
         end
+      end
 
-        def test_lang
-          xml = <<-eoxml
-    <awesome>
-      <p xml:lang="en">The quick brown fox jumps over the lazy dog.</p>
-      <p xml:lang="ja">日本語が上手です</p>
-    </awesome>
-          eoxml
+      def test_lang
+        xml = <<-eoxml
+          <awesome>
+            <p xml:lang="en">The quick brown fox jumps over the lazy dog.</p>
+            <p xml:lang="ja">日本語が上手です</p>
+          </awesome>
+        eoxml
 
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless lang = node.lang
-            assert_equal reader.encoding, lang.encoding.name
-          end
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless lang = node.lang
+          assert_equal reader.encoding, lang.encoding.name
         end
+      end
 
-        def test_value
-          called = false
-          @reader.each do |node|
-            next unless value = node.value
-            assert_equal @reader.encoding, value.encoding.name
-            called = true
-          end
-          assert called
+      def test_value
+        called = false
+        @reader.each do |node|
+          next unless value = node.value
+          assert_equal @reader.encoding, value.encoding.name
+          called = true
         end
+        assert called
+      end
 
-        def test_prefix
-          xml = <<-eoxml
-    <x xmlns:edi='http://ecommerce.example.org/schema'>
-      <edi:foo>hello</edi:foo>
-    </x>
-          eoxml
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless prefix = node.prefix
-            assert_equal reader.encoding, prefix.encoding.name
-          end
+      def test_prefix
+        xml = <<-eoxml
+          <x xmlns:edi='http://ecommerce.example.org/schema'>
+            <edi:foo>hello</edi:foo>
+          </x>
+        eoxml
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless prefix = node.prefix
+          assert_equal reader.encoding, prefix.encoding.name
         end
+      end
 
-        def test_ns_uri
-          xml = <<-eoxml
-    <x xmlns:edi='http://ecommerce.example.org/schema'>
-      <edi:foo>hello</edi:foo>
-    </x>
-          eoxml
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless uri = node.namespace_uri
-            assert_equal reader.encoding, uri.encoding.name
-          end
+      def test_ns_uri
+        xml = <<-eoxml
+          <x xmlns:edi='http://ecommerce.example.org/schema'>
+            <edi:foo>hello</edi:foo>
+          </x>
+        eoxml
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless uri = node.namespace_uri
+          assert_equal reader.encoding, uri.encoding.name
         end
+      end
 
-        def test_local_name
-          xml = <<-eoxml
-    <x xmlns:edi='http://ecommerce.example.org/schema'>
-      <edi:foo>hello</edi:foo>
-    </x>
-          eoxml
-          reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
-          reader.each do |node|
-            next unless lname = node.local_name
-            assert_equal reader.encoding, lname.encoding.name
-          end
+      def test_local_name
+        xml = <<-eoxml
+          <x xmlns:edi='http://ecommerce.example.org/schema'>
+            <edi:foo>hello</edi:foo>
+          </x>
+        eoxml
+        reader = Nokogiri::XML::Reader(xml, nil, 'UTF-8')
+        reader.each do |node|
+          next unless lname = node.local_name
+          assert_equal reader.encoding, lname.encoding.name
         end
+      end
 
-        def test_name
-          @reader.each do |node|
-            next unless name = node.name
-            assert_equal @reader.encoding, name.encoding.name
-          end
+      def test_name
+        @reader.each do |node|
+          next unless name = node.name
+          assert_equal @reader.encoding, name.encoding.name
         end
+      end
 
-        def test_value_lookup_segfault
-          skip("JRuby doesn't do GC.") if Nokogiri.jruby?
-          stress_memory_while do
-            while node = @reader.read
-              nodes = node.send(:attr_nodes)
-              nodes.first.name if nodes.first
-            end
+      def test_value_lookup_segfault
+        skip("JRuby doesn't do GC.") if Nokogiri.jruby?
+        stress_memory_while do
+          while node = @reader.read
+            nodes = node.send(:attr_nodes)
+            nodes.first.name if nodes.first
           end
         end
       end