martile 0.1.26 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a886f82c2bff38a89cd3f9359f3d12dd28cddfa
-  data.tar.gz: 29c17fc6058147279d46b8be5b6fb824724c60b2
+  metadata.gz: 1bd0764fcf645b03a35dcb6d27b423c2fbd2ef5c
+  data.tar.gz: 47583be9f06a798ea9ba1ff2e224a319efa76648
 SHA512:
-  metadata.gz: ab7d032ac774a73891a69224952be3ca1740a59bb7f9aaac77222850b68ef8849df37627c9690d953d085468f2c3551d589351fdda0dfdd10edb3b0c1da2434d
-  data.tar.gz: 06ff6985bfd449d0693a8d5c4b612c803866a7e52df4a0610756a1df738948f3faffa98300db51f42d1237e25a0cbc85bc9974c2139125066bfbd740761e2fe5
+  metadata.gz: 1e7a4c0b49e109ac5357a305f3b40706523984a42b3524dc7126488c1223d2822f9c02efcf12f625fb5011b181abca7052cc606b63192229ed87a76f813b393a
+  data.tar.gz: d42f83523621072e67a4a7df8de6efb74822d23f5c6612749383fca7fdc215c68e9b284a41c8ddc9950d9125b09e4f5b069b66f99f06bcb1b5f72b08d2dc515f

data/lib/martile.rb

@@ -8,6 +8,8 @@ require 'dynarex'
 require 'rdiscount'
 
 
+# bug fix:  03-Apr-2014: XML or HTML elements should now be filtered out 
+#                        of any transformations.
 # feature:  31-Mar-2014: Added an _underline_ feature.
 # bug fix:  01-Mar-2014: A Dynarex_to_table statement between 2 HTML blocks 
 #                        is now handled properly.
@@ -34,7 +36,9 @@ class Martile
   attr_reader :to_html
 
   def initialize(s)
-    raw_s2 = filter_out_html(s, :code_block_to_html)
+
+    raw_s2 = apply_filter(s) {|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|
@@ -55,16 +59,22 @@ class Martile
     end
 
     #puts 's2 : ' + s2.inspect
-    s3 = filter_out_html(s2, :ordered_list_to_html)
+
+    s3 = apply_filter(s2) {|x| ordered_list_to_html x }
     #puts 's3 : ' + s3.inspect
-    s4 = filter_out_html(s3, :unordered_list_to_html)
+
+    s4 = apply_filter(s3) {|x| unordered_list_to_html x }
     #puts 's4 : ' + s4.inspect
-    s5 = filter_out_html(s4, :dynarex_to_table)
+
+    s5 = apply_filter(s4) {|x| dynarex_to_table x }
     #puts 's5 :' + s5.inspect
-    s6 = filter_out_html(s5, :table_to_html) 
+
+    s6 = apply_filter(s5) {|x| table_to_html x }
     #puts 's6 : ' + s6.inspect
-    s7 = filter_out_html(s6, :underline) 
+
+    s7 = apply_filter(s6) {|x| underline x }
     #puts 's7 : ' + s7.inspect
+
     @to_html = s7
   end
 
@@ -105,8 +115,8 @@ class Martile
       
       dynarex = Dynarex.new($1)
       dynarex.to_h.map(&:values)
-      '[' + dynarex.to_h.map{|x| x.values.join('|') + "\n"}
-        .join('|').chomp + ']'
+      '[' + dynarex.to_h.map{|x| x.values.join('|').gsub('<','&lt;')\
+                            .gsub('>','&gt;') + "\n"}.join('|').chomp + ']'
     end
   end
 
@@ -136,19 +146,11 @@ class Martile
 
   end  
 
-  def filter_out_html(s, name)
-
-    s.gsub(/<(\w+)>[^(?:<\/\1>)]+<\/\1>*|.+/m) do |x|
+  def apply_filter(s, &block)
 
-      html = x[/<(\w+)>[^(?:<\/\1>)]+<\/\1>/m]
-      plain_text = html ? ($') : x
-      text1 = ($`).to_s
-      s1 = text1.length > 0 ? self.method(name).call(text1) : ''
-      #puts 'plain_text : ' + plain_text.inspect
-      s2 = plain_text.length > 0 ? self.method(name).call(plain_text.to_s) : ''
-      s1 + html.to_s + s2
-    end
-  end
+    Rexle.new("<root>#{s}</root>").root\
+            .map {|x|  x.is_a?(String) ? block.call(x) : x}.join
+  end  
   
   def ordered_list_to_html(s)
     list_to_html s, '#'
@@ -174,9 +176,8 @@ class Martile
           end
         end
       end
-      puts 'a = '  + a.inspect
+
       r = Rexle.new(a).xml pretty: true, declaration: false
-      puts 'r : ' + r.inspect
       r
     end
     return s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   YF3JmVOebtMx3b9sXkLX1YyX0fsg59FXvg9CVfAoaG6qjG2Y/okBwMSqqMLQiiao
   aRfEuwOkM9Z+zA==
   -----END CERTIFICATE-----
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle-builder