pseudohikiparser 0.0.0.5.develop → 0.0.0.6.develop

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0cd301fcbf579cecea32ac473e1bffd351cb9e21
+  data.tar.gz: 5871802bd7b9dc0e71df8f3a5c4805339caf1833
+SHA512:
+  metadata.gz: 411eeb634503a5f79d9f563ddcfcfa45140e2889c78463a494275d044c3fb7bbbaa50591a9a27d61604bda7adaf8e5ff43cdacd1b52c7b10bda672729b98d394
+  data.tar.gz: 9d58afc0b126a74e1b2ba1e9fc32efff8262a1a248e98037cb0c18371144bc3420bfd5b72a58d4a219dbcb48ff61653dca0b4a4abfb194bbe974fccd0c9be303

data/lib/htmlelement/htmltemplate.rb

@@ -17,8 +17,8 @@ class HtmlTemplate
     @content_language = create_meta("Content-Language", language)
     @base = set_path_to_base(base_uri)
     @content_type = set_charset_in_meta(charset)
-    @content_style_type = create_meta("Content-Style-Type","text/css")
-    @content_script_type = create_meta("Content-Script-Type","text/javascript")
+    @content_style_type = create_meta("Content-Style-Type", "text/css")
+    @content_script_type = create_meta("Content-Script-Type", "text/javascript")
     @default_css_link = create_css_link(css_link)
     @title = nil
     @title_element = create_element("title")
@@ -105,7 +105,7 @@ class HtmlTemplate
 
   private
 
-  def create_meta(type,content)
+  def create_meta(type, content)
     create_element("meta", nil,
                    "http-equiv" => type,
                    "content" => content)
@@ -119,7 +119,7 @@ class HtmlTemplate
   end
 
   def set_charset_in_meta(charset)
-    create_meta("Content-Type",META_CHARSET%[charset])
+    create_meta("Content-Type", META_CHARSET%[charset])
   end
 
   def set_path_to_base(base_uri)

data/lib/pseudohiki/blockparser.rb

@@ -183,33 +183,19 @@ module PseudoHiki
     end
 
     module BlockElement
-      class DescLeaf < BlockLeaf; end
-      class VerbatimLeaf < BlockLeaf; end
-      class QuoteLeaf < NonNestedBlockLeaf; end
-      class TableLeaf < BlockLeaf; end
-      class CommentOutLeaf < BlockLeaf; end
-      class HeadingLeaf < NestedBlockLeaf; end
-      class ParagraphLeaf < NonNestedBlockLeaf; end
-      class HrLeaf < BlockLeaf; end
-      class BlockNodeEnd < BlockLeaf; end
-
-      class ListLeaf < ListTypeLeaf; end
-      class EnumLeaf < ListTypeLeaf; end
-
-      class DescNode < BlockNode; end
-      class VerbatimNode < BlockNode; end
-      class QuoteNode < NonNestedBlockNode; end
-      class TableNode < BlockNode; end
-      class CommentOutNode < BlockNode; end
-      class HeadingNode < NestedBlockNode; end
-      class ParagraphNode < NonNestedBlockNode; end
-      class HrNode < BlockNode; end
-
-      class ListNode < ListTypeBlockNode; end
-      class EnumNode < ListTypeBlockNode; end
-
-      class ListWrapNode < ListLeafNode; end
-      class EnumWrapNode < ListLeafNode; end
+      {
+        BlockLeaf => %w(DescLeaf VerbatimLeaf TableLeaf CommentOutLeaf BlockNodeEnd HrLeaf),
+        NonNestedBlockLeaf => %w(QuoteLeaf ParagraphLeaf),
+        NestedBlockLeaf => %w(HeadingLeaf),
+        ListTypeLeaf => %w(ListLeaf EnumLeaf),
+        BlockNode => %w(DescNode VerbatimNode TableNode CommentOutNode HrNode),
+        NonNestedBlockNode => %w(QuoteNode ParagraphNode),
+        NestedBlockNode => %w(HeadingNode),
+        ListTypeBlockNode => %w(ListNode EnumNode),
+        ListLeafNode => %w(ListWrapNode EnumWrapNode)
+      }.each do |parent_class, children|
+        PseudoHiki.subclass_of(parent_class, binding, children)
+      end
     end
     include BlockElement
 

data/lib/pseudohiki/htmlformat.rb

@@ -2,6 +2,7 @@
 
 require 'pseudohiki/inlineparser'
 require 'pseudohiki/blockparser'
+require 'htmlelement'
 
 module PseudoHiki
   class HtmlFormat

data/lib/pseudohiki/inlineparser.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'pseudohiki/treestack'
-require 'htmlelement'
 
 module PseudoHiki
   PROTOCOL = /^((https?|file|ftp):|\.?\/)/
@@ -10,6 +9,10 @@ module PseudoHiki
   FILE_MARK = "file:///"
   ImageSuffix = /\.(jpg|jpeg|gif|png|bmp)$/io
 
+  def self.subclass_of(parent_class, bound_env, subclass_names)
+    subclass_names. each {|name| eval "class #{name} < #{parent_class}; end", bound_env  }
+  end
+
   def self.compile_token_pat(*token_sets)
     tokens = token_sets.flatten.uniq.sort do |x,y|
       [y.length, y] <=> [x.length, x]
@@ -23,12 +26,8 @@ module PseudoHiki
       class InlineLeaf < InlineParser::Leaf; end
       #  class LinkSepLeaf < InlineLeaf; end
 
-      class LinkNode < InlineNode; end
-      class EmNode < InlineNode; end
-      class StrongNode < InlineNode; end
-      class DelNode < InlineNode; end
-      class PlainNode < InlineNode; end
-      class PluginNode < InlineNode; end
+      PseudoHiki.subclass_of(InlineNode, binding,
+                             %w(LinkNode EmNode StrongNode DelNode PlainNode PluginNode))
 
       LinkSep, TableSep, DescSep = %w(| || :)
     end
@@ -125,6 +124,7 @@ module PseudoHiki
     class InlineElement::TableCellNode
       def parse_first_token(token)
         @cell_type, @rowspan, @colspan, parsed_token = TD, 1, 1, token.dup
+        return token if token.kind_of? InlineParser::InlineNode
         token_str = parsed_token[0]
         m = MODIFIED_CELL_PAT.match(token_str) #if token.kind_of? String
 

data/lib/pseudohiki/plaintextformat.rb

@@ -12,9 +12,7 @@ module PseudoHiki
     DescSep = [InlineParser::DescSep]
 
     class Node < Array
-      def to_s
-        self.join("")
-      end
+      alias to_s join
     end
 
     def create_self_element(tree=nil)
@@ -95,14 +93,14 @@ module PseudoHiki
 
     def format(tree)
       formatter = get_plain
-      tree.accept(formatter).join("")
+      tree.accept(formatter).join
     end
 
 ## Definitions of subclasses of PlainTextFormat begins here.
 
     class InlineLeafFormatter < self
       def visit(leaf)
-        leaf.join("")
+        leaf.join
       end
     end
 
@@ -112,15 +110,15 @@ module PseudoHiki
         element = Node.new
         caption = get_caption(tree)
         begin
-          ref = tree.last.join("")
+          ref = tree.last.join
         rescue NoMethodError
           raise NoMethodError unless tree.empty?
           STDERR.puts "No uri is specified for #{caption}"
         end
         if ImageSuffix =~ ref
-          element.push (caption||tree).join("")
+          element.push (caption||tree).join
         else
-          element.push caption||tree.join("")
+          element.push caption||tree.join
           element.push " (#{tree.join('')})" if @options.verbose_mode and caption
         end
         element
@@ -151,7 +149,7 @@ module PseudoHiki
           push_visited_results(element, tree.shift(dt_sep_index))
           tree.shift
         end
-        dd = tree.map {|token| visited_result(token) }.join("").lstrip
+        dd = tree.map {|token| visited_result(token) }.join.lstrip
         unless dd.empty?
           element.push element.empty? ? "\t" : ":\t"
           element.push dd
@@ -162,7 +160,7 @@ module PseudoHiki
 
     class VerbatimNodeFormatter < self
       def visit(tree)
-        tree.join("")
+        tree.join
       end
     end
 
@@ -195,7 +193,7 @@ ERROR_TEXT
             end
           end
         end
-        table.map {|row| row.join("\t")+$/ }.join("")
+        table.map {|row| row.join("\t")+$/ }.join
       end
 
       def each_cell_with_index(table, max_row, max_col, initial_row=0, initial_col=0)

data/lib/pseudohiki/version.rb

@@ -1,3 +1,3 @@
 module PseudoHiki
-  VERSION = "0.0.0.5.develop"
+  VERSION = "0.0.0.6.develop"
 end

data/test/test_htmlformat.rb

@@ -146,6 +146,45 @@ HTML
     assert_equal(html,convert_text_to_html(text))
   end
 
+  def test_table_with_link
+    text = <<TEXT
+||[[a link|http://www.example.org/]]||another cell
+TEXT
+
+    html = <<HTML
+<table>
+<tr><td><a href="http://www.example.org/">a link</a></td><td>another cell</td></tr>
+</table>
+HTML
+    assert_equal(html,convert_text_to_html(text))
+  end
+
+  def test_table_with_emphasis
+    text = <<TEXT
+||''put'' emphasis on the first word||another cell
+TEXT
+
+    html = <<HTML
+<table>
+<tr><td><em>put</em> emphasis on the first word</td><td>another cell</td></tr>
+</table>
+HTML
+    assert_equal(html,convert_text_to_html(text))
+  end
+
+  def test_table_with_strong
+    text = <<TEXT
+||'''strong''' is used for the first word.||another cell
+TEXT
+
+    html = <<HTML
+<table>
+<tr><td><strong>strong</strong> is used for the first word.</td><td>another cell</td></tr>
+</table>
+HTML
+    assert_equal(html,convert_text_to_html(text))
+  end
+
   def test_hr
     text = <<TEXT
 paragraph

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: pseudohikiparser
 version: !ruby/object:Gem::Version
-  version: 0.0.0.5.develop
-  prerelease: 8
+  version: 0.0.0.6.develop
 platform: ruby
 authors:
 - HASHIMOTO, Naoki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-12-01 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'
 description: PseudoHikiParser is a parser of texts written in a Hiki like notation,
@@ -52,52 +47,51 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - LICENSE
-- lib/pseudohikiparser.rb
-- lib/pseudohiki/treestack.rb
-- lib/pseudohiki/inlineparser.rb
+- README.md
+- bin/pseudohiki2html.rb
+- lib/htmlelement.rb
+- lib/htmlelement/htmltemplate.rb
 - lib/pseudohiki/blockparser.rb
 - lib/pseudohiki/htmlformat.rb
+- lib/pseudohiki/htmlplugin.rb
+- lib/pseudohiki/inlineparser.rb
 - lib/pseudohiki/plaintextformat.rb
+- lib/pseudohiki/treestack.rb
 - lib/pseudohiki/version.rb
-- lib/pseudohiki/htmlplugin.rb
-- lib/htmlelement.rb
-- lib/htmlelement/htmltemplate.rb
-- test/test_htmltemplate.rb
+- lib/pseudohikiparser.rb
 - test/test_blockparser.rb
-- test/test_plaintextformat.rb
 - test/test_htmlelement.rb
-- test/test_treestack.rb
-- test/test_inlineparser.rb
 - test/test_htmlformat.rb
 - test/test_htmlplugin.rb
-- bin/pseudohiki2html.rb
+- test/test_htmltemplate.rb
+- test/test_inlineparser.rb
+- test/test_plaintextformat.rb
+- test/test_treestack.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: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
-summary: ! 'PseudoHikiParser: a parser of texts in a Hiki like notation.'
+specification_version: 4
+summary: 'PseudoHikiParser: a parser of texts in a Hiki like notation.'
 test_files:
 - test/test_htmltemplate.rb
 - test/test_blockparser.rb