weblet 0.2.4 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a20edd9605c808815e0aa3cfc7e9779406760cca57fd34db6011c81f2abaa3f2
-  data.tar.gz: 1b99f0adc8fde98fe110fb06783644c3245ced80a4c5b03a4aa6f8bb20410e1e
+  metadata.gz: c38324cb006650b466537f08eb043e9fa44249e8d8046e4a05e318a12750aacc
+  data.tar.gz: e41b0ccb1fde8b1c318cc7cd371da07ddbc93a30d670df52af8d9cab8e7f7442
 SHA512:
-  metadata.gz: 3e7690b5ee283aee9c596e4496c738b756579801c54994bf0761e78a3a0825f9968eb84c5998675d3b6c8daf6a958a682872712f34a94631c60c74748cc3a156
-  data.tar.gz: 1aef800f17899e8b11e48bac43fdbfa254e848ff3db59ea840da8b2ecbfd7808cef3a4ff6257adda2b3a351f7bfedc8c36806769f5e91f07b897084a97c7f768
+  metadata.gz: 78f84ff8aa3bc2913fed7b1cdb037855ddec86305b5dc79a2d2fefa331cb6c21b45c4d3377c431625c4d96409edf51ffeaf8b06ebd5b25fdb1fc6cdd52003bdf
+  data.tar.gz: 9b694e463e7ac4e52b1c61dc9645e296eb359e35ff974362c0139a83747cb3c018f599c87100ecec0b1db09a21dbb4b72317c98ff1051c1267dad286a3808f7d

data.tar.gz.sig

@@ -1,3 +1,2 @@
-Nl�흢�>)�{`Bz�zp(RčQ ��'C16m�N��{s���$�"rצB�P����.�b��=y�\pcq�4A�G�ꓒ��sxuO[�w�����������Z�9
-i�S��M��,��l�?
-r�{���9���uD
+D��v�/�ƅ�Bw^Y�<5E��VL�n�K�B~��}[n�I>�e�1| J��$����qՕ�^���G��Ƽ�d��t#P�j����
��	C4}j��E�`X��N3���fޱ2��
+�OQ�x>�0��'ՓM��.Γ(�W�Ȍ�w?�3r�O���D>�A)t�1)ԾE��t!ݷ��-����Et�?\

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
       
@@ -68,7 +70,7 @@ end
 
 class Weblet
 
-  def initialize(raws, b, marker: nil, debug: false)
+  def initialize(raws, marker: nil, debug: false)
     
     @debug = debug
     
@@ -78,7 +80,6 @@ class Weblet
                                                     debug: debug).to_a
     @doc = Rexle.new(obj)
     @h = scan @doc.root
-    @b = b
 
   end
 
@@ -86,11 +87,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=@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,7 +105,13 @@ class Weblet
       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}']")
@@ -110,6 +123,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)
 
@@ -121,11 +148,43 @@ 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]
       
     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.2.4
+  version: 0.3.4
 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-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle