weblet 0.2.2 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1b3fa491f5536efe9eba1c3c3a0832c05d200e964af91b907a37bc585903261
-  data.tar.gz: baa8a63a3292328e12eb67b03e9d0ac5e89d931d1e6c0a77d0002ae5484a58b7
+  metadata.gz: f0f32000335f285a84e9b8d8c65c1538af4ebbbe436800e7be9495eb93d8dcf6
+  data.tar.gz: 49b57498d30f41b1d493f75f38323738535afd44b4635ab5b1946dcb1a544776
 SHA512:
-  metadata.gz: c10707bb0f4e4134565c0d3043dd5d1d571bf10e2451ff641c17bcd9786cb540ed2afa45b481d18494f5c1cab67f3b5e906590d2abc520cdf03a596e5a661ce4
-  data.tar.gz: 9387796aab5fd12979e1b5d0d7a05116e77b8400a2f73e4f21446616118f7065e92dc1f19f6e94a872e846ded6c96564ee5bfb3a57dc661b9fa592961b1bd08b
+  metadata.gz: f10d8b6c10928cf4b72fbd2ca96a00ef38fac45ee072758f36c7234a1d902d23bfd3b04d880fe62a83120c96193cff734e86b18dc50c55274cf428cf0f01e31d
+  data.tar.gz: ee926e36ed3b780a7efd4e0b651bb9bd21f4315107d92b1ab381938ca946eb191620573ba49f39990d6606ad0ae43ff0e77591d60bc6f7297010f581673a7501

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.2
+  version: 0.3.2
 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-04 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,27 @@ 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
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 description: 
 email: digital.robertson@gmail.com
 executables: []