hlt 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8a56a470b40740138cbbbc5e5cc6be96edd052f
-  data.tar.gz: 6d3a53d17ff4d38482dd9762989587312e9c52d1
+SHA256:
+  metadata.gz: fe7f80ff3054de3be9e6ad0b980863475b1cfe846e469a9b652b05dd5bc1c8ff
+  data.tar.gz: ca2b70a31f12a7860a7c20e3ce1c808107f3dae148035c14a920f98fa0d2ea74
 SHA512:
-  metadata.gz: 1d9da6de1544708247a5aa062f384c6e0b389f789fb5c804ae591094b6b2b51afe452b721495eb4b8ebe2a476446b50a3f84e5f75475d1c4be63e4364bce2fce
-  data.tar.gz: 59b1d73d13a3e1c45f32fc8258e0f7f63b50268a7d3610840c02324fe01fe41cea945311120f9228cb7e6e216579ccd401cbed893d822f0c9cc18db371024a86
+  metadata.gz: 51caac2ea386985124fa3967ce26202ab0dade79f5c18602738f68fad2d077c954a62b3a2a2d2087c60654b8d50bb13fde6ff7882a8b3e32be916b9d8a25a57d
+  data.tar.gz: c9819e4c34b028f699400a963f32cc22db6e658eb96da284e091ab094f4ff90e250216c882e743cec8d17f4ddae66c4473c39c80ad0018eba342e5ec32fb8c9d

data/lib/hlt.rb

@@ -2,12 +2,13 @@
 
 # file: hlt.rb
 
+
 require 'martile'
-require 'line-tree'
 require 'rexle-builder'
 
 
 class Hlt
+  using ColouredText
 
   attr_reader :to_html, :to_doc
 
@@ -28,9 +29,9 @@ class Hlt
     #s = raw_s
     # strip out the text from the line containing a comment
     s.gsub!(/((^#\s|\s#\s).*)/,'').strip if s[/((^#\s|\s#\s).*)/]
-    puts 's: ' + s.inspect if @debug
+    puts ('s: ' + s.inspect).debug if @debug
     a_code = s.scan(/^\[([^\]]+)\]\B/).map(&:first)
-    puts 'a_code: ' + a_code.inspect if @debug
+    puts ('a_code: ' + a_code.inspect).debug if @debug
     s.gsub!(/\n\[[^\]]+\]\B/, " !CODE\n")
 
     s2 = s.lines.to_a.map!{|line| 
@@ -70,10 +71,10 @@ class Hlt
     s3 = s2.join.gsub(/^(\s*)-\s+/,'\1templatecode ').\
                                        gsub(/^(\s*)=\s+/,'\1templateoutput ')
 
-    puts 's3: ' + s3.inspect if @debug
+    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 if @debug
+    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"
@@ -82,9 +83,9 @@ class Hlt
     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(\
@@ -93,7 +94,7 @@ class Hlt
                   '<\1 style=\'\2\'>'))
     end
     
-    puts 'html_: ' + html.inspect if @debug
+    puts ('html_: ' + html.inspect).debug if @debug
     
     doc = Rexle.new(html)
     
@@ -200,7 +201,7 @@ class Hlt
 
     s2 = s.lines.map do |line|
       
-      puts 'line: ' + line.inspect if @debug
+      puts ('line: ' + line.inspect).debug if @debug
       
       if state == :martile then
         
@@ -240,7 +241,7 @@ class Hlt
         end
       end
 
-      puts 'line: ' + line.inspect if @debug
+      puts ('line: ' + line.inspect).debug if @debug
       line
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hlt
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,88 +10,53 @@ 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
+  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
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAVLkUo4DhikdX5FihhTxCbaZSVRjwYANB20tvsUlv
+  aEK50lGseGySoaMPDvFNed03YOSnx8JephXi9iSgborJyarRdIH7c68LzSvtAL6x
+  HpazP7uPfOD91SwFIeFPab5wyYymi9g3frfPW/NhNpqXKACh/GD0Q6S/REVdI46I
+  vMLjWuO5Gowatr31VqzVFLDO2eNoENRH2lSOfwbzYsAJugKqaQVB2V1pbsatemlW
+  SpSnRNYlsjs3nK34YC7pPwK/Kk5AijMaf9E3yb8B0+lDxV63CsARs5YBsS9vbJ5I
+  3B8B04yJZt0F+gPBsa2UWzxeQOqwy8cm37IuUz7+3QAiooZaksIc8t8z9NQMC43g
+  ZU68dzjiF1T9xxwywptlJ53jTv8SPCpHQjWqKQvKPoQDnRDf/vxeMhCGWOxn9Nnj
+  JR7HLO1Kix+z5BF5wd5IpA16Z+fG8bIfbJy2r/33GHbSfFfAyUzCNXXkOjKNcxAj
+  hF/PZED/nIMabH86ci6/SaAr
   -----END CERTIFICATE-----
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2019-04-22 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.7
-  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.7
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: rexle-builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 1.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.7
+        version: 1.1.8
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -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.0.1
 signing_key: 
 specification_version: 4
 summary: Intended for building HTML from a kind of Slim template.