martile 0.1.4 → 0.1.5

data/lib/martile.rb

@@ -5,6 +5,9 @@
 require 'rexle-builder'
 require 'rexle'
 
+# modified: 28-Mar-2012; Added dynarex_to_table
+# modified: 28-Aug-2011; Added escaping of HTML within a code block
+
 class Martile
 
   attr_reader :to_html
@@ -12,40 +15,70 @@ class Martile
   def initialize(s)
     s2 = code_block_to_html(s)
     s3 = ordered_list_to_html(s2)
-    s4 = table_to_html(s3)      
-    @to_html = s4
+    s4 = dynarex_to_table(s3)      
+    s5 = table_to_html(s4)      
+    @to_html = s5
   end
 
   private
 
   def code_block_to_html(s)
 
-    s.split(/(?=\n\n\s{4})/).map do |x|
-      raw_code_block = x[/.*\s{4}[^\n]+/m]
-
-      if raw_code_block then
+    b =[]
+    
+    while s =~ /^\s{4}/ do
+      
+      a = s.lines.to_a
+      r = a.take_while{|x| x[/^(\s{4}|\n)/]}
+      
+      if r.join.strip.length > 0 then        
         code_block = "<pre><code>%s</code></pre>" % \
-          raw_code_block.lines.map{|x| x[4..-1]}[1..-1].join
-        code_block + ($').to_s
-      else
-        x
+          a.shift(r.length).map{|x| x.sub(/^\s{4}/,'')}.join\
+          .gsub('<','&lt;').gsub('>','&gt;')
+        b << code_block
+        s = a.join
+        i = r.length        
+      else        
+        i = (s =~ /^\s{4}/)        
       end
-    end.join("\n")
 
+      b << s.slice!(0,i)
+      
+    end
+    
+    b.join("\n") + s    
+
+  end
+  
+  def dynarex_to_table(s)
+
+    s.gsub(/-\[((https?:\/\/)?[\w\/\.]+)\]/) do |match|
+      
+      dynarex = Dynarex.new($1)
+      dynarex.to_h.map(&:values)
+      '[' + dynarex.to_h.map{|x| x.values.join('|') + "\n"}
+        .join('|').chomp + ']'
+    end
   end
 
   def ordered_list_to_html(s)
 
     s.split(/(?=\[#)/).map do |x|
+      
       s2, remainder = [x[/\[#.*#[^\]]+\]/m], ($').to_s] if x.strip.length > 0
+      
       if s2 then
 
         raw_list = s2[1..-2].split(/^#/).reject(&:empty?).map(&:strip)
         list = "<ol>%s</ol>" % raw_list.map {|x| "<li>%s</li>" % x}.join
         list + remainder.to_s
+        
       else
+        
         x
+        
       end
+      
     end.join
 
   end
@@ -73,4 +106,4 @@ class Martile
     return s
   end
 
-end
+end

metadata

@@ -2,7 +2,7 @@
 name: martile
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - James Robertson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 +01:00
+date: 2012-03-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency