weblet 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc94ddba2ec7b157db2ad2e536a796c46ae6a829536f12631331c5fa6f29e797
-  data.tar.gz: 5175e71457a2c80638175ba58b828d4cb92827e015ef54228e32164d770c3b6e
+  metadata.gz: a20edd9605c808815e0aa3cfc7e9779406760cca57fd34db6011c81f2abaa3f2
+  data.tar.gz: 1b99f0adc8fde98fe110fb06783644c3245ced80a4c5b03a4aa6f8bb20410e1e
 SHA512:
-  metadata.gz: 8c0f683f4aa1a07beb26cdeb5d2e7f5d5669bd5da389874d6d95b1c7d7ebbcba365d40357d30354b0147974aadef0a42e6eae59b22702e2880483a535e6aa5a5
-  data.tar.gz: 9ae047f6215a0435a60958c90eb1ee72bab8dec7fb739e69985b0646a99e2c452f3b6a8735522f4b099b6ef29a1330f32c6dd73a345235b3b225e1bb6b38205a
+  metadata.gz: 3e7690b5ee283aee9c596e4496c738b756579801c54994bf0761e78a3a0825f9968eb84c5998675d3b6c8daf6a958a682872712f34a94631c60c74748cc3a156
+  data.tar.gz: 1aef800f17899e8b11e48bac43fdbfa254e848ff3db59ea840da8b2ecbfd7808cef3a4ff6257adda2b3a351f7bfedc8c36806769f5e91f07b897084a97c7f768

data/lib/weblet.rb

@@ -12,11 +12,16 @@ class WebletBuilder
 
     @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 = build(scan(s.strip))
+    a = scan(s.strip)
+    puts 'a: ' + a.inspect if @debug
+    
+    @a = build(a)
     @a.unshift *['weblet', {}, '']
   
   end
@@ -38,21 +43,21 @@ 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
+                
+        [:node, {id: x[0][0][/#{@marker}(\w+)/,1]}, '', *build(x[1..-1])]
+        
       end
       
     end
@@ -85,10 +90,10 @@ class Weblet
     @doc.root.xml pretty: true
   end
 
-  def render(*args)
+  def render(*args, b=@b)
     
     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
@@ -100,7 +105,7 @@ class Weblet
       r = found.cdatas.join if found
     end
     
-    eval('%Q(' + r + ')', @b) if r
+    eval('%Q(' + r + ')', b) if r
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weblet
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - James Robertson
@@ -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,7 @@ 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