hiki2md 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db76e2902d739b22fea3bca6db5878c03b98b7ef
-  data.tar.gz: 14fae6cbf09185cb6bd084523081fe9432322ce7
+  metadata.gz: 3144012b65184c7a5362f65f9f004d1c9bcbeff3
+  data.tar.gz: a4424168aab76259fe55e50e2dd3116d65a3b806
 SHA512:
-  metadata.gz: 764fd9840a546519ab02e84fd5ffbeb20b5e48b87208aa31e789cadb97e337dad6a0493483fd35312cb1115c972f55d2741bdfb38431f8800751115c68cac9c5
-  data.tar.gz: 09e53c7f75e6dc868c66273e4acf0ee704de70967a64dab9c57e1ddf1af9328e50c3081057151a1eb04866c10a0b05db39b16a0b8357f1b20807f6c214c7f90b
+  metadata.gz: d3eafa88b9204d1284124bceb9aca242a5084df2d2c160e7c90eaecfb85bda7037b54193e9aef4d4012d1286deeb05eeafe58fada04db20d5ea3b3cbb0bd9aa5
+  data.tar.gz: a8639a667f70cfc182f997ea78e8084df40072736c8ade63834a305a4416fd40184a5e9efc8daa6571eb0e66224d4f8fc5d95ac2689fbba674d19037fc7bd49a

data/README.md

@@ -1,5 +1,9 @@
 # Hiki2md
 
+[![Build Status](https://travis-ci.org/kdmsnr/hiki2md.svg?branch=master)](https://travis-ci.org/kdmsnr/hiki2md)
+
+Converter of Hiki to Markdown.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/hiki2md/version.rb

@@ -1,3 +1,3 @@
 class Hiki2md
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/hiki2md.rb

@@ -6,7 +6,11 @@ class Hiki2md
     @outputs = []
 
     @in_plugin_block = false
-    @in_preformated_block = false
+    @in_preformatted_block = false
+    @in_multiline_preformatted_block = false
+    @in_table_block = false
+    @in_dl_block = false
+    @table_contents = []
 
     lines.split(/\n/).each do |line|
       # プラグイン
@@ -22,10 +26,23 @@ class Hiki2md
         @in_plugin_block = true
       end
 
-      # 整形済みテキスト
-      if @in_preformated_block
+      # テーブル
+      if line =~ /\A\|\|/
+        @in_table_block = true
+        @table_contents << line
+        next
+      end
+
+      if @in_table_block
+        @outputs << make_table(@table_contents)
+        @in_table_block = false
+        @table_contents = []
+      end
+
+      # 整形済みテキスト（複数行）
+      if @in_multiline_preformatted_block
         if line =~ /\A>>>/
-          @in_preformated_block = false
+          @in_multiline_preformatted_block = false
           @outputs << '```'
           next
         end
@@ -33,24 +50,45 @@ class Hiki2md
         next
       end
 
-      if line =~ /\A<<<\z/
-        @in_preformated_block = true
-        @outputs << '```'
+      if line =~ /\A<<<\s*(.*)/
+        @in_multiline_preformatted_block = true
+        @outputs << "```#{$1}"
+        next
+      end
+
+      # 整形済みテキスト
+      if @in_preformatted_block
+        if line =~ /\A[ \t]+/
+          @outputs << line.strip
+          next
+        else
+          @outputs << "```"
+          @in_preformatted_block = false
+        end
+      end
+
+      if line =~ /\A[ \t]+/
+        @in_preformatted_block = true
+        @outputs << "```\n#{line.strip}"
         next
       end
 
       # コメント削除
       next if line =~ %r|\A//.*\z|
 
-      # 整形済みテキスト
-      line.gsub! /\A[ \t]+/, '    '
-
       # 引用
       line.gsub! /\A""/, '>'
 
       # リンク
       line.gsub! /\[{2}([^\[\]\|]+?)\|([^\[\]\|]+?)\]{2}/, "[\\1](\\2)"
 
+      # 強調
+      line.gsub! /'''(.+)'''/, "**\\1**"
+      line.gsub! /''(.+)''/, "*\\1*"
+
+      # 取り消し
+      line.gsub! /\=\=(.+)\=\=/, "~~\\1~~"
+
       # 箇条書き
       line.gsub! /\A[*]{3} ?/, '    - '
       line.gsub! /\A[*]{2} ?/, '  - '
@@ -60,6 +98,23 @@ class Hiki2md
       line.gsub! /\A[#]{2} ?/  , '  1. '
       line.gsub! /\A[#] ?/     , '1. '
 
+      # 定義リスト
+      if line =~ /\A\:(.+)\:(.+)/
+        unless @in_dl_block
+          @outputs << "<dl>"
+        end
+        @outputs << "<dt>#{$1}</dt><dd>#{$2}</dd>"
+        @in_dl_block = true
+        next
+      end
+
+      if @in_dl_block
+        if line !=~ /\A\:.+\:.+/
+          @outputs << "</dl>"
+          @in_dl_block = false
+        end
+      end
+
       # 見出し
       line.gsub! /\A!{5} ?/ , '##### '
       line.gsub! /\A!{4} ?/ , '#### '
@@ -67,18 +122,105 @@ class Hiki2md
       line.gsub! /\A!{2} ?/ , '## '
       line.gsub! /\A! ?/    , '# '
 
-      # 強調
-      line.gsub! /'''(.+)'''/, "**\\1**"
-      line.gsub! /''(.+)''/, "*\\1*"
-
-      # 取り消し
-      line.gsub! /\=\=(.+)\=\=/, "~~\\1~~"
-
       # 画像
       line.gsub! /\[{2}([^\[\]\|]+?)\]{2}/, "![](\\1)"
 
       @outputs << line
     end
+
+    # ensure
+    if @in_table_block
+      @outputs << make_table(@table_contents)
+      @in_table_block = false
+      @table_contents = []
+    end
+
+    # ensure
+    if @in_preformatted_block
+      @outputs << "```"
+    end
+
+    # ensure
+    if @in_dl_block
+      @outputs << "</dl>"
+      @in_dl_block = false
+    end
+
+
     @outputs.join("\n")
   end
+
+  # tableから連結作用素に対応したmatrixを作る
+  # input:lineごとに分割されたcontents
+  # output:matrixと最長列数
+  def make_matrix(contents)
+    t_matrix = []
+    contents.each do |line|
+      row = line.split('||')
+      row.shift
+      t_matrix << row
+    end
+
+    # vertical joint row
+    t_matrix.each_with_index do |line, i|
+      line.each_with_index do |e, j|
+        if e =~ /\^+/
+          t_matrix[i][j] = Regexp.last_match.post_match
+          Regexp.last_match.size.times do |k|
+            t_matrix[i + k + 1] ||= []
+            t_matrix[i + k + 1].insert(j, " ")
+          end
+        end
+      end
+    end
+
+    # horizontal joint column
+    max_col = 0
+    t_matrix.each_with_index do |line, i|
+      n_col = line.size
+      j_col = 0
+      line.each do |e|
+        if e =~ />+/
+          t_matrix[i][j_col] = Regexp.last_match.post_match
+          cs = Regexp.last_match.size
+          cs.times do
+            j_col += 1
+            t_matrix[i][j_col] = ""
+          end
+          n_col += cs
+        else
+          t_matrix[i][j_col] = e
+          j_col += 1
+        end
+      end
+      max_col = n_col if n_col > max_col
+    end
+
+    [t_matrix, max_col]
+  end
+
+  # tableを整形する
+  def make_table(table_contents)
+    contents, max_col = make_matrix(table_contents)
+
+    align_line = "|"
+    max_col.times { align_line << ':----|' }
+    align_line << "\n"
+
+    table = "\n"
+    contents.each_with_index do |line, idx|
+      row = "|"
+      line.each do |e|
+        row << "#{e}|"
+      end
+      table << row + "\n"
+
+      # insert table alignment after 1st line
+      if idx == 0
+        table << align_line
+      end
+    end
+
+    table
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiki2md
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Masanori Kado
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler