martile 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d54722ac1ba698b83d8a0e8e7a0a89877e05ab08
-  data.tar.gz: a62031606c9f955aaf98cfe7f49f80e3e63e2ca4
+  metadata.gz: 9b1ab59b9e27447edce7ae0f83115e026b576598
+  data.tar.gz: fa8187355519c2a3652c6cd622ea458ba350b780
 SHA512:
-  metadata.gz: 769eb88b46d7a5c2ebc95e5f53371a88eff67146105178e679063c92623c68f2d39af48030504c9f52bd5106c8435713f41ad52a9b5b9b685306324514b94b1e
-  data.tar.gz: c31d4735aaa1fc0ed97208b9ceef2609fc941251afaddd427e6e8913b461dc58b2654ab18fba5a4cd740a64a0125206f9af0e8866a27fb6d623364780e549c82
+  metadata.gz: 5ed3dd4912ee68d876af4fe72a12149dcffed8d832c569a7ac1fa5e0fdd2233de6b290c875d4adf21a102eaefa480702477be42f425a880c9f159cade20ad4ca
+  data.tar.gz: 6b2e341d605ab8c39f806c4a894a9f4d1deb5ae8180d9480b213358dd2c41430fb7e7de72b53f9b57a066379da5ab2f80ed9493a56b54b0a73f0cee4b75eb538

data/lib/martile.rb

@@ -2,12 +2,14 @@
 
 # file: martile.rb
 
-require 'rexle-builder'
-require 'rexle'
+#require 'rexle-builder'
+#require 'rexle'
 require 'dynarex'
 require 'rdiscount'
 
 
+# bug fix:  01-Mar-2015: code_block_to_html() now only searches strings which 
+#                        are outside of angle brackets
 # bug fix:  10-Dec-2014: Generation of pre tags using // can now only happen 
 #                        when the // appears at the beginning of the line
 # feature:  30-Oct-2014: A section can now be between a set of equal signs at 
@@ -58,9 +60,9 @@ class Martile
   def initialize(raw_s)
     
     s = slashpre raw_s
-
+    #puts 's : ' + s.inspect
     raw_s2 = apply_filter(s.strip + "\n") {|x| code_block_to_html x }
-
+    #puts 'raw_s2 : ' + raw_s2.inspect
     # ensure all angle brackets within <pre><code> is escaped
     s2 = raw_s2.split(/(?=<pre><code>)/m).map { |y|
       y.sub(/<pre><code>(.*)<\/code><\/pre>/m) do |x|
@@ -81,6 +83,7 @@ class Martile
 
     #puts 's2 : ' + s2.inspect
     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 }
     #puts 's4 : ' + s4.inspect
 
@@ -106,30 +109,41 @@ class Martile
 
   def code_block_to_html(s)
 
-    b =[]
+    
+    s.split(/(?=<pre>)/).map do |s2|
+
+      if s2[0] != '<' then
+        
+        b =[]
 
-    while s =~ /^ {4}/ do
+        while s2 =~ /^ {4}/ do
 
-      a = s.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
+          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>" % raw_code
+            code_block = "<pre><code>%s</code></pre>" % raw_code
 
-        b << code_block
-        s = a.join
-        i = r.length        
-      else        
-        i = (s =~ /^ {4}/)        
-      end
+            b << code_block
+            s2 = a.join
+            i = r.length        
+          else        
+            i = (s =~ /^ {4}/)        
+          end
 
-      b << s.slice!(0,i)
+          b << s2.slice!(0,i)
+          
+        end
+        
+        b.join + s2
+      else
+        s2
+      end
+      
+    end.join
       
-    end
-    
-    b.join + s    
 
   end
   
@@ -179,7 +193,7 @@ class Martile
       else
         
         if names.grep  x.name then
-          block.call(x.xml)
+          block.call(x.xml pretty: false)
         else
           x
         end   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -12,67 +12,27 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE0MDMwMTE1MTM1N1oXDTE1MDMwMTE1MTM1N1owSDESMBAG
+  8ixkARkWAmV1MB4XDTE1MDMwMTE4MTQyNFoXDTE2MDIyOTE4MTQyNFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALpyB7g/7JKFOoKguOcHbRBeYoJEFgk4+6gOTYSUMc9QbwHOHx2+tgozZ+No
-  7B8S+DuHtehMdkZNb17ImyYhFMNCZhzIPNYhNlGNgQd8gzgmyPD3wdBa4xz9tcNH
-  LbjPzbidYDiTx/1wxVdWVv63EkA9GNmDn1hrRSO9xsceQu+koxBzodr0yYkJ95tc
-  w7/v3n9nIiOq+A9kWP0+T/zVp2EdpywFmJsBNI8ZBbjVMZndRcKrwcb5X72A+fUM
-  nr3y/tFIusGi5udkbTqewG27tHD4vQz+vpY44REzeCMjAbhyn8vvFAClppOoO1vW
-  wPmCM7CWLT4QUpoM4cDAybuWkpcCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUaew2SBXOYbmdBg/MNin7+6pZ6gkwJgYDVR0RBB8w
+  ggEBAMIbDK9oK5jl/kXf8CDDSMB1wCaIuAuNQjSWKm196uBiI6fb83KG6WmAJsuB
+  P5vOzDeq4+/NgIgEzZCPvIT9mTrAZPU7uirs8+7bESaexwiIriC4dHNnoIIGOmfo
+  VixmLjuaoYVofnbyeitIfz6QHde/yopaGaUW6Q9IARaOjVNSRLbB7OAUsZGFs3z4
+  ysAL3gE06oDyNCPsOb3ezCun1SrrHtL5+dEwBYB19dl9yVXm46QtPOGL/Wx/zjM2
+  0BmpsPV6gocWaszNqwjuafRqVnOtGL9j/ec5ab1iGwbXB2pEC4wjFn3XKvHEvdT7
+  3CzzjFVEbOB4qVmfPuF6C3aUJe8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUwDnTLohObYD3C2SPAJwj993F2ZkwJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAchiKYoxb
-  GANuyHDp4XvDEBvUDqYLiI8QzdOUCVK1IjggK+JluGV56OjvCk+dS0bpWQSKDI0A
-  lUzj4NOZwAkm2ruXs6gEpVXInDf1ZZ0TlNZyU+jK2cZ0igknaptsIlLdopY8mI3e
-  03XFF0RJYehvRb/7p7hUXduEW3MZdt6xS5gYU09gk8hDAIGBsr4REw2NHOj7RUDR
-  d9yujmbsdLOwkY9Yel5ADtzsebPb3fKp2+qG1ojdsQujGbiOIZs7e+T8Q65mPn4W
-  YF3JmVOebtMx3b9sXkLX1YyX0fsg59FXvg9CVfAoaG6qjG2Y/okBwMSqqMLQiiao
-  aRfEuwOkM9Z+zA==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAjRuICZ1L
+  FQgCWlo7lCUp8vrF554+OdGk5+/v+5MfDUoNXfXUDdyajEiv4uQ0vcUylHv5jxw5
+  AeCJrrf7WumDG9N0CcDb2VPr9ZDzEjknIN3hH4//tYdgwsleJo+SUCuFo9bI1FXz
+  KlFeMb4up8Yu/N/Y6MwlqdnFEj9QqLdIKPZjm5E0WpCW5tbeF3XL1FJx+wG68cKt
+  UJinqIgLKrEPKrGxzCf3kInYUatxGx5IT4dg+tnik+GkPzgausNb1Ida9XioBmRJ
+  fnr5l+RI/6f8lfxBNgDrktGB/RwPkOyWtyKk1tu9CWgHmptxL0JglikCXg5MzuZI
+  tZzXOvXUoUf1VQ==
   -----END CERTIFICATE-----
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2015-03-01 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rexle-builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.9
-- !ruby/object:Gem::Dependency
-  name: rexle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.33
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.33
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -99,20 +59,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.90
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.90
+        version: 1.4.1
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -143,5 +103,5 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Converts a martile string to html
+summary: A flavour of Markdown which converts a Martile string to html
 test_files: []