martile 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 445281e12c8f376f78b11e9dd15c64f4100bcef0f43a3b1b5677f6839230e9ca
-  data.tar.gz: 14203ff4903cd96d1e5dc8855ab53aff61f433c89186468bc691156f67563b42
+  metadata.gz: be76b25bcef2907f0d7603e5576018fe669ca9b954fff5b14bd002ba648a20f0
+  data.tar.gz: 2c66373e1409180abc5d6f06f1698e516bf0fe658b792cd68e36ed866c9781be
 SHA512:
-  metadata.gz: 6dbed2b98a733948b790a5559e9a3d6fb75a24a59078b7c6f4d6576aa91a5f6e65a1a580acd826e5eb28bab5c00d4114125160fd330c0e9d4368b9d906285e49
-  data.tar.gz: 5bd64f861d26f65037c4e1f67a6108f901d616fceddd00546bfeb9df3b90ee57755657a511de0f57891155507bb3e447dbefe445f8e0f0acc189a40001a0c7af
+  metadata.gz: 5bae3c21b1974e818bb50d36b593b1c98f8ebf0ad559fe6aeab269bc43fbb34ea31e50e53abd7e9fbaecd52356e07786db6a0c1b22f02b8a233302bf2b35f925
+  data.tar.gz: f94ae42b6b29daedb73d810e2acc0a24bf41724d49e9ff83ce20d3822de73838591f65dcb9415c47a209a9fdeaa7d5c9da0acdb9d42ff7c0d45ad8ffd5ea798d

data/lib/martile.rb

@@ -11,8 +11,10 @@ require 'rqrcode'
 #require 'rdiscount'
 require 'mindmapdoc'
 require 'flowchartviz'
+require 'jsmenubuilder'
 
 
+# feature:  16-Jul-2019 An HTML Tabs component can now be created from XML
 # feature:  05-May-2019 Dimensions can now be supplied for an iframe
 # improvment: 06-Mar-2019 Checks for mindmap tags outside of other tags
 # feature:  03-Mar-2019 A high level mindmap with associated doc can now be 
@@ -76,7 +78,7 @@ require 'flowchartviz'
 class Martile
   using ColouredText
 
-  attr_reader :to_s, :to_html, :data_source, :to_css
+  attr_reader :to_s, :to_html, :data_source
 
   def initialize(raw_s='', ignore_domainlabel: nil, debug: false, log: nil)
 
@@ -86,14 +88,15 @@ class Martile
     
     @ignore_domainlabel, @log = ignore_domainlabel, log
     
-    @css = []
+    @css, @js = [], []
 
     raw_s.gsub!("\r",'')
     
     mmd = MindmapDoc.new(debug: debug)
     s5 = apply_filter(raw_s) {|x| mmd.to_mmd(x) }
     s10 = apply_filter(s5) {|x| mmd.transform(s5) }
-    puts 's10: ' + s10.inspect if debug    
+    #puts 's10: ' + s10.inspect if debug
+    #s10 = raw_s
     s20 = s10 =~ /^__DATA__$/ ? parse__data__(s10) : s10
     puts ('s20: ' + s20.inspect).debug if debug    
     
@@ -147,10 +150,12 @@ class Martile
     s230 = apply_filter(s220) {|x| embedtag x }
     s240 = apply_filter(s230) {|x| script_out x }
     
-    @to_s = s240
+    @to_s = s240.to_s
     
     s250 = apply_filter(s240) {|x| nomarkdown x }
-    s260 = Yatoc.new(Kramdown::Document.new(s250).to_html, debug: debug).to_html
+    
+    s255 = tabs(s250)
+    s260 = Yatoc.new(Kramdown::Document.new(s255).to_html, debug: debug).to_html
     puts ('s260: '  + s260.inspect).debug if debug    
     
     #puts 's17 : ' + s17.inspect
@@ -201,7 +206,10 @@ class Martile
     @css.join("\n")
   end
   
-
+  def to_js()
+    @js.join("\n")
+  end
+  
   private
   
   def audiotag(s)
@@ -653,6 +661,18 @@ class Martile
         
         Flowchartviz.new s2        
         
+      when /^<\?graphvizml /
+        
+        GraphVizML.new s2        
+                
+      when /^<\?pxgraphviz /
+        puts 'before PxGraphViz.new'.info if @debug
+        PxGraphViz.new s2, debug: @debug                        
+                
+      when /^<\?depviz /
+        
+        DepViz.new s2          
+        
       when /^<\?sectionx /
         
         sx = SectionX.new
@@ -697,6 +717,39 @@ class Martile
     end
     return s
   end
+  
+  def tabs(s1)
+    
+    s = s1.clone
+    
+    doc = Rexle.new("<root>#{s}</root>")
+    
+    a = doc.root.xpath('tabs').map.with_index do |e, i |
+      
+      build = JsMenuBuilder.new()
+      build.import(e.xml)
+      
+      if i < 1 then
+        @css << build.to_css 
+        @js << build.to_js
+      end
+      
+      build.to_html
+      
+    end
+    
+    a.each do |html|
+      
+      istart = s =~ /^<tabs[^>]*>/
+      iend = s =~ /^<\/tabs>/
+      s.slice!(istart, (iend - istart) + '</tab>'.length + 1)
+      s.insert(istart, html)
+      
+    end
+    
+    return s
+    
+  end
 
   def underline(s)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,7 +30,7 @@ cert_chain:
   h9crBM07TwSkUs7Sqw12Wh0aEldB8f+8+8mRzbWrJxdYt0EC7ZeByVSu26XqSA9a
   QUQ=
   -----END CERTIFICATE-----
-date: 2019-05-05 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc
@@ -112,6 +112,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
+- !ruby/object:Gem::Dependency
+  name: jsmenubuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: 
 email: james@jamesrobertson.eu
 executables: []