martile 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1ded764190af8c226d4536daad4a7435efa158c
-  data.tar.gz: 878222fd429d1504f9f4bbec0c49ba0fbbc19412
+  metadata.gz: c385709f2357966e81fa9abbb82e21fc94b259d3
+  data.tar.gz: 5717ab324dc3a1897b23eb156f3f61bdd220cf65
 SHA512:
-  metadata.gz: a7959ddb284add3b568e822d9d068e50110e9ea1bd2c42fbccbfdd6db6dd809ea27a3b65773cd9e8ae3588eb8ed8a91be1602c17179453b1c5a38d65e31bdada
-  data.tar.gz: f15ca1764681a7a08b8406078dba9f6cc6b05a65cd9cbc10b6d2637292d8f1ae9a240b47612025b2e5a0a1a7634678d8a75e3adf5a88809501e58c8c2c292f62
+  metadata.gz: f89e37f145e4507d3c448726dee2435dabc8041ceb2bc9fcfa239562eb0ee83e5e25b4e3c6f6b9c8177098a9c326d1d4c7ddf1a6f860f072cd507a9beb1c0016
+  data.tar.gz: 7ab89467da5e94e8283bb9031237927104e019359de913abe8546c6cbd991ff35376ec9d2612b45f967a12c4790d2c3e0770a92b6c121daaeaca0dbd14694547

data.tar.gz.sig

@@ -1,3 +1,3 @@
-��^ۏŐ\'��ڞ�Y0,
-?s�F��(�~I;�9
-�uF�
+a�[��o��e
+�D�r
+m��)5Ij	@�CC�

data/lib/martile.rb

@@ -7,6 +7,8 @@ require 'rexle'
 require 'dynarex'
 require 'rdiscount'
 
+
+# feature:  12-Aug-2013: unordered_list supported
 # feature:  31-Mar-2013: markdown inside a martile ordered list
 #                          is now converted to HTML
 # bug fix:  02-Nov-2012: within dynarex_to_table URLs containing a 
@@ -23,10 +25,16 @@ class Martile
 
   def initialize(s)
     s2 = code_block_to_html(s)
-    s3 = ordered_list_to_html(s2)  
-    s4 = dynarex_to_table(s3)      
-    s5 = table_to_html(s4)      
-    @to_html = s5
+    
+    s3 = ordered_list_to_html(s2)
+    
+    s4 = unordered_list_to_html(s3)  
+    
+    s5 = dynarex_to_table(s4)      
+    
+    s6 = table_to_html(s5)      
+    
+    @to_html = s6
   end
 
   private
@@ -70,17 +78,20 @@ class Martile
     end
   end
 
-  def ordered_list_to_html(s)
+  def list_to_html(s,symbol='#')
+
+    return s unless s[/\[#{symbol}[^\]]+\]/]
+    tag = {'#' => 'ol', '\*' => 'ul'}[symbol]
 
-    s.split(/(?=\[#|^##)/).map do |x|
+    s.split(/(?=\[#{symbol}|^#{symbol*2})/).map do |x|
       
-      s2, remainder = [x[/\[#.*#[^\]]+\]/m], ($').to_s] if x.strip.length > 0
+      s2, remainder = [x[/\[#{symbol}.*#{symbol}[^\]]+\]/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>" % RDiscount.new(x).to_html}.join
+        raw_list = s2[1..-2].split(/^#{symbol}/).reject(&:empty?).map(&:strip)
+        list = "<#{tag}>%s</#{tag}>" % raw_list.map {|x| \
+                    "<li>%s</li>" % RDiscount.new(x).to_html[/<p>(.*)<\/p>/,1]}.join
         list + remainder.to_s
         
       else
@@ -91,7 +102,15 @@ class Martile
       
     end.join
 
+  end  
+  
+  def ordered_list_to_html(s)
+    list_to_html s, '#'
   end
+  
+  def unordered_list_to_html(s)
+    list_to_html s, '\*'
+  end  
 
   def table_to_html(s)
     # create any tables

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - James Robertson