RubyGems - nokogiri - Versions diffs - 1.6.1 → 1.6.2.rc1 - Mend

nokogiri 1.6.1 → 1.6.2.rc1

Potentially problematic release.

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

Files changed (93) hide show

checksums.yaml +7 -7
data/.editorconfig +17 -0
data/.travis.yml +4 -6
data/CHANGELOG.ja.rdoc +37 -8
data/CHANGELOG.rdoc +48 -3
data/Gemfile +3 -3
data/Manifest.txt +57 -1
data/README.ja.rdoc +22 -16
data/README.rdoc +24 -19
data/ROADMAP.md +1 -2
data/Rakefile +161 -58
data/build_all +56 -31
data/dependencies.yml +3 -3
data/ext/nokogiri/extconf.rb +379 -121
data/ext/nokogiri/html_document.c +2 -2
data/ext/nokogiri/nokogiri.c +6 -1
data/ext/nokogiri/xml_document.c +5 -4
data/ext/nokogiri/xml_node.c +11 -4
data/ext/nokogiri/xml_reader.c +1 -1
data/ext/nokogiri/xml_sax_parser_context.c +40 -0
data/ext/nokogiri/xml_syntax_error.c +10 -5
data/ext/nokogiri/xml_syntax_error.h +1 -1
data/ext/nokogiri/xml_xpath_context.c +2 -14
data/ext/nokogiri/xslt_stylesheet.c +1 -1
data/lib/nokogiri.rb +31 -22
data/lib/nokogiri/css/node.rb +0 -50
data/lib/nokogiri/css/parser.rb +213 -218
data/lib/nokogiri/css/parser.y +21 -30
data/lib/nokogiri/css/xpath_visitor.rb +62 -14
data/lib/nokogiri/html/document.rb +97 -18
data/lib/nokogiri/html/sax/parser.rb +2 -2
data/lib/nokogiri/version.rb +1 -1
data/lib/nokogiri/xml/builder.rb +1 -1
data/lib/nokogiri/xml/document.rb +2 -2
data/lib/nokogiri/xml/dtd.rb +10 -0
data/lib/nokogiri/xml/node.rb +26 -1
data/lib/nokogiri/xml/sax/parser.rb +1 -1
data/ports/archives/libxslt-1.1.28.tar.gz +0 -0
data/ports/patches/libxml2/0001-Fix-parser-local-buffers-size-problems.patch +265 -0
data/ports/patches/libxml2/0002-Fix-entities-local-buffers-size-problems.patch +102 -0
data/ports/patches/libxml2/0003-Fix-an-error-in-previous-commit.patch +26 -0
data/ports/patches/libxml2/0004-Fix-potential-out-of-bound-access.patch +26 -0
data/ports/patches/libxml2/0005-Detect-excessive-entities-expansion-upon-replacement.patch +158 -0
data/ports/patches/libxml2/0006-Do-not-fetch-external-parsed-entities.patch +78 -0
data/ports/patches/libxml2/0007-Enforce-XML_PARSER_EOF-state-handling-through-the-pa.patch +480 -0
data/ports/patches/libxml2/0008-Improve-handling-of-xmlStopParser.patch +315 -0
data/ports/patches/libxml2/0009-Fix-a-couple-of-return-without-value.patch +37 -0
data/ports/patches/libxslt/0001-Adding-doc-update-related-to-1.1.28.patch +222 -0
data/ports/patches/libxslt/0002-Fix-a-couple-of-places-where-f-printf-parameters-wer.patch +53 -0
data/ports/patches/libxslt/0003-Initialize-pseudo-random-number-generator-with-curre.patch +60 -0
data/ports/patches/libxslt/0004-EXSLT-function-str-replace-is-broken-as-is.patch +42 -0
data/ports/patches/libxslt/0006-Fix-str-padding-to-work-with-UTF-8-strings.patch +164 -0
data/ports/patches/libxslt/0007-Separate-function-for-predicate-matching-in-patterns.patch +587 -0
data/ports/patches/libxslt/0008-Fix-direct-pattern-matching.patch +80 -0
data/ports/patches/libxslt/0009-Fix-certain-patterns-with-predicates.patch +185 -0
data/ports/patches/libxslt/0010-Fix-handling-of-UTF-8-strings-in-EXSLT-crypto-module.patch +126 -0
data/ports/patches/libxslt/0013-Memory-leak-in-xsltCompileIdKeyPattern-error-path.patch +25 -0
data/ports/patches/libxslt/0014-Fix-for-bug-436589.patch +43 -0
data/ports/patches/libxslt/0015-Fix-mkdir-for-mingw.patch +41 -0
data/suppressions/README.txt +1 -0
data/suppressions/nokogiri_ree-1.8.7.358.supp +61 -0
data/suppressions/nokogiri_ruby-1.8.7.370.supp +0 -0
data/suppressions/nokogiri_ruby-1.9.2.320.supp +28 -0
data/suppressions/nokogiri_ruby-1.9.3.327.supp +28 -0
data/test/css/test_nthiness.rb +65 -2
data/test/css/test_parser.rb +27 -10
data/test/css/test_tokenizer.rb +1 -1
data/test/css/test_xpath_visitor.rb +6 -1
data/test/files/atom.xml +344 -0
data/test/files/shift_jis_no_charset.html +9 -0
data/test/helper.rb +10 -0
data/test/html/test_document.rb +74 -7
data/test/html/test_document_encoding.rb +10 -0
data/test/html/test_document_fragment.rb +3 -3
data/test/namespaces/test_namespaces_in_cloned_doc.rb +31 -0
data/test/test_nokogiri.rb +6 -0
data/test/test_reader.rb +7 -4
data/test/test_xslt_transforms.rb +25 -0
data/test/xml/sax/test_parser.rb +16 -0
data/test/xml/sax/test_parser_context.rb +9 -0
data/test/xml/test_builder.rb +9 -0
data/test/xml/test_c14n.rb +12 -2
data/test/xml/test_document.rb +66 -0
data/test/xml/test_document_fragment.rb +5 -0
data/test/xml/test_dtd.rb +84 -0
data/test/xml/test_entity_reference.rb +3 -3
data/test/xml/test_node.rb +21 -3
data/test/xml/test_node_attributes.rb +17 -0
data/test/xml/test_schema.rb +26 -0
data/test/xml/test_xpath.rb +81 -0
metadata +254 -174
data/ports/archives/libxslt-1.1.26.tar.gz +0 -0
data/tasks/cross_compile.rb +0 -134

data/test/files/shift_jis_no_charset.html ADDED

@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>����ɂ��́I</title>
+  </head>
+  <body>
+    <h1>This is a Shift_JIS File</h1>
+    <h2>����ɂ��́I</h2>
+  </body>
+</html>

data/test/helper.rb CHANGED

@@ -26,11 +26,14 @@ module Nokogiri
     PO_SCHEMA_FILE      = File.join(ASSETS_DIR, 'po.xsd')
     PO_XML_FILE         = File.join(ASSETS_DIR, 'po.xml')
     SHIFT_JIS_HTML      = File.join(ASSETS_DIR, 'shift_jis.html')
+    SHIFT_JIS_NO_CHARSET= File.join(ASSETS_DIR, 'shift_jis_no_charset.html')
     SHIFT_JIS_XML       = File.join(ASSETS_DIR, 'shift_jis.xml')
     SNUGGLES_FILE       = File.join(ASSETS_DIR, 'snuggles.xml')
     XML_FILE            = File.join(ASSETS_DIR, 'staff.xml')
     XML_XINCLUDE_FILE   = File.join(ASSETS_DIR, 'xinclude.xml')
+    XML_ATOM_FILE       = File.join(ASSETS_DIR, 'atom.xml')
     XSLT_FILE           = File.join(ASSETS_DIR, 'staff.xslt')
+    XPATH_FILE          = File.join(ASSETS_DIR, 'slow-xpath.xml')
     def teardown
       if ENV['NOKOGIRI_GC']
@@ -69,6 +72,13 @@ module Nokogiri
     alias :assert_not_nil       :refute_nil
     alias :assert_raise         :assert_raises
     alias :assert_not_equal     :refute_equal
+    def assert_not_send send_ary, m = nil
+      recv, msg, *args = send_ary
+      m = message(m) {
+        "Expected #{mu_pp(recv)}.#{msg}(*#{mu_pp(args)}) to return false" }
+      assert !recv.__send__(msg, *args), m
+    end unless method_defined?(:assert_not_send)
   end
   module SAX

data/test/html/test_document.rb CHANGED

@@ -166,6 +166,20 @@ EOHTML
         assert_nil doc.meta_encoding
       end
+      def test_meta_encoding_checks_charset
+        doc = Nokogiri::HTML(<<-eohtml)
+<html>
+  <head>
+    <meta charset="UTF-8">
+  </head>
+  <body>
+    foo
+  </body>
+</html>
+        eohtml
+        assert_equal 'UTF-8', doc.meta_encoding
+      end
       def test_meta_encoding=
         @html.meta_encoding = 'EUC-JP'
         assert_equal 'EUC-JP', @html.meta_encoding
@@ -189,11 +203,13 @@ EOHTML
 </html>
 eohtml
         doc.title = 'new'
+        assert_equal 1, doc.css('title').size
         assert_equal 'new', doc.title
         doc = Nokogiri::HTML(<<eohtml)
 <html>
   <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   </head>
   <body>
     foo
@@ -202,6 +218,10 @@ eohtml
 eohtml
         doc.title = 'new'
         assert_equal 'new', doc.title
+        title = doc.at('/html/head/title')
+        assert_not_nil title
+        assert_equal 'new', title.text
+        assert_equal -1, doc.at('meta[@http-equiv]') <=> title
         doc = Nokogiri::HTML(<<eohtml)
 <html>
@@ -211,19 +231,66 @@ eohtml
 </html>
 eohtml
         doc.title = 'new'
-        if Nokogiri.uses_libxml?
-          assert_nil doc.title
-        else
-          assert_equal 'new', doc.title
-        end
+        assert_equal 'new', doc.title
+        # <head> may or may not be added
+        title = doc.at('/html//title')
+        assert_not_nil title
+        assert_equal 'new', title.text
+        assert_equal -1, title <=> doc.at('body')
+        doc = Nokogiri::HTML(<<eohtml)
+<html>
+  <meta charset="UTF-8">
+  <body>
+    foo
+  </body>
+</html>
+eohtml
+        doc.title = 'new'
+        assert_equal 'new', doc.title
+        assert_equal -1, doc.at('meta[@charset]') <=> doc.at('title')
+        assert_equal -1, doc.at('title') <=> doc.at('body')
+        doc = Nokogiri::HTML('<!DOCTYPE html><p>hello')
+        doc.title = 'new'
+        assert_equal 'new', doc.title
+        assert_instance_of Nokogiri::XML::DTD, doc.children.first
+        assert_equal -1, doc.at('title') <=> doc.at('p')
+        doc = Nokogiri::HTML('')
+        doc.title = 'new'
+        assert_equal 'new', doc.title
+        assert_equal 'new', doc.at('/html/head/title/text()').to_s
       end
       def test_meta_encoding_without_head
-        html = Nokogiri::HTML('<html><body>foo</body></html>')
+        encoding = 'EUC-JP'
+        html = Nokogiri::HTML('<html><body>foo</body></html>', nil, encoding)
         assert_nil html.meta_encoding
-        html.meta_encoding = 'EUC-JP'
+        html.meta_encoding = encoding
+        assert_equal encoding, html.meta_encoding
+        meta = html.at('/html/head/meta[@http-equiv and boolean(@content)]')
+        assert meta, 'meta is in head'
+        assert meta.at('./parent::head/following-sibling::body'), 'meta is before body'
+      end
+      def test_html5_meta_encoding_without_head
+        encoding = 'EUC-JP'
+        html = Nokogiri::HTML('<!DOCTYPE html><html><body>foo</body></html>', nil, encoding)
         assert_nil html.meta_encoding
+        html.meta_encoding = encoding
+        assert_equal encoding, html.meta_encoding
+        meta = html.at('/html/head/meta[@charset]')
+        assert meta, 'meta is in head'
+        assert meta.at('./parent::head/following-sibling::body'), 'meta is before body'
       end
       def test_meta_encoding_with_empty_content_type

data/test/html/test_document_encoding.rb CHANGED

@@ -19,6 +19,16 @@ module Nokogiri
           assert_match 'UTF-8', doc.to_html(:encoding => 'UTF-8').encoding.name
         end
+        def test_encoding_without_charset
+          doc = Nokogiri::HTML File.open(SHIFT_JIS_NO_CHARSET, 'r:cp932:cp932').read
+          hello = "こんにちは"
+          assert_match hello, doc.content
+          assert_match hello, doc.to_html(:encoding => 'UTF-8')
+          assert_match 'UTF-8', doc.to_html(:encoding => 'UTF-8').encoding.name
+        end
         def test_default_to_encoding_from_string
           bad_charset = <<-eohtml
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

data/test/html/test_document_fragment.rb CHANGED

@@ -193,14 +193,14 @@ module Nokogiri
       end
       def test_to_xhtml
-        doc = "<span>foo<br></span><span>bar</span>"
+        doc = "<span>foo<br></span><span>bar</span><p></p>"
         fragment = Nokogiri::HTML::Document.new.fragment(doc)
         if Nokogiri.jruby? || Nokogiri::VERSION_INFO['libxml']['loaded'] >= "2.7.0"
-          assert_equal "<span>foo<br /></span><span>bar</span>", fragment.to_xhtml
+          assert_equal "<span>foo<br /></span><span>bar</span><p></p>", fragment.to_xhtml
         else
           # FIXME: why are we doing this ? this violates the spec,
           # see http://www.w3.org/TR/xhtml1/#C_2
-          assert_equal "<span>foo<br></span><span>bar</span>", fragment.to_xhtml
+          assert_equal "<span>foo<br></span><span>bar</span><p></p>", fragment.to_xhtml
         end
       end

data/test/namespaces/test_namespaces_in_cloned_doc.rb ADDED

@@ -0,0 +1,31 @@
+require "helper"
+module Nokogiri
+  module XML
+    class TestNamespacesInClonedDoc < Nokogiri::TestCase
+      def setup
+        super
+        b = Nokogiri::XML::Builder.new do |xml|
+          xml.mods("xmlns"=>"http://www.loc.gov/mods/v3") {
+            xml.name(:type=>"personal") {
+              xml.namePart()
+            }
+          }
+        end
+        @doc = b.doc
+        @clone = Nokogiri::XML(@doc.to_s)
+      end
+      def check_namespace e
+        e.namespace.nil? ? nil : e.namespace.href
+      end
+      def test_namespace_ns
+        xpath = '//oxns:name[@type="personal"]'
+        namespaces = {'oxns' => "http://www.loc.gov/mods/v3"}
+        assert_equal @doc.xpath(xpath, namespaces).length, @clone.xpath(xpath, namespaces).length
+      end
+    end
+  end
+end

data/test/test_nokogiri.rb CHANGED

@@ -41,6 +41,12 @@ class TestNokogiri < Nokogiri::TestCase
     assert !doc.html?
   end
+  def test_atom_is_xml?
+    doc = Nokogiri.parse(File.read(XML_ATOM_FILE))
+    assert doc.xml?
+    assert !doc.html?
+  end
   def test_html?
     doc = Nokogiri.parse(File.read(HTML_FILE))
     assert !doc.xml?

data/test/test_reader.rb CHANGED

@@ -45,14 +45,17 @@ class TestReader < Nokogiri::TestCase
         node_out = node
         break
       end
+      rd.close
     end
     sleep(1)              # sleep for one second to make sure the reader will actually block for input
-    wr.puts "<foo>"
-    wr.puts "<bar/>" * 10000
-    wr.flush
+    begin
+      wr.puts "<foo>"
+      wr.puts "<bar/>" * 10000
+      wr.flush
+    rescue Errno::EPIPE
+    end
     res = t.join(5)    # wait 5 seconds for the thread to finish
     wr.close
-    rd.close
     refute_nil node_out, "Didn't read any nodes, exclude the trivial case"
     refute_nil res, "Reader blocks trying to read the entire stream"
   end

data/test/test_xslt_transforms.rb CHANGED

@@ -251,4 +251,29 @@ encoding="iso-8859-1" indent="yes"/>
       assert_equal p.content, params[p.name.intern]
     end
   end
+  def test_non_html_xslt_transform
+    xml = Nokogiri.XML(<<-EOXML)
+    <a>
+      <b>
+      <c>123</c>
+        </b>
+      </a>
+    EOXML
+    xsl = Nokogiri.XSLT(<<-EOXSL)
+      <xsl:stylesheet version="1.0"
+                      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+        <xsl:output encoding="UTF-8" indent="yes" method="xml" />
+        <xsl:template match="/">
+          <xsl:value-of select="/a" />
+        </xsl:template>
+      </xsl:stylesheet>
+    EOXSL
+    result = xsl.transform xml
+    assert !result.html?
+  end
 end

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

@@ -360,6 +360,22 @@ module Nokogiri
           assert_equal [['root', []], ['foo', [['a', '&b'], ['c', '>d']]]], @parser.document.start_elements
         end
+        def test_recovery_from_incorrect_xml
+          xml = <<-eoxml
+<?xml version="1.0" ?><Root><Data><?xml version='1.0'?><Item>hey</Item></Data><Data><Item>hey yourself</Item></Data></Root>
+          eoxml
+          block_called = false
+          @parser.parse(xml) { |ctx|
+            block_called = true
+            ctx.recovery = true
+          }
+          assert block_called
+          assert_equal [['Root', []], ['Data', []], ['Item', []], ['Data', []], ['Item', []]], @parser.document.start_elements
+        end
       end
     end
   end

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

@@ -65,6 +65,15 @@ world
           assert_equal true, pc.replace_entities
         end
+        def test_recovery
+          pc = ParserContext.new StringIO.new('<root />'), 'UTF-8'
+          pc.recovery = false
+          assert_equal false, pc.recovery
+          pc.recovery = true
+          assert_equal true, pc.recovery
+        end
         def test_from_io
           ctx = ParserContext.new StringIO.new('fo'), 'UTF-8'
           assert ctx

data/test/xml/test_builder.rb CHANGED

@@ -13,6 +13,15 @@ module Nokogiri
         assert_equal 'world', doc.root['abcDef']
       end
+      def test_builder_multiple_nodes
+        builder = Nokogiri::XML::Builder.new do |xml|
+          0.upto(10) do
+            xml.text "test"
+          end
+        end
+      end
       def test_builder_with_utf8_text
         text = "test ﺵ "
         doc = Nokogiri::XML::Builder.new(:encoding => "UTF-8") { |xml| xml.test text }.doc

data/test/xml/test_c14n.rb CHANGED

@@ -28,6 +28,8 @@ module Nokogiri
         assert_no_match(/Comment/, c14n)
         c14n = doc.canonicalize(nil, nil, true)
         assert_match(/Comment/, c14n)
+        c14n = doc.canonicalize(nil, nil, false)
+        assert_no_match(/Comment/, c14n)
       end
       def test_exclude_block_params
@@ -100,7 +102,6 @@ module Nokogiri
       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
@@ -142,7 +143,16 @@ module Nokogiri
         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
+      def test_wrong_params
+        xml = '<a><b></b></a>'
+        doc = Nokogiri.XML xml
+        assert_raise(TypeError){ doc.canonicalize :wrong_type }
+        assert_raise(TypeError){ doc.canonicalize nil, :wrong_type }
+        doc.canonicalize nil, nil, :wrong_type
       end

data/test/xml/test_document.rb CHANGED

@@ -26,6 +26,13 @@ module Nokogiri
         assert doc.root
       end
+      # issue #1005
+      def test_strict_parsing_empty_doc_should_raise_exception
+        assert_raises(SyntaxError) do
+          Nokogiri::XML(StringIO.new('')) { |c| c.strict }
+        end
+      end
       # issue #838
       def test_document_with_invalid_prolog
         doc = Nokogiri::XML '<? ?>'
@@ -337,6 +344,59 @@ module Nokogiri
         assert_equal "quack!", doc.root.children.first.content
       end
+      def test_prepend
+        doc = Nokogiri::XML('<root>')
+        node_set = doc.root.prepend_child '<branch/>'
+        assert_equal %w[branch], node_set.map(&:name)
+        branch = doc.at('//branch')
+        leaves = %w[leaf1 leaf2 leaf3]
+        leaves.each { |name|
+          branch.prepend_child('<%s/>' % name)
+        }
+        assert_equal leaves.length, branch.children.length
+        assert_equal leaves.reverse, branch.children.map(&:name)
+      end
+      def test_prepend_child_fragment_with_single_node
+        doc = Nokogiri::XML::Document.new
+        fragment = doc.fragment('<hello />')
+        doc.prepend_child fragment
+        assert_equal '/hello', doc.at('//hello').path
+        assert_equal 'hello', doc.root.name
+      end
+      def test_prepend_child_fragment_with_multiple_nodes
+        doc = Nokogiri::XML::Document.new
+        fragment = doc.fragment('<hello /><goodbye />')
+        assert_raises(RuntimeError) do
+          doc.prepend_child fragment
+        end
+      end
+      def test_prepend_child_fragment_with_multiple_nodes
+        doc = Nokogiri::XML::Document.new
+        fragment = doc.fragment('<hello /><goodbye />')
+        assert_raises(RuntimeError) do
+          doc.prepend_child fragment
+        end
+      end
+      def test_prepend_child_with_multiple_roots
+        assert_raises(RuntimeError) do
+          @xml.prepend_child Node.new('foo', @xml)
+        end
+      end
+      def test_prepend_child_with_string
+        doc = Nokogiri::XML::Document.new
+        doc.prepend_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
@@ -483,6 +543,12 @@ module Nokogiri
         }
       end
+      def test_xpath_syntax_error
+        assert_raises(Nokogiri::XML::XPath::SyntaxError) do
+          @xml.xpath('\\')
+        end
+      end
       def test_ancestors
         assert_equal 0, @xml.ancestors.length
       end