martile 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73846c6282cf20b59b4afcb0f5b7864f775f8f96
-  data.tar.gz: 7baf57d9425254be7cbf203483205b6ae012b604
+  metadata.gz: c63c50dfb33d820a5e691a8c4c891a0b08f2d9e2
+  data.tar.gz: e6e6fc61f78cc63352ecbb34c017694323c6b8c1
 SHA512:
-  metadata.gz: 7922dee94cfcb4704f9cf086a1c838ce6742200d5e863d2184e2133dd63d62bfabdc7be9e520765e64a77fb3dfea73139c0f8ce04be7967888c7342ea81746ff
-  data.tar.gz: bd0ba146beee259b300abd3eee65eb7f57292bf2d783518aac95ea08b51c53f3d764ccf99dca8edbaa77bd7eed8a39b1700b7c3e621ac709e5ef899e1b64c111
+  metadata.gz: 93d2b0e234640fc100eaff52bc194ba6f0129a314d90e1744fc1bbbe46db792a91afd57c86430592a670dd1948a7af007d3515daabbd7dcc4df519c7cd0f8dd7
+  data.tar.gz: de26b7b0f4b764be08bab71fdbb7410e43cd00ec9d1ec6e34eb6f016e8c803a1e8d179535fac24abc1ce16ad678852961c2f42151001df8361d20402856a91c5

data/lib/martile.rb

@@ -8,8 +8,9 @@ require 'dynarex'
 require 'rdiscount'
 
 
-# feature:  06-Jul-2015  dynarex_to_table(): A URL within a 
-#                        col is now hyperlinked
+# feature:  06-Jul-2015  dynarex_to_table(): 
+#                        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
 #                        The shorthand !i[]() can now render an iframe tag 
 #                        e.g. !i[](http://somefile.url/sometext.txt)                        
@@ -198,24 +199,36 @@ class Martile
   
   def dynarex_to_table(s)
 
-    s.gsub(/-\[((https?:\/\/)?[\w\/\.\-]+)\]/) do |match|
-            
+    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"
+        '| ' + 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"
+        '|:' + 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
 
-      dx = Dynarex.new($1)
-      keys = dx.to_h.map(&:keys).first
+      dx = Dynarex.new(source)
 
-      raw_vals = dx.to_h.map(&:values)
+      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
       
@@ -276,7 +289,9 @@ class Martile
 
     s.split(/(?=\[#{symbol}|^#{symbol*2})/).map do |x|
       
-      s2, remainder = [x[/\[#{symbol}.*#{symbol}[^\]]+\]/m], ($').to_s] if x.strip.length > 0
+      if x.strip.length > 0 then
+        s2, remainder = [x[/\[#{symbol}.*#{symbol}[^\]]+\]/m], ($').to_s]
+      end
       
       if s2 then
 

metadata

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