nokogiri 1.0.0 → 1.6.8.1

data/test/css/test_tokenizer.rb

@@ -1,20 +1,58 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+# -*- coding: utf-8 -*-
+
+require "helper"
+
+module Nokogiri
+  module CSS
+    class Tokenizer
+      alias :scan :scan_setup
+    end
+  end
+end
 
 module Nokogiri
   module CSS
     class TestTokenizer < Nokogiri::TestCase
       def setup
+        super
         @scanner = Nokogiri::CSS::Tokenizer.new
       end
 
+      def test_has
+        @scanner.scan("a:has(b)")
+        assert_tokens(
+          [[:IDENT, "a"], [":", ":"], [:HAS, "has("], [:IDENT, "b"], [:RPAREN, ")"]],
+          @scanner)
+      end
+
+      def test_unicode
+        @scanner.scan("a日本語")
+        assert_tokens([[:IDENT, 'a日本語']], @scanner)
+      end
+
+      def test_tokenize_bad_single_quote
+        @scanner.scan("'")
+        assert_tokens([["'", "'"]], @scanner)
+      end
+
       def test_not_equal
         @scanner.scan("h1[a!='Tender Lovemaking']")
         assert_tokens([ [:IDENT, 'h1'],
-                        ['[', '['],
+                        [:LSQUARE, '['],
                         [:IDENT, 'a'],
                         [:NOT_EQUAL, '!='],
                         [:STRING, "'Tender Lovemaking'"],
-                        [']', ']'],
+                        [:RSQUARE, ']'],
+        ], @scanner)
+      end
+
+      def test_negation
+        @scanner.scan("p:not(.a)")
+        assert_tokens([ [:IDENT, 'p'],
+                        [:NOT, ':not('],
+                        ['.', '.'],
+                        [:IDENT, 'a'],
+                        [:RPAREN, ')'],
         ], @scanner)
       end
 
@@ -23,15 +61,14 @@ module Nokogiri
         assert_tokens([ [:IDENT, 'script'],
                         [:S, ' '],
                         [:FUNCTION, 'comment('],
-                        [')', ')'],
+                        [:RPAREN, ')'],
         ], @scanner)
       end
 
       def test_preceding_selector
         @scanner.scan("E ~ F")
         assert_tokens([ [:IDENT, 'E'],
-                        [:TILDE, ' ~'],
-                        [:S, ' '],
+                        [:TILDE, ' ~ '],
                         [:IDENT, 'F'],
         ], @scanner)
       end
@@ -39,19 +76,19 @@ module Nokogiri
       def test_scan_attribute_string
         @scanner.scan("h1[a='Tender Lovemaking']")
         assert_tokens([ [:IDENT, 'h1'],
-                        ['[', '['],
+                        [:LSQUARE, '['],
                         [:IDENT, 'a'],
-                        ['=', '='],
+                        [:EQUAL, '='],
                         [:STRING, "'Tender Lovemaking'"],
-                        [']', ']'],
+                        [:RSQUARE, ']'],
         ], @scanner)
         @scanner.scan('h1[a="Tender Lovemaking"]')
         assert_tokens([ [:IDENT, 'h1'],
-                        ['[', '['],
+                        [:LSQUARE, '['],
                         [:IDENT, 'a'],
-                        ['=', '='],
+                        [:EQUAL, '='],
                         [:STRING, '"Tender Lovemaking"'],
-                        [']', ']'],
+                        [:RSQUARE, ']'],
         ], @scanner)
       end
 
@@ -84,8 +121,7 @@ module Nokogiri
       def test_scan_greater
         @scanner.scan('x > y')
         assert_tokens([ [:IDENT, 'x'],
-                        [:GREATER, ' >'],
-                        [:S, ' '],
+                        [:GREATER, ' > '],
                         [:IDENT, 'y']
         ], @scanner)
       end
@@ -112,11 +148,11 @@ module Nokogiri
                         [':', ':'],
                         [:FUNCTION, 'eq('],
                         [:NUMBER, "0"],
-                        [")", ")"]
+                        [:RPAREN, ')'],
         ], @scanner)
       end
 
-      def test_scan_an_plus_b
+      def test_scan_nth
         @scanner.scan('x:nth-child(5n+3)')
         assert_tokens([ [:IDENT, 'x'],
                         [':', ':'],
@@ -125,7 +161,7 @@ module Nokogiri
                         [:IDENT, 'n'],
                         [:PLUS, '+'],
                         [:NUMBER, '3'],
-                        [")", ")"]
+                        [:RPAREN, ')'],
         ], @scanner)
 
         @scanner.scan('x:nth-child(-1n+3)')
@@ -136,7 +172,7 @@ module Nokogiri
                         [:IDENT, 'n'],
                         [:PLUS, '+'],
                         [:NUMBER, '3'],
-                        [")", ")"]
+                        [:RPAREN, ')'],
         ], @scanner)
 
         @scanner.scan('x:nth-child(-n+3)')
@@ -146,7 +182,24 @@ module Nokogiri
                         [:IDENT, '-n'],
                         [:PLUS, '+'],
                         [:NUMBER, '3'],
-                        [")", ")"]
+                        [:RPAREN, ')'],
+        ], @scanner)
+      end
+
+      def test_significant_space
+        @scanner.scan('x :first-child [a] [b]')
+        assert_tokens([ [:IDENT, 'x'],
+                        [:S, ' '],
+                        [':', ':'],
+                        [:IDENT, 'first-child'],
+                        [:S, ' '],
+                        [:LSQUARE, '['],
+                        [:IDENT, 'a'],
+                        [:RSQUARE, ']'],
+                        [:S, ' '],
+                        [:LSQUARE, '['],
+                        [:IDENT, 'b'],
+                        [:RSQUARE, ']'],
         ], @scanner)
       end
 

data/test/css/test_xpath_visitor.rb

@@ -1,14 +1,56 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module CSS
     class TestXPathVisitor < Nokogiri::TestCase
       def setup
+        super
         @parser = Nokogiri::CSS::Parser.new
       end
 
+      def test_not_simple_selector
+        assert_xpath('//ol/*[not(self::li)]', @parser.parse('ol > *:not(li)'))
+      end
+
+      def test_not_last_child
+        assert_xpath('//ol/*[not(count(following-sibling::*) = 0)]',
+          @parser.parse('ol > *:not(:last-child)'))
+      end
+
+      def test_not_only_child
+        assert_xpath('//ol/*[not(count(preceding-sibling::*) = 0 and count(following-sibling::*) = 0)]',
+          @parser.parse('ol > *:not(:only-child)'))
+      end
+
+      def test_function_calls_allow_at_params
+        assert_xpath("//a[foo(., @href)]", @parser.parse('a:foo(@href)'))
+        assert_xpath("//a[foo(., @a, b)]", @parser.parse('a:foo(@a, b)'))
+        assert_xpath("//a[foo(., a, 10)]", @parser.parse('a:foo(a, 10)'))
+      end
+
+      def test_namespace_conversion
+        assert_xpath("//aaron:a", @parser.parse('aaron|a'))
+        assert_xpath("//a", @parser.parse('|a'))
+      end
+
+      def test_namespaced_attribute_conversion
+        assert_xpath("//a[@flavorjones:href]", @parser.parse('a[flavorjones|href]'))
+        assert_xpath("//a[@href]", @parser.parse('a[|href]'))
+        assert_xpath("//*[@flavorjones:href]", @parser.parse('*[flavorjones|href]'))
+      end
+
+      def test_unknown_psuedo_classes_get_pushed_down
+        assert_xpath("//a[aaron(.)]", @parser.parse('a:aaron'))
+      end
+
+      def test_unknown_functions_get_dot_plus_args
+        assert_xpath("//a[aaron(.)]", @parser.parse('a:aaron()'))
+        assert_xpath("//a[aaron(., 12)]", @parser.parse('a:aaron(12)'))
+        assert_xpath("//a[aaron(., 12, 1)]", @parser.parse('a:aaron(12, 1)'))
+      end
+
       def test_class_selectors
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' red ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' red ')]",
                       @parser.parse(".red")
       end
 

data/test/decorators/test_slop.rb

@@ -0,0 +1,20 @@
+require "helper"
+
+module Nokogiri
+  class TestSlop < Nokogiri::TestCase
+    def test_description_tag
+      doc = Nokogiri.Slop(<<-eoxml)
+        <item>
+          <title>foo</title>
+          <description>this is the foo thing</description>
+        </item>
+      eoxml
+      assert doc.item.respond_to?(:title)
+      assert_equal 'foo', doc.item.title.text
+      assert doc.item.respond_to?(:_description), 'should have description'
+      assert 'this is the foo thing', doc.item._description.text
+      assert !doc.item.respond_to?(:foo)
+      assert_raise(NoMethodError) { doc.item.foo }
+    end
+  end
+end

data/test/files/2ch.html

@@ -0,0 +1,108 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS" />
+<meta http-equiv="Content-Script-Type" content="text/javascript" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="Description" CONTENT="�u�n�b�L���O�v����u���ӂ̂������v�܂ł���L���J�o�[���鋐��f���ŒQ�w�Q�����˂�x�ւ悤�����I">
+<meta name="KeyWords" CONTENT="�Q�����˂�, �f����, 2ch, BBS">
+<meta name="Author" CONTENT="�Q�����˂�">
+<meta name="verify-v1" content="hMevVuWJIPYrUj9ItfRJByoLNIpyhnrWaywiH+IFocU=" />
+<title>�Q�����˂�f���‚ւ悤����</title>
+<style type="text/css" media="all">
+@import url(2ch_top.css);
+</style>
+<script>
+<!--
+function fcs(){document.f.STR.focus();}
+-->
+</script>
+</head>
+
+<body onLoad="document.f.STR.focus()">
+
+<div id="wrapper">
+<div id="header">
+<div id="header_inside">
+<div class="header_left">
+<a href="http://www2.2ch.net/2ch.html"><img src="images/2ch_logo.gif" width="151" height="40" alt="�Q�����˂�" align="middle" border="0" /><a href="http://www2.2ch.net/2ch.html">�f����</a>�b
+<a href="http://c.2ch.net/">imode</a>�b<a href="http://orz.2ch.io/top.html">�g��orz</a>�b<a href="http://p2.2ch.net/">�r���[�Ap2</a>
+</div>
+
+<div class="senna_banner">
+
+<a href="http://razil.jp/product/senna/"><img src="images/senna88x31.gif" width="88" height="31" alt="Senna" align="middle" border="0" /></a>
+</div>
+<div class="header_right">
+<!---find 2ch form --->
+<form method=GET name=f action="http://find.2ch.net/" style="margin:0px">
+<input size=25 name=STR value="" class="form_input">
+<select name="TYPE" class="form_select">
+<option value="BODY">�{��</option>
+
+<option value="TITLE" selected>�X���b�h�^�C�g��</option>
+<option value="POSTERS">���e��</option>
+</select>
+<input type="image" src="images/search_button.gif"  alt="����"  class="form_button"><br />
+<input type=hidden name=BBS value=ALL>
+
+<input type=hidden name=ENCODING value=SJIS>
+<input type=hidden name=COUNT value=50>
+<div class="caption">�{�������⌟���ݒ��<a href="http://find.2ch.net/moritapo/notlogin.php">���O�C��</a><a href="http://find.2ch.net/moritapo/welcome/">&raquo;�ڍ�</a></div>
+
+</form>
+</div>
+</div><!--- header_inside --->
+</div><!--- end of header--->
+
+<div id="under_header">
+<a href="http://newsnavi.2ch.net/">�j���[�X</a>�b<a href="http://headline.2ch.net/bbynews/">�w�b�h���C��</a>�b<a href="http://epg.2ch.net/">�e���r��</a>�b<a href="http://www.2ch.net/kakolog.html">�ߋ����O�q��</a>
+
+</div><!--- end of under header--->
+
+<div id="main">
+<iframe src="http://cast.texpo.jp/2chtop/main_frame.html" width="100%" height="550" scrolling="no" border="0" frameborder="0"></iframe>
+</div><!--- end of main--->
+
+<div id="footer_menu">
+<div class="guide">
+<a href="http://info.2ch.net/guide/">�g����������</a>�b<a href="http://info.2ch.net/guide/adv.html#saku_guide">�폜�K�C�h���C��</a>�b<a href="http://www2.2ch.net/2ch2.html">�g���Ń��j���[</a>�b<a href="http://info.2ch.net/blog.html">�Ђ�䂫���L</a>�b<a href="http://www.2ch.net/ad.html">�L���̂��ē�</a>
+
+</div>
+
+<div class="service">
+<iframe src="http://cast.texpo.jp/2chtop/moritapo_frame.html" width="100%" height="50" scrolling="no" border="0" frameborder="0"></iframe>
+</div>
+
+<div class="banner">
+<a href=http://livede55.com/ target="_blank"><img
+src="http://www2.livede55.com/2ch_468_60_13.gif"
+width="468" height="60" border="0" alt=���C�u�`���b�g></a><br>
+<br>
+<A href="http://www.bb-chat.tv/" target=_blank><IMG height=60 src="http://img.bbchat.tv/images/bannar/46860-3.gif" width=468 border=0></A><br>
+</div>
+
+<div class="condition">
+�Q�����˂�̂����p�͗��p�Ҋe�ʂ̂����f�ɂ��C�����Ă��܂��b<a href="precautions.html">2ch�̃f�[�^���p�ɂ‚���</a>
+
+</div>
+</div><!--- end of footer_menu--->
+
+
+<div id="footer">
+<div class="footer_left">
+<a href="http://www.bunka.go.jp/jiyuriyo/" target="_blank">
+<img src="http://www.dd.iij4u.or.jp/~cap/y_3copyok.jpg" width="184" height="31" border="0" alt="���R���p�}�[�N" /></a>
+</div>
+
+<div class="footer_right">
+<a href="http://count.2ch.net/?index" target="_blank">
+<img src="http://count.2ch.net/ct.php/index" width="88" height="31"  border="0" alt="���������J�E���^�["></a>
+
+
+</div>
+</div><!---end of footer--->
+
+</div><!--- end of wrapper--->
+</body>
+</html>

data/test/files/GH_1042.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head></head>
+<body>
+  <table align="center" border>
+    <tr><th>foo1.0</th><th>bar</th><th>bazz</th></tr>
+    <tr><td>foo1.1</td><td>bar</td><td>bazz</td></tr>
+  </table>
+  <table align="center" border>
+    <tr><th>foo2.0</th><th>bar</th><th>bazz</th></tr>
+    <tr><td>foo2.1</td><td>bar</td><td>bazz</td></tr>
+  </table>
+  <table align="center" border>
+    <tr><th>foo3.0</th><th>bar</th><th>bazz</th></tr>
+    <tr><td>foo3.1</td><td>bar</td><td>bazz</td></tr>
+  </table>
+</body>
+</html>

data/test/files/address_book.rlx

@@ -0,0 +1,12 @@
+<element name="addressBook" xmlns="http://relaxng.org/ns/structure/1.0">
+  <oneOrMore>
+    <element name="card">
+      <element name="name">
+        <text/>
+      </element>
+      <element name="email">
+        <text/>
+      </element>
+    </element>
+  </oneOrMore>
+</element>

data/test/files/address_book.xml

@@ -0,0 +1,10 @@
+<addressBook>
+  <card>
+    <name>John Smith</name>
+    <email>js@example.com</email>
+  </card>
+  <card>
+    <name>Fred Bloggs</name>
+    <email>fb@example.net</email>
+  </card>
+</addressBook>