hlt 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecdfac33c7dda8c7efc1d37f99ec0ce904b2c2a9
-  data.tar.gz: a31cf0421054fbeaa6548211e8d6d31610928b49
+  metadata.gz: b0e0fa086282bc3b41011326708ebf5cb7d090f8
+  data.tar.gz: 865673de04ddd2a3ca6066d1adf29ce665793eb3
 SHA512:
-  metadata.gz: 4fd9248c8e7d6577b67f1ecac69d5b82149fde2e54b7213fd2db194b07ecf51816cd2b76704ad2b4a2d91d7fc9b1eef0d748adfbcad7c4827aed4bbcfba1d173
-  data.tar.gz: c44ee8b315879205696319316548c441d8d61d183f7f1e52b0367984f6c897fa54d9e233a31fe98847a445de16f0a11ca161e97238b7b310bf149fb17190d19d
+  metadata.gz: 64524ffdfe4e9012e7b42b0291167fe15b1461a66ceca17a44da4e8de15455b99f2cd66ae926d0a1a77fe507cd24854b056c5514190347d0dcf1adb405fb4fdf
+  data.tar.gz: 64afc025ef3c7958519b56796168e1cc30b7749c5afcbcb0aaa814c2aceff54290c7311a513aeb556808065b7742f8db7f71ccee73e490b174d5a90676112d17

data/lib/hlt.rb

@@ -2,10 +2,11 @@
 
 # file: hlt.rb
 
+require 'kramdown'
 require 'line-tree'
-require 'rdiscount'
 require 'rexle-builder'
 
+
 class Hlt
 
   attr_reader :to_html, :to_doc
@@ -64,6 +65,7 @@ class Hlt
     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
 
     html = raw_html.gsub('!CODE').with_index do |x,i| 
@@ -71,7 +73,7 @@ class Hlt
     end
 
     markdown.each.with_index do |x,i|
-      html.sub!(/<markdown:#{i}\/>/, RDiscount.new(x).to_html
+      html.sub!(/<markdown:#{i.to_s}\/>/, Kramdown::Document.new(x).to_html
         .gsub(/<(\w+)>{style:\s*['"]([^'"]+)[^\}]+\}/,'<\1 style=\'\2\'>'))
     end
     
@@ -116,7 +118,7 @@ class Hlt
 
     a = eval variables.join("\n") + "\n" + s
     
-    Rexle.new(a).element('root/.').xml pretty: true
+    Rexle.new(a).element('root/.')
 
   end
   
@@ -177,7 +179,7 @@ class Hlt
     markdown = []
 
     s2 = s.lines.map do |line|
-      
+            
       if state == :markdown then
         
         spaces = line[/^\s+/].to_s.length
@@ -210,8 +212,8 @@ class Hlt
 
           state = :markdown 
           md_spaces = r.length    
-
           line.sub!(/markdown:/,'\0' + index.to_s)
+
           markdown[index] = ''
         end
       end
@@ -283,4 +285,4 @@ class Hlt
   end
 
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hlt
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,27 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MTEwMzEyMTY0N1oXDTE2MTEwMjEyMTY0N1owSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAJJlXldK1EvaQdN9Ka1+yWLCIZw1x/FYwHuFEnysnLyv4rf7nJK1YSnjmycv
-  567qDFqM2KBJrc5O1KCCaMa9W1pigE9D8d2BoCrB+0O4P5bmvNVuSibt1x86Cnsf
-  QMpXbbKx0j4cDuW5f0Q+D1qJx/e5XopEm7Huecq216uN6nxRj+cmFbWCbjNcFTY7
-  PipPv+MTgDle+SDRvjkNL/4F7KvONj+3JpVbiLYcKlIRP3lqBm7bK448Uvlag6ft
-  IPRAN2j4FTU6SpsNZWvNzf4S8MpwvG0LAwhf4kZvsZjQUOD4x6qpdtqKMitcLrMl
-  ZE2NkSXwXm9eAWs1CBG9uDPL/h0CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUUz4MxG8tgu1wDHxZaZldTB8DR4wwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAXLp2Xj8Y
-  FghFB/IPEJrFmXISSqHQmDc9G4RbxNHkdgvuUJAcaqHWpn5YsdfWKjeS+BquHOBl
-  TZWqYkuXvZR1gRtexrHp6nUFvDqocuHWBIDCrdp8LPePXyI+6U8oHRgEF3ly/28N
-  AJqkegyN2kmrJg54NQetN3NSpK2s21nI3ijQqgtwQlVl/M+tlITrZl5F7FmrYNZE
-  BxkGYj7KywRu8O8GaKwZW3sbSK9ISLBMisjyb3LjhYiG4EOG88YOoJBpfXwK0sCA
-  N3HzwT7MWhAYJMZarxR3Ex/3IaAB+NtAHcEtSB7E/q26iMAybB6QTR4W4RTD+5t0
-  cbGTR3O9WFjg/w==
+  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=
   -----END CERTIFICATE-----
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2018-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -39,62 +38,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.7.1
+        version: 1.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.16'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.7.1
+        version: 1.16.2
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.7
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -120,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Intended for building an HTML page from a kind of a Slim template
+summary: Intended for building HTML from a kind of Slim template.
 test_files: []