martile 0.6.22 → 0.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4de5719b825434a16bdc903d24f54e13a6df82df
-  data.tar.gz: ee68a11eae4c28461b595a8939897306df59feae
+  metadata.gz: b6242f62455efceab20f5041c8cba6baade349de
+  data.tar.gz: cea9426033ff0576640491108fa00328651ec299
 SHA512:
-  metadata.gz: cfa3f4546eebbeba9953afbb8897e9d106bb57dabdf0ab11b9719eb5f2a4f222ec54bafccd1105dc4b1c9fbe620e3eed8863fabd7d9e6848848597869a98e042
-  data.tar.gz: c095b2f488e72d48a47680bbc216b9f20dfb5239fa22a9382266df43f955c8b8a3cef261be316e54d018ea8e45347ebaf7f4bf627af84ad18b30bfd3ac8137f5
+  metadata.gz: 05b999ec27c33fd04590755ef0c20fbda05fdb635d9993ca9d65acf7557f6d88f45e2c5419a7d6a80cce19dd16ef8f983c407234af1c107f52341568e96c09b7
+  data.tar.gz: c3535cde31d823ed6151b088c59b3459b2ff01e7a4d767353ba8798ac2af3eada06ed65c1cec20f4b29aa54e787bebf03316f95ed34f071c76729989adbba495

data.tar.gz.sig

@@ -1 +1,2 @@
-'���.�z?0�bD��ۚA�l�Ϩ<����}��u�@���Oϸ"�$?{�r��s�L��g�UG��<<�O���D��\��aŶ����`�a�b܊d�ͶN����`��z�<����G��iwϤ�c�ſXhk��y*�uӄ�fi�!8�{:�[}?��r��cn<�4F���Z*І������L(T4�\M�9Y�Ŏ���&~�8U˜$AD�Gͮ�#m��'��[-��b_z�qQ5p��Q��j� �
+$	��}
+��0b�:�`
�3�Q�&�j %�ǒ�5�����	g�C��&��1�hG\핗�o&�#���?|��<ޫ

data/lib/martile.rb

@@ -9,6 +9,10 @@ require 'rdiscount'
 require 'kvx'
 
 
+# bug fix:  05-Dec-2015  PRE tags are now correctly filtered out using the 
+#                        apply_filter() method.
+#                        the ignore_domainlabel keword is now supplied to the 
+#                        Martile.new statement within the section() method
 # bug fix:  04-Dec-2015  apply_filter() now masks over <pre> tags rather than
 #                        splitting them and passing them to the block
 # bug fix:  03-Dec-2015  A smartlink which ends with a closing parenthesis is 
@@ -312,28 +316,35 @@ class Martile
 
   end  
 
-  
   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
+    separator = "\n1449232851\n"
+    
+    a, apre = s.split(/(?=<pre)/).inject([[],[]]) do |r, row|
 
-        s2 = blk.call [upper,lower].join(separator)
+      pre = nil
 
-        s2.split(separator, 2).insert(1, pre).join
-      else
-        blk.call row
+      s2 = row.sub(/<pre.*<\/pre>/m) do |pattern|
+        pre = pattern
+        separator
       end
-    end.join
+
+      r.first << s2
+      r.last << pre if pre
+      r    
+
+    end
+
+    r2 = blk.call a.join
+    
+    apre.compact.each do |x|
+      r2.sub!(separator, x)
+    end
+
+    r2
     
   end
-  
-  
+
   def explicit_list_to_html(s)
 
     match = s.match(/<([ou]l)>([\*#])/m)
@@ -529,9 +540,11 @@ class Martile
         if r.last.length > 0 and r.last.first[/<section/] then
 
           list = r.pop
+
           r << ["%s%s</section>" % 
                  [list[0], \
-                  RDiscount.new(Martile.new(list[1..-1].join).to_html).to_html
+                  RDiscount.new(Martile.new(list[1..-1].join, \
+                      ignore_domainlabel: @ignore_domainlabel).to_html).to_html
                  ]
                ]
           r << []

metadata

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