martile 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc855a6e087fd6a67eaf8556d57f7c62cef56411
-  data.tar.gz: 1ae382806102a9bf9c3ada1ab9fd6df97c7b5635
+  metadata.gz: 5c9050ed070ce8ba9b23417e4cdc7f458f631010
+  data.tar.gz: dc5273e48401c4586c298142bce8c5365d4cf8a5
 SHA512:
-  metadata.gz: 9c209c6cbc7f4232ff811595818f4c9fbd0f0d554ffb1be4cb7caa2a1914658dfa96fbabf9603f974aba64b57ff487dfc04cc59a000ae8d09de65c27bb13d74c
-  data.tar.gz: 3a53360139e72bd15d87da0cf65ad5616cbd9514fbc4875041b9c2269f97a187bb11d1a120ad580cd94a7d9881d3aaf5fdfec5c833a689e336fcd9d5b264f2be
+  metadata.gz: 2c4ea26e9b558a41c74f028c05d10b157099571fcbb16f1e92b969790b1f2b061532dbfa78d6ee6db77c964b7642658ecbd6656ce786c5a1c4503ce2d0358db7
+  data.tar.gz: e5fa8bd3af9e1be7a1c47484d8e32a014effb8580f823f0bd9db217a514bdca3fd278bdbc1ae658a7f8868823058e1f866f4344c5a23962d57ca369ef8a10827

data/lib/martile.rb

@@ -4,11 +4,13 @@
 
 #require 'rexle-builder'
 #require 'rexle'
+require 'kvx'
 require 'dynarex'
 require 'rdiscount'
-require 'kvx'
+require 'mindmapviz'
 
 
+# feature:   9-Sep-2017 A Mindmapviz raw document can now be embedded
 # feature:   8-Sep-2017 An SVG doc can now be embedded from !s[]()
 # feature:   6-Sep-2017 The preparation of a Dynarex table in Markdown is now 
 #                       done from the Dynarex object
@@ -337,6 +339,7 @@ class Martile
     end
 
   end
+    
   
   def mtlite_utils(s)
     
@@ -481,10 +484,17 @@ class Martile
       next if s2.empty?
       
       id = s2.lines.first[/id=["']([^"']+)/,1]
-      dx = Dynarex.new
-      dx.import s2
-
-      @data_source[id] = dx    
+      
+      @data_source[id] = case s2 
+      when /^<\?dynarex /
+        
+        dx = Dynarex.new
+        dx.import s2
+        dx
+      when /^<\?mindmapviz /
+        
+        Mindmapviz.new s2
+      end    
     end
     
     a[0..-2].join
@@ -598,12 +608,22 @@ class Martile
   
   def svgtag(s)
     
-    s.gsub(/\B!s\[\]\((https?:\/\/[^\)]+)\)/) do 
+    s.gsub(/\B!s\[\]\((#\w+|https?:\/\/[^\)]+)\)/) do 
+      
+      source = ($1)  
+      
+      svg = if source =~ /^http/ then
+      
+        RXFHelper.read($1).first        
+        
+      else
+        
+        @data_source[source[/\w+/]].to_svg
+        
+      end     
       
-      svg = RXFHelper.read($1).first
       svg.slice!(/.*(?=<svg)/m)
       svg
-      
     end
 
   end
@@ -641,4 +661,4 @@ class Martile
     s.gsub(/\B(\* +)([^\n]+)\s+(https?:\/\/.*)/,'\1[\2](\3)')
 
   end    
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,8 +31,28 @@ cert_chain:
   ta+wi0WcePPmMfSbCGQcYixXdM6qZvflWMz0AK44eQcm6OymMXgMQG6GvHPAl6s2
   ASPGReskINIIrA==
   -----END CERTIFICATE-----
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: kvx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +82,7 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.24
+        version: 1.7.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,27 +92,27 @@ dependencies:
         version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.24
+        version: 1.7.25
 - !ruby/object:Gem::Dependency
-  name: kvx
+  name: mindmapviz
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 0.2.1
 description: 
 email: james@jamesrobertson.eu
 executables: []