weblet 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 188d4008035db1c75dee24819614915edc2a32eadd6ead9e5b792d9381458655
-  data.tar.gz: 68136024110f77153101601d8115607c966e36c660e42c0e1b2b708cebd16e27
+  metadata.gz: db2437f118c3c20ae3793072517fb43614ab736e31ceddb2e94c25e9f5f7f2f6
+  data.tar.gz: 2624d3afc74ac2dc93867e4423614c483b6f26f091f27c081335210799d93222
 SHA512:
-  metadata.gz: b7a4492500cab87adf86d969e0ef4324ec4ea41d46fd389d84e37895f19f166729e5eb4b2f54ce649d7d2dbf6834d5e3dbe9aaec8b4d9b13dd2802209fe913c0
-  data.tar.gz: 67d9cca9a3aa8ff32edc6137c614b8ae3cb6e020643c91b20fc445a48b7699897c0a54242c499d9d72504a5ccb2c38e6ab3eedc8f2728a196f1a1beba8e448a2
+  metadata.gz: b464034193c7a1972c1554423198bb48a3b07cf97737b278c048d25ee59bbfa2b189514a6b35143e9d1352b0c1f1dae4b27afdc85c1c54bf77733a7392f92b3a
+  data.tar.gz: b715617193855dbbde52a3ac3dd78bc22ab6c1af7643c6a329f78f778f5d7018c09f3b92a07edd01c86890609a71777911a1d7de17be041d515e635418fb4bd2

data/lib/weblet.rb

@@ -7,8 +7,9 @@ require 'rexle'
 
 class WebletBuilder
 
-  def initialize(s)
+  def initialize(s, debug: false)
 
+    @debug = debug
     @a = build(scan(s.strip))
     @a.unshift *['weblet', {}, '']
   
@@ -32,13 +33,19 @@ class WebletBuilder
   def build(a)
 
     a.map do |x|
-
+      
+      puts 'x: ' + x.inspect if @debug
+      
       if x.is_a? String then
-        head, body = x.split("\n",2)
-        [:node, {id: head[/#(\w+)/,1]}, body.strip]
+        head, body = x.split("\n", 2)
+        [:node, {id: head[/#(\w+)/,1]}, '',['![', {}, body.strip]]
+      elsif x.length < 2
+        x.flatten!(1)
+        head, body = x.shift.split("\n", 2)
+        [:node, {id: head[/#(\w+)/,1].rstrip}, '',['![', {}, body.rstrip, ]]
       else
         x.flatten!(1)
-        head, body = x.shift.split("\n",2)
+        head, body = x.shift.split("\n", 2)
         [:node, {id: head[/#(\w+)/,1].rstrip}, body.rstrip, *build(x)]
       end
       
@@ -50,12 +57,14 @@ end
 
 class Weblet
 
-  def initialize(raws, b)
+  def initialize(raws, b, debug: false)
+    
+    @debug = debug
 
     raws.strip!
-    obj = raws[0] == '<' ? raws : WebletBuilder.new(raws).to_a
-    doc = Rexle.new(obj)
-    @h = scan doc.root
+    obj = raws[0] == '<' ? raws : WebletBuilder.new(raws, debug: debug).to_a
+    @doc = Rexle.new(obj)
+    @h = scan @doc.root
     @b = b
 
   end
@@ -63,6 +72,10 @@ class Weblet
   def to_h()
     @h
   end
+  
+  def to_xml()
+    @doc.root.xml pretty: true
+  end
 
   def render(*args)
     
@@ -73,6 +86,12 @@ class Weblet
     end
 
     r = @h.dig *path
+    
+    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
 
   end
@@ -82,10 +101,14 @@ class Weblet
   def scan(node)
 
     a = node.elements.map do |e|
+      
+      puts 'e: ' + e.inspect if @debug
 
       nodes = e.xpath('node')
-
-      r = nodes.any? ? scan(e) : e.children.join()
+      
+      puts 'nodes: ' + nodes.inspect if @debug
+      
+      r = nodes.any? ? scan(e) : e.cdatas.join()
 
       [e.attributes[:id].to_sym, r]
       

metadata

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