martile 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b385e21a3ab1023ef2d570da9bb2a62efc26146250a5bfd4e20fd3ec990ef06d
-  data.tar.gz: f5acf9194da31afc5e1cf2b4d37cb6f69e6f6b52f41aac6cafca07969f3bb7d1
+  metadata.gz: 8fb9f0c5d9cf0623795ba66a2116f33dc06a756de0aea99a8cf954b82cd1a088
+  data.tar.gz: 918cff6aa70177d109dae4a82bd7da1eb69a0e3cf821e0cdf80223462c9bd6b3
 SHA512:
-  metadata.gz: 88ea1fea26b15988059043ffcf375a18249d1d8b1dec70c16c5522e18fc223ab43080e698bbb2bfb117aa987b6a4d43e2e06c01fd917970fff833141d2782c91
-  data.tar.gz: 5d46d533bc864562d45a362bb41bc0d92fb565d6a8ed30f17749a549ab35c4b2abe66316b5228966594d2f76ec3ed1be90820175df205de1fe8af5d7d96b45b8
+  metadata.gz: '0788c91db51446b301d09e5010e6b9578a0b0e937df178cbcb61ec17c3cc7a829e09ae6c287ef49e672aa6caa6d4bdc1ebe4081a29e3b8d6ef3b32233138dc2a'
+  data.tar.gz: ecfbe6d3e77975c97f315c3fb8d52258eac355412e6a4fbef5fe44d0898873442c017a8d6502b209f9a97dbca2339a42d8d87d72bc4a88b25b23232832995dd4

data/lib/martile.rb

@@ -12,8 +12,11 @@ require 'rqrcode'
 require 'mindmapdoc'
 require 'flowchartviz'
 require 'jsmenubuilder'
+require 'htmlcom'
 
 
+# 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 
 #                       the tag <sidebar/> is used
 # feature:  16-Jul-2019 An HTML Tabs component can now be created from XML
@@ -164,12 +167,14 @@ class Martile
     s255 = tabs(s253)
     puts ('s255 after tabs: ' + s255.inspect).debug if @debug
     
-    toc = false if s255 =~ /class=['"]sidenav['"]>/ 
+    s257 = accordion(s255)
+    
+    toc = false if s257 =~ /class=['"]sidenav['"]>/ 
     
     s260 = if toc then
-      Yatoc.new(Kramdown::Document.new(s255).to_html, debug: debug).to_html
+      Yatoc.new(Kramdown::Document.new(s257).to_html, debug: debug).to_html
     else
-      s255
+      s257
     end
     
     puts ('s260: '  + s260.inspect).debug if debug        
@@ -227,6 +232,41 @@ class Martile
   
   private
   
+  def accordion(s1)
+    
+    s = s1.clone
+    
+    doc = Rexle.new("<root>#{s}</root>")
+    puts 'doc.root.xml: ' + doc.root.xml.inspect if @debug
+    a = doc.root.xpath('accordion').map.with_index do |e, i |
+      
+      build = HtmlCom::Accordion.new(e.xml, debug: false)
+      
+      if i < 1 then
+        @css << build.to_css 
+        @js << build.to_js
+      end
+      
+      build.to_html
+      
+      
+    end
+    puts 'accordion a:' + a.inspect if @debug
+
+    # replaces the <accordion> XML with HTML
+    a.each do |html|
+      
+      istart = s =~ /^<accordion[^>]*>/
+      iend = s =~ /<\/accordion>/
+      s.slice!(istart, (iend - istart) + '</accordion>'.length + 1)
+      s.insert(istart, html)
+      
+    end
+    
+    return s
+    
+  end  
+  
   def audiotag(s)
     
     s.gsub(/\B!a\[\]\((https?:\/\/[^\)]+)\)\B/) do |x|
@@ -305,7 +345,8 @@ class Martile
         x[2..-1].sub(/(.*)[^\+]+\n\+/m) do |x2|
 
           summary, detail = x2.split(/----+/,2)
-          "<details><summary>%s</summary>%s</details>" % [summary, detail.chop]
+          "<details><summary>%s</summary>%s</details>" % \
+              [summary, Martile.new(detail.chop).to_html]
 
         end
         
@@ -739,7 +780,7 @@ class Martile
       
       s.sub!(/^<sidenav\/>/,'')
       #jtb = JsTreeBuilder.new :tree, {src: tree, debug: true}
-      jtb = JsTreeBuilder.new(:sidebar, {src: s, hn: 2, 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)\

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   g0+rPDPUCWKVNHo7BG5zGRDcLsJO0QeIILy/AQaSAE3lQiHmC47nhsiBK0qNehWa
   47XiKvz0ZVCGgrz4GEb723WC
   -----END CERTIFICATE-----
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2020-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc
@@ -61,22 +61,22 @@ dependencies:
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: mindmapdoc
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.10
 - !ruby/object:Gem::Dependency
   name: jstreebuilder
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.2
+- !ruby/object:Gem::Dependency
+  name: htmlcom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 description: 
 email: james@jamesrobertson.eu
 executables: []