martile 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f75a6d7fc3b3c016747c5bfed719bdf08ab2d9
-  data.tar.gz: 6e3203dc584f605d97150997d40b66d18820de0e
+  metadata.gz: 047df8e816c678ff60a333e8b0b1a7883781b2b6
+  data.tar.gz: 725d1fa7318ddcb909475a216076587505b50f38
 SHA512:
-  metadata.gz: 47c7143e239abf3bb794480c2833160a5bf0f901b76c1c23eaed1a24780e6d4c36c526e21a5b796d01c435f3a48c6e94182bea057f9d333dd003068056a504c5
-  data.tar.gz: 13b61c680d53ce68967be62d05ea9512077e51b9e1dc6bc4b1ac93d816653689c8147255ffbdaadaa56948d31f954aa3b5855c27ec35ce86697ed58e1f2b2b66
+  metadata.gz: 5785400f160e2565afc7244253c8be5d8adb37225bc8b6451936df3b982534f5d0af94af213b102527135763a8e54e5c265144e0c440af2130f0cf8d4ad224c1
+  data.tar.gz: 51f2a250dcba07bfe43e11ffcb98a555f005aa5ac6e75932bfe1e9464364a9d6856e5c6ec3208787b025c173bf887115cd2929b4dec1f06f311ad4b652fef86b

data/lib/martile.rb

@@ -8,10 +8,13 @@ require 'dynarex'
 require 'rdiscount'
 
 
+# feature:  02-Aug-2015  dynarex_to_table() is now know as dynarex_to_markdown()
+#                        A markdown list will be rendered from a Dynarex 
+#                        document if there is only a single field column
 # improvement: 
 #           16-Jul-2015  to_s is now equivalent to_html; to_s is 
 #                        more readable when it's just text which is returned
-# feature:  06-Jul-2015  dynarex_to_table(): 
+# feature:  06-Jul-2015  dynarex_to_markdown(): 
 #                        1. A URL within a  col is now hyperlinked
 #                        2. Select fields can now be displayd
 # feature:  02-Jul-2015  Apply_filter() now filters out pre and code tags
@@ -79,12 +82,12 @@ 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 
+# bug fix:  02-Nov-2012: within dynarex_to_markdown URLs containing a 
 #                        dash now work
 # bug fix:  20-Sep-2012: in ordered_list_to_html it now cuts off from 
 #                        parsing headings
 # bug fix:  04-Aug-2012; replaced \s with a space in regex patterns
-# modified: 28-Mar-2012; Added dynarex_to_table
+# modified: 28-Mar-2012; Added dynarex_to_markdown
 # modified: 28-Aug-2011; Added escaping of HTML within a code block
 
 class Martile
@@ -108,7 +111,7 @@ class Martile
     s5 = apply_filter(s4) {|x| unordered_list_to_html x }
     #puts 's5 : ' + s5.inspect
 
-    s6 = apply_filter(s5) {|x| dynarex_to_table x }
+    s6 = apply_filter(s5) {|x| dynarex_to_markdown x }
     #puts 's6 :' + s6.inspect
 
     s7 = apply_filter(s6) {|x| table_to_html x }
@@ -192,7 +195,7 @@ class Martile
 
   end
   
-  def dynarex_to_table2(s)
+  def dynarex_to_markdown2(s)
 
     s.gsub(/-\[((https?:\/\/)?[\w\/\.\-]+)\]/) do |match|
       
@@ -202,72 +205,19 @@ class Martile
     end
   end
   
-  def dynarex_to_table(s)
+  def dynarex_to_markdown(s)
 
     s.gsub(/-\[((https?:\/\/)?[\w\/\.\-]+)\](\{[^\}]+\})?/) do |match|
 
       source = ($1)
       raw_select = ($3)
-      
-      if raw_select then
-        raw_fields = raw_select[/select:\s*["']([^"']+)/,1]
-        fields = raw_fields.split(/\s*,\s*/)        
-      end
-      
-      print_row = -> (row, widths) do
-        '| ' + row.map\
-            .with_index {|y,i| y.to_s.ljust(widths[i])}.join(' | ') + " |\n"
-      end
-
-      print_thline = -> (row, widths) do
-        '|:' + row.map\
-            .with_index {|y,i| y.to_s.ljust(widths[i])}.join('|:') + "|\n"
-      end
+      dx = Dynarex.new(source)      
 
-      print_rows = -> (rows, widths) do
-        rows.map {|x| print_row.call(x,widths)}.join
+      if dx.fields.length > 1 then
+        dx_render_table(source, raw_select)
+      else
+        dx.records.keys.map {|x| '* ' + x}.join("\n")
       end
-
-      dx = Dynarex.new(source)
-
-      flat_records = raw_select ? dx.to_a(select: fields) : dx.to_a
-      
-      keys = flat_records.map(&:keys).first
-      raw_vals = flat_records.map(&:values)
-      
-      # create Markdown hyperlinks for any URLs
-      
-      vals = raw_vals.map do |row|
-
-        row.map do |col|
-
-          found_match = col.match(/https?:\/\/([^\/]+)(.*)/)
-
-          r = if found_match then
-
-            domain, path = found_match.captures
-
-            a = domain.split('.')
-            a.shift if a.length > 2
-            url_title = (a.join('.') + path)[0..39] + '...'
-
-            "[%s](%s)" % [url_title, col]
-          else
-            col
-          end
-          
-          r
-        end
-      end      
-
-      widths = ([keys] + vals).transpose.map{|x| x.max_by(&:length).length}
-      th = '|' + keys.join('|') + "|\n"
-      th = print_row.call(keys, widths)
-      th_line = print_thline.call widths.map {|x| '-' * (x+1)}, widths
-
-      tb = print_rows.call(vals, widths)
-      table = th + th_line + tb
-
     end
   end
     
@@ -393,6 +343,68 @@ class Martile
     list_to_html s, '#'
   end
   
+  def dx_render_table()
+    
+      if raw_select then
+        raw_fields = raw_select[/select:\s*["']([^"']+)/,1]
+        fields = raw_fields.split(/\s*,\s*/)        
+      end
+      
+      print_row = -> (row, widths) do
+        '| ' + row.map\
+            .with_index {|y,i| y.to_s.ljust(widths[i])}.join(' | ') + " |\n"
+      end
+
+      print_thline = -> (row, widths) do
+        '|:' + row.map\
+            .with_index {|y,i| y.to_s.ljust(widths[i])}.join('|:') + "|\n"
+      end
+
+      print_rows = -> (rows, widths) do
+        rows.map {|x| print_row.call(x,widths)}.join
+      end
+
+
+
+      flat_records = raw_select ? dx.to_a(select: fields) : dx.to_a
+      
+      keys = flat_records.map(&:keys).first
+      raw_vals = flat_records.map(&:values)
+      
+      # create Markdown hyperlinks for any URLs
+      
+      vals = raw_vals.map do |row|
+
+        row.map do |col|
+
+          found_match = col.match(/https?:\/\/([^\/]+)(.*)/)
+
+          r = if found_match then
+
+            domain, path = found_match.captures
+
+            a = domain.split('.')
+            a.shift if a.length > 2
+            url_title = (a.join('.') + path)[0..39] + '...'
+
+            "[%s](%s)" % [url_title, col]
+          else
+            col
+          end
+          
+          r
+        end
+      end      
+
+      widths = ([keys] + vals).transpose.map{|x| x.max_by(&:length).length}
+      th = '|' + keys.join('|') + "|\n"
+      th = print_row.call(keys, widths)
+      th_line = print_thline.call widths.map {|x| '-' * (x+1)}, widths
+
+      tb = print_rows.call(vals, widths)
+      table = th + th_line + tb
+    end
+  
   def unordered_list_to_html(s)
     list_to_html s, '\*'
   end  
@@ -501,4 +513,4 @@ class Martile
     end    
   
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   fnr5l+RI/6f8lfxBNgDrktGB/RwPkOyWtyKk1tu9CWgHmptxL0JglikCXg5MzuZI
   tZzXOvXUoUf1VQ==
   -----END CERTIFICATE-----
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount