martile 0.6.27 → 0.6.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c82e54f50f94ae7be44ab6449e2c5defe0801d24
-  data.tar.gz: 9093f1e4ab36350febe6fd62cf249c6b8dd9e87d
+  metadata.gz: 2c27a84eb62497e8c17af299fdb740c14e80f709
+  data.tar.gz: c62e29e1f18f2b76ab6f850cd7f3ffc58b8845f1
 SHA512:
-  metadata.gz: ea92efaaf95d6ada71633ac5fca9914c4748c595f0ed82a756f3696eca58cbcc6869e60c1e892bf320e8149c3085ab298f57fae39378b9738144d3dcf4d5f86e
-  data.tar.gz: ee95038e83e1c8d2bbd22ce20782144d35e4a6093156fffe3f24f708ccbb4d44f9d0b615ea74b8857c6ee025d2ce4cf099192a4cb9f91e016f9683a15967332c
+  metadata.gz: cc74c733a4aaf5e1fa3c638fdde27c3f56a3ae3d55fdb8cf5685cc569ddb01e80bc9ecfb1a269ed10af3cef4c74c63399d64ef64822036be12a65d5020fb5c9e
+  data.tar.gz: 1110f77cf75e3241839f5ae909dce8a71477375c9a083a54db88e6ef26d423820de5792b8f593c3a6a14afd9e2c87a83ae02c253bf189f6253b7a3f7d50790d7

data/lib/martile.rb

@@ -9,6 +9,7 @@ require 'rdiscount'
 require 'kvx'
 
 
+# bug fix:  11-Jun-2016  pre tags are now filtered out properly
 # feature:  22-May-2016  Introduced the __DATA__ section which appears at 
 #                        the end of the document to reference 1 or more raw 
 #                        Dynarex documents
@@ -68,12 +69,13 @@ class Martile
     @data_source = {}
     
     @ignore_domainlabel = ignore_domainlabel
+
     
     s0 = raw_s =~ /^__DATA__$/ ? parse__data__(raw_s) : raw_s
-    
-    s1 = slashpre s0
-    #puts 's : ' + s.inspect
-    s2 = code_block_to_html(s1.strip + "\n")
+    #puts 's0: ' + s0.inspect
+    s1 = apply_filter(s0) {|x| slashpre x }
+    #puts 's1 : ' + s1.inspect
+    s2 = apply_filter(s1) {|x| code_block_to_html(x.strip + "\n") }
 
     #puts 's2 : ' + s2.inspect
     #s3 = apply_filter(s2, %w(ol ul)) {|x| explicit_list_to_html x }
@@ -90,9 +92,9 @@ class Martile
     s7 = apply_filter(s6) {|x| table_to_html x }
     #puts 's7 : ' + s7.inspect
 
-    s8 = apply_filter(s7) {|x| underline x }
+    s8 = apply_filter(s7) {|x| underline x}
     #puts 's8: ' + s8.inspect
-    s9 = apply_filter(s8) {|x| section x }    
+    s9 = apply_filter(s8) {|x| section x }
     #puts 's9: ' + s9.inspect
     
     s10 = apply_filter(s9) {|x| smartlink x }
@@ -101,20 +103,20 @@ class Martile
 
     #s11 = section s9
     #puts 's11 : ' + s11.inspect
-    s12 = apply_filter(s10){|x| audiotag x}
+    s12 = apply_filter(s10) {|x| audiotag x }
     #puts 's12 : ' + s12.inspect
-    s13 = apply_filter(s12){|x| videotag x}
+    s13 = apply_filter(s12) {|x| videotag x }
     #puts 's13 : ' + s13.inspect
-    s14 = apply_filter(s13){|x| iframetag x}
+    s14 = apply_filter(s13) {|x| iframetag x }
     #puts 's14 : ' + s14.inspect
-    s15 = apply_filter(s14){|x| kvx_to_dl x}
+    s15 = apply_filter(s14) {|x| kvx_to_dl x }
     #puts 's15 : ' + s15.inspect
-    s16 = apply_filter(s15){|x| list_item_to_hyperlink x}
+    s16 = apply_filter(s15) {|x| list_item_to_hyperlink x }
     #puts 's16 : ' + s16.inspect
-    s17 = apply_filter(s16) {|x| mtlite_utils x }        
+    s17 = apply_filter(s16) {|x| mtlite_utils x }
     
     #puts 's17 : ' + s17.inspect
-
+    
     @to_s = s17
   end
   
@@ -145,8 +147,8 @@ class Martile
   def code_block_to_html(s)
 
     
-    s.split(/(?=<pre>)/).map do |s2|
-
+    s.split(/(?=<pre>)/).map do |s2|      
+      
       if s2[0] != '<' then
         
         b =[]
@@ -180,17 +182,7 @@ class Martile
     end.join
       
 
-  end
-  
-  def dynarex_to_markdown2(s)
-
-    s.gsub(/-\[((https?:\/\/)?[\w\/\.\-]+)\]/) do |match|
-      
-      dynarex = Dynarex.new($1)
-      dynarex.to_h.map(&:values)
-      '[' + dynarex.to_h.map{|x| escape(x.values.join('|')) + "\n"}.join('|').chomp + ']'
-    end
-  end
+  end  
   
   def dynarex_to_markdown(s)
     
@@ -274,36 +266,42 @@ class Martile
       
     end.join
 
-  end  
-
-  def apply_filter(s, names=%w(pre code), &blk)
-
-    separator = "\n1449232851\n"
-    
-    a, apre = s.split(/(?=<pre)/).inject([[],[]]) do |r, row|
+  end
+  
+  def filter_on(s)
 
-      pre = nil
+    @filter = []
 
-      s2 = row.sub(/<pre.*<\/pre>/m) do |pattern|
-        pre = pattern
-        separator
+    a = s.split(/(?=<pre)/).map.with_index do |row, i|
+      
+      row.sub(/<pre.*<\/pre>/m) do |pattern|
+        placeholder = '!' + Time.now.to_i.to_s + i.to_s
+        @filter << [placeholder, pattern]
+        placeholder
       end
 
-      r.first << s2
-      r.last << pre if pre
-      r    
-
     end
-
-    r2 = blk.call a.join
+    a.join
     
-    apre.compact.each do |x|
-      r2.sub!(separator, x)
-    end
+  end  
+  
+  def filter_off(raw_s)
+    
+    s = raw_s.clone
+    @filter.each {|id, x| s.sub!(id, x) }
+    return s
+
+  end
 
-    r2
+  def apply_filter(s)
+    
+    s1 = filter_on(s)
+    s2 = yield s1
+    s3 = filter_off s2
     
+    return s3
   end
+  
 
   def explicit_list_to_html(s)
 
@@ -315,7 +313,7 @@ class Martile
       symbol = ('\\' + symbol) if symbol == '*'
 
       a3 = s.split(/(?=<#{type}>)/).map do |x|
-       # puts 'x' + x.inspect
+
         if x =~ /<ol>/ then
           "<%s>%s</%s>" % \
               [type, x[/<#{type}>[#{symbol}]\s*(.*)<\/#{type}>/m,1]\
@@ -438,7 +436,6 @@ class Martile
       s2 = x.strip
       next if s2.empty?
       
-      puts 's2: ' + s2.inspect
       id = s2.lines.first[/id=["']([^"']+)/,1]
       dx = Dynarex.new
       dx.import s2
@@ -515,7 +512,7 @@ class Martile
     a = s.lines
 
     a2 = a.inject([[]]) do |r,x|
-
+      
       match = x.match(/^={1}(?:#)?(\w+)?$/)
 
       if match then
@@ -575,4 +572,4 @@ class Martile
     s.gsub(/\B(\* +)([^\n]+)\s+(https?:\/\/.*)/,'\1[\2](\3)')
 
   end    
-end
+end

data.tar.gz.sig

@@ -1,3 +1,3 @@
-�P�3�v�c	A��|f
-n�q�)�8J0�S��צ��bD����z��[؈����I�F,�P�dY��zW_�M[�B>
-n4��=�'�d,�<�|
+U������9U�s7���V�6�B<X[F����e�$��.�%����h�T),�;�!FqO>���ٮ�ˁ�$���t�
+�(m"��}T�v`��n��&�p�����SU�̂���
+�9�9g���: 8o�q�,�"a_|</��މ�| &�����������]p��]N"��$ŃĀ�� �!.�O��@P�,B

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.6.27
+  version: 0.6.28
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   fHJRwdYS8tvLYH9UFytJxDKjlovBuFUsfKP0FJlZGQGJM5JiIj5LWelTGJtJD8hI
   2jPlwrOtiqZt2A==
   -----END CERTIFICATE-----
-date: 2016-05-22 00:00:00.000000000 Z
+date: 2016-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
@@ -123,5 +123,6 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A flavour of Markdown which converts a Martile string to html
+summary: Martile is a Markdown pre formatter which is designed to format custom Markdown
+  tags prior to being passed to the Markdown gem.
 test_files: []