hlt 0.6.1 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7c84fd69fa082a907a0df5c140bd1cc3519dd0c7
-  data.tar.gz: ab6a2d8d68c17930659bb7326da904ce7c738ff5
+SHA256:
+  metadata.gz: 48ef4fe61faa5abb7df415fe54610141405c880325c0ab12e63cdf0d5d82887b
+  data.tar.gz: 27b5664cc8436b75db26e926c626e3da1c9727346e73e3cf9d8e6bc56c482ffe
 SHA512:
-  metadata.gz: e83dcfb9bfb9fc044fb463c7ccfedfd0b6d61756ac953be3f4a3867c12b7c793ec78e2f482550ec7b0680254a79de7989a8833af4833852e647428eb09ef8230
-  data.tar.gz: b8b5406e5838d29f87d0f06397328ed190f1c74cbf96aafd7a34ed4858257e3afb7a0be1b19c0bcb1c3de5255bb282e4e0c12ee7d23a8186d60b653e660eb7ec
+  metadata.gz: 7ceb3873c51582d0b17bd87dbeaa0059ccb7659dc1c0d843690e52937c348d095fcc926363dcedebcb217e9b6b1446db9a513a2ff2af02bbde3ed17ca4dabe4a
+  data.tar.gz: 2a05a52b8e1b4be7108595396f5719824f9263bfbdda48c8a50cfe1a18b74610a1405e9059acc296fdd71e3e60702ce710f1b62e8e9806f453c61c5ae38fb501

data/lib/hlt.rb

@@ -2,43 +2,48 @@
 
 # file: hlt.rb
 
+
 require 'martile'
-require 'line-tree'
 require 'rexle-builder'
 
 
 class Hlt
+  using ColouredText
 
   attr_reader :to_html, :to_doc
 
-  def initialize(raw_s, pretty: true, declaration: true, style: true, 
-                 debug: false)
-    
-        
+  def initialize(raw_s, pretty: true, declaration: true, style: true,
+                 nocomment: true,  debug: false)
+
+
+    @debug = debug
     # 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, martile = fetch_martile raw_s
+    puts 'martile: ' + martile.inspect if @debug
     s, xml_list = filter_xml(s2)
 
     #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_code = s.scan(/^\[([^\]]+)\]\n/).map(&:first)
-    s.gsub!(/\n\[[^\]]+\]\n/, " !CODE\n")
+    puts ('s: ' + s.inspect).debug if @debug
+    a_code = s.scan(/^\[([^\]]+)\]\B/).map(&:first)
+    puts ('a_code: ' + a_code.inspect).debug if @debug
+    s.gsub!(/\n\[[^\]]+\]\B/, " !CODE\n")
 
-    s2 = s.lines.to_a.map!{|line| 
+    s2 = s.lines.to_a.map!{|line|
 
       hash = "(\s*\{[^\}]+\})?"
-                          
+
       line.prepend '  '
 
       line.sub!(/^(\s*)\w+: /,'\0' + "\n" + '\1')
-                          
-      r = 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
 
@@ -46,7 +51,7 @@ class Hlt
         tag = x[/(^\s*\w*)[#\.]/,1] || 'div'
         tag += 'div' if tag.strip.empty?
 
-        x.sub(/(?:\.\w+){1,}/) do |x2|          
+        x.sub(/(?:\.\w+){1,}/) do |x2|
           a = x2[/(?:\.\w+){1,}/].split('.')
           a.shift
           a2 << "class: '%s'" % a.join(' ')
@@ -61,65 +66,71 @@ class Hlt
 
       r
     }
-    
+
     s2.unshift "root\n"
     s3 = s2.join.gsub(/^(\s*)-\s+/,'\1templatecode ').\
                                        gsub(/^(\s*)=\s+/,'\1templateoutput ')
 
-    raw_html = LineTree.new(s3, ignore_non_element: false).to_xml
+    puts ('s3: ' + s3.inspect).debug if @debug
 
-    html = raw_html.gsub('!CODE').with_index do |x,i| 
+    raw_html = LineTree.new(*s3, ignore_non_element: false, debug: debug).to_xml
+    puts ('raw_html: ' + raw_html.inspect).debug if @debug
+
+    html = raw_html.gsub('!CODE').with_index do |x,i|
       "\n\n" + a_code[i].lines.map{|x| ' ' * 4 + x}.join + "\n"
     end
 
     martile.each.with_index do |x,i|
-      
+
       if @debug then
-        puts 'i: ' + i.inspect
-        puts 'x: ' + x.inspect
-        puts 'html: ' + html.inspect
+        puts ('i: ' + i.inspect).debug
+        puts ('x: ' + x.inspect).debug
+        puts ('html: ' + html.inspect).debug
       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
-    
+
+    puts ('html_: ' + html.inspect).debug if @debug
+
     doc = Rexle.new(html)
-    
+
     xml_list.each.with_index do |xml,i|
       e = doc.root.element('//xml:' + i.to_s)
       e.insert_before Rexle.new(xml).root
       e.delete
     end
-    
+
     # remove the style attributes from the document if style == false
     #
     if style == false then
-      doc.root.xpath('//.[@style]').each do |e| 
+      doc.root.xpath('//.[@style]').each do |e|
         unless e.attributes[:style][/^clear:/] then
-          e.attributes.delete :style 
+          e.attributes.delete :style
         end
       end
-    end    
-    
-    
+    end
+
+
     @doc = doc
     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")
-    comment = "\n  <!-- Generated by Hlt-site_builder on the %s -->\n" % timestamp
 
-    html.sub!(/(?=<\/html>)/, comment)
+    unless nocomment
+      comment = "\n  <!-- Generated by Hlt-site_builder on the %s -->\n" % timestamp
+      html.sub!(/(?=<\/html>)/, comment)
+    end
+
     @to_html = html
 
   end
-  
+
   def render(locals: {})
 
     variables = locals.map do |key, value|
@@ -130,24 +141,24 @@ class Hlt
     s <<  scanbuild(@doc.to_a)
 
     a = eval variables.join("\n") + "\n" + s
-    
+
     Rexle.new(a).element('root/.')
 
   end
-  
+
   def to_doc()
     @doc
   end
-  
+
   private
-  
+
   def filter_xml(s)
-    
+
     n = s =~ /</
     return [s,[]] unless n
-  
+
     end_pos = s.length - (s =~ />[^>]+$/)
-    
+
 
     i = 0
     xml = []
@@ -170,9 +181,9 @@ class Hlt
 
       n = s =~ /</
     end
-    
+
     [s, xml]
-    
+
   end
 
   def fetch_martile(raw_s)
@@ -192,13 +203,13 @@ class Hlt
     martile = []
 
     s2 = s.lines.map do |line|
-      
-      puts 'line: ' + line.inspect if @debug
-      
+
+      puts ('line: ' + line.inspect).debug if @debug
+
       if state == :martile then
-        
+
         spaces = line[/^\s+/].to_s.length
-        
+
         if spaces > md_spaces then
           martile[index] << line[(md_spaces + 2)..-1]
           line = ''
@@ -206,54 +217,54 @@ class Hlt
           martile[index].strip!
           index += 1
           state = :default
-          
+
           r = line[/^(\s+)martile:/,1]
 
-          if r then  
+          if r then
 
-            state = :martile 
-            md_spaces = r.length    
+            state = :martile
+            md_spaces = r.length
 
             line.sub!(/mar(kdown|tile):/,'\0' + index.to_s)
             martile[index] = ''
           end
-        end                
+        end
 
       else
 
         r = line[/^(\s+)mar(kdown|tile):/,1]
 
-        if r then  
+        if r then
 
-          state = :martile 
-          md_spaces = r.length    
+          state = :martile
+          md_spaces = r.length
           line.sub!(/mar(kdown|tile):/,'\0' + index.to_s)
 
           martile[index] = ''
         end
       end
 
-      puts 'line: ' + line.inspect
+      puts ('line: ' + line.inspect).debug if @debug
       line
 
     end
 
     [s2.join, martile]
   end
-  
+
   def ordinalize(n)
-    n.to_s + ( (10...20).include?(n) ? 'th' : 
+    n.to_s + ( (10...20).include?(n) ? 'th' :
                %w{ th st nd rd th th th th th th }[n % 10] )
   end
-  
-  
+
+
   def v(x)
 
     if x then
       var = x[/^=\s+(.*)/,1]
       var ? var : x.inspect
     end
-    
+
   end
 
   def scanbuild(x, indent=0)
@@ -263,9 +274,9 @@ class Hlt
     children = remaining.shift
     text = ''
 
-      
+
     if children.is_a? Array then
-      nested = scanbuild(children, indent+1) 
+      nested = scanbuild(children, indent+1)
     elsif children
       text = children
     end
@@ -291,7 +302,7 @@ class Hlt
     while remaining.any? do
       children = remaining.shift
       if children and children.is_a? Array then
-        s2 << "\n" + scanbuild(children, indent+1) 
+        s2 << "\n" + scanbuild(children, indent+1)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hlt
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.4
 platform: ruby
 authors:
 - James Robertson
@@ -10,90 +10,55 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMjEwMDAxMzQ2WhcN
-  MTkwMjEwMDAxMzQ2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1DKcr
-  ZJqTkN/2W8tQkpcSqw/2qdUkMKcDXPHPdb3KYRNkfBaf3GUdzxpeRMIypqJdLLbQ
-  dmMJ/TTdWuU2Natuo+maUfe3KYjNyF50sFNoUK+3vsjNgPdu41sUS4YYbeAf5LJU
-  i70OLumscEqQjkLT/+AaeY2BMIhy7Q72aFRfogBpyE4MMm1UUOMbUhIf+8r+hkJr
-  Yo98xe4YrMEuvBFYSUYGIrLGIK7PT/ieMDiMpq6YuhXON8xsA2BM8Ka+dn5TsXyI
-  pLAtHuTP+znsbEdVqwPD9GOAOvs/ShD9vyzpHEoRfs3WDuSlpzM58+qgJWgs9upv
-  vBKIGFKyfrs4pkRxAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFNL5Tu/AFptXATDkCWJ77vlCEaYmMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAE91DAZ7Ro/8NT3FjK0U
-  RVGzA5HwMJT7MqIcDYbriiakBOmYKfZP2Ai89OkKEb65rj8bTff3glxSacrrm4EI
-  vQqLX3X18CnEsnhUXNu6CKsiwBqya8QHa+hhWVPvN45BBQu3QJxEZH9b8cZQd2bm
-  WiKfVXqlQK09eoozx+ruGoma0mRCC1ss8BCEJVqxGXRx0iKtia8llJN80ITt5elK
-  F1tUlULjsrCnaho1orlXyk1R9Uherdfq+NjW3SWHWz45dWW99Ezn9PhuTdRAQpg/
-  sRlrGDTopksgnOiLC2QX128tctCCXvdHQlcLPOIqakOkwdqA+fWvzX/vBL+R3LDJ
-  dgw=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwNDA2MTUyODQ3WhcN
+  MjMwNDA2MTUyODQ3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCk7o70
+  ZqZrzvVBcLuB90CxEk97gJh05MkB0Xg9yB8oJquZSV18OQa+FHJGM8hQ4qvzH/R/
+  sbRLA2z3qqRTHJ/nDlioEJj8j1a3M+ewYmBpeBl2i5qq1PJQPLHtXDjezEv8hKFF
+  /xFqXJlQADr9DpAtYif/SFHQasMZvBbxlCBzNKD6sTBFTKsXPKDoQYwjT8JJf4ID
+  vBeHs3RIG/puUa46g3Rng/P1s0/dL9wJdvJKHbm8Zv/3XkCk2IMcpCdmEz8kDzDn
+  Xit4kK8IegvjmmV33uazZWHYiAU9FyI3PYGU2tKE2IDgAGYCTTDgbZ88bmMaCjIC
+  NYWm3bXOiE3LlOBxzT4bCexiJQL7B+MQN2t5XncO1l3YmbflC+YmeM5ZAo8TIx14
+  W0hs0wdG0vHiBAROV3mihDu0TxCNny/Ojtb4IyP7amylWPnEKwueCH7457oiWw4t
+  ckw1F/2Np2RwhTk9Zm7bJdwmBAq6tfwyuYF605k+K0xbQtXr8M5MFAh94G8CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUdPQbCMGB
+  WvkRRcebFanOZUnn/9MwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAQIQvhDYxcPIAvRlgmjxk7SDuZppb1WwAfFbYB9P5
+  YHxrokRZb4b/p0p2Jey7II44ik5t98lFDjkhqPuPph7oYJw5T06Z7FJAdudS68fh
+  G4qZ0Nh1A6HcQe9yGV0lYxr3rR6Fumk5nkb7Srq9pK8j8Vpkyjy4spIuks8egG2R
+  fU33f4/smPNubEk6m4qWSS+eE6p88uLC0nb0CzUfxPkn9LHO3dm692YZYLrZVHD9
+  y6hv9n0PgEpfRrvCFhCUoEQY6v7+49KEaQcHPzJXXgOUKZZUFy7ywxWgVMGvJpr1
+  edBjqd6rMwug+FAgXReYkqer0BRUIkbc6p9RWavsfV07JUcbYbO+dzZ27L9GXLmV
+  3oMnD+s3/Xvg8QBWtznvsPA4UmwNRK7iyjUGcT8rDIl2GZx3kM2I2DAgQ6kLKOKp
+  siUpSxLYLAnXUjn6nTDDJSkzsajG/UPWQCTPUsvEnJK6oyzAdcb83xZ56B05bA1e
+  PpVYUtAiq8MU2gnelzudj7EY
   -----END CERTIFICATE-----
-date: 2018-02-10 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: line-tree
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.3
-- !ruby/object:Gem::Dependency
-  name: rexle-builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 1.5.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -118,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Intended for building HTML from a kind of Slim template.