weblet 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab44a31aac8707efb70785c2ed488d5ee1a1db55c7eece43369bf6c011a98011
-  data.tar.gz: db483e53188fde625e1ad1ee9f0309e6f837005f4a115ccfa49291aee179721b
+  metadata.gz: 032dd5ce3fc7237ea08c37f074873ef744afff5a35d51a16aeb293786d60fbf8
+  data.tar.gz: db870c39d48a31a3cd50f063212a7582a3656464f26b2f5db1fde340153d17c0
 SHA512:
-  metadata.gz: ec04da0a74d5e73bd5d5392332293499ce21bbc8794d6287118b63f65e3655be09e986da7bd72915aa8dfa59489999c5439b3585c0f2dd8c2b9f60c52b3c9658
-  data.tar.gz: 9d18a68fed44fc9e096275c19b64c193f7245f7f294672d0cc513846c333e109c0e09d5bc5d312be807c59eb96a8371c0ea0fe7b17e969ebbc7ecb350a92ab1f
+  metadata.gz: 9bbefcb010f857e04619611f848505059fd00c1dba11efb12ba97677cd4e9e079bf136e86f04ce2728137072f4080fab7e8994db8a927233fa26e96abb56f57f
+  data.tar.gz: c6c07b881b3dbe33aceeb1afb85dc37dd5db60411ccd8e3e93254bb9501bcd18a67b8b5289abde84dbb7240cf0fc96927bb2214c8fa5e485c32f0bb4cb7a058a

data/lib/weblet.rb

@@ -3,15 +3,25 @@
 # file: weblet.rb
 
 require 'rexle'
+require 'rxfhelper'
 
 
 class WebletBuilder
 
-  def initialize(s, marker: '#', debug: false)
+  def initialize(s, marker: nil, debug: false)
 
     @marker, @debug = marker, debug
     
-    @a = build(scan(s.strip))
+    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
@@ -33,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)
+      if x[0].is_a? String then
+        
+        head, body = x[0].split("\n", 2)
         [:node, {id: head[/#{@marker}(\w+)/,1]}, '',['![', {}, body.strip]]
-      elsif x.length < 2
-        x.flatten!(1)
-        head, body = x.shift.split("\n", 2)
-        [:node, {id: head[/#{@marker}(\w+)/,1].rstrip}, '',['![', {}, body.rstrip, ]]
-      else
-        x.flatten!(1)
-        head, body = x.shift.split("\n", 2)
-        [:node, {id: head[/#{@marker}(\w+)/,1].rstrip}, body.rstrip, *build(x)]
+        
+      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
@@ -58,12 +70,13 @@ end
 
 class Weblet
 
-  def initialize(raws, b, marker: '#', 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, marker: marker, \
+    obj = s[0] == '<' ? s : WebletBuilder.new(s, marker: marker, \
                                                     debug: debug).to_a
     @doc = Rexle.new(obj)
     @h = scan @doc.root
@@ -81,13 +94,21 @@ 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)
+    
+    # check for interpolated substitution tags e.g/ <:card/svg/link>
+    r.gsub!(/<:([^>]+)>/) {|x| self.render($1) }
+    
+    puts 'r: ' + r.inspect if @debug
     
     if r.nil? then
       found = @doc.root.element("//node[@id='#{path.join}']")
@@ -99,6 +120,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)
 
@@ -110,7 +145,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.1
+  version: 0.3.1
 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: []