weblet 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db2437f118c3c20ae3793072517fb43614ab736e31ceddb2e94c25e9f5f7f2f6
-  data.tar.gz: 2624d3afc74ac2dc93867e4423614c483b6f26f091f27c081335210799d93222
+  metadata.gz: a554a34daec79c81fca1f25d822c6d0ceb784f9e86b8420cd6fada8372057995
+  data.tar.gz: 22ba08494032e5b230e5837baab8c821b23321a3d4cb91b507fe99ca6afa0fd2
 SHA512:
-  metadata.gz: b464034193c7a1972c1554423198bb48a3b07cf97737b278c048d25ee59bbfa2b189514a6b35143e9d1352b0c1f1dae4b27afdc85c1c54bf77733a7392f92b3a
-  data.tar.gz: b715617193855dbbde52a3ac3dd78bc22ab6c1af7643c6a329f78f778f5d7018c09f3b92a07edd01c86890609a71777911a1d7de17be041d515e635418fb4bd2
+  metadata.gz: e665e8e8b68bd5fb7de8020b5f648087e4d8abeaf8580118a1f2ea786820dd69f359252ed51a502e171b9b59d9f3928f1ec457502e8eb5e9c52e1c15c632c917
+  data.tar.gz: be1d18c638b4628bfad7da54e717d476df9b339dc74233f08efa03dc5ca6ddc7ec42b0e377d97197c4dc85f8e04c911073fe817f20e44eed965e83b01791aae6

data/lib/weblet.rb

@@ -3,14 +3,25 @@
 # file: weblet.rb
 
 require 'rexle'
+require 'rxfhelper'
 
 
 class WebletBuilder
 
-  def initialize(s, debug: false)
+  def initialize(s, marker: nil, debug: false)
 
-    @debug = debug
-    @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
@@ -23,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)}
@@ -32,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)
-        [: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)
-        [:node, {id: head[/#(\w+)/,1].rstrip}, body.rstrip, *build(x)]
+      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
+                
+        head, body = x[0][0].split("\n", 2)
+        [:node, {id: head[/#{@marker}(\w+)/,1]}, '', \
+         ['![', {}, body.to_s.strip], *build(x[1..-1])]
+        
       end
       
     end
@@ -57,12 +70,14 @@ end
 
 class Weblet
 
-  def initialize(raws, b, debug: false)
+  def initialize(raws, b, marker: nil, debug: false)
     
     @debug = debug
+    
+    s, _ = RXFHelper.read(raws.strip)
 
-    raws.strip!
-    obj = raws[0] == '<' ? raws : WebletBuilder.new(raws, debug: debug).to_a
+    obj = s[0] == '<' ? s : WebletBuilder.new(s, marker: marker, \
+                                                    debug: debug).to_a
     @doc = Rexle.new(obj)
     @h = scan @doc.root
     @b = b
@@ -79,13 +94,18 @@ 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)
+    
+    puts 'r: ' + r.inspect if @debug
     
     if r.nil? then
       found = @doc.root.element("//node[@id='#{path.join}']")
@@ -97,6 +117,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)
 
@@ -108,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.0
+  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
@@ -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: []