hlt 0.1.11 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92eee83d9a2c6260c28978ee46751505c850a577
-  data.tar.gz: ec03bab4c6335cb5294088a9764339108bb3a4fb
+  metadata.gz: 9bb51ca55833a336cde7a8ea1994202d0a1a117d
+  data.tar.gz: f8a6a92377d845860f1b3b968d65e0caef6ba0b7
 SHA512:
-  metadata.gz: c1e832c6a3d400e8e0e9637a17babdb006557b99c80349854e0d16100f576843929404bac00709b489a2bbe114fe1a9456441d8cc836fcaa73f161d62cfbf7a8
-  data.tar.gz: 45bde2628a415aa0adf2b6d39bc1617dcc889425bda7e273e94a58894b278f039d343eb03157258440935701a7a3312b7c518ea91dd6e3593cbc24e30d051e73
+  metadata.gz: bcd42b24d1f384bcd8318a7435b02dd9d2791eb4012f15d40f73758972dd9ee2f8589318eb448f0aaa9fb66449a7cff61889b794bb65f2110b7ef9320c30bf8e
+  data.tar.gz: 767373f23ffda3ac1a6bfa8e69f99bee04bb6e7400f7a4de5e4af7984b0df2be877a5c66a857bcfc9fb1f58cde6948335180b3827d1af135e30618cf2b2c1031

data/lib/hlt.rb

@@ -3,6 +3,7 @@
 # file: hlt.rb
 
 require 'line-tree'
+require 'rdiscount'
 
 class Hlt
 
@@ -12,23 +13,24 @@ class Hlt
 
     # strip out lines which are blank or only contain a comment
     #s = raw_s.lines.to_a.reject!{|x| x[/(^\s+\#\s)|(^\s*$)/] }
-    s = raw_s
 
+    s, markdown = fetch_markdown raw_s
+    #s = raw_s
     # strip out the text from the line containing a comment
     s.gsub!(/((^#\s|\s#\s).*)/,'').strip if s[/((^#\s|\s#\s).*)/]
-    a = s.scan(/^\[([^\]]+)\]\n/).map(&:first)
+    a_code = s.scan(/^\[([^\]]+)\]\n/).map(&:first)
     s.gsub!(/\n\[[^\]]+\]\n/, " !CODE\n")
 
     s2 = s.lines.to_a.map!{|line| 
 
       hash = "(\s+\{[^\}]+\})?"
-      line.sub(/^\s+(\w+)?(?:[\.#]\w+){1,}#{hash}/) do |x| 
+      r = line.sub(/^\s+(\w+)?(?:[\.#]\w+){1,}#{hash}/) do |x| 
 
         raw_attrs = x.slice!(/\{.*\}/)
         attrs = raw_attrs[1..-2] if raw_attrs
 
         a2 = []
-        tag = x[/((?:^|\s+)\w*)#/,1] || 'div'
+        tag = x[/(^\s*\w*)[#\.]/,1] || 'div'
         tag += 'div' if tag.strip.empty?
 
         x.sub(/(?:\.\w+){1,}/) do |x2|
@@ -43,13 +45,73 @@ class Hlt
         "%s {%s}" % [tag, a2.join(', ')]
 
       end
+
+      r
     }.join
 
+
     raw_html = LineTree.new(s2).to_xml
+
     html = raw_html.gsub('!CODE').with_index do |x,i| 
-      "\n\n" + a[i].lines.map{|x| ' ' * 4 + x}.join + "\n"
+      "\n\n" + a_code[i].lines.map{|x| ' ' * 4 + x}.join + "\n"
     end
+
+    markdown.each.with_index do |x,i|
+      html.sub!(/<markdown:#{i}\/>/, RDiscount.new(x).to_html)
+    end
+
     @to_html = Rexle.new(html).xml pretty: true
+
+  end
+
+  def fetch_markdown(raw_s)
+
+    # any lines which are in the context of markdown which only contain
+    # a new line character will have spaces inserted into them
+
+    prev_line = ''
+    s = raw_s.lines.map {|line|
+      line = prev_line + "\n" if line == "\n"
+      prev_line = line[/^\s+/]
+      line
+    }.join
+
+    index, spaces, md_spaces = 0, 0, 0
+    state = :default
+    markdown = []
+
+    s2 = s.lines.map do |line|
+
+      if state == :markdown then
+        spaces = line[/^\s+/].to_s.length
+        if spaces > md_spaces then
+          markdown[index] << line[(md_spaces + 2)..-1]
+          line = ''
+        else
+          markdown[index].strip!
+          index += 1
+          state = :default
+        end
+
+      else
+
+        r = line[/^(\s+)markdown:/,1]
+
+        if r then  
+
+          state = :markdown 
+          md_spaces = r.length    
+
+          line.sub!(/markdown:/,'\0' + index.to_s)
+          markdown[index] = ''
+        end
+      end
+
+      line
+
+    end
+
+    [s2.join, markdown]
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hlt
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -29,7 +29,7 @@ cert_chain:
   WLDjnwWJij3s1n0smA0epN35TNfBPwBuMix0lFvcsZD+rLm3Q/VpL11uc8WftPB8
   AjmkUd4GsuVwySXdl57hm+F/UhshciKo
   -----END CERTIFICATE-----
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -45,6 +45,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  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: []