mindmapdoc 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb7f980be65d7fbdeb609465376a069ab6c237f
-  data.tar.gz: e914a6107ddf93116bfd393b5ab2f0a62ad7d74c
+  metadata.gz: 48fb6a5690a698712730434dd6f79af2b53436d4
+  data.tar.gz: b25a696b53ad6bc8d9078e7ff57ecf8daa8eb97f
 SHA512:
-  metadata.gz: ed18f72c6f70d1460c9db993b57819aa08cb2318ad0727f3c93349323a21eb68f88605c6cca40ddf707c744375ddacbc80daf6dd0705cc14ea90e4e3dcbd5a8a
-  data.tar.gz: af89280edf4cb70a598afee008834198ceaf0b0d191e4fabfcdb0c9071a7539b665441056bd28df809af19a885571e5a3697a689a06e5a720f6c7903267d3f45
+  metadata.gz: 4ebc4c07a9db4b3a400311e8afe93f0a40514dd16352ef26e4e383a84412a2dff0c1eea24d3255a235890ec6d472b45a2b74462aea4bdce2962bf1362c6fbd53
+  data.tar.gz: e15a756bc2075ba3403d49384633d3a2e7fc4fe9137ea8a55c235106caad5d810e328e5cc94264a5cea6c18903bd593e2eb670e7cc190462cfd8fffd4343bfed

data/lib/mindmapdoc.rb

@@ -6,11 +6,12 @@ require 'rdiscount'
 require 'mindmapviz'
 
 
+
 class MindmapDoc
 
   attr_accessor :root
 
-  def initialize(s=nil, root: 'root', debug: false)
+  def initialize(s=nil, root: nil, debug: false)
 
     @root, @tree, @txtdoc, @svg, @debug = root, '', '', '', debug
     import(s) if s
@@ -42,22 +43,24 @@ class MindmapDoc
   #
   def transform(s)
     
-    a = s.split(/(?=<mindmap>)/)
+    a = s.split(/(?=^<mindmap[^>]*>)/)
     puts 'transform: a: ' + a.inspect if @debug
     
     count = 0
     
     a2 = a.map do |x|
 
-      if x =~ /^<mindmap>/ then
+      if x =~ /^<mindmap/ then
         
         count += 1
         
-        mm, remaining = x[/<mindmap>(.*)/m,1].split(/<\/mindmap>/,2)
+        mm, remaining = x[/<mindmap[^>]*>(.*)/m,1].split(/<\/mindmap>/,2)
         raw_tree, raw_md = mm.split(/-{10,}/,2)
         mm1, mm2 = [raw_tree, raw_md].map {|x| MindmapDoc.new x}
+        docwidth = x[/<mindmap +docwidth=['"]([^'"]+)/,1]
+        puts 'docwidth: ' + docwidth.inspect if @debug
         
-        mm_template(mm1.to_svg, mm2.to_doc, count)    
+        mm_template(mm1.to_svg, mm2.to_doc, count, docwidth) + remaining
         
       else
         x
@@ -116,9 +119,10 @@ class MindmapDoc
   
   # used by public method transform()
   #
-  def mm_template(svg, doc, count)
+  def mm_template(svg, doc, count, docwidth='50%')
 
-    style = 'float: right; width: 50%; overflow-y: auto; height: 70vh'
+    style = "float: right; width: #{docwidth || '50%'}; \
+overflow-y: auto; height: 70vh; "
     
 "<div id='mindmap#{count}'>
 #{svg}
@@ -154,7 +158,17 @@ class MindmapDoc
   #
   def parse_tree(s)
 
-    asrc = [@root + "\n"] + s.gsub(/\r/,'').strip.lines.map {|x| '  ' + x}
+    puts 'inside parse_tree' if @debug
+    
+    lines = s.gsub(/\r/,'').strip.lines
+    
+    @root = if lines.first[/^[^#\s]/] then
+      lines.shift.chomp
+    elsif @root.nil?
+      'root'
+    end
+  
+    asrc = [@root + "\n"] + lines.map {|x| '  ' + x}
 
     a2 = asrc.inject([]) do |r,x| 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mindmapdoc
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   MVgPwk1JjHwj6LchFY/zTEamSovovbrRFMSbfw5kdbPk/wmOGRYaEwTk7wm8u0Zm
   RRHYVIirxLY0zg==
   -----END CERTIFICATE-----
-date: 2018-02-12 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount