RubyGems - pseudohikiparser - Versions diffs - 0.0.4 → 0.0.5.develop - Mend

pseudohikiparser 0.0.4 → 0.0.5.develop

Files changed (24) hide show

checksums.yaml +4 -4
data/README.ja.md +13 -11
data/README.md +14 -12
data/bin/{pseudohiki2html.rb → pseudohiki2html} +1 -1
data/lib/htmlelement/utils.rb +132 -0
data/lib/htmlelement.rb +1 -1
data/lib/pseudohiki/blockparser.rb +115 -15
data/lib/pseudohiki/converter.rb +204 -135
data/lib/pseudohiki/htmlformat.rb +65 -0
data/lib/pseudohiki/markdownformat.rb +8 -1
data/lib/pseudohiki/sinatra_helpers.rb +23 -0
data/lib/pseudohiki/utils.rb +34 -0
data/lib/pseudohiki/version.rb +1 -1
data/lib/pseudohikiparser.rb +2 -0
data/test/test_blockparser.rb +67 -0
data/test/test_data/css/test.css +3 -0
data/test/test_htmlelement_utils.rb +200 -0
data/test/test_htmlformat.rb +419 -0
data/test/test_markdownformat.rb +153 -0
data/test/test_plaintextformat.rb +85 -0
data/test/test_pseudohiki2html.rb +111 -26
data/test/test_utils.rb +22 -0
metadata +14 -10
data/test/test_latexformat.rb +0 -19

data/test/test_markdownformat.rb CHANGED Viewed

@@ -518,6 +518,159 @@ TEXT
     assert_equal(md_text, @formatter.format(tree).to_s)
   end
+  def test_decorator_for_verbatim
+    text = <<TEXT
+//@code[ruby]
+ def bonjour!
+   puts "Bonjour!"
+ end
+TEXT
+    gfm_text =<<TEXT
+```ruby
+def bonjour!
+  puts "Bonjour!"
+end
+```
+TEXT
+    md_text = <<TEXT
+    def bonjour!
+      puts "Bonjour!"
+    end
+TEXT
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(gfm_text, @gfm_formatter.format(tree).to_s)
+    assert_equal(md_text, @formatter.format(tree).to_s)
+  end
+  def test_decorator_for_verbatim_block
+    text = <<TEXT
+//@code[ruby]
+<<<
+def bonjour!
+  puts "Bonjour!"
+end
+>>>
+TEXT
+    gfm_text =<<TEXT
+```ruby
+def bonjour!
+  puts "Bonjour!"
+end
+```
+TEXT
+    md_text = <<TEXT
+    def bonjour!
+      puts "Bonjour!"
+    end
+TEXT
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(gfm_text, @gfm_formatter.format(tree).to_s)
+    assert_equal(md_text, @formatter.format(tree).to_s)
+  end
+  def test_without_sectioning_node
+        text = <<TEXT
+! Main title
+!! first title in header
+paragraph
+!! second title in header
+paragraph2
+!! first subtitle in main part
+paragraph3
+paragraph4
+TEXT
+    expected_text = <<HTML
+# Main title
+## first title in header
+paragraph
+## second title in header
+paragraph2
+## first subtitle in main part
+paragraph3
+paragraph4
+HTML
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, @gfm_formatter.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_text = <<HTML
+# Main title
+## first title in header
+paragraph
+## second title in header
+paragraph2
+## first subtitle in main part
+paragraph3
+paragraph4
+HTML
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, @gfm_formatter.format(tree).to_s)
+  end
   def test_collect_headings
     text = <<TEXT
 !![main-heading] heading

data/test/test_plaintextformat.rb CHANGED Viewed

@@ -265,4 +265,89 @@ TEXT
     assert_equal(expected_text_in_verbose_mode, PlainTextFormat.format(tree, { :verbose_mode => true }).to_s)
     assert_equal(expected_text, PlainTextFormat.format(tree, { :verbose_mode => false }).to_s)
   end
+  def test_without_sectioning_node
+        text = <<TEXT
+! Main title
+!! first title in header
+paragraph
+!! second title in header
+paragraph2
+!! first subtitle in main part
+paragraph3
+paragraph4
+TEXT
+    expected_text = <<HTML
+ Main title
+ first title in header
+paragraph
+ second title in header
+paragraph2
+ first subtitle in main part
+paragraph3
+paragraph4
+HTML
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, PlainTextFormat.format(tree, { :verbose_mode => false }).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_text = <<HTML
+ Main title
+ first title in header
+paragraph
+ second title in header
+paragraph2
+ first subtitle in main part
+paragraph3
+paragraph4
+HTML
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, PlainTextFormat.format(tree, { :verbose_mode => false }).to_s)
+  end
 end

data/test/test_pseudohiki2html.rb CHANGED Viewed

@@ -13,11 +13,11 @@ end
 class TC_OptionManager < MiniTest::Unit::TestCase
   include PseudoHiki
-  def test_set_options_from_command_line
+  def test_parse_command_line_options
     set_argv("-fx -s -m 'Table of Contents' -c css/with_toc.css wikipage.txt -o wikipage_with_toc.html")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     assert_equal("xhtml1", options[:html_version].version)
     assert_equal(true, options[:split_main_heading])
@@ -27,11 +27,11 @@ class TC_OptionManager < MiniTest::Unit::TestCase
     assert_equal("wikipage_with_toc.html", File.basename(options[:output]))
   end
-  def test_set_options_from_command_line2
+  def test_parse_command_line_options2
     set_argv("-f h -m 'Table of Contents' -w 'Title' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     assert_equal("html4", options[:html_version].version)
     assert_equal(false, options[:split_main_heading])
@@ -51,7 +51,7 @@ LINES
     set_argv("-f h -m 'Table of Contents' -w 'Title' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     options.set_options_from_input_file(input_data.each_line.to_a)
     assert_equal("Table of Contents set in the input file", options[:toc])
@@ -68,7 +68,7 @@ LINES
     set_argv("-F -f h -m 'Table of Contents' -w 'Title' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     options.set_options_from_input_file(input_data.each_line.to_a)
     assert_equal("Table of Contents", options[:toc])
@@ -85,7 +85,7 @@ LINES
     set_argv("-F -f h -m 'Table of Contents' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     options.set_options_from_input_file(input_data.each_line.to_a)
     assert_equal("Table of Contents", options[:toc])
@@ -101,12 +101,25 @@ LINES
     set_argv("-F -f h -m 'Table of Contents' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     options.set_options_from_input_file(input_data.each_line.to_a)
     assert_equal("Table of Contents", options[:toc])
     assert_equal(nil, options[:title])
   end
+  def test_remove_bom
+    bom = "\xef\xbb\xbf"
+    string_without_bom = "a string without BOM"
+    string_with_bom = bom + string_without_bom
+    io_with_bom = StringIO.new(string_with_bom, "r")
+    io_without_bom = StringIO.new(string_without_bom, "r")
+    OptionManager.remove_bom(io_with_bom)
+    assert_equal(string_without_bom, io_with_bom.read)
+    OptionManager.remove_bom(io_without_bom)
+    assert_equal(string_without_bom, io_without_bom.read)
+  end
 end
 class TC_PageComposer < MiniTest::Unit::TestCase
@@ -138,17 +151,17 @@ HIKI
   def test_collect_nodes_for_table_of_contents
     set_argv("-fg -s -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     collected_nodes = [[["Heading1\n"]],
                        [["Heading2\n"]],
                        [["Heading2-1\n"]]]
     tree = BlockParser.parse(@input_lines)
-    toc_nodes = PageComposer.new(options).collect_nodes_for_table_of_contents(tree)
+    toc_nodes = PageComposer::BaseComposer.new(options).send(:collect_nodes_for_table_of_contents, tree)
     assert_equal(collected_nodes, toc_nodes)
   end
-  def test_create_plain_table_of_contents
+  def test_plain_composer_create_table_of_contents
     toc_in_plain_text = <<TEXT
   * Heading1
   * Heading2
@@ -157,14 +170,28 @@ TEXT
     set_argv("-fg -s -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
+    toc = PageComposer::PlainComposer.new(options).create_table_of_contents(@parsed_tree)
-    toc = PageComposer.new(options).create_plain_table_of_contents(@parsed_tree)
+    assert_equal(toc_in_plain_text, toc)
+  end
+  def test_gfm_composer_create_table_of_contents
+    toc_in_plain_text = <<TEXT
+  * [Heading1](#heading1)
+  * [Heading2](#heading2)
+    * [Heading2-1](#heading21)
+TEXT
+    set_argv("-fg -s -c css/with_toc.css wikipage.txt")
+    options = OptionManager.new
+    options.parse_command_line_options
+    toc = PageComposer::GfmComposer.new(options).create_table_of_contents(@parsed_tree)
     assert_equal(toc_in_plain_text, toc)
   end
-  def test_create_html_table_of_contents
+  def test_html_composer_create_table_of_contents
     toc_in_html = <<TEXT
 <ul>
 <li><a href="#HEADING1" title="toc_item: Heading1">Heading1
@@ -181,9 +208,8 @@ TEXT
     set_argv("-fh5 -s -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
-    toc = PageComposer.new(options).create_html_table_of_contents(@parsed_tree).join
+    options.parse_command_line_options
+    toc = PageComposer::HtmlComposer.new(options).create_table_of_contents(@parsed_tree).join
     assert_equal(toc_in_html, toc)
   end
@@ -191,7 +217,7 @@ TEXT
   def test_create_table_of_contents
     set_argv("-c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     toc = PageComposer.new(options).create_table_of_contents(@parsed_tree)
     assert_equal("", toc)
@@ -203,7 +229,7 @@ TEXT
     set_argv("-fg -m 'table of contents' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     toc = PageComposer.new(options).create_table_of_contents(@parsed_tree)
     assert_equal(toc_in_gfm_text, toc)
@@ -222,11 +248,28 @@ TEXT
     set_argv("-fh5 -m 'table of contents' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     toc = PageComposer.new(options).create_table_of_contents(@parsed_tree).join
     assert_equal(toc_in_html, toc)
   end
+  def test_html_composer_create_style
+    expected_style = <<STYLE
+<style type="text/css">
+h1 {
+    margin-left: 0.5em;
+}
+</style>
+STYLE
+    set_argv("-c test_data/css/test.css wikipage.txt")
+    options = OptionManager.new
+    options.parse_command_line_options
+    test_data = File.join(File.dirname(__FILE__), "test_data/css/test.css")
+    style = PageComposer::HtmlComposer.new(options).create_style(test_data).to_s
+    assert_equal(expected_style, style)
+  end
   def test_compose_html
     expected_html =<<HTML
 <?xml version="1.0" encoding="UTF-8"?>
@@ -321,19 +364,61 @@ TEXT
     set_argv("-fh5 -m 'table of contents' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     composed_html = PageComposer.new(options).compose_html(@input_lines).to_s
     assert_equal(expected_html, composed_html)
     set_argv("-fg -m 'table of contents' -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     composed_gfm_text = PageComposer.new(options).compose_html(@input_lines).join
     assert_equal(expected_gfm_text, composed_gfm_text)
   end
+  def test_compose_html_with_relative_links
+    expected_html =<<HTML
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta charset="UTF-8" />
+<title>wikipage</title>
+<link href="css/with_toc.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+<p>
+a link in a paragraph <a href="./">http://www.example.org/</a>
+</p>
+<p>
+another link <a href="index.html">for index.html</a> in a paragraph
+</p>
+<pre>
+<a href="http://www.example.org/">http://www.example.org/</a>
+</pre>
+</body>
+</html>
+HTML
+    input_text = <<TEXT
+a link in a paragraph http://www.example.org/
+another link [[for index.html|http://www.example.org/index.html]] in a paragraph
+<<<
+http://www.example.org/
+>>>
+TEXT
+    set_argv("-fh5 -d 'www.example.org' --relative-links-in-html -c css/with_toc.css wikipage.txt")
+    options = OptionManager.new
+    options.parse_command_line_options
+    composed_html = PageComposer.new(options).compose_html(input_text).to_s
+    assert_equal(expected_html, composed_html)
+  end
   def test_output_in_gfm_with_toc
     input = <<TEXT.each_line.to_a
 //title: Test Data
@@ -372,7 +457,7 @@ GFM
     set_argv("-fg -s -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     options.set_options_from_input_file(input)
     html = PageComposer.new(options).compose_html(input).join
@@ -384,7 +469,7 @@ GFM
     current_auto_linker = BlockParser.auto_linker
     set_argv("--with-wikiname wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     assert_equal(AutoLink::WikiName, BlockParser.auto_linker.class)
@@ -443,14 +528,14 @@ HTML
     set_argv("-fh5 -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     composed_html = PageComposer.new(options).compose_html(verbatim_block_text).to_s
     assert_equal(expected_html, composed_html)
     set_argv("-fh5 -c css/with_toc.css wikipage.txt")
     options = OptionManager.new
-    options.set_options_from_command_line
+    options.parse_command_line_options
     current_auto_linker = BlockParser.auto_linker
     BlockParser.auto_linker = AutoLink::Off

data/test/test_utils.rb CHANGED Viewed

@@ -37,5 +37,27 @@ TEXT
     assert_equal(selected_headings, nodes)
   end
+  def test_table_manager_guess_header_scope
+    table_with_row_header_text = <<TABLE
+||!header1||!header2||!header3
+||row1-1||row1-2||row1-3
+||row2-1||row2-2||row2-3
+TABLE
+table_with_col_header_text = <<TABLE
+||!header1||col1-1||col2-1
+||!header2||col1-2||col2-2
+||!header3||col1-3||col2-3
+TABLE
+    table_manager = PseudoHiki::Utils::TableManager.new
+    table_with_row_header = PseudoHiki::BlockParser.parse(table_with_row_header_text)[0]
+    assert_equal("col", table_manager.guess_header_scope(table_with_row_header))
+    table_with_col_header = PseudoHiki::BlockParser.parse(table_with_col_header_text)[0]
+    assert_equal("row", table_manager.guess_header_scope(table_with_col_header))
+  end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pseudohikiparser
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5.develop
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,21 +66,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.31'
-description: PseudoHikiParser is a parser of texts written in a Hiki like notation,
-  and coverts them into HTML or other formats.
+description: PseudoHikiParser parses texts written in a Hiki like notation, and coverts
+  them into HTML, Markdown or other formats.
 email:
 - hashimoto.naoki@gmail.com
 executables:
-- pseudohiki2html.rb
+- pseudohiki2html
 extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
 - README.ja.md
 - README.md
-- bin/pseudohiki2html.rb
+- bin/pseudohiki2html
 - lib/htmlelement.rb
 - lib/htmlelement/htmltemplate.rb
+- lib/htmlelement/utils.rb
 - lib/pseudohiki/autolink.rb
 - lib/pseudohiki/blockparser.rb
 - lib/pseudohiki/converter.rb
@@ -89,18 +90,20 @@ files:
 - lib/pseudohiki/inlineparser.rb
 - lib/pseudohiki/markdownformat.rb
 - lib/pseudohiki/plaintextformat.rb
+- lib/pseudohiki/sinatra_helpers.rb
 - lib/pseudohiki/treestack.rb
 - lib/pseudohiki/utils.rb
 - lib/pseudohiki/version.rb
 - lib/pseudohikiparser.rb
 - test/test_autolink.rb
 - test/test_blockparser.rb
+- test/test_data/css/test.css
 - test/test_htmlelement.rb
+- test/test_htmlelement_utils.rb
 - test/test_htmlformat.rb
 - test/test_htmlplugin.rb
 - test/test_htmltemplate.rb
 - test/test_inlineparser.rb
-- test/test_latexformat.rb
 - test/test_markdownformat.rb
 - test/test_plaintextformat.rb
 - test/test_pseudohiki2html.rb
@@ -122,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project:
 rubygems_version: 2.2.3
@@ -144,5 +147,6 @@ test_files:
 - test/test_htmlformat.rb
 - test/test_htmlplugin.rb
 - test/test_autolink.rb
+- test/test_htmlelement_utils.rb
 - test/test_utils.rb
-- test/test_latexformat.rb
+- test/test_data/css/test.css

data/test/test_latexformat.rb DELETED Viewed

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-require 'minitest/autorun'
-require 'pseudohiki/latexformat'
-class TC_LaTeXTag < MiniTest::Unit::TestCase
-  include PseudoHiki
-  def test_escape
-    unescaped = '# $ % \\ & {} ^ _ ~'
-    escaped = '\\# \\$ \\% \\textbackslash{} \\& \\{\\} \\^{} \\_ \\~{}'
-    assert_equal(escaped, LaTeXTag.escape(unescaped))
-  end
-  def test_format_options
-    command = LaTeXTag.new("documentclass")
-  end
-end