mdextab 0.1.0 → 0.1.3

data/lib/mdextab/table.rb

@@ -1,20 +1,20 @@
-require 'forwardable'
+require "forwardable"
 
 module Mdextab
   class Table
     extend Forwardable
-    def_delegators :@tbody, :add_th, :add_td, :tdAppend, :thAppend, :add
+    def_delegators :@tbody, :add_th, :add_td, :td_append, :th_append, :add
     attr_reader :lineno, :tbody
 
-    def initialize(lineno, logger,attr=nil)
+    def initialize(lineno, mes, attr=nil)
       @lineno = lineno
       @attr = attr
       @tbody = nil
-      @logger = logger
+      @mes = mes
     end
 
     def add_tbody(lineno)
-      @tbody = Tbody.new(lineno, @logger)
+      @tbody = Tbody.new(lineno, @mes)
     end
 
     def tbody_end
@@ -32,20 +32,17 @@ module Mdextab
     def to_s(debug=false)
       if @attr
         if debug
-          str_1 = %Q!<table #{@attr} lineno:#{@lineno}>! 
+          str = %Q(<table #{@attr} lineno:#{@lineno}>)
         else
-          str_1 = %Q!<table #{@attr}>! 
+          str = %Q(<table #{@attr}>)
         end
+      elsif debug
+        str = %Q(<table  lineno:#{@lineno}>)
       else
-        if debug
-          str_1 = %Q!<table  lineno:#{@lineno}>!
-        else
-          str_1 = %Q!<table>!
-        end
+        str = %Q(<table>)
       end
 
-      [str_1, @tbody.to_s, "</table>"].join("\n")
+      [str, @tbody.to_s, "</table>"].join("\n")
     end
-
   end
 end

data/lib/mdextab/tbody.rb

@@ -2,16 +2,16 @@ module Mdextab
   class Tbody
     attr_reader :lineno
 
-    def initialize(lineno, logger)
+    def initialize(lineno, mes)
       @array = []
       @tr = nil
       @th = nil
       @td = nil
       @lineno = lineno
-      @logger = logger
+      @mes = mes
     end
 
-    def add_th(lineno, content, nth, attr=nil, condense)
+    def add_th(lineno, content, nth, attr, condense)
       if nth == 1
         @tr = Tr.new(lineno)
         @array << @tr
@@ -21,22 +21,22 @@ module Mdextab
       @tr.add(@th)
     end
 
-    def add_td(lineno, content, nth, attr=nil, condense)
-      @logger.debug( "content=#{content}|nth=#{nth}|attr=#{attr}" )
+    def add_td(lineno, content, nth, attr, condense)
+      @mes.output_debug("content=#{content}|nth=#{nth}|attr=#{attr}")
       if nth == 1
         @tr = Tr.new(lineno)
         @array << @tr
       end
-      @td = Td.new(lineno,attr)
+      @td = Td.new(lineno, attr)
       @td.add(content, condense)
       @tr.add(@td)
     end
 
-    def tdAppend(content, condense)
+    def td_append(content, condense)
       @td.add(content, condense)
     end
 
-    def thAppend(content, condense)
+    def th_append(content, condense)
       @th.add(content, condense)
     end
 
@@ -49,7 +49,7 @@ module Mdextab
     end
 
     def to_s
-      ["<tbody>" , @array.map{|x| x.to_s} , "</tbody>"].join("\n")
+      ["<tbody>", @array.map(&:to_s), "</tbody>"].join("\n")
     end
   end
 end

data/lib/mdextab/td.rb

@@ -1,31 +1,31 @@
-  class Td
-    def initialize(lineno, attr=nil)
-      @lineno = lineno
-      @attr = attr
-      @content = ""
-    end
+class Td
+  def initialize(lineno, attr=nil)
+    @lineno = lineno
+    @attr = attr
+    @content = ""
+  end
 
-    def add(content, condnese)
-      if condnese
-        if @content
-          if @contnet.match?(/^\s*$/)
-            @content=content.to_s
-          else
-            @content+=content.to_s
-          end
+  def add(content, condnese)
+    if condnese
+      if @content
+        if @contnet.match?(/^\s*$/)
+          @content = content.to_s
         else
-          @content=content.to_s
+          @content += content.to_s
         end
       else
-        @content = [@content, content].join("\n") if content
+        @content = content.to_s
       end
+    elsif content
+      @content = [@content, content].join("\n")
     end
+  end
 
-    def to_s
-      if @attr != nil
-        %Q!<td #{@attr}>#{@content}</td>!
-      else
-        %Q!<td>#{@content}</td>!
-      end
+  def to_s
+    if @attr.nil?
+      %Q(<td>#{@content}</td>)
+    else
+      %Q(<td #{@attr}>#{@content}</td>)
     end
   end
+end

data/lib/mdextab/th.rb

@@ -12,21 +12,21 @@ module Mdextab
           if @content.match?(/^\s*$/)
             @content = content.to_s
           else
-            @content+=content.to_s
+            @content += content.to_s
           end
         else
-          @content=content.to_s
+          @content = content.to_s
         end
-      else
-        @content = [@content , content].join("\n") if content
+      elsif content
+        @content = [@content, content].join("\n")
       end
     end
 
     def to_s
-      if @attr != nil
-        %Q!<th #{@attr}>#{@content}</th>!
+      if @attr.nil?
+        %Q(<th>#{@content}</th>)
       else
-        %Q!<th>#{@content}</th>!
+        %Q(<th #{@attr}>#{@content}</th>)
       end
     end
   end

data/lib/mdextab/token.rb

@@ -2,10 +2,104 @@ module Mdextab
   class Token
     attr_reader :kind, :opt
 
-    def initialize(kind , opt={})
-      @kind = kind
-      @opt = opt
+    def initialize(mes)
+      @mes = mes
+      @token_struct = Struct.new(:kind, :opt)
+    end
+
+    def create_token(kind, opt={})
+      @token_struct.new(kind, opt)
+    end
+
+    def get_token_start_table(line, lineno)
+      if /^\s*<table>\s*$/.match?(line)
+        ret = create_token(:TABLE_START, { lineno: lineno })
+      elsif (m = /^\s*<table\s+(.+)>\s*$/.match(line))
+        ret = create_token(:TABLE_START, { attr: m[1], lineno: lineno })
+      else
+        ret = nil
+      end
+      ret
+    end
+
+    def get_token_start_tbody(line, lineno)
+      if /^\s*<tbody>\s*$/.match?(line)
+        ret = create_token(:TBODY_START, { lineno: lineno })
+      else
+        ret = nil
+      end
+      ret
+    end
+
+    def get_token_start_colon(line, lineno, nth, cont)
+      if (m = /^th(.*)/.match(cont))
+        cont2 = m[1]
+        if (m2 = /^\s(.*)/.match(cont2))
+          cont3 = m2[1]
+          if (m3 = /^([^<]*)>(.*)$/.match(cont3))
+            attr = m3[1]
+            cont4 = m3[2]
+            ret = create_token(:TH, { nth: nth, attr: attr, content: cont4, lineno: lineno })
+          else
+            # error
+            # ret = nil
+            ret = create_token(:ELSE, { nth: nth, attr: nil, content: cont, lineno: lineno })
+          end
+        elsif (m = /^>(.*)$/.match(cont2))
+          cont3 = m[1]
+          ret = create_token(:TH, { nth: nth, attr: nil, content: cont3, lineno: lineno })
+        else
+          ret = create_token(:ELSE, { nth: nth, attr: nil, content: cont, lineno: lineno })
+        end
+      elsif (m = /^([^<]*)>(.*)$/.match(cont))
+        attr = m[1]
+        cont2 = m[2]
+        ret = create_token(:TD, { nth: nth, attr: attr, content: cont2, lineno: lineno })
+      else
+        ret = create_token(:TD, { nth: nth, attr: attr, content: cont, lineno: lineno })
+      end
+      ret
+    end
+
+    def get_token_end_table(line, lineno)
+      if %r{^\s*</table>\s*$}.match?(line)
+        ret = create_token(:TABLE_END, { lineno: lineno })
+      else
+        ret = nil
+      end
+      ret
+    end
+
+    def get_token(line, lineno)
+      case line
+      when /^\*S(.+)$/
+        content = Regexp.last_match(1)
+        ret = create_token(:STAR_START, { content: content, lineno: lineno })
+      when /^\*E(.+)$/
+        content = Regexp.last_match(1)
+        ret = create_token(:STAR_END, { content: content, lineno: lineno })
+      when /^\s*<table/
+        ret = get_token_start_table(line, lineno)
+      when /^\s*<tbody/
+        ret = get_token_start_tbody(line, lineno)
+      when /^\s*(\:+)(.*)$/
+        nth = Regexp.last_match(1).size
+        cont = Regexp.last_match(2)
+        ret = get_token_start_colon(line, lineno, nth, cont)
+      when %r{^\s*</table}
+        ret = get_token_end_table(line, lineno)
+      when %r{^\s*</tbody}
+        if %r{^\s*</tbody>\s*$}.match?(line)
+          ret = create_token(:TBODY_END, { lineno: lineno })
+        else
+          @mes.output_debug("E001 line=#{line}")
+          ret = nil
+        end
+      else
+        ret = create_token(:ELSE, { content: line, lineno: lineno })
+      end
+
+      ret
     end
   end
 end
-

data/lib/mdextab/tr.rb

@@ -10,7 +10,7 @@ module Mdextab
     end
 
     def to_s
-      ["<tr>", @array.map{|x| x.to_s} , "</tr>"].join("\n")
+      ["<tr>", @array.map(&:to_s), "</tr>"].join("\n")
     end
   end
 end

data/lib/mdextab/version.rb

@@ -1,3 +1,3 @@
 module Mdextab
-  VERSION = "0.1.0"
+  VERSION = "0.1.3"
 end