weblet 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f32000335f285a84e9b8d8c65c1538af4ebbbe436800e7be9495eb93d8dcf6
-  data.tar.gz: 49b57498d30f41b1d493f75f38323738535afd44b4635ab5b1946dcb1a544776
+  metadata.gz: 44c3165f75000e5c2ad59d99ab37d672a631389fb1241b9e739ccf58aaf64b5d
+  data.tar.gz: 371470bb1005b3291e69cbba8d8d04a17c1afc4ae876cded7f30c0277362700c
 SHA512:
-  metadata.gz: f10d8b6c10928cf4b72fbd2ca96a00ef38fac45ee072758f36c7234a1d902d23bfd3b04d880fe62a83120c96193cff734e86b18dc50c55274cf428cf0f01e31d
-  data.tar.gz: ee926e36ed3b780a7efd4e0b651bb9bd21f4315107d92b1ab381938ca946eb191620573ba49f39990d6606ad0ae43ff0e77591d60bc6f7297010f581673a7501
+  metadata.gz: e76ced239f76106bd12abe6733dabed1f197c381dc868a785d59e16f66f34be08bb5defa704b031403f5e680a15511afa59361cc7fe309e83b5a4919a6d7c08e
+  data.tar.gz: 0c4fe8b26f780ca467f6e53ddfcd9852ff7c10a88a2925cd1909ba3179199a358adcf5ec282f29c3f003b93327c431473fd4df6483c51495fb3490d6043c93a7

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
@@ -70,32 +82,36 @@ end
 
 class Weblet
 
-  def initialize(raws, b, marker: nil, debug: false)
-    
+  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
-    @b = b
 
   end
 
   def to_h()
     @h
   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
-    
+
+    b = args.pop if args.last.is_a? Binding
+
     if args.first.is_a? String then
       path = args.first.split('/').map(&:to_sym)
     else
@@ -104,23 +120,23 @@ class Weblet
 
     #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
+
+    eval('%Q(' + r + ')', b) if r
 
   end
 
   private
-  
+
   def digx(obj, a)
 
     h = obj.is_a?(Array) ? obj.last : obj
@@ -133,30 +149,55 @@ class Weblet
       r.is_a?(Array) ? r.first : r
     end
 
-  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|
+      value.is_a?(Array) ? [key, scan_h(value.last)] : [key]
+    end
+
+  end
+
+  def treeize(a, indent=-2)
+
+    indent += 1
+    a.map  do |x|
+
+      if x.is_a? Symbol then
+        (' ' * indent) + x.to_s
+      else
+        treeize(x, indent)
+      end
+
+    end.join("\n")
+
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weblet
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   mKbvoKGru7nPXh4E/ArWQ70Yz24o3lwGZW3XLzwdLPKB8MiOOGuTARkCWFEYT5tE
   We42rjyhFeidBuSZp6/7Wwlo
   -----END CERTIFICATE-----
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2022-02-21 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