martile 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fb9f0c5d9cf0623795ba66a2116f33dc06a756de0aea99a8cf954b82cd1a088
-  data.tar.gz: 918cff6aa70177d109dae4a82bd7da1eb69a0e3cf821e0cdf80223462c9bd6b3
+  metadata.gz: 57fb8dcb688e8dacc6aa9201a11e27a8677e00d5e8fd6f77faff1cf6b3932bc1
+  data.tar.gz: 2d1f43f87a9f167f77d41d8876b8dc2b4f93cf353b598fb5c2bfdd49dce4f42d
 SHA512:
-  metadata.gz: '0788c91db51446b301d09e5010e6b9578a0b0e937df178cbcb61ec17c3cc7a829e09ae6c287ef49e672aa6caa6d4bdc1ebe4081a29e3b8d6ef3b32233138dc2a'
-  data.tar.gz: ecfbe6d3e77975c97f315c3fb8d52258eac355412e6a4fbef5fe44d0898873442c017a8d6502b209f9a97dbca2339a42d8d87d72bc4a88b25b23232832995dd4
+  metadata.gz: 4d8fbdb4e965ae5cbb26e001d40cb19b84e5046f95b0a9d3a62646a71e3a676373eb60c4a47a48301d156b09c45443e2ea264b0e9438cf89c728fb12a5a6b271
+  data.tar.gz: 7545ab60ade0306951aa45905511a9fd56a23af9904c58f4b2f81ea471a6caabc03454ed0a55171aeeb2e412db2c7c0881fd55654247cc2ecfb84bbb07e3874f

data/lib/martile.rb

@@ -15,6 +15,7 @@ require 'jsmenubuilder'
 require 'htmlcom'
 
 
+# feature:  29-Feb-2020 The sidenav tag can now contain a raw hierachical list
 # feature:  22-Jan-2020 An HtmlCom::Accordion component can now be generated
 #                       using the tag <accordion>
 # feature:  16-Sep-2019 An HTML Tree component can now be generated when 
@@ -776,13 +777,37 @@ class Martile
   def sidenav(s1)
     
     s = s1.clone
-    if s =~ /^<sidenav\/>/ then
+    if s =~ /^<sidenav/ then
+      
+      content = s[/<sidenav[^>]+>[^<]+<[^>]+>/]
+      puts ('content: ' + content.inspect) if @debug
+      
+      doc = if content then
+      
+        s.sub!(content,'')
+        doc2 = Rexle.new(content)
+        target = doc2.root.attributes[:target] || 'pgview'
+        txt = doc2.root.text
+        puts 'txt: ' + txt.inspect if @debug
+        
+        html = HtmlCom::Tree.new(txt).to_webpage
+        puts 'html: ' + html.inspect if @debug        
+        
+        doc2 = Rexle.new(html)
+        
+        doc2.root.xpath('body/ul[@class="sidenav"]/li//a').each do |node|
+          node.attributes[:target] = target
+        end
+        
+        doc2
+        
+      else
+        s.sub!(/^<sidenav\/>/,'')
+        html = HtmlCom::Tree.new(s).to_webpage
+        Rexle.new(html)
+      end
+      
       
-      s.sub!(/^<sidenav\/>/,'')
-      #jtb = JsTreeBuilder.new :tree, {src: tree, debug: true}
-      jtb = JsTreeBuilder.new(:sidebar, {src: s, hn: 2, debug: @debug})
-      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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   g0+rPDPUCWKVNHo7BG5zGRDcLsJO0QeIILy/AQaSAE3lQiHmC47nhsiBK0qNehWa
   47XiKvz0ZVCGgrz4GEb723WC
   -----END CERTIFICATE-----
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc