weblet 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44c3165f75000e5c2ad59d99ab37d672a631389fb1241b9e739ccf58aaf64b5d
-  data.tar.gz: 371470bb1005b3291e69cbba8d8d04a17c1afc4ae876cded7f30c0277362700c
+  metadata.gz: 9cdf3dd81231ca9ee4385a6bb250af42f86677e30951cea62e74c5dac3a2ed19
+  data.tar.gz: 0f5aead405414359f202d14c97f4da26fb102d55a5b077822a4f2ebf1087c5d1
 SHA512:
-  metadata.gz: e76ced239f76106bd12abe6733dabed1f197c381dc868a785d59e16f66f34be08bb5defa704b031403f5e680a15511afa59361cc7fe309e83b5a4919a6d7c08e
-  data.tar.gz: 0c4fe8b26f780ca467f6e53ddfcd9852ff7c10a88a2925cd1909ba3179199a358adcf5ec282f29c3f003b93327c431473fd4df6483c51495fb3490d6043c93a7
+  metadata.gz: c2062764f51b7343e8800a9e32a823efed674af59c8e088705916e53da12b61d61c5f42ae7778940fb1f214507e672bdbb4d1dc460219ca585f23dc7a8624c7e
+  data.tar.gz: 6bca43e05423533b06f0ad10645c0ef8e0d9376a6335d6a26302946d18e6f8cbf0db1941da34b7c112896e1d73248111c76509e52ede277c17b0f0d70726454c

data/lib/weblet.rb

@@ -93,13 +93,27 @@ class Weblet
     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
@@ -108,59 +122,26 @@ class Weblet
     @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)
 
-    #r = @h.dig *path
-    r = digx(@h, path)
+    key = rawkey.to_s
+    return unless @kvp.has_key?(key)
 
     # check for interpolated substitution tags e.g/ <:card/svg/link>
-    r.gsub!(/<:([^>]+)>/) {|x| self.render($1) } if r
+    r = @kvp[key].gsub(/<:([^>]+)>/) {|x| self.render($1) }
 
-    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
+    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)
@@ -199,5 +180,32 @@ class Weblet
 
   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.4.0
+  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: 2022-02-21 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle