hlt 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe7f80ff3054de3be9e6ad0b980863475b1cfe846e469a9b652b05dd5bc1c8ff
-  data.tar.gz: ca2b70a31f12a7860a7c20e3ce1c808107f3dae148035c14a920f98fa0d2ea74
+  metadata.gz: 48ef4fe61faa5abb7df415fe54610141405c880325c0ab12e63cdf0d5d82887b
+  data.tar.gz: 27b5664cc8436b75db26e926c626e3da1c9727346e73e3cf9d8e6bc56c482ffe
 SHA512:
-  metadata.gz: 51caac2ea386985124fa3967ce26202ab0dade79f5c18602738f68fad2d077c954a62b3a2a2d2087c60654b8d50bb13fde6ff7882a8b3e32be916b9d8a25a57d
-  data.tar.gz: c9819e4c34b028f699400a963f32cc22db6e658eb96da284e091ab094f4ff90e250216c882e743cec8d17f4ddae66c4473c39c80ad0018eba342e5ec32fb8c9d
+  metadata.gz: 7ceb3873c51582d0b17bd87dbeaa0059ccb7659dc1c0d843690e52937c348d095fcc926363dcedebcb217e9b6b1446db9a513a2ff2af02bbde3ed17ca4dabe4a
+  data.tar.gz: 2a05a52b8e1b4be7108595396f5719824f9263bfbdda48c8a50cfe1a18b74610a1405e9059acc296fdd71e3e60702ce710f1b62e8e9806f453c61c5ae38fb501

data/lib/hlt.rb

@@ -12,16 +12,16 @@ class Hlt
 
   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)
@@ -34,16 +34,16 @@ class Hlt
     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
 
@@ -51,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(' ')
@@ -66,68 +66,71 @@ class Hlt
 
       r
     }
-    
+
     s2.unshift "root\n"
     s3 = s2.join.gsub(/^(\s*)-\s+/,'\1templatecode ').\
                                        gsub(/^(\s*)=\s+/,'\1templateoutput ')
 
     puts ('s3: ' + s3.inspect).debug if @debug
-    
+
     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| 
+    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).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).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|
@@ -138,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 = []
@@ -178,9 +181,9 @@ class Hlt
 
       n = s =~ /</
     end
-    
+
     [s, xml]
-    
+
   end
 
   def fetch_martile(raw_s)
@@ -200,13 +203,13 @@ class Hlt
     martile = []
 
     s2 = s.lines.map do |line|
-      
+
       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 = ''
@@ -214,27 +217,27 @@ 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] = ''
@@ -248,20 +251,20 @@ class Hlt
 
     [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)
@@ -271,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
@@ -299,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.3
+  version: 0.6.4
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwNDIyMTI1NzM1WhcN
-  MjAwNDIxMTI1NzM1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCoASEq
-  AFCQN84SfWink5sE/abq1gr0FSKE/B3791pPDPUJWGWSz/LsVUFdrQjyXr2qKnWc
-  RhThN7fTw4+CVfTdTts/7jp3zDvAgEabSKjwjFdM8gukq06ZCOfy1AE3G85cUeVE
-  dyIk8d63EDiQk/DkVDPFXnj/sbdvg6UnJq9Y1j7Xg4XD8jmkya/BlF6rvAB0jMMp
-  Jpf8sVJDzn7UAFATAEYx5qIeblGlsmoCC23exahclW8Ov2tyfx1HNBonc00DyswO
-  mWf546eVdvnY9zdGWlPYgB5NrNNWrai1FF6ogVRK4mlaaCJSSC49pxhS3kiXHllU
-  wg5ey4MyYLCg0xgZWlm1h1yyO4BY+BwSJco9z6TUsG3npp/uQUQTtGucma3McxoU
-  RoVzr6t3zLrF6B9ElKhjc5zFPMlthHoTvbMk7P4YFqlCNhumixRrYpzEIjebsy6w
-  54e/AeTOACY7j57Ir/ZU075idwLaycqwAjEElSQd9JQvEvc7LtsyO0EF5NUCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUYl5WCbPb
-  bN3pqLPkwjBDE7SfnaAwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  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
-  BgkqhkiG9w0BAQsFAAOCAYEAVLkUo4DhikdX5FihhTxCbaZSVRjwYANB20tvsUlv
-  aEK50lGseGySoaMPDvFNed03YOSnx8JephXi9iSgborJyarRdIH7c68LzSvtAL6x
-  HpazP7uPfOD91SwFIeFPab5wyYymi9g3frfPW/NhNpqXKACh/GD0Q6S/REVdI46I
-  vMLjWuO5Gowatr31VqzVFLDO2eNoENRH2lSOfwbzYsAJugKqaQVB2V1pbsatemlW
-  SpSnRNYlsjs3nK34YC7pPwK/Kk5AijMaf9E3yb8B0+lDxV63CsARs5YBsS9vbJ5I
-  3B8B04yJZt0F+gPBsa2UWzxeQOqwy8cm37IuUz7+3QAiooZaksIc8t8z9NQMC43g
-  ZU68dzjiF1T9xxwywptlJ53jTv8SPCpHQjWqKQvKPoQDnRDf/vxeMhCGWOxn9Nnj
-  JR7HLO1Kix+z5BF5wd5IpA16Z+fG8bIfbJy2r/33GHbSfFfAyUzCNXXkOjKNcxAj
-  hF/PZED/nIMabH86ci6/SaAr
+  BgkqhkiG9w0BAQsFAAOCAYEAQIQvhDYxcPIAvRlgmjxk7SDuZppb1WwAfFbYB9P5
+  YHxrokRZb4b/p0p2Jey7II44ik5t98lFDjkhqPuPph7oYJw5T06Z7FJAdudS68fh
+  G4qZ0Nh1A6HcQe9yGV0lYxr3rR6Fumk5nkb7Srq9pK8j8Vpkyjy4spIuks8egG2R
+  fU33f4/smPNubEk6m4qWSS+eE6p88uLC0nb0CzUfxPkn9LHO3dm692YZYLrZVHD9
+  y6hv9n0PgEpfRrvCFhCUoEQY6v7+49KEaQcHPzJXXgOUKZZUFy7ywxWgVMGvJpr1
+  edBjqd6rMwug+FAgXReYkqer0BRUIkbc6p9RWavsfV07JUcbYbO+dzZ27L9GXLmV
+  3oMnD+s3/Xvg8QBWtznvsPA4UmwNRK7iyjUGcT8rDIl2GZx3kM2I2DAgQ6kLKOKp
+  siUpSxLYLAnXUjn6nTDDJSkzsajG/UPWQCTPUsvEnJK6oyzAdcb83xZ56B05bA1e
+  PpVYUtAiq8MU2gnelzudj7EY
   -----END CERTIFICATE-----
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: martile
@@ -43,22 +43,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.8
+        version: 1.5.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Intended for building HTML from a kind of Slim template.