martile 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45bed3d0771bb32b6215f3b90ed567171b628811ca7a1fa0f721a198945f5b35
-  data.tar.gz: 6f30e95b6696a2dc82ba117c91e0a7fe06a99822e02ad60abbf540ccf43f08a3
+  metadata.gz: b385e21a3ab1023ef2d570da9bb2a62efc26146250a5bfd4e20fd3ec990ef06d
+  data.tar.gz: f5acf9194da31afc5e1cf2b4d37cb6f69e6f6b52f41aac6cafca07969f3bb7d1
 SHA512:
-  metadata.gz: 1b7da4fbed2332530432d3784eec11fb071db3ae66d3aebf7d3638ecc7a14418a5bd65cc9d299a23bbddc78b9b15d4b2380890bc4e748d3ea27218514b0ce1b0
-  data.tar.gz: 7e538b514e0d0e361585b16c65525fdff0caf2576c6eeaee1791b26ee0bdb9fc708ef246586e29844eef53a500cfdc6c924c7cf00545c3e6ca10fd7b52e9a52f
+  metadata.gz: 88ea1fea26b15988059043ffcf375a18249d1d8b1dec70c16c5522e18fc223ab43080e698bbb2bfb117aa987b6a4d43e2e06c01fd917970fff833141d2782c91
+  data.tar.gz: 5d46d533bc864562d45a362bb41bc0d92fb565d6a8ed30f17749a549ab35c4b2abe66316b5228966594d2f76ec3ed1be90820175df205de1fe8af5d7d96b45b8

data/lib/martile.rb

@@ -14,6 +14,8 @@ require 'flowchartviz'
 require 'jsmenubuilder'
 
 
+# feature:  16-Sep-2019 An HTML Tree component can now be generated when 
+#                       the tag <sidebar/> is used
 # feature:  16-Jul-2019 An HTML Tabs component can now be created from XML
 #                       XML can now be created using !tag notation e.g. !tabs
 # feature:  05-May-2019 Dimensions can now be supplied for an iframe
@@ -81,7 +83,8 @@ class Martile
 
   attr_reader :to_s, :to_html, :data_source
 
-  def initialize(raw_s='', ignore_domainlabel: nil, debug: false, log: nil)
+  def initialize(raw_s='', ignore_domainlabel: nil, toc: true, debug: false, 
+                 log: nil)
 
 
     @debug = debug
@@ -154,14 +157,24 @@ class Martile
     @to_s = s240.to_s
     
     s250 = apply_filter(s240) {|x| nomarkdown x }
-    
-    s253 = bang_xml(s250)
+    s252 = sidenav(s250)
+    s253 = bang_xml(s252)
+    puts ('s235 after bang_xml: ' + s253.inspect).debug if @debug
+
     s255 = tabs(s253)
-    s260 = Yatoc.new(Kramdown::Document.new(s255).to_html, debug: debug).to_html
-    puts ('s260: '  + s260.inspect).debug if debug    
+    puts ('s255 after tabs: ' + s255.inspect).debug if @debug
     
-    #puts 's17 : ' + s17.inspect
+    toc = false if s255 =~ /class=['"]sidenav['"]>/ 
     
+    s260 = if toc then
+      Yatoc.new(Kramdown::Document.new(s255).to_html, debug: debug).to_html
+    else
+      s255
+    end
+    
+    puts ('s260: '  + s260.inspect).debug if debug        
+    #puts 's17 : ' + s17.inspect
+
     @to_html = s260
     
   end
@@ -718,6 +731,28 @@ class Martile
     a[0..-2].join
     
   end
+  
+  def sidenav(s1)
+    
+    s = s1.clone
+    if s =~ /^<sidenav\/>/ then
+      
+      s.sub!(/^<sidenav\/>/,'')
+      #jtb = JsTreeBuilder.new :tree, {src: tree, debug: true}
+      jtb = JsTreeBuilder.new(:sidebar, {src: s, hn: 2, debug: true})
+      html = jtb.to_webpage
+      doc = Rexle.new(html)
+      html2 = Kramdown::Document.new(Martile.new(s, toc: false).to_html)\
+        .to_html
+      div = Rexle.new("<div class='main'>%s</div>" % html2)
+
+      doc.root.element('body/ul').insert_after  div.root
+      doc.xml(declaration: false)
+    else
+      s1
+    end
+
+  end
 
   def table_to_html(s)
     
@@ -748,7 +783,7 @@ class Martile
     s = s1.clone
     
     doc = Rexle.new("<root>#{s}</root>")
-    
+    puts 'doc.root.xml: ' + doc.root.xml.inspect if @debug
     a = doc.root.xpath('tabs').map.with_index do |e, i |
       
       build = JsMenuBuilder.new()
@@ -762,7 +797,9 @@ class Martile
       build.to_html
       
     end
-    
+    puts 'tabs a:' + a.inspect if @debug
+
+    # replaces the <tabs> XML with HTML
     a.each do |html|
       
       istart = s =~ /^<tabs[^>]*>/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNzIzMDk0NDI5WhcN
-  MTkwNzIzMDk0NDI5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwfp13
-  9uVBVoJJp1oHHQalluwWpU3nz9Jc8ullSoGgqZIhyojes2xEYyLxpH7NrHaFkT+D
-  nktpIBXGqBd4Ws3KOca4fWZc7SXeV4ZDsg0sZ3JhJeyBdXsNbSecbJAR9V1C8lke
-  66D57mq37JJUGXAdqobTbStJzsVs5NYMWKOdF4fxr9e81bLLVmwzlSV9zsfqv6BG
-  qYstlCktdJZK75VBw81vlsu5LkS/hlabtTECkXXg/kbmZ4ap2JUU6OWGEbNX9H9z
-  +32VSVNh1xpil1TUtEB/XDX1H8z80W7zylzqf5vF9GXrQAuGM0KE+awWM8SgN36d
-  CgyzhzIUYFcppwHzAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFHGsvIkCXBMjMK0UORqOkQT/MfrMMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAAsJLX2e4bv+02/BrLr9
-  xxMG2XGMJei7gUyQbVifInSCEm1usNakx5PIPy4UBeSp/EaSuXV7KO6jqZTeBs1o
-  XI9x9ELUf+YO+9CV4/CP3WmjepQ3drZY7oRt7fyhVRbTR3Ey/N8Gjvkomku1xVaf
-  +5KNJjpNNT0ZWIl8Le3aOrS9FaGLglmsFvCHjVmW5x23SM50oliGw/kUSf62UFIL
-  n7suVG+ciUKasz70DplBkzIlMmqct4Dd//7YbfPbqxNCZ8uvbiWm8At8Y80FhvM1
-  h9crBM07TwSkUs7Sqw12Wh0aEldB8f+8+8mRzbWrJxdYt0EC7ZeByVSu26XqSA9a
-  QUQ=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwOTE2MjEzODM5WhcN
+  MjAwOTE1MjEzODM5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCnenuP
+  FWIwR7SoLI3RGCP/z/DId3Gn1vydwIIJoEjYUJo4ggN89r9DNybRna/5AkU/4ZqB
+  qNATSqcDduNjOsaLnIkdhlsCZsF/JOETIXbnNK9Vq+yb1guQD5k5VYd4G+8YrVyq
+  Ym7cFUZubzIpyMIJeWxlonT/pa9LasRKNIHjjagUU0HGUFXl45tzcJ9DI9GoXlLf
+  VggQrlotu7odMgPaxyy5b44AWDByzS/0SawkeNCpN32QedSchhRN6n42w0SQodZg
+  /aY58Z6UfbgXSEYMgWJ12yAhmBuMueD4evqLUTCG5wim8TgZ7qhTA4rjWPp6upAC
+  uSkqtXBclU71u/k4UFpAOKWXibXrpZvuOg0J/GTdGZrsAHnPVpR5utG6nYL+/8qx
+  vEYr8jtDiyaL7qI/lM95cei55s9/0OiI1TYa0Yffv2y2qLgtiYtc0pD+IDn2s/+3
+  opQ7OV6G5Vl0Xuo6r+h8UbhHAFKsm88990Z02+yIP/1IddHSu8/8npXxe3kCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUX2EmAO1E
+  PSABL4PMtcQQi626eGMwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAQSJ/hREtKoMtmTPUdqbSlhgNt7EQwzpfDijG0MzV
+  YaiohOzGuUtSS4YwS7el0uAm4GfR33FlSclL2YTRn0PrtXY4fqQpw7LpHO7qNTzH
+  4GEP1prieo5mnw1pbkqQoeTu36Z8P5GBLJC0C4tczXMrRB8ZmsubSir7XAEaU5vh
+  1tv9y0GBL/pzxT1JeJuDw/1ddw5oGZxKilkqq4/upO/Su2AnOzplMNccaFK1H1yP
+  MjZtfGRVDtIKPH91jwfBtU+4IxeoY/HCZL03vTg9RAbJgg/5l5ndx8E17kcWK+cM
+  oU4MMgC5Xl/m7dI9DIQgIXi3CU4Z4LF+i8kgUw7VOP1mDug67fcfSMVus8NbLWEe
+  6jg2WIgE1SSAq8SeDCEkqwLyvDirsS6jUfM20LXaGEeSPr4Vc6Y4FKYfrEv2Vp6S
+  g0+rPDPUCWKVNHo7BG5zGRDcLsJO0QeIILy/AQaSAE3lQiHmC47nhsiBK0qNehWa
+  47XiKvz0ZVCGgrz4GEb723WC
   -----END CERTIFICATE-----
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc
@@ -56,22 +61,22 @@ dependencies:
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mindmapdoc
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +86,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +96,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: flowchartviz
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +119,26 @@ dependencies:
         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.3
+  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.3
+- !ruby/object:Gem::Dependency
+  name: jstreebuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -158,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Martile is a Markdown pre formatter which is designed to format custom Markdown