hlt 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb7466834814fe0e00f3272371a1d407b9fb73f2
-  data.tar.gz: 54fdb09907aff7bbf5910f2a075cd9a0632d54a6
+  metadata.gz: ecdfac33c7dda8c7efc1d37f99ec0ce904b2c2a9
+  data.tar.gz: a31cf0421054fbeaa6548211e8d6d31610928b49
 SHA512:
-  metadata.gz: 56ce1329ecd686e7168734f70858eeabfd1c7813a68c8400cfeb1a3f90d622b7f52f7cd64ed14c58e8fbbea596db3ba29f6c79b7cce48143f8dd0a8c04940657
-  data.tar.gz: 64579a2a9adebd0211907ab930da944bf74f815887645b5b3c8f142abd7ab312951590a1b02a2092f66434d06c2a6c226bccf0706a48cdbe6ee8c72fa518c914
+  metadata.gz: 4fd9248c8e7d6577b67f1ecac69d5b82149fde2e54b7213fd2db194b07ecf51816cd2b76704ad2b4a2d91d7fc9b1eef0d748adfbcad7c4827aed4bbcfba1d173
+  data.tar.gz: c44ee8b315879205696319316548c441d8d61d183f7f1e52b0367984f6c897fa54d9e233a31fe98847a445de16f0a11ca161e97238b7b310bf149fb17190d19d

data/lib/hlt.rb

@@ -105,14 +105,19 @@ class Hlt
 
   end
   
-  def render()
-    
+  def render(locals: {})
+
+    variables = locals.map do |key, value|
+      "#{key} = locals['#{key}']"
+    end
+
     s = "xml = RexleBuilder.new\n"
     s <<  scanbuild(@doc.to_a)
-    a = eval s
+
+    a = eval variables.join("\n") + "\n" + s
     
     Rexle.new(a).element('root/.').xml pretty: true
-    
+
   end
   
   def to_doc()
@@ -223,37 +228,59 @@ class Hlt
                %w{ th st nd rd th th th th th th }[n % 10] )
   end
   
-  # under development 04-Nov-2015
   
+  def v(x)
+
+    if x then
+      var = x[/^=\s+(.*)/,1]
+      var ? var : x.inspect
+    end
+    
+  end
+
   def scanbuild(x, indent=0)
 
     name, attributes, *remaining = x
-  
+
     children = remaining.shift
     text = ''
 
       
     if children.is_a? Array then
       nested = scanbuild(children, indent+1) 
-    else
+    elsif children
       text = children
     end
 
     pad = '  ' * indent
-    
+
+
     s2 = if children.is_a? Array then
-      "%sxml.%s(%s,%s) do\n%s" % [pad, name, attributes.to_s, text.inspect, nested]
+      if name == 'templatecode' then
+        "%s%s" % [pad, text]
+      else
+        "%sxml.%s(%s,%s) do\n%s" % \
+                                  [pad, name, attributes.to_s, v(text), nested]
+      end
     else
-      '  ' * indent + "xml.%s(%s,%s)" % [name, attributes.to_s, text.inspect]
+      if name == 'templatecode' then
+        "%s%s" % [pad, text]
+      else
+        '  ' * indent + "xml.%s(%s,%s)" % [name, attributes.to_s, v(text)]
+      end
     end
 
-    if remaining.any? and remaining[0].is_a? Array then
-      s2 << "\n" + scanbuild(remaining[0], indent+1) 
+    while remaining.any? do
+      children = remaining.shift
+      if children and children.is_a? Array then
+        s2 << "\n" + scanbuild(children, indent+1) 
+      end
     end
 
-    s2 << "\n%send" % [pad] if children.is_a?(Array)
+    s2 << "\n%send" % [pad] if children.is_a?(Array) or name == 'templatecode'
 
     s2
   end
 
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hlt
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - James Robertson