wiki_md 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0827d3ff8a838f7dbd0a7c579aa9614085a07e417973c47deb24c80fd7ca4422'
-  data.tar.gz: 56ddf102fae4fc8b8464389fb1d0d3b70fca3079eccde9ea7d388d5ee5fcc537
+  metadata.gz: 408698c62b969e712beb279dee3d60915fc46a023cf44b9b7d17d2d03ff4a32f
+  data.tar.gz: a72992cc840872a1dde3c8918d42d46f3ba83a03887b1527b3899dc5ac48f137
 SHA512:
-  metadata.gz: 904e3d93b2f9c20b75bf11dae84c066f79bcdce24d42a11d4a7555ca9992d47f976d34c733f5701269b99ef3b73f413ea5c45003446418a25c30a03be8545dcd
-  data.tar.gz: f07a725919290bbdaf79f2e379b28091592f0f20d9c985cefaf1a5a3a3f67d44fa5a8e5d87f77ea1f5fb7beb12db3b365a968ae61e36ed7d08664098bb29c0f1
+  metadata.gz: 43d2129e8231a72c2b29da45211980bfdf7bfacfed17ea1e7f46f8e68a09367b4cf27a1fc4b56354543b5e4f49b54d5e57b4a03e2bfbe51f54e376faca7d55f0
+  data.tar.gz: 9962124d7bf79537502b5aa2bb62eff4b48a36cfe3705ecd6e1bfaddc785f8c2b296c27a5fa200d433550c2f93f42293514a492ea6d0fe75acced2a44af0408a

data/lib/wiki_md.rb

@@ -355,11 +355,17 @@ EOF
     @dx = new_index(File.join(@filepath, 'index.xml')) unless @dx
     
   end
-
+  
   def sort!()
+    
     @dxsx.dx.sort_by! do |rec|
       rec.element('x').value.lines.first.chomp[/(?<=^# ).*/]
-    end       
+    end
+    
+  end
+  
+  def tags()
+    @dxtags.tags
   end
   
   def title()
@@ -377,13 +383,39 @@ EOF
   # generates an accordion menu in XML format. It can be rendered to 
   # HTML using the Martile gem
   #
-  def to_accordion(ascending: true)
+  def to_accordion(ascending: true, includetags: false)
     
     doc = Rexle.new('<accordion/>')
+    
+    unsortedrows = entries
+    
+    if includetags then
+      
+      unsortedrows += tags().map do |key, value|
 
-    sort!() if ascending
+        body = value.map do |x|
 
-    entries.each do |x|
+          title = x[:title][/^[^#]+/].rstrip
+          "* [%s](#%s)" % [title, title.downcase.gsub(/\W/,'-')\
+                        .gsub(/-{2,}/,'-').gsub(/^-|-$/,'')]
+        end
+
+        OpenStruct.new(heading: key, body: body.join("\n"))
+        
+      end
+      
+      
+      
+    end
+    
+    puts 'ascending: ' + ascending.inspect if @debug
+    
+    rows = ascending ? unsortedrows.sort_by {|x| x.heading.downcase} \
+        : unsortedrows
+    
+    puts 'rows: ' + rows.inspect if @debug
+
+    rows.each do |x|
 
       e = Rexle::Element.new('panel')
       e.add_attribute(title: x.heading)
@@ -546,6 +578,7 @@ EOF
                 URI.escape(entry.heading.gsub(/ /,'_'))].join('/')}
                 
       dx.create record    
+      @dxtags.add record
 
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiki_md
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   N5hZmnA6M2h3NysLCPRtwS2vMJh8qq6OS5RjU9cc5V08vyIkQ7/YC/x+7kLm5Kn0
   kvoWXxa8gpUBS+qMlSYFDHlq
   -----END CERTIFICATE-----
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx
@@ -63,20 +63,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 description: 
 email: james@jamesrobertson.eu
 executables: []

metadata.gz.sig

@@ -1,2 +1,2 @@
-�SlPG�(%��
-�>7�FP3E�V^Lg䋺#"�<
��o	�n;��E
f{�#H����'3^�����/�bi�5�傒���2Vka/��%��Y�[&N��g����䲛�n�c��[��
+6���Gto;��/�!w}�o��z�����#�~����C�}k����Y��'��!Wvr̹+(�f�.�Tq��T��Ǖ0�)��Kg��w!�&����%`4Ɖ�K�.���
�!#
+$˃��Sf9�kÑ�z�h��j�Γֿ�p������O"vJ?^���}Ȍр�rZ��9m[홏����]�Oy�>�7�b?V���8�a{5���!��#�G��5�f�'�Nj���5�������@&�7�R}�L���O|��7E�B�J9����hI�]r���!���W�}���K[�"KS�G *����`УiuCW}��6