pseudohikiparser 0.0.0.8.develop → 0.0.0.9.develop

data/lib/pseudohiki/htmlformat.rb

@@ -11,13 +11,11 @@ module PseudoHiki
     include TableRowParser::InlineElement
 
     #for InlineParser
-    LINK, IMG, EM, STRONG, DEL = %w(a img em strong del)
-    HREF, SRC, ALT = %w(href src alt)
-    PLAIN, PLUGIN = %w(plain span)
+    LINK, LITERAL, PLUGIN = %w(a code span)
+    BLANK, SPACE = "", " "
+    HREF, SRC, ALT, ID, CLASS, ROWSPAN, COLSPAN = %w(href src alt id class rowspan colspan)
     #for BlockParser
-    DESC, VERB, QUOTE, TABLE, PARA, HR, UL, OL = %w(dl pre blockquote table p hr ul ol)
-    SECTION = "section"
-    DT, DD, TR, HEADING, LI = %w(dt dd tr h li)
+    DT, DD, LI = %w(dt dd li)
     DescSep = [InlineParser::DescSep]
 
     Formatter = {}
@@ -27,7 +25,7 @@ module PseudoHiki
 
     def self.setup_new_formatter(new_formatter, generator)
       new_formatter.each do |node_class, formatter|
-        new_formatter[node_class] = formatter.dup
+        new_formatter[node_class] = formatter.clone
         new_formatter[node_class].generator = generator
         new_formatter[node_class].formatter = new_formatter
       end
@@ -76,9 +74,56 @@ module PseudoHiki
       chunks.push tree
     end
 
+    class ListLeafNodeFormatter < self
+      def create_self_element(tree)
+        super(tree).tap do |element|
+          element[ID] = tree.node_id.upcase if tree.node_id
+        end
+      end
+    end
+
+    [ [EmNode, "em"],
+      [StrongNode, "strong"],
+      [DelNode, "del"],
+      [LiteralNode, LITERAL],
+      [PluginNode, PLUGIN],
+      [LinkNode, LINK],
+      [InlineLeaf, nil],
+      [PlainNode, nil], #Until here is for InlineParser
+      [DescNode, "dl"],
+      [QuoteNode, "blockquote"],
+      [TableNode, "table"],
+      [ParagraphNode, "p"],
+      [HrNode, "hr"],
+      [ListNode, "ul"],
+      [EnumNode, "ol"],
+      [TableLeaf, "tr"],
+      [VerbatimNode, "pre"],
+      [CommentOutNode, nil],
+      [HeadingNode, "section"],
+      [DescLeaf, DT],
+      [TableCellNode, nil],
+      [HeadingLeaf, "h"], #Until here is for BlockParser
+    ].each {|node_class, element| Formatter[node_class] = self.new(element) }
+
+    #for InlineParser
+    ImgFormat = self.new("img")
+    #for BlockParser
+    Formatter[ListWrapNode] = ListLeafNodeFormatter.new(LI)
+    Formatter[EnumWrapNode] = ListLeafNodeFormatter.new(LI)
+
     #for InlineParser
 
-    class LinkNodeFormatter < self
+    class << Formatter[PluginNode]
+      def visit(tree)
+        str = tree.join
+        return str if InlineParser::HEAD[str] or InlineParser::TAIL[str]
+        return str.strip * 2 if str == ' {' or str == '} '
+        super(tree)
+      end
+    end
+
+    class << Formatter[LinkNode]
       def visit(tree)
         tree = tree.dup
         caption = get_caption(tree)
@@ -107,13 +152,13 @@ module PseudoHiki
       end
     end
 
-    class InlineLeafFormatter < self
+    class << Formatter[InlineLeaf]
       def visit(leaf)
         @generator.escape(leaf.first)
       end
     end
 
-    class PlainNodeFormatter < self
+    class << Formatter[PlainNode]
       def create_self_element(tree=nil)
         @generator::Children.new
       end
@@ -121,32 +166,32 @@ module PseudoHiki
 
     #for BlockParser
 
-    class VerbatimNodeFormatter < self
+    class << Formatter[VerbatimNode]
       def visit(tree)
         create_self_element.tap do |element|
           contents = @generator.escape(tree.join).gsub(BlockParser::URI_RE) do |url|
-            @generator.create("a", url, "href" => url).to_s
+            @generator.create(LINK, url, HREF => url).to_s
           end
           element.push contents
         end
       end
     end
 
-    class CommentOutNodeFormatter < self
-      def visit(tree); ""; end
+    class << Formatter[CommentOutNode]
+      def visit(tree); BLANK; end
     end
 
-    class HeadingNodeFormatter < self
+    class << Formatter[HeadingNode]
       def create_self_element(tree)
         super(tree).tap do |element|
           heading_level = "h#{tree.first.nominal_level}"
-          element['class'] ||= heading_level
-          element['class'] +=  " " + heading_level unless element['class'] == heading_level
+          element[CLASS] ||= heading_level
+          element[CLASS] +=  SPACE + heading_level unless element[CLASS] == heading_level
         end
       end
     end
 
-    class DescLeafFormatter < self
+    class << Formatter[DescLeaf]
       def visit(tree)
         tree = tree.dup
         element = @generator::Children.new
@@ -162,61 +207,24 @@ module PseudoHiki
       end
     end
 
-    class TableCellNodeFormatter < self
+    class << Formatter[TableCellNode]
       def visit(tree)
         @element_name = tree.cell_type
         super(tree).tap do |element|
-          element["rowspan"] = tree.rowspan if tree.rowspan > 1
-          element["colspan"] = tree.colspan if tree.colspan > 1
+          element[ROWSPAN] = tree.rowspan if tree.rowspan > 1
+          element[COLSPAN] = tree.colspan if tree.colspan > 1
           # element.push "&#160;" if element.empty? # &#160; = &nbsp; this line would be necessary for HTML 4 or XHTML 1.0
         end
       end
     end
 
-    class HeadingLeafFormatter < self
+    class << Formatter[HeadingLeaf]
       def create_self_element(tree)
         @generator.create(@element_name+tree.nominal_level.to_s).tap do |element|
-          element["id"] = tree.node_id.upcase if tree.node_id
-        end
-      end
-    end
-
-    class ListLeafNodeFormatter < self
-      def create_self_element(tree)
-        super(tree).tap do |element|
-          element["id"] = tree.node_id.upcase if tree.node_id
+          element[ID] = tree.node_id.upcase if tree.node_id
         end
       end
     end
-
-    [ [EmNode,EM],
-      [StrongNode,STRONG],
-      [DelNode,DEL],
-      [PluginNode,PLUGIN], #Until here is for InlineParser
-      [DescNode, DESC],
-      [QuoteNode, QUOTE],
-      [TableNode, TABLE],
-      [ParagraphNode, PARA],
-      [HrNode, HR],
-      [ListNode, UL],
-      [EnumNode, OL],
-      [TableLeaf, TR], #Until here is for BlockParser
-    ].each {|node_class, element| Formatter[node_class] = self.new(element) }
-
-    #for InlineParser
-    ImgFormat = self.new(IMG)
-    Formatter[LinkNode] = LinkNodeFormatter.new(LINK)
-    Formatter[InlineLeaf] = InlineLeafFormatter.new(nil)
-    Formatter[PlainNode] = PlainNodeFormatter.new(PLAIN)
-    #for BlockParser
-    Formatter[VerbatimNode] = VerbatimNodeFormatter.new(VERB)
-    Formatter[CommentOutNode] = CommentOutNodeFormatter.new(nil)
-    Formatter[HeadingNode] = HeadingNodeFormatter.new(SECTION)
-    Formatter[DescLeaf] = DescLeafFormatter.new(DT)
-    Formatter[TableCellNode] = TableCellNodeFormatter.new(nil)
-    Formatter[HeadingLeaf] = HeadingLeafFormatter.new(HEADING)
-    Formatter[ListWrapNode] = ListLeafNodeFormatter.new(LI)
-    Formatter[EnumWrapNode] = ListLeafNodeFormatter.new(LI)
   end
 
   class XhtmlFormat < HtmlFormat

data/lib/pseudohiki/inlineparser.rb

@@ -27,7 +27,7 @@ module PseudoHiki
       #  class LinkSepLeaf < InlineLeaf; end
 
       PseudoHiki.subclass_of(InlineNode, binding,
-                             %w(LinkNode EmNode StrongNode DelNode PlainNode PluginNode))
+                             %w(LinkNode EmNode StrongNode DelNode PlainNode LiteralNode PluginNode))
 
       LinkSep, TableSep, DescSep = %w(| || :)
     end
@@ -42,6 +42,7 @@ module PseudoHiki
      [EmNode, "''", "''"],
      [StrongNode, "'''", "'''"],
      [DelNode, "==", "=="],
+     [LiteralNode, "``", "``"],
      [PluginNode, "{{","}}"]].each do |type, head, tail|
       HEAD[head] = type
       TAIL[tail] = type

data/lib/pseudohiki/markdownformat.rb

@@ -13,6 +13,18 @@ module PseudoHiki
     include TableRowParser::InlineElement
     include BlockParser::BlockElement
 
+    Formatters = {}
+
+    def self.format(tree, options={ :strict_mode=> false, :gfm_style => false })
+      if Formatters.empty?
+        default_options = { :strict_mode=> false, :gfm_style => false }
+        Formatters[default_options] = create(default_options)
+      end
+
+      Formatters[options] ||= create(options)
+      Formatters[options].format(tree)
+    end
+
     def initialize(formatter={}, options={ :strict_mode=> false, :gfm_style => false })
       @formatter = formatter
       options_given_via_block = nil
@@ -78,7 +90,8 @@ module PseudoHiki
       formatter[EmNode] = EmNodeFormatter.new(formatter, options)
       formatter[StrongNode] = StrongNodeFormatter.new(formatter, options)
       formatter[DelNode] = DelNodeFormatter.new(formatter, options)
-#      formatter[PluginNode] = PluginNodeFormatter.new(formatter, options)
+      formatter[LiteralNode] = LiteralNodeFormatter.new(formatter, options)
+      formatter[PluginNode] = PluginNodeFormatter.new(formatter, options)
 #      formatter[DescLeaf] = DescLeafFormatter.new(formatter, options)
 #      formatter[TableCellNode] = TableCellNodeFormatter.new(formatter, options)
       formatter[VerbatimLeaf] = VerbatimLeafFormatter.new(formatter, options)
@@ -172,7 +185,20 @@ module PseudoHiki
       end
     end
 
-#    class PluginNodeFormatter < self; end
+    class LiteralNodeFormatter < self
+      def visit(tree)
+        "`#{super(tree).join.strip}`"
+      end
+    end
+
+    class PluginNodeFormatter < self
+      def visit(tree)
+        str =tree.join
+        return str.strip * 2 if str == " {" or str == "} "
+        super(tree)
+      end
+    end
+
 #    class DescLeafFormatter < self; end
 #    class TableCellNodeFormatter < self; end
 
@@ -268,7 +294,7 @@ module PseudoHiki
             format%[cell]
           end
           "|#{formatted_row.join("|") }|#{$/}"
-        end.join
+        end.join+$/
       end
 
       def format_html_table(tree)

data/lib/pseudohiki/plaintextformat.rb

@@ -66,6 +66,7 @@ module PseudoHiki
       formatter[TableNode] = TableNodeFormatter.new(formatter, options)
       formatter[CommentOutNode] = CommentOutNodeFormatter.new(formatter, options)
       formatter[ParagraphNode] = ParagraphNodeFormatter.new(formatter, options)
+      formatter[PluginNode] = PluginNodeFormatter.new(formatter, options)
       main_formatter
     end
 
@@ -215,5 +216,13 @@ ERROR_TEXT
         super(tree).join+$/
       end
     end
+
+    class PluginNodeFormatter < self
+      def visit(tree)
+        str =tree.join
+        return str.strip * 2 if str == " {" or str == "} "
+        super(tree)
+      end
+    end
   end
 end

data/lib/pseudohiki/version.rb

@@ -1,3 +1,3 @@
 module PseudoHiki
-  VERSION = "0.0.0.8.develop"
+  VERSION = "0.0.0.9.develop"
 end

data/test/test_blockparser.rb

@@ -1,9 +1,9 @@
 #/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'lib/pseudohiki/blockparser'
 
-class TC_BlockLeaf < Test::Unit::TestCase
+class TC_BlockLeaf < MiniTest::Unit::TestCase
   include PseudoHiki::BlockParser::BlockElement
 
   def test_block_when_descnode

data/test/test_htmlelement.rb

@@ -1,9 +1,9 @@
 #/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'lib/htmlelement'
 
-class TC_HtmlElement < Test::Unit::TestCase
+class TC_HtmlElement < MiniTest::Unit::TestCase
 
   def test_format_attributes
     a = HtmlElement.create("a")

data/test/test_htmlformat.rb

@@ -1,11 +1,10 @@
 #/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'lib/pseudohiki/blockparser'
 require 'lib/pseudohiki/htmlformat'
 
-
-class TC_HtmlFormat < Test::Unit::TestCase
+class TC_HtmlFormat < MiniTest::Unit::TestCase
   include PseudoHiki
 
   class ::String
@@ -98,6 +97,8 @@ HTML
 
 a paragraph with an ''emphasised'' word.
 a paragraph with a [[link|http://www.example.org/]].
+
+a paragraph with a ``literal`` word.
 TEXT
 
     html = <<HTML
@@ -105,6 +106,8 @@ TEXT
 <h2>heading2</h2>
 <p>
 a paragraph with an <em>emphasised</em> word.a paragraph with a <a href="http://www.example.org/">link</a>.</p>
+<p>
+a paragraph with a <code>literal</code> word.</p>
 <!-- end of section h2 -->
 </div>
 HTML
@@ -112,6 +115,30 @@ HTML
     assert_equal(html,convert_text_to_html(text))
   end
 
+  def test_plugin
+    text = <<TEXT
+a paragraph with several plugin tags.
+{{''}} should be presented as two quotation marks.
+{{ {}} should be presented as two left curly braces.
+{{} }} should be presented as two right curly braces.
+{{in span}} should be presented as <span>in span</span>.
+TEXT
+
+    html = <<HTML
+<p>
+a paragraph with several plugin tags.
+'' should be presented as two quotation marks.
+{{ should be presented as two left curly braces.
+}} should be presented as two right curly braces.
+<span>in span</span> should be presented as &lt;span&gt;in span&lt;/span&gt;.
+</p>
+HTML
+
+    tree = BlockParser.parse(text)
+    assert_equal(html, HtmlFormat.format(tree).to_s)
+    assert_equal(html, XhtmlFormat.format(tree).to_s)
+  end
+
   def test_table
     text = <<TEXT
 ||!col||!^[[col|link]]||>col

data/test/test_htmlplugin.rb

@@ -1,9 +1,9 @@
 #/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'lib/pseudohiki/htmlplugin'
 
-class TC_HtmlPlugin < Test::Unit::TestCase
+class TC_HtmlPlugin < MiniTest::Unit::TestCase
   include PseudoHiki
 
   def test_visit_pluginnode

data/test/test_htmltemplate.rb

@@ -1,9 +1,9 @@
 #/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'htmlelement/htmltemplate'
 
-class TC_HtmlTemplate < Test::Unit::TestCase
+class TC_HtmlTemplate < MiniTest::Unit::TestCase
 
   def test_new
     html_result = <<HTML
@@ -94,7 +94,7 @@ HTML
   end
 end
 
-class TC_XhtmlTemplate < Test::Unit::TestCase
+class TC_XhtmlTemplate < MiniTest::Unit::TestCase
 
   def test_new
     html_result = <<HTML

data/test/test_inlineparser.rb

@@ -1,16 +1,16 @@
 #/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'lib/pseudohiki/inlineparser'
 require 'lib/pseudohiki/htmlformat'
 
 
-class TC_InlineParser < Test::Unit::TestCase
+class TC_InlineParser < MiniTest::Unit::TestCase
   include PseudoHiki
 
   def test_inlineparser_compile_token_pat
     parser = InlineParser.new("")
-    assert_equal(/'''|\}\}|\|\||\{\{|\]\]|\[\[|==|''|\||:/,parser.token_pat)
+    assert_equal(/'''|\}\}|\|\||\{\{|``|\]\]|\[\[|==|''|\||:/,parser.token_pat)
   end
 
   def test_inlineparser_split_into_tokens
@@ -47,7 +47,7 @@ class TC_InlineParser < Test::Unit::TestCase
   end
 end
 
-class TC_HtmlFormat < Test::Unit::TestCase
+class TC_HtmlFormat < MiniTest::Unit::TestCase
   include PseudoHiki
 
   def test_visit_linknode

data/test/test_markdownformat.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'pseudohiki/markdownformat'
 
-class TC_MarkDownFormat < Test::Unit::TestCase
+class TC_MarkDownFormat < MiniTest::Unit::TestCase
   include PseudoHiki
 
   def setup
@@ -12,6 +12,38 @@ class TC_MarkDownFormat < Test::Unit::TestCase
     @forced_gfm_formatter = MarkDownFormat.create({ :gfm_style => :force })
   end
 
+  def test_self_format
+    text = <<TEXT
+||!header 1||!header 2
+||cell 1-1||cell 1-2
+||cell 2-1||cell 2-2
+||cell 3-1 (a bit wider)||cell 3-2
+TEXT
+
+    md_text = <<TEXT
+<table>
+<tr><th>header 1</th><th>header 2</th></tr>
+<tr><td>cell 1-1</td><td>cell 1-2</td></tr>
+<tr><td>cell 2-1</td><td>cell 2-2</td></tr>
+<tr><td>cell 3-1 (a bit wider)</td><td>cell 3-2</td></tr>
+</table>
+
+TEXT
+
+    gfm_text = <<TEXT
+|header 1              |header 2|
+|----------------------|--------|
+|cell 1-1              |cell 1-2|
+|cell 2-1              |cell 2-2|
+|cell 3-1 (a bit wider)|cell 3-2|
+
+TEXT
+
+    tree = BlockParser.parse(text)
+    assert_equal(md_text, MarkDownFormat.format(tree))
+    assert_equal(gfm_text, MarkDownFormat.format(tree, :gfm_style => true))
+  end
+
   def test_plain
     text = <<TEXT
 test string
@@ -54,6 +86,33 @@ IMAGE
     assert_equal("a ~~striked out string~~#{$/}", @formatter.format(tree).to_s)
   end
 
+  def test_literal
+    text = "a ``literal`` word"
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal("a `literal` word#{$/}", @formatter.format(tree).to_s)
+  end
+
+  def test_plugin
+    text = <<TEXT
+A paragraph with several plugin tags.
+{{''}} should be presented as two quotation marks.
+{{ {}} should be presented as two left curly braces.
+{{} }} should be presented as two right curly braces.
+{{in span}} should be presented as 'in span'.
+TEXT
+    expected_text = <<TEXT
+A paragraph with several plugin tags.
+'' should be presented as two quotation marks.
+{{ should be presented as two left curly braces.
+}} should be presented as two right curly braces.
+in span should be presented as 'in span'.
+
+TEXT
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, @formatter.format(tree).to_s)
+  end
+
   def test_hr
     text = "----#{$/}"
     md_text = "----#{$/}"
@@ -150,6 +209,7 @@ TEXT
 |cell 1-1              |cell 1-2|
 |cell 2-1              |cell 2-2|
 |cell 3-1 (a bit wider)|cell 3-2|
+
 TEXT
 
     html =<<HTML
@@ -173,6 +233,7 @@ HTML
 ||cell 1-1||cell 1-2
 ||cell 2-1||cell 2-2
 ||cell 3-1 (a bit wider)||cell 3-2
+
 TEXT
 
     md_text = <<TEXT
@@ -181,6 +242,7 @@ TEXT
 |cell 1-1              |cell 1-2|
 |cell 2-1              |cell 2-2|
 |cell 3-1 (a bit wider)|cell 3-2|
+
 TEXT
 
     html =<<HTML
@@ -217,6 +279,7 @@ TEXT
 |cell 1-1              |cell 1-2  |
 |cell 2-1              |cell 2-2  |
 |cell 3-1 (a bit wider)|cell 3-2  |
+
 TEXT
 
     html = <<HTML
@@ -252,6 +315,7 @@ TEXT
 |cell 1-1              |cell 1-2  |cell 1-3  |cell 1-4  |
 |cell 2-1              |cell 2-2  |          |cell 2-4  |
 |cell 3-1 (a bit wider)|cell 3-2  |cell 3-3  |cell 3-4  |
+
 TEXT
 
     html = <<HTML
@@ -286,6 +350,7 @@ TEXT
 |cell 1-1              |cell 1-2  |cell 1-3  |cell 1-4  |
 |cell 2-1              |cell 2-2  |          |cell 2-4  |
 |cell 3-1 (a bit wider)|cell 3-2  |cell 3-3  |cell 3-4  |
+
 TEXT
 
     html = <<HTML

data/test/test_plaintextformat.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'pseudohiki/plaintextformat'
 
-class TC_PlainTextFormat < Test::Unit::TestCase
+class TC_PlainTextFormat < MiniTest::Unit::TestCase
   include PseudoHiki
 
   def setup
@@ -54,6 +54,40 @@ TEXT
     assert_equal(expected_text_in_verbose_mode, @verbose_formatter.format(tree).to_s)
   end
 
+  def test_literal
+    text = <<TEXT
+A test string with a ``literal`` is here.
+TEXT
+    expected_text = <<TEXT
+A test string with a literal is here.
+
+TEXT
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, @formatter.format(tree).to_s)
+  end
+
+  def test_plugin
+    text = <<TEXT
+A paragraph with several plugin tags.
+{{''}} should be presented as two quotation marks.
+{{ {}} should be presented as two left curly braces.
+{{} }} should be presented as two right curly braces.
+{{in span}} should be presented as 'in span'.
+TEXT
+    expected_text = <<TEXT
+A paragraph with several plugin tags.
+'' should be presented as two quotation marks.
+{{ should be presented as two left curly braces.
+}} should be presented as two right curly braces.
+in span should be presented as 'in span'.
+
+TEXT
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(expected_text, @formatter.format(tree).to_s)
+  end
+
   def test_link_url
     text = <<TEXT
 A test string with a [[link|http://www.example.org/]] is here.
@@ -204,7 +238,7 @@ cell 3-1	||	||	cell 3-4	cell 3-5
 cell 4-1	cell 4-2	cell 4-3	cell 4-4	cell 4-5
 TEXT
 
-    assert_raise(PlainTextFormat::TableNodeFormatter::MalFormedTableError) do
+    assert_raises(PlainTextFormat::TableNodeFormatter::MalFormedTableError) do
       tree = BlockParser.parse(mal_formed_text.lines.to_a)
       @strict_formatter.format(tree).to_s
     end

data/test/test_treestack.rb

@@ -1,9 +1,9 @@
 #/usr/bin/env ruby
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'pseudohiki/treestack'
 
-class TC_TreeStack < Test::Unit::TestCase
+class TC_TreeStack < MiniTest::Unit::TestCase
 
   def test_push_node
     stack = TreeStack.new
@@ -34,7 +34,7 @@ class TC_TreeStack < Test::Unit::TestCase
     node = TreeStack::Node.new
     assert_same node.class, TreeStack::Node
     assert_equal true, node.kind_of?(TreeStack::Node)
-    assert_not_equal true, node.kind_of?(TreeStack::Mergeable)
+    refute node.kind_of?(TreeStack::Mergeable)
   end
 
   def test_with_mergeable