weblet 0.1.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 188d4008035db1c75dee24819614915edc2a32eadd6ead9e5b792d9381458655
-  data.tar.gz: 68136024110f77153101601d8115607c966e36c660e42c0e1b2b708cebd16e27
+  metadata.gz: a20edd9605c808815e0aa3cfc7e9779406760cca57fd34db6011c81f2abaa3f2
+  data.tar.gz: 1b99f0adc8fde98fe110fb06783644c3245ced80a4c5b03a4aa6f8bb20410e1e
 SHA512:
-  metadata.gz: b7a4492500cab87adf86d969e0ef4324ec4ea41d46fd389d84e37895f19f166729e5eb4b2f54ce649d7d2dbf6834d5e3dbe9aaec8b4d9b13dd2802209fe913c0
-  data.tar.gz: 67d9cca9a3aa8ff32edc6137c614b8ae3cb6e020643c91b20fc445a48b7699897c0a54242c499d9d72504a5ccb2c38e6ab3eedc8f2728a196f1a1beba8e448a2
+  metadata.gz: 3e7690b5ee283aee9c596e4496c738b756579801c54994bf0761e78a3a0825f9968eb84c5998675d3b6c8daf6a958a682872712f34a94631c60c74748cc3a156
+  data.tar.gz: 1aef800f17899e8b11e48bac43fdbfa254e848ff3db59ea840da8b2ecbfd7808cef3a4ff6257adda2b3a351f7bfedc8c36806769f5e91f07b897084a97c7f768

data/lib/weblet.rb

@@ -3,13 +3,25 @@
 # file: weblet.rb
 
 require 'rexle'
+require 'rxfhelper'
 
 
 class WebletBuilder
 
-  def initialize(s)
+  def initialize(s, marker: nil, debug: false)
 
-    @a = build(scan(s.strip))
+    @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 = scan(s.strip)
+    puts 'a: ' + a.inspect if @debug
+    
+    @a = build(a)
     @a.unshift *['weblet', {}, '']
   
   end
@@ -22,7 +34,7 @@ class WebletBuilder
 
   def scan(s, indent=0)
 
-    a = s.split(/(?=^#{'  ' * indent}#)/)
+    a = s.split(/(?=^#{('  ' * indent) + @marker})/)
     return a unless a.length > 1
 
     a.map {|x| scan(x, indent+1)}
@@ -31,15 +43,21 @@ class WebletBuilder
 
   def build(a)
 
+    puts 'a: ' + a.inspect if @debug
+    
     a.map do |x|
-
-      if x.is_a? String then
-        head, body = x.split("\n",2)
-        [:node, {id: head[/#(\w+)/,1]}, body.strip]
-      else
-        x.flatten!(1)
-        head, body = x.shift.split("\n",2)
-        [:node, {id: head[/#(\w+)/,1].rstrip}, body.rstrip, *build(x)]
+      
+      puts 'x: ' + x.inspect if @debug
+      
+      if x[0].is_a? String then
+        
+        head, body = x[0].split("\n", 2)
+        [:node, {id: head[/#{@marker}(\w+)/,1]}, '',['![', {}, body.strip]]
+        
+      elsif x[0] and x[0].is_a? Array
+                
+        [:node, {id: x[0][0][/#{@marker}(\w+)/,1]}, '', *build(x[1..-1])]
+        
       end
       
     end
@@ -50,12 +68,16 @@ end
 
 class Weblet
 
-  def initialize(raws, b)
+  def initialize(raws, b, marker: nil, debug: false)
+    
+    @debug = debug
+    
+    s, _ = RXFHelper.read(raws.strip)
 
-    raws.strip!
-    obj = raws[0] == '<' ? raws : WebletBuilder.new(raws).to_a
-    doc = Rexle.new(obj)
-    @h = scan doc.root
+    obj = s[0] == '<' ? s : WebletBuilder.new(s, marker: marker, \
+                                                    debug: debug).to_a
+    @doc = Rexle.new(obj)
+    @h = scan @doc.root
     @b = b
 
   end
@@ -63,17 +85,27 @@ class Weblet
   def to_h()
     @h
   end
+  
+  def to_xml()
+    @doc.root.xml pretty: true
+  end
 
-  def render(*args)
+  def render(*args, b=@b)
     
     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
-    eval('%Q(' + r + ')', @b) if r
+    
+    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 +114,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.4
 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
@@ -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: []