hlt 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e0fa086282bc3b41011326708ebf5cb7d090f8
-  data.tar.gz: 865673de04ddd2a3ca6066d1adf29ce665793eb3
+  metadata.gz: 7c84fd69fa082a907a0df5c140bd1cc3519dd0c7
+  data.tar.gz: ab6a2d8d68c17930659bb7326da904ce7c738ff5
 SHA512:
-  metadata.gz: 64524ffdfe4e9012e7b42b0291167fe15b1461a66ceca17a44da4e8de15455b99f2cd66ae926d0a1a77fe507cd24854b056c5514190347d0dcf1adb405fb4fdf
-  data.tar.gz: 64afc025ef3c7958519b56796168e1cc30b7749c5afcbcb0aaa814c2aceff54290c7311a513aeb556808065b7742f8db7f71ccee73e490b174d5a90676112d17
+  metadata.gz: e83dcfb9bfb9fc044fb463c7ccfedfd0b6d61756ac953be3f4a3867c12b7c793ec78e2f482550ec7b0680254a79de7989a8833af4833852e647428eb09ef8230
+  data.tar.gz: b8b5406e5838d29f87d0f06397328ed190f1c74cbf96aafd7a34ed4858257e3afb7a0be1b19c0bcb1c3de5255bb282e4e0c12ee7d23a8186d60b653e660eb7ec

data/lib/hlt.rb

@@ -2,7 +2,7 @@
 
 # file: hlt.rb
 
-require 'kramdown'
+require 'martile'
 require 'line-tree'
 require 'rexle-builder'
 
@@ -11,16 +11,16 @@ class Hlt
 
   attr_reader :to_html, :to_doc
 
-  def initialize(raw_s, options={})
+  def initialize(raw_s, pretty: true, declaration: true, style: true, 
+                 debug: false)
     
-    opt = {pretty: true, declaration: true, style: true}.merge(options)
         
     # strip out lines which are blank or only contain a comment
     #s = raw_s.lines.to_a.reject!{|x| x[/(^\s+\#\s)|(^\s*$)/] }
     
     raw_s.strip!
         
-    s2, markdown = fetch_markdown raw_s
+    s2, martile = fetch_martile raw_s
     s, xml_list = filter_xml(s2)
 
     #s = raw_s
@@ -72,11 +72,22 @@ class Hlt
       "\n\n" + a_code[i].lines.map{|x| ' ' * 4 + x}.join + "\n"
     end
 
-    markdown.each.with_index do |x,i|
-      html.sub!(/<markdown:#{i.to_s}\/>/, Kramdown::Document.new(x).to_html
-        .gsub(/<(\w+)>{style:\s*['"]([^'"]+)[^\}]+\}/,'<\1 style=\'\2\'>'))
+    martile.each.with_index do |x,i|
+      
+      if @debug then
+        puts 'i: ' + i.inspect
+        puts 'x: ' + x.inspect
+        puts 'html: ' + html.inspect
+      end
+      
+      html.sub!(/<mar(tile|kdown):#{i.to_s}\/>/, RDiscount.new(\
+                  Martile.new(x).to_s).to_html\
+            .gsub(/<(\w+)>\s*{style:\s*['"]([^'"]+)[^\}]+\}/,\
+                  '<\1 style=\'\2\'>'))
     end
     
+    puts 'html_: ' + html.inspect if @debug
+    
     doc = Rexle.new(html)
     
     xml_list.each.with_index do |xml,i|
@@ -85,7 +96,9 @@ class Hlt
       e.delete
     end
     
-    if opt[:style] == false then
+    # remove the style attributes from the document if style == false
+    #
+    if style == false then
       doc.root.xpath('//.[@style]').each do |e| 
         unless e.attributes[:style][/^clear:/] then
           e.attributes.delete :style 
@@ -94,9 +107,9 @@ class Hlt
     end    
     
     
-    #html = doc.xml opt
     @doc = doc
-    html = doc.root.xpath('*'){|x| x.xml opt}.join("\n")
+    h = {declaration: declaration, pretty: pretty, style: style}
+    html = doc.root.xpath('*'){|x| x.xml(h)}.join("\n")
     
     time = Time.now
     timestamp = time.strftime("#{ordinalize(time.day)} %B %Y @ %H:%M")
@@ -162,9 +175,9 @@ class Hlt
     
   end
 
-  def fetch_markdown(raw_s)
+  def fetch_martile(raw_s)
 
-    # any lines which are in the context of markdown which only contain
+    # any lines which are in the context of martile which only contain
     # a new line character will have spaces inserted into them
 
     prev_line = ''
@@ -176,53 +189,56 @@ class Hlt
 
     index, spaces, md_spaces = 0, 0, 0
     state = :default
-    markdown = []
+    martile = []
 
     s2 = s.lines.map do |line|
-            
-      if state == :markdown then
+      
+      puts 'line: ' + line.inspect if @debug
+      
+      if state == :martile then
         
         spaces = line[/^\s+/].to_s.length
         
         if spaces > md_spaces then
-          markdown[index] << line[(md_spaces + 2)..-1]
+          martile[index] << line[(md_spaces + 2)..-1]
           line = ''
         else
-          markdown[index].strip!
+          martile[index].strip!
           index += 1
           state = :default
           
-          r = line[/^(\s+)markdown:/,1]
+          r = line[/^(\s+)martile:/,1]
 
           if r then  
 
-            state = :markdown 
+            state = :martile 
             md_spaces = r.length    
 
-            line.sub!(/markdown:/,'\0' + index.to_s)
-            markdown[index] = ''
+            line.sub!(/mar(kdown|tile):/,'\0' + index.to_s)
+            martile[index] = ''
           end
         end                
 
       else
 
-        r = line[/^(\s+)markdown:/,1]
+        r = line[/^(\s+)mar(kdown|tile):/,1]
 
         if r then  
 
-          state = :markdown 
+          state = :martile 
           md_spaces = r.length    
-          line.sub!(/markdown:/,'\0' + index.to_s)
+          line.sub!(/mar(kdown|tile):/,'\0' + index.to_s)
 
-          markdown[index] = ''
+          martile[index] = ''
         end
       end
 
+      puts 'line: ' + line.inspect
       line
 
     end
 
-    [s2.join, markdown]
+    [s2.join, martile]
   end
   
   def ordinalize(n)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hlt
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - James Robertson
@@ -53,25 +53,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.4
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: martile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: 0.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.16.2
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1 +1,2 @@
-oûi��ْ,�[;��u�Ee>>�S,j���Y�.!���]� �F=�ނ�#�G�P�!�Hɀp]����o�sq5��c�΃b9�%���k�i�8��� ��?ޒ���w"MBׄ����P�GĒho�U$�j�,6){7�fF��\���;��QS���	 �z�͎��g$Ϊ��c�퓿Du�pՎ�K�_jQi���ژ��;)��ӱ۪,�V3�P��8��1�e��O—E1[�"7��|,T
+�;��UQ��G��O���@�U���!�-61���B%?RE����k��/�Lj����7���,
�T�$m�]�˨��iWςN�-+����(�}a�ۅ�H�����؇���Kw�U���'�Hw�c�ufM�Y��D��xö��}�D�x�@.T{���R��RSQI��أӜ	�CV�n���)[7�_��|�m�K%΍v�gN�p?������ڨ��+
+���Ù�����;!c�ѦiV������q�M