martile 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b57ab631c3ae6f611e3c376f1c59c03b3f1e85a0e586d3eb8d59467b497361
-  data.tar.gz: e2f986cbbe92b16d795760da59dec37498ce28f8c0d565d6d2cd8c4740b29b14
+  metadata.gz: 1124782048fa0880bbe315f7f11027dfe5af85f6295a208bd25d82ca8a13fbbd
+  data.tar.gz: f8e8fe3391da738db85577e7f3389c4baf06a4f59ea2d2c59394e4928901701d
 SHA512:
-  metadata.gz: b6cbd55a289bf4c29ca15641f044c3175c77dbf473523a0d5594300965d361fa3c26889e78ba652a543c8a44fe2c411d4d6f6d4f677ca080d9db6170eb6673f2
-  data.tar.gz: 8ad3cced0643a65896a1e587bd4cfdd72c57bc06b064b49542b024bff6c91a777aae1d3563d7bb1f9f838131f5822c19485c17172d1b507f0d06513362626760
+  metadata.gz: 52a1f18d1695efafd854ed1b9d94d4254040d341ab7baed8328c283193f1920988c7772a8849c8a5e45f144f9dc6aa30f365d70e6dd94a83fa23357f0544491d
+  data.tar.gz: 195b72d5e9222aff857711ae286141b3ded71131622ecc719a953ca0aebe5ee7109b603c54221148ce4565c2feef1f478abd40fd21178f65c2151b01bb053208

data/lib/martile.rb

@@ -13,6 +13,8 @@ require 'mindmapdoc'
 require 'flowchartviz'
 
 
+# feature:  23-Dec-2018 A SectionX or KVX object can now be referenced 
+#                       from interpolated variables
 # feature:  17-Dec-2018 Now automatically generates a toc when there are 3 
 #                       sections or more
 # feature:   3-Oct-2018 An embed tag can now be used to dynamically load content
@@ -131,8 +133,9 @@ class Martile
     s210 = apply_filter(s200) {|x| qrcodetag x }
     s220 = apply_filter(s210) {|x| svgtag x }
     s230 = apply_filter(s220) {|x| embedtag x }
+    s240 = apply_filter(s230) {|x| script_out x }
     
-    @to_s = s230
+    @to_s = s240
     
     s240 = Yatoc.new(Kramdown::Document.new(s230).to_html, debug: debug).to_html
     puts ('s240:'  + s240.inspect).debug if debug    
@@ -567,9 +570,32 @@ class Martile
     a = s.split(/^__DATA__$/,2)
 
     data = a[-1]
-
-    data.split(/(?=<\?)/).each do |x|
     
+    links, locals = data.split(/(?=<)/, 2)
+    
+    links.strip.split("\n").each do |line|
+      
+      puts ('line:'  + line.inspect).debug if @debug
+      next if line.nil?
+      
+      id, url = line.split(/:\s+/,2)
+      puts 'id: ' + id.inspect if @debug
+      puts 'url: ' + url.inspect if @debug
+      
+      obj, _ = RXFHelper.read(url, auto: true)
+      define_singleton_method(id.to_sym) { @data_source[id] }
+      @data_source[id] = obj 
+      
+    end
+    
+    puts 'before locals' if @debug
+    
+    locals ||= ''
+    
+    locals.split(/(?=<\?)/).each do |x|
+
+      puts ('__data__ x: ' + x.inspect).debug if @debug
+      
       s2 = x.strip
       next if s2.empty?
       
@@ -589,6 +615,21 @@ class Martile
       when /^<\?flowchart(?:viz)? /
         
         Flowchartviz.new s2        
+        
+      when /^<\?sectionx /
+        
+        sx = SectionX.new
+        sx.import s2
+        define_singleton_method(id.to_sym) { @data_source[id] }
+        sx
+        
+      when /^<\?kvx /
+        
+        kvx = Kvx.new s2
+
+        define_singleton_method(id.to_sym) { @data_source[id] }
+        kvx        
+        
       end    
     end
     
@@ -632,7 +673,11 @@ class Martile
 
     s.gsub(/\^[\w ]+\^/) {|x| "<mark>%s</mark>" % x[1..-2] }
 
-  end  
+  end
+
+  def script_out(s)
+    s.gsub(/({!)[^}]+\}/) {|x| eval(x[/(?<={!)[^}]+/]) }
+  end
   
   def smartlink(s)
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   h9crBM07TwSkUs7Sqw12Wh0aEldB8f+8+8mRzbWrJxdYt0EC7ZeByVSu26XqSA9a
   QUQ=
   -----END CERTIFICATE-----
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2018-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc
@@ -38,20 +38,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +81,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: flowchartviz
   requirement: !ruby/object:Gem::Requirement