weblet 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c38324cb006650b466537f08eb043e9fa44249e8d8046e4a05e318a12750aacc
-  data.tar.gz: e41b0ccb1fde8b1c318cc7cd371da07ddbc93a30d670df52af8d9cab8e7f7442
+  metadata.gz: 9cdf3dd81231ca9ee4385a6bb250af42f86677e30951cea62e74c5dac3a2ed19
+  data.tar.gz: 0f5aead405414359f202d14c97f4da26fb102d55a5b077822a4f2ebf1087c5d1
 SHA512:
-  metadata.gz: 78f84ff8aa3bc2913fed7b1cdb037855ddec86305b5dc79a2d2fefa331cb6c21b45c4d3377c431625c4d96409edf51ffeaf8b06ebd5b25fdb1fc6cdd52003bdf
-  data.tar.gz: 9b694e463e7ac4e52b1c61dc9645e296eb359e35ff974362c0139a83747cb3c018f599c87100ecec0b1db09a21dbb4b72317c98ff1051c1267dad286a3808f7d
+  metadata.gz: c2062764f51b7343e8800a9e32a823efed674af59c8e088705916e53da12b61d61c5f42ae7778940fb1f214507e672bdbb4d1dc460219ca585f23dc7a8624c7e
+  data.tar.gz: 6bca43e05423533b06f0ad10645c0ef8e0d9376a6335d6a26302946d18e6f8cbf0db1941da34b7c112896e1d73248111c76509e52ede277c17b0f0d70726454c

data/lib/weblet.rb

@@ -3,7 +3,7 @@
 # file: weblet.rb
 
 require 'rexle'
-require 'rxfhelper'
+require 'rxfreader'
 
 
 class WebletBuilder
@@ -11,19 +11,19 @@ class WebletBuilder
   def initialize(s, marker: nil, debug: false)
 
     @marker, @debug = marker, debug
-    
+
     s.strip!
-    
-    # the default marker is the hash symbol (#) but the client can set their 
+
+    # 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
 
   def to_a()
@@ -38,30 +38,42 @@ class WebletBuilder
     return a unless a.length > 1
 
     a.map {|x| scan(x, indent+1)}
-    
+
   end
 
   def build(a)
 
     puts 'a: ' + a.inspect if @debug
-    
+
     a.map do |x|
-      
+
       puts 'x: ' + x.inspect if @debug
-      
-      if x[0].is_a? String then
-        
+
+      if x.is_a? String then
+
+        head, body = x.split("\n", 2)
+        puts 'head: ' + head.inspect if @debug
+        puts 'body: ' + body.inspect if @debug
+        puts 'marker: ' + @marker.inspect if @debug
+
+        [:node, {id: head[/#{@marker}(\w+)/,1]}, '',['![', {}, body.strip]]
+
+      elsif x[0].is_a? String
+
         head, body = x[0].split("\n", 2)
+        puts 'body: ' + body.inspect if @debug
+        puts 'marker: ' + @marker.inspect if @debug
+
         [: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
 
   end
@@ -71,98 +83,80 @@ end
 class Weblet
 
   def initialize(raws, marker: nil, debug: false)
-    
+
     @debug = debug
-    
-    s, _ = RXFHelper.read(raws.strip)
+
+    s, _ = RXFReader.read(raws.strip)
 
     obj = s[0] == '<' ? s : WebletBuilder.new(s, marker: marker, \
                                                     debug: debug).to_a
+    puts 'obj: ' + obj.inspect if @debug
     @doc = Rexle.new(obj)
     @h = scan @doc.root
+    @kvp = scan2keypair(@h).to_h
+
+  end
 
+  def [](key)
+    @kvp[key.to_s]
+  end
+
+  def []=(key, value)
+    @kvp[key.to_s] = value
   end
 
   def to_h()
     @h
   end
-  
+
+  # key-value pair
+  def to_kvp()
+    @kvp
+  end
+
   def to_outline()
     treeize(scan_h(@h))
   end
-  
+
   def to_xml()
     @doc.root.xml pretty: true
   end
 
-  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)
-    else
-      path = *args.flatten(1)
-    end
+  def render(rawkey, bindingx=nil)
+
+    key = rawkey.to_s
+    return unless @kvp.has_key?(key)
 
-    #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}']")
-      r = found.cdatas.join if found
-    end
-    
-    eval('%Q(' + r + ')', b) if r
+    r = @kvp[key].gsub(/<:([^>]+)>/) {|x| self.render($1) }
+
+    eval('%Q(' + r + ')', bindingx)
 
   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)
 
     a = node.elements.map do |e|
-      
-      puts 'e: ' + e.inspect if @debug
 
       nodes = e.xpath('node')
-      
-      puts 'nodes: ' + nodes.inspect if @debug
-      
+
       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|
@@ -170,7 +164,7 @@ class Weblet
     end
 
   end
-  
+
   def treeize(a, indent=-2)
 
     indent += 1
@@ -185,6 +179,33 @@ class Weblet
     end.join("\n")
 
   end
-  
-  
+
+  def scan2keypair(h, trail=nil)
+
+    h.inject([]) do |r,x|
+
+      if x.last.is_a? String then
+
+        key, val = x
+
+        new_key = if r.last and r.last.first.length > 0 then
+          key.to_s
+        else
+          key.to_s
+        end
+
+        r << [[trail, new_key].compact.join('/'), val]
+
+      else
+
+        new_key = x.first.to_s
+        r << [new_key, x.last.first]
+        r.concat scan2keypair(x.last.last, [trail, new_key].compact.join('/'))
+
+      end
+
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weblet
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwNDAyMjA1NjE2WhcN
-  MjIwNDAyMjA1NjE2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDeT7iZ
-  2Rq2gB9JMjpvuSywAjBJd904yMTINVnue+yGshnh6t2xg9BPXbnuSdjS8pg2vyJ4
-  EgkwsZvsTbAgeg0D/+fDxPKNj4765QwLDOWGGNgD7XbLwOcqVdtmqxH8Q3/vgklC
-  OlPJxI5ea/gEHVezAiaKYBhIUQ+9unBQdTiOfO4pmSWoxYZ9ecqip9E1Pg+/F6S8
-  Fghu8Krax3y7rLuox0NQv8ow+HZRW8axWu2rlaGc3wnVzY+UFTMJhwNdl0/k0BMS
-  ntSLdWDy+GZV8dlVJiVggV4hVfBIlFdQBFUP61D+k79jAyr7vhT+4T6t1LmovjP6
-  sKbFfGmkPBIVr1sWLEFO+1/XnuRQVzn6XXN52nNAXQJdeJQhYJRVyYnWieadIKxL
-  6FvfmdpppZ9kvqGRzCdOsC0ucAHcpTBYiSAxWGcdBFcWj6/OU3e/5TJSZRStRZu3
-  JiXBIi3wA6s2DMi2vDp+vSZaIUQGr01U89M1JJrJ2X6dPl9FHifQaIVyH3MCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUVfVFIV4z
-  A50pS1wLovQkHQiAcS0wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwNDE5MTg1NzA3WhcN
+  MjMwNDE5MTg1NzA3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDKvvMb
+  ioAcg3h52M1Uy3m0bfWi5TCu+dIU2sg8d0ZLi6L839XtlE7fZ5H/Mcg1G6pGSlmW
+  O3ZXyZkEQqlKWOIgPlYsY8xgD3/FsYlM9Xrlf5HRT3vdn7BjtDLrUR1wE4xRag7t
+  f2svVsqfmm6oVPn+ERVUP/uafMV8hY0naodBaGa1URQaZwgfO700LOLmAi0yak3o
+  3MHhm0SLbhJGCPz1Sn3sUoRbCSJSz6Gx1k7QTwhiFGDH9Oh0234U7rxjbzU0h4Jb
+  vFVKx/A98ztwySjOwjo0gach0PW5f1K3OQPGUGt/s3SZdLu7V+8gmnCuGp0pmY9S
+  teYJZlGzrnYTclS41OOiCQklWA1KttrYdbvgrskkoC4dhBF6AUZjZCwj8y0+hmlE
+  jD6Y2lGPnGhDkdg/S7uqfr7wPldjWgxLi53Sf0g95A09Bg6YIye4xkKQeC30cR1n
+  smGT6azbC3BzAbtTEHp6IVx7K5x/fgi5jsoXK0ZgBviLG7H3UJ9UFxfQrO0CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUSUTRpvsE
+  6XW0XiGm/gVJ9FyJSf0wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAD3nG0BgesVFhsZDN/FZymOIJg1nPKJtc7bTpNvgm
-  GV7hisjx1cCzhi1jdq/uWiKp44pTOofZdxgDs0wHCE9G9CQXf4m7152BW4N86pf2
-  gS2uwk9GS+SF9vWHgGswgWjsuU6kbgFLkDufdSzzdxppsZB3191Rr/3BAx2GnVkY
-  N8Uo0Pz1gYlEULv4gz6cuGspkmC46/PqMLcjT4AZmtPwRRqiBQxnfLKteVIpeuVf
-  dwjFx0wicfWla9uxKYeS1jsQ7KAIRmWk5lnjQCPU9IeLbZ8QypwJuQInHv4kTGLW
-  gc4VwiaTfxW7C/tvVh9iBQB3ugkbeAz9SBdNa/q/Z/ZyxsS0rYRtHjhVzb4m0rnO
-  kkXjbxb0nTA2TdBq3NGyAfMRCkVVj0+SVFkVIrermDC7e6TbhZ9vC0J2dAjAqJ6c
-  mKbvoKGru7nPXh4E/ArWQ70Yz24o3lwGZW3XLzwdLPKB8MiOOGuTARkCWFEYT5tE
-  We42rjyhFeidBuSZp6/7Wwlo
+  BgkqhkiG9w0BAQsFAAOCAYEAYhZip4/1zSGRq5Ku1NeWXyfgMcGi/obkJBkV68Yl
+  R2p0wd7Ff7Cbg26B+cw5CdSuTigGtAwff9AUvYXYyPOfiQfRBvnXqc0Awya8Pcqh
+  WEy7EsCR7zYwVXhwKjVazss2N+EHTwCNBuOu6tK69bzTf1j0cm6KRcJ5jxzkpZr+
+  N7376dc4ukN7rhBqjKnjYZln/TKbP4eRwqhOEerBVDn1/W6BzZMCkJGB9BQpp4/B
+  XH6/f4U2XBLY5kGDq0YeVnKaoqjyyMtEh93qTIukESvIjlMWuh5pUktikPsrhqly
+  f07hewJIYm5TfvecZtS9aCRJiAIEQBCZ5zAeisxCJKJzoHkHltoYmPZ0z7LanOWy
+  JnNGpUAfgxmo+dQH+d6tbe9rVXNyk2FINurCKGx3N7OJsfJWueTiHXENks2men9q
+  35oUH2ouHjXtvit5hQCmL2+hQV/HFZj86eWeg422XrNjGwBbyQwueRmGDSR5jAbO
+  /gJR3jXcFcpOgDnvL6xGYhfn
   -----END CERTIFICATE-----
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2022-04-19 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.11
+        version: 1.5.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,27 +56,27 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: 1.5.14
 - !ruby/object:Gem::Dependency
-  name: rxfhelper
+  name: rxfreader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.1.2
 description: 
 email: digital.robertson@gmail.com
 executables: []
@@ -103,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Intended for retrieving HTML templates from a convenient to use Hash-like