martile 0.1.18 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 339380ee009e8a63eae2a98a26cf9839e11fcc97
-  data.tar.gz: 34e6c37ce50f8a1c56dae1fb35c2defe3bd0f353
+  metadata.gz: 2f4862ef60a703fe5f68077061c8f565ed46db14
+  data.tar.gz: 957ce7bdb00fe10a977c20db69f6ff24f66c1f9b
 SHA512:
-  metadata.gz: 15e947424e98f3af28445b57c6d1f6c4bc45b7adcc238ee238bad75aafafda1807d5cc1e411d471576a6ac4fe7564751ed2a08ebabd61b1eace8f5e82d565c9d
-  data.tar.gz: f95bfdda9cbe9e7b0529e4b204ab3f8308c26bfd2f480938d9b05e211d28bfaea0b302340b90035763f81b104ecfcb7aa1092abb02adf79fe734ce6d4a9cc332
+  metadata.gz: 3937246b2ed64c544e53ca4b380ef3b77c9846a2acf704b84cbc4739eaeb208dfe42b4fbf3d55c6695e2290d237ba419bab5dc9d02b3c0e1a725d8a27e563a89
+  data.tar.gz: 29377f95bf39cca5e0da254adc719541d1aa4e592cbf44c93e6f7d240179749f9daee0b7130cbb945f863166087606f308150ea23b0105bc74aba5f6803a70e4

data/lib/martile.rb

@@ -8,6 +8,8 @@ require 'dynarex'
 require 'rdiscount'
 
 
+# feature:  04-Oct-2013: angle brackets within <pre><code> blocks are 
+#                        escaped automatically
 # feature:  03-Oct-2013: HTML tags now handled
 # bug fix:  25-Sep-2013: removed the new line statement from the join command.
 #                        headings etc. should no longer be split with a new line
@@ -27,7 +29,16 @@ class Martile
   attr_reader :to_html
 
   def initialize(s)
-    s2 = filter_out_html(s, :code_block_to_html)
+    raw_s2 = filter_out_html(s, :code_block_to_html)
+
+    # 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|
+      s3 = ($1)
+      "<pre><code>%s</code></pre>" % s3.gsub(/</,'&lt;').gsub(/>/,'&gt;')
+      end
+    }.join
+
     #puts 's2 : ' + s2.inspect
     s3 = filter_out_html(s2, :ordered_list_to_html)
     #puts 's3 : ' + s3.inspect
@@ -47,14 +58,15 @@ class Martile
     b =[]
 
     while s =~ /^ {4}/ do
-      
+
       a = s.lines.to_a
       r = a.take_while{|x| x[/^( {4}|\n)/]}
       
-      if r.join.strip.length > 0 then        
-        code_block = "<pre><code>%s</code></pre>" % \
-          a.shift(r.length).map{|x| x.sub(/^ {4}/,'')}.join\
-          .gsub('<','&lt;').gsub('>','&gt;')
+      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
+
         b << code_block
         s = a.join
         i = r.length        

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.20
 platform: ruby
 authors:
 - James Robertson
@@ -73,6 +73,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dynarex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: james@r0bertson.co.uk
 executables: []