pseudohikiparser 0.0.0.9.develop → 0.0.0.10.develop

data/README.md

@@ -49,6 +49,7 @@ pseudohiki2html.rb <<TEXT
 The first paragraph
 TEXT
 ```
+
 will return the following result to stdout:
 
 ```html
@@ -116,6 +117,7 @@ tree = PseudoHiki::BlockParser.parse(plain.lines.to_a)
 html = PseudoHiki::HtmlFormat.format(tree)
 puts html
 ```
+
 you will get the following output:
 
 ```html
@@ -152,8 +154,11 @@ Other than PseudoHiki::HtmlFormat, you can choose PseudoHiki::XhtmlFormat, Pseud
 * Plugins - Not supported (and will not be compatible with the original one)
 
 ## Additional Features
+
 ### Already Implemented
+
 #### Assigning ids
+
 If you add [name_of_id], just after the marks that denote heading or list type items, it becomes the id attribute of resulting html elements. Below is an example.
 
 ```
@@ -176,7 +181,9 @@ will be rendered as
 ```
 
 ### Partly Implemented
+
 #### A visitor that removes markups and returns plain texts
+
 The visitor, [PlainTextFormat](https://github.com/nico-hn/PseudoHikiParser/blob/develop/lib/pseudohiki/plaintextformat.rb) is currently available only in the [develop branch](https://github.com/nico-hn/PseudoHikiParser/tree/develop). Below are examples
 
 ```
@@ -184,6 +191,7 @@ The visitor, [PlainTextFormat](https://github.com/nico-hn/PseudoHikiParser/blob/
 ::03-yyyy-yyyy
 :fax:03-xxxx-xxxx
 ```
+
 will be rendered as
 
 ```
@@ -200,6 +208,7 @@ And
 ||cell 3-1||cell 3-4||cell 3-5
 ||cell 4-1||cell 4-2||cell 4-3||cell 4-4||cell 4-5
 ```
+
 will be rendered as
 
 ```
@@ -208,8 +217,10 @@ cell 2-1	cell 2-2,3 3-2,3	==	cell 2-4	cell 2-5
 cell 3-1	||	||	cell 3-4	cell 3-5
 cell 4-1	cell 4-2	cell 4-3	cell 4-4	cell 4-5
 ```
+
 #### A visitor for HTML5
-The visitor, [Xhtml5Format](https://github.com/nico-hn/PseudoHikiParser/blob/develop/lib/pseudohiki/htmlformat.rb#L222) is currently available only in the [develop branch](https://github.com/nico-hn/PseudoHikiParser/tree/develop).
+
+The visitor, [Xhtml5Format](https://github.com/nico-hn/PseudoHikiParser/blob/develop/lib/pseudohiki/htmlformat.rb#L239) is currently available only in the [develop branch](https://github.com/nico-hn/PseudoHikiParser/tree/develop).
 
 #### A visitor for (Git Flavored) Markdown
 
@@ -282,4 +293,6 @@ For example, '' or == can be escaped.
 And {{ and }} sould be rendered as two left curly braces and two right curly braces respectively.
 ```
 
+
 ### Not Implemented Yet
+

data/lib/pseudohiki/blockparser.rb

@@ -166,14 +166,16 @@ module PseudoHiki
       end
 
       def add_leaf(line, blockparser)
-        if LINE_PAT::VERBATIM_BEGIN =~ line
-          return blockparser.stack.push BlockElement::VerbatimNode.new.tap {|node| node.in_block_tag = true }
-        end
-        line = tagfy_link(line) unless BlockElement::VerbatimLeaf.head_re =~ line
-        leaf = blockparser.select_leaf_type(line).create(line)
+        leaf = create_leaf(line, blockparser)
         blockparser.stack.pop while blockparser.breakable?(leaf)
         blockparser.stack.push leaf
       end
+
+      def create_leaf(line, blockparser)
+        return BlockElement::VerbatimLeaf.create("", true) if LINE_PAT::VERBATIM_BEGIN =~ line
+        line = tagfy_link(line) unless BlockElement::VerbatimLeaf.head_re =~ line
+        blockparser.select_leaf_type(line).create(line)
+      end
     end
 
     class NonNestedBlockNode < BlockNode
@@ -218,7 +220,7 @@ module PseudoHiki
     end
 
     class BlockElement::VerbatimNode
-      attr_writer :in_block_tag
+      attr_accessor :in_block_tag
 
       def add_leaf(line, blockparser)
         return @stack.pop if LINE_PAT::VERBATIM_END =~ line
@@ -241,9 +243,18 @@ module PseudoHiki
     end
 
     class BlockElement::VerbatimLeaf
+      attr_accessor :in_block_tag
+
       def self.create(line, in_block_tag=nil)
         line.sub!(self.head_re, "") if self.head_re and not in_block_tag
-        self.new.tap {|leaf| leaf.push line }
+        self.new.tap do |leaf|
+          leaf.push line
+          leaf.in_block_tag = in_block_tag
+        end
+      end
+
+      def push_block(stack)
+        stack.push(block.new.tap {|n| n.in_block_tag = @in_block_tag })
       end
     end
 

data/lib/pseudohiki/htmlformat.rb

@@ -116,10 +116,14 @@ module PseudoHiki
 
     class << Formatter[PluginNode]
       def visit(tree)
+        escape_inline_tags(tree) { super(tree) }
+      end
+
+      def escape_inline_tags(tree)
         str = tree.join
         return str if InlineParser::HEAD[str] or InlineParser::TAIL[str]
         return str.strip * 2 if str == ' {' or str == '} '
-        super(tree)
+        yield
       end
     end
 

data/lib/pseudohiki/htmlplugin.rb

@@ -9,7 +9,7 @@ module PseudoHiki
   class HtmlFormat
     class << Formatter[PluginNode]
       def visit(leaf)
-        HtmlPlugin.new(@element_name,leaf.join).apply
+        escape_inline_tags(leaf) { HtmlPlugin.new(@element_name,leaf.join).apply }
       end
     end
   end

data/lib/pseudohiki/version.rb

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

data/test/test_blockparser.rb

@@ -310,4 +310,19 @@ TEXT
     parsed = PseudoHiki::BlockParser.parse(text2.split(/\r?\n/o))
     assert_equal([[[["heading"]]]],parsed)
   end
+
+  def test_comment_out_followed_by_a_verbatim_block
+    text = <<TEXT
+the first paragraph
+
+//a comment
+<<<
+the first verbatim line
+the second verbatim line
+>>>
+TEXT
+
+    parsed = PseudoHiki::BlockParser.parse(text.split(/\r?\n/o))
+    assert_equal([[[["the first paragraph"]]], [[["a comment"]]], [[""], ["the first verbatim line"], ["the second verbatim line"]]],parsed)
+  end
 end

data/test/test_htmlformat.rb

@@ -667,4 +667,35 @@ HTML
     tree = BlockParser.parse(text.lines.to_a)
     assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
   end
+
+  def test_comment_out_followed_by_a_verbatim_block
+    text = <<TEXT
+the first paragraph
+
+//a comment
+the second paragraph
+
+//a comment
+<<<
+the first verbatim line
+the second verbatim line
+>>>
+TEXT
+
+    xhtml = <<HTML
+<p>
+the first paragraph
+</p>
+<p>
+the second paragraph
+</p>
+<pre>
+the first verbatim line
+the second verbatim line
+</pre>
+HTML
+
+    tree = BlockParser.parse(text.lines.to_a)
+    assert_equal(xhtml, XhtmlFormat.format(tree).to_s)
+  end
 end

data/test/test_htmlplugin.rb

@@ -11,4 +11,16 @@ class TC_HtmlPlugin < MiniTest::Unit::TestCase
     tree = InlineParser.new("{{co2}} represents the carbon dioxide.").parse.tree
     assert_equal("CO<sub>2</sub> represents the carbon dioxide.",tree.accept(formatter).to_s)
   end
+
+  def test_escape_inline_tags
+    formatter = HtmlFormat.get_plain
+    tree = InlineParser.new("a line with an inline tag such as {{''}}").parse.tree
+    assert_equal("a line with an inline tag such as ''",tree.accept(formatter).to_s)
+  end
+
+  def test_html_plugin
+    formatter = HtmlFormat.get_plain
+    tree = InlineParser.new("you can directly embed a snippet of html code like '{{html(<i>italic</i>)}}'.").parse.tree
+    assert_equal("you can directly embed a snippet of html code like '<i>italic</i>'.",tree.accept(formatter).to_s)
+  end
 end

metadata

@@ -1,55 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: pseudohikiparser
 version: !ruby/object:Gem::Version
-  version: 0.0.0.9.develop
+  version: 0.0.0.10.develop
+  prerelease: 9
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: PseudoHikiParser is a parser of texts written in a Hiki like notation,
@@ -61,53 +68,54 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
-- bin/pseudohiki2html.rb
-- lib/htmlelement.rb
-- lib/htmlelement/htmltemplate.rb
+- LICENSE
+- lib/pseudohikiparser.rb
+- lib/pseudohiki/treestack.rb
+- lib/pseudohiki/inlineparser.rb
 - lib/pseudohiki/blockparser.rb
 - lib/pseudohiki/htmlformat.rb
-- lib/pseudohiki/htmlplugin.rb
-- lib/pseudohiki/inlineparser.rb
-- lib/pseudohiki/markdownformat.rb
 - lib/pseudohiki/plaintextformat.rb
-- lib/pseudohiki/treestack.rb
+- lib/pseudohiki/markdownformat.rb
 - lib/pseudohiki/version.rb
-- lib/pseudohikiparser.rb
+- lib/pseudohiki/htmlplugin.rb
+- lib/htmlelement.rb
+- lib/htmlelement/htmltemplate.rb
+- test/test_htmltemplate.rb
 - test/test_blockparser.rb
+- test/test_plaintextformat.rb
 - test/test_htmlelement.rb
-- test/test_htmlformat.rb
-- test/test_htmlplugin.rb
-- test/test_htmltemplate.rb
+- test/test_treestack.rb
 - test/test_inlineparser.rb
 - test/test_markdownformat.rb
-- test/test_plaintextformat.rb
-- test/test_treestack.rb
+- test/test_htmlformat.rb
+- test/test_htmlplugin.rb
+- bin/pseudohiki2html.rb
 homepage: https://github.com/nico-hn/PseudoHikiParser/wiki
 licenses:
 - BSD 2-Clause license
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
-summary: 'PseudoHikiParser: a parser of texts in a Hiki like notation.'
+specification_version: 3
+summary: ! 'PseudoHikiParser: a parser of texts in a Hiki like notation.'
 test_files:
 - test/test_htmltemplate.rb
 - test/test_blockparser.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8c837bd7cafbfe2ca4d3356d41d419f058f80bdb
-  data.tar.gz: 6db584032f8226011930cc326d6b4c792df73fa8
-SHA512:
-  metadata.gz: 153e09b4d391c0d2c74262b9ccd2c41285686415e435c8e3bae1c4d3aacfc18916462c6f53543f81b9ce773fd985e0cb7154abfd6b759930b83cd5e6d4ae172a
-  data.tar.gz: 82c96e88ad295a05092d6f06ad68f6c17919aeacae58d247e6ee4d6feb9913d3575d569ed47401f90ce68ee6e1c784c6a46af11cfcebb35c2fdd28a7520db71b