martile 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b1ab59b9e27447edce7ae0f83115e026b576598
-  data.tar.gz: fa8187355519c2a3652c6cd622ea458ba350b780
+  metadata.gz: 57c77f14ea96d92bec54a35e63e2123c33c186a1
+  data.tar.gz: ce9a89ce4f2da190f7c38dba918ea634ffd380f3
 SHA512:
-  metadata.gz: 5ed3dd4912ee68d876af4fe72a12149dcffed8d832c569a7ac1fa5e0fdd2233de6b290c875d4adf21a102eaefa480702477be42f425a880c9f159cade20ad4ca
-  data.tar.gz: 6b2e341d605ab8c39f806c4a894a9f4d1deb5ae8180d9480b213358dd2c41430fb7e7de72b53f9b57a066379da5ab2f80ed9493a56b54b0a73f0cee4b75eb538
+  metadata.gz: eea430a364e7e58a7b99db5bc2cee89d968b2585b644f4cb57422668c43e9637e20d91b7a986a57113461f2886d7bc28f416362d13f807bbca0d08f79ebd3ee4
+  data.tar.gz: a146c2bda3edc11975ceb660cc75b72fa8672472f7ddca31e1893324874e45cfb1298f836ce652a2077fd2fa31ec03ca3be83f7622e1102f620ab23aff03e8e1

data/lib/martile.rb

@@ -8,6 +8,8 @@ require 'dynarex'
 require 'rdiscount'
 
 
+# bug fix:  11-Mar-2015: Escapes angle brackets within a code block *before* 
+#                        the string is passed to Rexle
 # 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 
@@ -61,25 +63,7 @@ class Martile
     
     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|
-      s3 = ($1)
-      "<pre><code>%s</code></pre>" % s3.gsub(/</,'&lt;').gsub(/>/,'&gt;')
-      end
-    }.join
-
-    # escape the content of <pre> tags which doesn't contain the code tag
-    s2.gsub(/<(pre)>[^(?:<\/\1>)]+<\/\1>/m) do |x|
-      s = x[5..-7]
-      if s[/^<code>/] then
-        x
-      else
-        "<pre>%s</pre>" % s.gsub(/</,'&lt;').gsub(/>/,'&gt;')
-      end
-    end
+    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 }
@@ -124,7 +108,7 @@ class Martile
           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>" % escape(raw_code)
 
             b << code_block
             s2 = a.join
@@ -153,10 +137,13 @@ class Martile
       
       dynarex = Dynarex.new($1)
       dynarex.to_h.map(&:values)
-      '[' + dynarex.to_h.map{|x| x.values.join('|').gsub('<','&lt;')\
-                            .gsub('>','&gt;') + "\n"}.join('|').chomp + ']'
+      '[' + dynarex.to_h.map{|x| escape(x.values.join('|')) + "\n"}.join('|').chomp + ']'
     end
   end
+  
+  def escape(s)
+    s.gsub('<','&lt;').gsub('>','&gt;')
+  end  
 
   def list_to_html(s,symbol='#')
 
@@ -248,7 +235,7 @@ class Martile
         rows.each do |cols|
           xml.tr do
             cols.each do |col|
-              xml.td col.gsub('<','&lt;').gsub('>','&gt;')
+              xml.td escape(col)
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   fnr5l+RI/6f8lfxBNgDrktGB/RwPkOyWtyKk1tu9CWgHmptxL0JglikCXg5MzuZI
   tZzXOvXUoUf1VQ==
   -----END CERTIFICATE-----
-date: 2015-03-01 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
@@ -42,7 +42,7 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.7.1
+        version: 2.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,27 +52,27 @@ dependencies:
         version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.7.1
+        version: 2.1.8
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.5.0
 description: 
 email: james@r0bertson.co.uk
 executables: []