weblet 0.2.3 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc94ddba2ec7b157db2ad2e536a796c46ae6a829536f12631331c5fa6f29e797
-  data.tar.gz: 5175e71457a2c80638175ba58b828d4cb92827e015ef54228e32164d770c3b6e
+  metadata.gz: 84328a442455cb403946363b167a422151842600101026ed880f9efa3f7bae5f
+  data.tar.gz: eb5786ae7f0b2991b8d7b4b3475011bed15fa89641b3a0644707e2a506f9e328
 SHA512:
-  metadata.gz: 8c0f683f4aa1a07beb26cdeb5d2e7f5d5669bd5da389874d6d95b1c7d7ebbcba365d40357d30354b0147974aadef0a42e6eae59b22702e2880483a535e6aa5a5
-  data.tar.gz: 9ae047f6215a0435a60958c90eb1ee72bab8dec7fb739e69985b0646a99e2c452f3b6a8735522f4b099b6ef29a1330f32c6dd73a345235b3b225e1bb6b38205a
+  metadata.gz: 1bb9ecfb115c39da76cbc5b49871a8391985ec6eae1caf825b75457c65a754b36e7ed00cf38af8fcdff6a2cb0482b8634230ffca072582724d793162bb863b63
+  data.tar.gz: 3bc984b898e9c2a4d92a9e09a37835c1cc5666f4f4c019668aab423b3b922b9d28af924b428b599d1a92ff2d7dd670f9fe8a5018d389416e00773ce215ee95b0

data/lib/weblet.rb

@@ -12,11 +12,16 @@ class WebletBuilder
 
     @marker, @debug = marker, debug
     
+    s.strip!
+    
     # the default marker is the hash symbol (#) but the client can set their 
     # own marker by simply using their custom symbol in the 1st line of input
     @marker ||= s[0]
     
-    @a = build(scan(s.strip))
+    a = scan(s.strip)
+    puts 'a: ' + a.inspect if @debug
+    
+    @a = build(a)
     @a.unshift *['weblet', {}, '']
   
   end
@@ -38,21 +43,23 @@ class WebletBuilder
 
   def build(a)
 
+    puts 'a: ' + a.inspect if @debug
+    
     a.map do |x|
       
       puts 'x: ' + x.inspect if @debug
       
-      if x.is_a? String then
-        head, body = x.split("\n", 2)
+      if x[0].is_a? String then
+        
+        head, body = x[0].split("\n", 2)
         [:node, {id: head[/#{@marker}(\w+)/,1]}, '',['![', {}, body.strip]]
-      elsif x.length < 2
-        x.flatten!(1)
-        head, body = x.shift.split("\n", 2)
-        [:node, {id: head[/#{@marker}(\w+)/,1].rstrip}, '',['![', {}, body.rstrip, ]]
-      else
-        x.flatten!(1)
-        head, body = x.shift.split("\n", 2)
-        [:node, {id: head[/#{@marker}(\w+)/,1].rstrip}, body.rstrip, *build(x)]
+        
+      elsif x[0] and x[0].is_a? Array
+                
+        head, body = x[0][0].split("\n", 2)
+        [:node, {id: head[/#{@marker}(\w+)/,1]}, '', \
+         ['![', {}, body.to_s.strip], *build(x[1..-1])]
+        
       end
       
     end
@@ -87,13 +94,21 @@ class Weblet
 
   def render(*args)
     
+    @b = args.pop if args.last.is_a? Binding
+    
     if args.first.is_a? String then
-      path = args.first.split('/',2).map(&:to_sym)
+      path = args.first.split('/').map(&:to_sym)
     else
       path = *args.flatten(1)
     end
 
-    r = @h.dig *path
+    #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
       found = @doc.root.element("//node[@id='#{path.join}']")
@@ -105,6 +120,20 @@ class Weblet
   end
 
   private
+  
+  def digx(obj, a)
+
+    h = obj.is_a?(Array) ? obj.last : obj
+
+    r = h.dig(a.shift)
+
+    if a.any? then
+      digx(r, a)
+    else
+      r.is_a?(Array) ? r.first : r
+    end
+
+  end  
 
   def scan(node)
 
@@ -116,7 +145,14 @@ class Weblet
       
       puts 'nodes: ' + nodes.inspect if @debug
       
-      r = nodes.any? ? scan(e) : e.cdatas.join()
+      r = if nodes.any? then
+      
+        r2 = scan(e)
+        e.cdatas.any? ? [e.cdatas.join(), r2] : r2
+        
+      else
+        e.cdatas.join()
+      end
 
       [e.attributes[:id].to_sym, r]
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weblet
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   mKbvoKGru7nPXh4E/ArWQ70Yz24o3lwGZW3XLzwdLPKB8MiOOGuTARkCWFEYT5tE
   We42rjyhFeidBuSZp6/7Wwlo
   -----END CERTIFICATE-----
-date: 2021-04-03 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -46,7 +46,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.5.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 1.5.11
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement