martile 0.6.29 → 0.6.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d35ea75ad96bb5904232d0b7edf0d3ae20d038ab
-  data.tar.gz: 446b10e8c40fa5758a97b9fe5d90d9710b0f0629
+  metadata.gz: a883444aeb334dee25fc9b4acaf6d342bf05c024
+  data.tar.gz: 007effbafb1d0deafe2fae5d55880ee45f070a88
 SHA512:
-  metadata.gz: ca0cbe07a23833611287748ec2728dfda66d8113939747b1a29c371e507c67e99448328db440dca9659e8d1eecec53b32d1189db0d27258abd9ddc9e2a2c9f36
-  data.tar.gz: 054a7023189ef012e5082a0e7e8db0e5248fec763cc2d288875258f4fe1374d961fedd4ed49c7e50bccf24186b759eb1e9e1c1f012038f356189de5dd01900ff
+  metadata.gz: 7e35bd3808d3b300634d12e5e54a629b1781344da971436845ed7d8ead193fc03a3595a3078d7b37bf13ab7e4e00cbc43261b21c19f984d34aafbea6d9683360
+  data.tar.gz: d243a38f7016c6905cd8943e8675aa68b03fe5df4fa5c9d37c9336a8b94b71bf9a7e2bb069b6bb44a5920a9be95d4bca3a234fcb2772be60153da873937001d3

data/lib/martile.rb

@@ -9,6 +9,7 @@ require 'rdiscount'
 require 'kvx'
 
 
+# bug fix:  29-Jan-2017  2 or more code listings should now be parsed correctly
 # feature:  24-Jun-2016  links containing a right parenthesis at the 
 #                        end are no longer cropped
 # bug fix:  11-Jun-2016  pre tags are now filtered out properly
@@ -153,30 +154,16 @@ class Martile
       
       if s2[0] != '<' then
         
-        b =[]
+        s.lines.chunk {|x| x =~ /^\n|^    |\n/ }.map do |_, x| 
 
-        while s2 =~ /^ {4}/ do
-
-          a = s2.lines.to_a
-          r = a.take_while{|x| x[/^( {4}|\n)/]}
-          
-          if r.join.strip.length > 0 then
-            raw_code = a.shift(r.length).map{|x| x.sub(/^ {4}/,'')}.join
-
-            code_block = "<pre><code>%s</code></pre>\n" % escape(raw_code)
-
-            b << code_block
-            s2 = a.join
-            i = r.length        
-          else        
-            i = (s =~ /^ {4}/)        
+          if x.join.lstrip[/    /] then
+            "\n<pre><code>%s</code></pre>\n" % escape(x.join.gsub(/^ {4}/,''))
+          else
+            x.join
           end
 
-          b << s2.slice!(0,i)
-          
-        end
-        
-        b.join + s2
+        end.join
+
       else
         s2
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.6.29
+  version: 0.6.30
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   fHJRwdYS8tvLYH9UFytJxDKjlovBuFUsfKP0FJlZGQGJM5JiIj5LWelTGJtJD8hI
   2jPlwrOtiqZt2A==
   -----END CERTIFICATE-----
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2017-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
@@ -94,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.11
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Martile is a Markdown pre formatter which is designed to format custom Markdown