martile 0.6.20 → 0.6.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ec23f1e3edcee07d499d3523f788f0c7f32c216
-  data.tar.gz: 5c2339f3046c7570be1d230568f501199c39af8f
+  metadata.gz: 8a04824f656a9911978b8ebf4746987f7d264832
+  data.tar.gz: 2b66c0d44b85c1d9f45715f8f0821ab575ede2b8
 SHA512:
-  metadata.gz: 0da8582d41d702ada827ccc447fdf7d822b7280a87a57c1cfb32d8ca5ef1c03c46d66c00259ba7d4c17907b5bf9df4ad2f441cf1c1c7d3f9fd53f3610ccd1acb
-  data.tar.gz: f2e0a37d79ff22a03be74f6e7dc37aead91cb90706fde5ce4170d67b098f7bcceb0e9d5e48b70b603cd8884b3308b86eebd225b992499f12805e7a9baa23741d
+  metadata.gz: 3023d74494103af8fb64241aad246202a282671977107df374d44435c33f2b467b7c102b2d42800727efccf84b4269ba66088854f8c028feeee86f7cf805c0f1
+  data.tar.gz: d13c73afbf8afb0d7737666ff130bb1c0ebb004d7d3fa22691dd1db87a357eeb1cdc1414899432b01c67ead615fadaa1fe814c29639448aa5adce0c9228bf7ae

data/lib/martile.rb

@@ -9,6 +9,8 @@ require 'rdiscount'
 require 'kvx'
 
 
+# bug fix:  04-Dec-2015  apply_filter() now masks over <pre> tags rather 
+#                        splitting them and passing them to the block
 # bug fix:  03-Dec-2015  A smartlink which ends with a closing parenthesis is 
 #                          now output to a regular anchor tag
 #                        It should now identify when using a section equals sign
@@ -118,9 +120,9 @@ class Martile
     s2 = code_block_to_html(s.strip + "\n")
 
     #puts 's2 : ' + s2.inspect
-    s3 = apply_filter(s2, %w(ol ul)) {|x| explicit_list_to_html x }
+    #s3 = apply_filter(s2, %w(ol ul)) {|x| explicit_list_to_html x }
     #puts 's3 : ' + s3.inspect
-    s4 = apply_filter(s3) {|x| ordered_list_to_html x }
+    s4 = apply_filter(s2) {|x| ordered_list_to_html x }
     #puts 's4 : ' + s4.inspect
 
     s5 = apply_filter(s4) {|x| unordered_list_to_html x }
@@ -310,26 +312,28 @@ class Martile
 
   end  
 
-  def apply_filter(s, names=%w(pre code), &block)
-    
-    doc = Rexle.new("<root>#{s}</root>")
-    #puts 'doc : ' + doc.root.xml(pretty: true).inspect
-    doc.root.map do |x|  
+  
+  def apply_filter(s, names=%w(pre code), &blk)
+
+    s.split(/(?=<pre)/).map do |row|
+      separator = "\n1449232851\n"
+      upper = row[/.*(?=<pre>)/m]
+      lower = row[/<\/pre>(.*)/m,1]
+      pre = row[/<pre>.*<\/pre>/m]
+
+      if pre then
 
-      if x.is_a?(String) then
-        block.call(x)
+        s2 = blk.call [upper,lower].join(separator)
+
+        s2.split(separator, 2).insert(1, pre).join
       else
-        
-        if not names.grep  x.name then
-          block.call(x.xml pretty: false)
-        else
-          x
-        end   
-        
-      end      
+        blk.call row
+      end
     end.join
+    
   end
   
+  
   def explicit_list_to_html(s)
 
     match = s.match(/<([ou]l)>([\*#])/m)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.6.20
+  version: 0.6.21
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   fnr5l+RI/6f8lfxBNgDrktGB/RwPkOyWtyKk1tu9CWgHmptxL0JglikCXg5MzuZI
   tZzXOvXUoUf1VQ==
   -----END CERTIFICATE-----
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount