weblet 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20edd9605c808815e0aa3cfc7e9779406760cca57fd34db6011c81f2abaa3f2
-  data.tar.gz: 1b99f0adc8fde98fe110fb06783644c3245ced80a4c5b03a4aa6f8bb20410e1e
+  metadata.gz: a554a34daec79c81fca1f25d822c6d0ceb784f9e86b8420cd6fada8372057995
+  data.tar.gz: 22ba08494032e5b230e5837baab8c821b23321a3d4cb91b507fe99ca6afa0fd2
 SHA512:
-  metadata.gz: 3e7690b5ee283aee9c596e4496c738b756579801c54994bf0761e78a3a0825f9968eb84c5998675d3b6c8daf6a958a682872712f34a94631c60c74748cc3a156
-  data.tar.gz: 1aef800f17899e8b11e48bac43fdbfa254e848ff3db59ea840da8b2ecbfd7808cef3a4ff6257adda2b3a351f7bfedc8c36806769f5e91f07b897084a97c7f768
+  metadata.gz: e665e8e8b68bd5fb7de8020b5f648087e4d8abeaf8580118a1f2ea786820dd69f359252ed51a502e171b9b59d9f3928f1ec457502e8eb5e9c52e1c15c632c917
+  data.tar.gz: be1d18c638b4628bfad7da54e717d476df9b339dc74233f08efa03dc5ca6ddc7ec42b0e377d97197c4dc85f8e04c911073fe817f20e44eed965e83b01791aae6

data/lib/weblet.rb

@@ -56,7 +56,9 @@ class WebletBuilder
         
       elsif x[0] and x[0].is_a? Array
                 
-        [:node, {id: x[0][0][/#{@marker}(\w+)/,1]}, '', *build(x[1..-1])]
+        head, body = x[0][0].split("\n", 2)
+        [:node, {id: head[/#{@marker}(\w+)/,1]}, '', \
+         ['![', {}, body.to_s.strip], *build(x[1..-1])]
         
       end
       
@@ -90,7 +92,9 @@ class Weblet
     @doc.root.xml pretty: true
   end
 
-  def render(*args, b=@b)
+  def render(*args)
+    
+    @b = args.pop if args.last.is_a? Binding
     
     if args.first.is_a? String then
       path = args.first.split('/').map(&:to_sym)
@@ -98,18 +102,35 @@ class Weblet
       path = *args.flatten(1)
     end
 
-    r = @h.dig *path
+    #r = @h.dig *path
+    r = digx(@h, path)
+    
+    puts 'r: ' + r.inspect if @debug
     
     if r.nil? then
       found = @doc.root.element("//node[@id='#{path.join}']")
       r = found.cdatas.join if found
     end
     
-    eval('%Q(' + r + ')', b) if r
+    eval('%Q(' + r + ')', @b) if r
 
   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)
 
@@ -121,7 +142,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.4
+  version: 0.3.0
 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