weblet 0.3.0 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a554a34daec79c81fca1f25d822c6d0ceb784f9e86b8420cd6fada8372057995
-  data.tar.gz: 22ba08494032e5b230e5837baab8c821b23321a3d4cb91b507fe99ca6afa0fd2
+  metadata.gz: e27f4831158495cbf179b607ccb378ae7a966d27abf52cb62a2381d45efcbf43
+  data.tar.gz: c9e3288adb19d3b9f01288932e852970cfb7ab86922ef8fce7de7e61db7af530
 SHA512:
-  metadata.gz: e665e8e8b68bd5fb7de8020b5f648087e4d8abeaf8580118a1f2ea786820dd69f359252ed51a502e171b9b59d9f3928f1ec457502e8eb5e9c52e1c15c632c917
-  data.tar.gz: be1d18c638b4628bfad7da54e717d476df9b339dc74233f08efa03dc5ca6ddc7ec42b0e377d97197c4dc85f8e04c911073fe817f20e44eed965e83b01791aae6
+  metadata.gz: 8b61a25a7e5c1a44e1949f99fa040a1be54e6c534d358de2dda6deee1d5f8353adf4a59405e7eb581e7ee4ce05f4baf34c773b61e3591ecc3e62095df7addec8
+  data.tar.gz: 65fd2f1ed959b189c87fd630fef8284db76e4d242ce95f5bd038ce9cc22082e14a080009fb9c2cac29fe2f7d71b79ad8cbd3344fee069265cf922121366af535

data/lib/weblet.rb

@@ -49,9 +49,21 @@ class WebletBuilder
       
       puts 'x: ' + x.inspect if @debug
       
-      if x[0].is_a? String then
+      if x.is_a? String then
+        
+        head, body = x.split("\n", 2)
+        puts 'head: ' + head.inspect if @debug
+        puts 'body: ' + body.inspect if @debug
+        puts 'marker: ' + @marker.inspect if @debug
+        
+        [:node, {id: head[/#{@marker}(\w+)/,1]}, '',['![', {}, body.strip]]
+        
+      elsif x[0].is_a? String 
         
         head, body = x[0].split("\n", 2)
+        puts 'body: ' + body.inspect if @debug
+        puts 'marker: ' + @marker.inspect if @debug
+        
         [:node, {id: head[/#{@marker}(\w+)/,1]}, '',['![', {}, body.strip]]
         
       elsif x[0] and x[0].is_a? Array
@@ -70,7 +82,7 @@ end
 
 class Weblet
 
-  def initialize(raws, b, marker: nil, debug: false)
+  def initialize(raws, marker: nil, debug: false)
     
     @debug = debug
     
@@ -78,9 +90,9 @@ class Weblet
 
     obj = s[0] == '<' ? s : WebletBuilder.new(s, marker: marker, \
                                                     debug: debug).to_a
+    puts 'obj: ' + obj.inspect if @debug
     @doc = Rexle.new(obj)
     @h = scan @doc.root
-    @b = b
 
   end
 
@@ -88,13 +100,17 @@ class Weblet
     @h
   end
   
+  def to_outline()
+    treeize(scan_h(@h))
+  end
+  
   def to_xml()
     @doc.root.xml pretty: true
   end
 
   def render(*args)
     
-    @b = args.pop if args.last.is_a? Binding
+    b = args.pop if args.last.is_a? Binding
     
     if args.first.is_a? String then
       path = args.first.split('/').map(&:to_sym)
@@ -105,6 +121,9 @@ class Weblet
     #r = @h.dig *path
     r = digx(@h, path)
     
+    # check for interpolated substitution tags e.g/ <:card/svg/link>
+    r.gsub!(/<:([^>]+)>/) {|x| self.render($1) } if r
+    
     puts 'r: ' + r.inspect if @debug
     
     if r.nil? then
@@ -112,7 +131,7 @@ class Weblet
       r = found.cdatas.join if found
     end
     
-    eval('%Q(' + r + ')', @b) if r
+    eval('%Q(' + r + ')', b) if r
 
   end
 
@@ -156,4 +175,29 @@ class Weblet
     end.to_h
     
   end
+  
+  def scan_h(h)
+
+    a = h.map do |key, value|
+      value.is_a?(Array) ? [key, scan_h(value.last)] : [key]
+    end
+
+  end
+  
+  def treeize(a, indent=-2)
+
+    indent += 1
+    a.map  do |x|
+
+      if x.is_a? Symbol then
+        (' ' * indent) + x.to_s
+      else
+        treeize(x, indent)
+      end
+
+    end.join("\n")
+
+  end
+  
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weblet
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   mKbvoKGru7nPXh4E/ArWQ70Yz24o3lwGZW3XLzwdLPKB8MiOOGuTARkCWFEYT5tE
   We42rjyhFeidBuSZp6/7Wwlo
   -----END CERTIFICATE-----
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle