martile 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b75f3c95fc2a30c6dd89a276c093f0fa37a3785
-  data.tar.gz: b577d1a25320935cef0997acf3b384045561c7f7
+  metadata.gz: 5a0dd4c5ddeba3c248c3d6ba296153b2e26a39ab
+  data.tar.gz: a7b86a55464a246e8f85c9fc48809a24fffb0f2b
 SHA512:
-  metadata.gz: 861658a4cd3e4d0dd43d047c03bb438ed78b60b32adc30ea7b303f72f86249b3d671444f98120605adc2a9119f5db2b1432193d37da309da43117b6f39d5ccae
-  data.tar.gz: 56378242f0518e7c9c61d533a8b799f9d207a1487b9a02b5bdafe1fcb34d3bb1c3e8ec79a9cd398800686a122826a2829a66ac65c08bd5740c4c9fb28d86f137
+  metadata.gz: 33e29722349e4e28231a2a58da76c85f918d2e0f29f9bebf39c66c89cfbab8beae2fd23dce843ee357db7b18b936560f3b9452c550b79ccb26208131a7084878
+  data.tar.gz: 5fdfceb4823eac7a234e789fa05e9afe99459d3a8b279235b78b38bbf3b2c56b7132dfa17ce74c9739cbdb13df3d0d1fdf72d71d29b757ef26271c3bd27cb314

data/lib/martile.rb

@@ -8,6 +8,7 @@ require 'dynarex'
 require 'rdiscount'
 
 
+# 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
 # feature:  12-Aug-2013: unordered_list supported
@@ -26,16 +27,16 @@ class Martile
   attr_reader :to_html
 
   def initialize(s)
-    s2 = code_block_to_html(s)
-    puts 's2 : ' + s2.inspect
-    s3 = ordered_list_to_html(s2)
-    puts 's3 : ' + s3.inspect
-    s4 = unordered_list_to_html(s3)  
-    puts 's4 : ' + s4.inspect
-    s5 = dynarex_to_table(s4)      
-    puts 's5 :' + s5.inspect
-    s6 = table_to_html(s5)      
-    puts 's6 : ' + s6.inspect
+    s2 = filter_out_html(s, :code_block_to_html)
+    #puts 's2 : ' + s2.inspect
+    s3 = filter_out_html(s2, :ordered_list_to_html)
+    #puts 's3 : ' + s3.inspect
+    s4 = filter_out_html(s3, :unordered_list_to_html)
+    #puts 's4 : ' + s4.inspect
+    s5 = filter_out_html(s4, :dynarex_to_table)
+    #puts 's5 :' + s5.inspect
+    s6 = filter_out_html(s5, :table_to_html) 
+    #puts 's6 : ' + s6.inspect
     @to_html = s6
   end
 
@@ -105,6 +106,17 @@ class Martile
     end.join
 
   end  
+
+  def filter_out_html(s, name)
+
+    s.gsub(/<(\w+)>.*<\/\1>[^<]*|.+/m) do |x|
+
+      html = x[/<(\w+)>.*<\/\1>/]
+      plain_text = html ? ($') : x
+      s2 = plain_text.length > 0 ? self.method(name).call(plain_text.to_s) : ''
+      ($`).to_s + html.to_s + s2
+    end
+  end
   
   def ordered_list_to_html(s)
     list_to_html s, '#'
@@ -137,4 +149,5 @@ class Martile
     return s
   end
 
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   dxxPRWzHhWwDxwQSM9uhSReVj7QoO/gFoKZHmN7+/EhAwKMqI6IK1QwiXHhjaAJG
   NC9ItVKLmT+Y6rbeYcoXRv6i5t7GjD4m
   -----END CERTIFICATE-----
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle-builder