martile 0.6.37 → 0.6.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce1d725e6741563cb5b00968413be8c8981b71c6
-  data.tar.gz: 90955ee07ce663269c9e7f5d644fcc15cf575c71
+  metadata.gz: cd3eeb5b209ea2dbdfc78c4591177a08ef3b2969
+  data.tar.gz: a66e15bc31e24c297912d830eeefdf08889e8a9d
 SHA512:
-  metadata.gz: 057427ca9d6a7ff8c9c848a97d3d3a93b911b78ac2aaffd5878676aa006bf7bf206ebb20cf5884157ffad26bb1d8dc669507ec536f1b584f41222739fd224ce9
-  data.tar.gz: bf200b7e2d78294fae10f2b9f4f1741ed84611a997db81c5e3665d726c4ad1f17cc706ba4eb8fcf7716e85d037e3c9809be6ba0d6e1df3a5e69afae97bbc0c01
+  metadata.gz: 5ed12d55ac62cd35e3e6f240013992005dbc6c51584883840665b9ccf396074d54549d4a6b20bb18e0ead66c701ea703c4a44c4121ebd90eee2309eb60195829
+  data.tar.gz: d7f6a6430fcb7d32e45feeb187f76b1d4e3d0ea4205a8a3ccbfb2cf61c39a00ee1582737db706878196f66ecdd7c08212f9f219dbb31b23efbfff21d964293bd

checksums.yaml.gz.sig

@@ -1,3 +1,3 @@
-(>���l����_WT�Z�����Y�����_�5��4�q�<��(��l٣8(3+ࣾ�j���6�>�8+1��{��+	I��-�1��P���E&�� ��k��k����1�+�'������$��1�x�C�X���AG�
-�2�ᘪP�UI��&"����t�e���{�MH<��B[�����9�������=L-�M{�#��3CX'Q�Z�xfͦ3��Mݮ
-��*�Sg�I��*���%��$�1���o3�
+g��#G��ǵK��l'۪�=I�~�5i"m-����(X��������|c�����*�d$�#t|�tpֶ�ݠe�` ���D�r�Zv%�h��Y��)p��)�W@���#ٞ����1c9��e��w>��%�Ҧ[3o(�$U��ha��I-�G�g��K�����R��
+��%�/�ZC*$�c���{�t�������j����3OB)��M��/f1l���Z\C&�
+ȩ��֯3`#�5�_�*�nx��

data/lib/martile.rb

@@ -9,8 +9,11 @@ require 'rdiscount'
 require 'kvx'
 
 
-# feature:  28-May-2017  Return characters are now stripped out.
-
+# feature:  28-May-2017  Within the context of an embedded Dynarex table, 
+#  the nomarkdown extension was wrapped around the inner HTML for each column
+#                        
+#                        Return characters are now stripped out.
+#
 #                        An embeded Dynarex table contents are now rendered to 
 #                        Markdown by default
 # feature:  11-Mar-2017  A details and summary tag can now be generated from +> 
@@ -359,12 +362,13 @@ class Martile
   
   def dx_render_table(dx, raw_select)
     
-      markdown = true
+      markdown, heading = true, true
       
       if raw_select then
         raw_fields = raw_select[/select:\s*["']([^"']+)/,1]
         fields = raw_fields.split(/\s*,\s*/) if raw_fields
         markdown = false if raw_select[/\bmarkdown:\s*false\b/]
+        heading = false if raw_select[/\bheading:\s*false\b/]
       end
       
       print_row = -> (row, widths) do
@@ -394,7 +398,7 @@ class Martile
 
         row.map do |col|
 
-          found_match = col.match(/https?:\/\/([^\/]+)(.*)/)
+          found_match = col.match(/^https?:\/\/([^\/]+)(.*)/)
 
           r = if found_match then
 
@@ -405,8 +409,17 @@ class Martile
             url_title = (a.join('.') + path)[0..39] + '...'
 
             "[%s](%s)" % [url_title, col]
+            
           else
-            markdown ? RDiscount.new(col).to_html.strip.gsub("\n",'') : col
+            
+            if markdown then 
+              "{::nomarkdown}" + 
+                  RDiscount.new(col).to_html.strip.gsub("\n",'') + "{:/}"
+            else
+
+              col
+              
+            end
             
           end
           
@@ -415,12 +428,14 @@ class Martile
       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)
+      
+            
+      th = heading  ? 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)

metadata

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