pseudohikiparser 0.0.5 → 0.0.6.develop

data/test/test_blockparser.rb

@@ -311,6 +311,73 @@ TEXT
     assert_equal([[[["heading"]]]],parsed)
   end
 
+
+  def test_decorator
+    text = <<TEXT
+//@class[section_name]
+!!title of section
+
+//@summary: Summary of the table
+||!header 1||! header 2
+||cell 1||cell 2
+
+a paragraph.
+
+//@class[class_name]
+//@[id_name]
+another paragraph.
+TEXT
+
+    tree = PseudoHiki::BlockParser.parse(text.lines.to_a.map {|line| line.chomp })
+    assert_equal(PseudoHiki::BlockParser::BlockNode, tree.class)
+    assert_equal("section_name", tree[0].decorator["class"].id)
+    assert_equal(PseudoHiki::BlockParser::BlockElement::HeadingNode, tree[0].class)
+    assert_equal([[["title of section"]], [[[["header 1"]], [[" header 2"]]], [[["cell 1"]], [["cell 2"]]]], [[["a paragraph."]]], [[["another paragraph."]]]], tree[0])
+    assert_equal([["Summary of the table"]], tree[0][1].decorator["summary"].value)
+    assert_equal(PseudoHiki::BlockParser::BlockElement::TableNode, tree[0][1].class)
+    assert_equal(nil, tree[0][2].decorator)
+    assert_equal('id_name', tree[0][3].decorator[:id].id)
+    assert_equal('class_name', tree[0][3].decorator["class"].id)
+  end
+
+  def test_sectioning_node
+    text = <<TEXT
+! Main title
+
+//@begin[header]
+!! first title in header
+
+paragraph
+
+!! second title in header
+
+paragraph2
+
+//@end[header]
+
+!! first subtitle in main part
+
+paragraph3
+
+TEXT
+
+    expected_tree = [[[[" Main title\n"]],
+                      [
+                       [[[" first title in header\n"]],
+                        [[["paragraph\n"]]]],
+                       [[[" second title in header\n"]],
+                        [[["paragraph2\n"]]]]
+                      ],
+                      [[[" first subtitle in main part\n"]],
+                       [[["paragraph3\n"]]]]]]
+
+
+    tree = PseudoHiki::BlockParser.parse(text)
+    assert_equal(expected_tree, tree)
+    assert_kind_of(PseudoHiki::BlockParser::BlockElement::SectioningNode, tree[0][1])
+    assert_equal("header", tree[0][1].node_id)
+  end
+
   def test_comment_out_followed_by_a_verbatim_block
     text = <<TEXT
 the first paragraph

data/test/test_htmlelement.rb

@@ -4,6 +4,40 @@ require 'minitest/autorun'
 require 'lib/htmlelement'
 
 class TC_HtmlElement < MiniTest::Unit::TestCase
+  def test_pop
+    section = HtmlElement.create("section")
+    h1 = HtmlElement.create("h1")
+    section.push h1
+    assert_equal(section.children[0], h1)
+    assert_equal(section, h1.parent)
+    section.pop
+    assert(section.children.empty?)
+    assert_nil(h1.parent)
+  end
+
+  def test_unshift
+    section = HtmlElement.create("section")
+    paragraph = HtmlElement.create("p", "paragraph")
+    h1 = HtmlElement.create("h1", "title")
+    section.push paragraph
+    assert_equal(1, section.children.length)
+    section.unshift h1
+    assert_equal(2, section.children.length)
+    assert_equal(h1, section.children[0])
+  end
+
+  def test_shift
+    section = HtmlElement.create("section")
+    paragraph = HtmlElement.create("p", "paragraph")
+    h1 = HtmlElement.create("h1", "title")
+    section.push h1
+    section.push paragraph
+    assert_equal(section.children[0], h1)
+    assert_equal(section, h1.parent)
+    section.shift
+    refute(section.children.include?(h1))
+    assert_nil(h1.parent)
+  end
 
   def test_format_attributes
     a = HtmlElement.create("a")

data/test/test_htmlelement_utils.rb

@@ -135,11 +135,19 @@ table_with_col_header_text = <<TABLE
 ||!header1||col1-1||col2-1
 ||!header2||col1-2||col2-2
 ||!header3||col1-3||col2-3
+TABLE
+
+table_with_row_header_and_caption_text = <<TABLE
+//@caption: Caption
+||!header1||!header2||!header3
+||row1-1||row1-2||row1-3
+||row2-1||row2-2||row2-3
 TABLE
 
     @table_manager = HtmlElement::Utils::TableManager.new
     @table_with_row_header = PseudoHiki::BlockParser.parse(table_with_row_header_text)
     @table_with_col_header = PseudoHiki::BlockParser.parse(table_with_col_header_text)
+    @table_with_row_header_and_caption = PseudoHiki::BlockParser.parse(table_with_row_header_and_caption_text)
 
   end
 
@@ -149,6 +157,9 @@ TABLE
 
     html_table = PseudoHiki::HtmlFormat.format(@table_with_col_header)[0]
     assert_equal("row", @table_manager.guess_header_scope(html_table))
+
+    html_table = PseudoHiki::HtmlFormat.format(@table_with_row_header_and_caption)[0]
+    assert_equal("col", @table_manager.guess_header_scope(html_table))
   end
 
   def test_assign_scope

data/test/test_htmlformat.rb

@@ -775,6 +775,419 @@ HTML
     assert_equal(xhtml, HtmlFormat.format(tree, {:auto_link_in_verbatim => false }).to_s)
   end
 
+  def test_decorator
+    text = <<TEXT
+//@class[section_type]
+!!title of section
+
+a paragraph.
+
+//@class[class_name]
+//@id[id_name]
+another paragraph.
+TEXT
+
+    xhtml = <<HTML
+<div class="section_type">
+<h2>title of section</h2>
+<p>
+a paragraph.</p>
+<p class="class_name" id="ID_NAME">
+another paragraph.</p>
+<!-- end of section_type -->
+</div>
+HTML
+    tree = BlockParser.parse(text.lines.to_a.map {|line| line.chomp })
+    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
+  end
+
+  def test_decorator_for_table
+    text = <<TEXT
+//@summary: Summary of the table
+||!header 1||! header 2
+||cell 1||cell 2
+TEXT
+
+    xhtml = <<HTML
+<table summary="Summary of the table">
+<tr><th>header 1</th><th> header 2</th></tr>
+<tr><td>cell 1</td><td>cell 2</td></tr>
+</table>
+HTML
+    tree = BlockParser.parse(text.lines.to_a.map {|line| line.chomp })
+    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
+  end
+
+  def test_decorator_for_table_summary
+    text = <<TEXT
+//@summary: Summary of the table
+||!header 1||! header 2
+TEXT
+
+    xhtml = <<HTML
+<table summary="Summary of the table">
+<tr><th>header 1</th><th> header 2
+</th></tr>
+</table>
+HTML
+    tree = BlockParser.parse(text.lines.to_a.map {|line| line })
+    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
+  end
+
+  def test_decorator_for_table_caption
+    text = <<TEXT
+//@caption: Caption of ''the table''
+||!header 1||! header 2
+||cell 1||cell 2
+TEXT
+
+    xhtml = <<HTML
+<table>
+<caption>Caption of <em>the table</em></caption>
+<tr><th>header 1</th><th> header 2</th></tr>
+<tr><td>cell 1</td><td>cell 2</td></tr>
+</table>
+HTML
+    tree = BlockParser.parse(text.lines.to_a.map {|line| line.chomp })
+    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
+  end
+
+  def test_decorator_for_table_caption_with_tags
+    text = <<TEXT
+//@caption: [[''Table caption''that begins with a link|http://www.example.org/]] and contains other strings
+||!header 1||! header 2
+TEXT
+
+    xhtml = <<HTML
+<table>
+<caption><a href="http://www.example.org/"><em>Table caption</em>that begins with a link</a> and contains other strings</caption>
+<tr><th>header 1</th><th> header 2</th></tr>
+</table>
+HTML
+    tree = BlockParser.parse(text.lines.to_a.map {|line| line.chomp })
+    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
+  end
+
+  def test_decorator_for_verbatim
+    text = <<TEXT
+//@code[ruby]
+ def bonjour!
+   puts "Bonjour!"
+ end
+TEXT
+
+    xhtml = <<HTML
+<pre>
+def bonjour!
+  puts &quot;Bonjour!&quot;
+end
+</pre>
+HTML
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
+  end
+
+  def test_sectioning_node
+        text = <<TEXT
+! Main title
+
+//@begin[header]
+!! first title in header
+
+paragraph
+
+!! second title in header
+
+paragraph2
+
+//@end[header]
+
+!! first subtitle in main part
+
+paragraph3
+
+//@begin[#footer]
+
+paragraph4
+
+//@end[#footer]
+
+TEXT
+
+    expected_html = <<HTML
+<div class="section h1">
+<h1> Main title
+</h1>
+<div class="header">
+<div class="section h2">
+<h2> first title in header
+</h2>
+<p>
+paragraph
+</p>
+<!-- end of section h2 -->
+</div>
+<div class="section h2">
+<h2> second title in header
+</h2>
+<p>
+paragraph2
+</p>
+<!-- end of section h2 -->
+</div>
+<!-- end of header -->
+</div>
+<div class="section h2">
+<h2> first subtitle in main part
+</h2>
+<p>
+paragraph3
+</p>
+<div class="section" id="footer">
+<p>
+paragraph4
+</p>
+<!-- end of footer -->
+</div>
+<!-- end of section h2 -->
+</div>
+<!-- end of section h1 -->
+</div>
+HTML
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_html, XhtmlFormat.format(tree).to_s)
+  end
+
+  def test_sectioning_node_for_html5
+        text = <<TEXT
+! Main title
+
+//@begin[header]
+!! first title in header
+
+paragraph
+
+!! second title in header
+
+paragraph2
+
+//@end[header]
+
+!! first subtitle in main part
+
+paragraph3
+
+//@begin[#footer]
+
+paragraph4
+
+//@end[#footer]
+
+TEXT
+
+    expected_html = <<HTML
+<section class="h1">
+<h1> Main title
+</h1>
+<header>
+<section class="h2">
+<h2> first title in header
+</h2>
+<p>
+paragraph
+</p>
+<!-- end of h2 -->
+</section>
+<section class="h2">
+<h2> second title in header
+</h2>
+<p>
+paragraph2
+</p>
+<!-- end of h2 -->
+</section>
+</header>
+<section class="h2">
+<h2> first subtitle in main part
+</h2>
+<p>
+paragraph3
+</p>
+<section id="footer">
+<p>
+paragraph4
+</p>
+<!-- end of footer -->
+</section>
+<!-- end of h2 -->
+</section>
+<!-- end of h1 -->
+</section>
+HTML
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_html, Xhtml5Format.format(tree).to_s)
+  end
+
+  def test_sectioning_node_when_end_tag_is_omitted
+        text = <<TEXT
+!! First part
+
+paragraph1
+
+//@begin[first_sub_part]
+!!! first title in first sub-part
+
+paragraph2
+
+!!! second title in first sub-part
+
+paragraph3
+
+//you should put //@end[first_sub_part] here.
+
+!! Second part
+
+paragraph4
+
+//@begin[#footer]
+
+paragraph5
+
+//@end[#footer]
+
+TEXT
+
+    expected_html = <<HTML
+<div class=\"section h2\">
+<h2> First part
+</h2>
+<p>
+paragraph1
+</p>
+<div class=\"section first_sub_part\">
+<div class=\"section h3\">
+<h3> first title in first sub-part
+</h3>
+<p>
+paragraph2
+</p>
+<!-- end of section h3 -->
+</div>
+<div class=\"section h3\">
+<h3> second title in first sub-part
+</h3>
+<p>
+paragraph3
+</p>
+<!-- end of section h3 -->
+</div>
+<!-- end of section first_sub_part -->
+</div>
+<!-- end of section h2 -->
+</div>
+<div class=\"section h2\">
+<h2> Second part
+</h2>
+<p>
+paragraph4
+</p>
+<div class=\"section\" id=\"footer\">
+<p>
+paragraph5
+</p>
+<!-- end of footer -->
+</div>
+<!-- end of section h2 -->
+</div>
+HTML
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_html, XhtmlFormat.format(tree).to_s)
+  end
+
+  def test_sectioning_node_when_end_tag_is_wrongly_placed
+        text = <<TEXT
+!! First part
+
+paragraph1
+
+//@begin[first_sub_part]
+!!! first title in first sub-part
+
+paragraph2
+
+!!! second title in first sub-part
+
+paragraph3
+
+//you should put //@end[first_sub_part] here.
+
+!! Second part
+
+paragraph4
+
+
+//@end[first_sub_part] this end tag is wrongly placed.
+
+//@begin[#footer]
+
+paragraph5
+
+//@end[#footer]
+
+TEXT
+
+    expected_html = <<HTML
+<div class=\"section h2\">
+<h2> First part
+</h2>
+<p>
+paragraph1
+</p>
+<div class=\"section first_sub_part\">
+<div class=\"section h3\">
+<h3> first title in first sub-part
+</h3>
+<p>
+paragraph2
+</p>
+<!-- end of section h3 -->
+</div>
+<div class=\"section h3\">
+<h3> second title in first sub-part
+</h3>
+<p>
+paragraph3
+</p>
+<!-- end of section h3 -->
+</div>
+<!-- end of section first_sub_part -->
+</div>
+<!-- end of section h2 -->
+</div>
+<div class=\"section h2\">
+<h2> Second part
+</h2>
+<p>
+paragraph4
+</p>
+<div class=\"section\" id=\"footer\">
+<p>
+paragraph5
+</p>
+<!-- end of footer -->
+</div>
+<!-- end of section h2 -->
+</div>
+HTML
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_html, XhtmlFormat.format(tree).to_s)
+  end
+
   def test_comment_out_followed_by_a_verbatim_block
     text = <<TEXT
 the first paragraph

data/test/test_htmltemplate.rb

@@ -187,4 +187,88 @@ HTML
     html.base = '/base/path'
     assert_equal(html_result, html.to_s)
   end
+
+  def test_embed_style
+    expected_html = <<HTML
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<meta content="en" http-equiv="Content-Language">
+<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+<meta content="text/javascript" http-equiv="Content-Script-Type">
+<title></title>
+<link href="default.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+<!--
+p {
+  font-size: 120%;
+}
+-->
+</style>
+</head>
+<body>
+</body>
+</html>
+HTML
+
+    css = <<CSS
+p {
+  font-size: 120%;
+}
+CSS
+
+    html = HtmlTemplate.new
+    html.embed_style(css)
+
+    assert_equal(expected_html, html.to_s)
+  end
+
+  def test_add_skip_link
+    html = HtmlTemplate.new
+    html.body.push html.create_element("p").push("content")
+    html.add_skip_link
+    assert_equal("a", html.body.children[0].children[0].tagname)
+    assert_equal("#contents", html.body.children[0].children[0]["href"])
+    html = HtmlTemplate.new
+    skip_link_container = html.create_element("div")
+    html.add_skip_link("contents", skip_link_container)
+    assert_equal("a", skip_link_container.children[0].tagname)
+    assert_equal("#contents", skip_link_container.children[0]["href"])
+  end
+
+  def test_xhtmltemplate_embed_style
+    expected_html = <<HTML
+<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\"
+  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">
+<html lang=\"en\" xml:lang=\"en\" xmlns=\"http://www.w3.org/1999/xhtml\">
+<head>
+<meta content=\"en\" http-equiv=\"Content-Language\" />
+<meta content=\"text/html; charset=UTF-8\" http-equiv=\"Content-Type\" />
+<meta content=\"text/javascript\" http-equiv=\"Content-Script-Type\" />
+<title></title>
+<link href=\"default.css\" rel=\"stylesheet\" type=\"text/css\" />
+<style type=\"text/css\">
+p {
+  font-size: 120%;
+}
+</style>
+</head>
+<body>
+</body>
+</html>
+HTML
+
+    css = <<CSS
+p {
+  font-size: 120%;
+}
+CSS
+
+    html = XhtmlTemplate.new
+    html.embed_style(css)
+
+    assert_equal(expected_html, html.to_s)
+  end
 end

data/test/test_inlineparser.rb

@@ -10,19 +10,19 @@ class TC_InlineParser < MiniTest::Unit::TestCase
 
   def test_inlineparser_compile_token_pat
     parser = InlineParser.new("")
-    assert_equal(/'''|\}\}|\|\||\{\{|``|\]\]|\[\[|==|''|\||:/, InlineParser::TokenPat[parser.class])
+    assert_equal(/'''|\}\}|\|\||\{\{|``|\]\]|\[\[|==|''|\||:/, parser.class.token_pat)
   end
 
   def test_inlineparser_split_into_tokens
     parser = InlineParser.new("")
     tokens = PseudoHiki.split_into_tokens("As a test case, '''this part''' must be in <strong>.",
-                                          InlineParser::TokenPat[parser.class])
+                                          InlineParser.token_pat)
     assert_equal(["As a test case, ","'''","this part","'''"," must be in <strong>."],tokens)
     tokens = PseudoHiki.split_into_tokens("As another {{test case}}, '''this part''' must be in <strong>.",
-                                          InlineParser::TokenPat[parser.class])
+                                          InlineParser.token_pat)
     assert_equal(["As another ","{{","test case","}}", ", ","'''","this part","'''"," must be in <strong>."],tokens)
     tokens = PseudoHiki.split_into_tokens("As another ''test case'', '''this part''' must be in <strong>.",
-                                          InlineParser::TokenPat[parser.class])
+                                          InlineParser.token_pat)
     assert_equal(["As another ","''","test case","''", ", ","'''","this part","'''"," must be in <strong>."],tokens)
   end