wiki_md 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 812073421ddfee0070fd6c340e54853949d4ba7cfbb5cd736a9b4ef54640efb1
-  data.tar.gz: bf512609589a4eb78fd2eeb9052fa4626052a4408621d32bd4417f9aaa461c31
+  metadata.gz: '0827d3ff8a838f7dbd0a7c579aa9614085a07e417973c47deb24c80fd7ca4422'
+  data.tar.gz: 56ddf102fae4fc8b8464389fb1d0d3b70fca3079eccde9ea7d388d5ee5fcc537
 SHA512:
-  metadata.gz: d8c2045c900695dd6eb122e1e869b34d2dd27aa79d62b2f64f746c924c668914003e92d94d3218358f5af0f80cd951782514b4cde6ef9df829a773a08515b0e6
-  data.tar.gz: 0c34abcedaf88c4cc771f6f9e66019f9ac684bd095afb2c7560e2a2b02a2a953754da3d3334b614463967192e2a3c46be49c0ab204a7eebddb6c32660c12f49b
+  metadata.gz: 904e3d93b2f9c20b75bf11dae84c066f79bcdce24d42a11d4a7555ca9992d47f976d34c733f5701269b99ef3b73f413ea5c45003446418a25c30a03be8545dcd
+  data.tar.gz: f07a725919290bbdaf79f2e379b28091592f0f20d9c985cefaf1a5a3a3f67d44fa5a8e5d87f77ea1f5fb7beb12db3b365a968ae61e36ed7d08664098bb29c0f1

data/lib/wiki_md.rb

@@ -19,9 +19,9 @@ class WikiMd
     
     attr_reader :heading, :body, :footer, :tags, :x
     
-    def initialize(rx)
+    def initialize(rx, debug: false)
       
-      @rx = rx
+      @rx, @debug = rx, debug
       @x = @rx.x
       parse_x()
       
@@ -52,6 +52,8 @@ class WikiMd
     def parse_x()
       
       a = @rx.x.lines
+      puts 'a: ' + a.inspect if @debug
+      
       @heading, @footer, @body = a.shift.chomp[/(?<=# ).*/], a.pop, 
           a.join.strip
       @tags = @footer[1..-1].strip.split
@@ -69,7 +71,9 @@ class WikiMd
     if wiki then
       
       puts 'before rxfhelper wiki: ' + wiki.inspect if @debug
-      s, type = RXFHelper.read(wiki, auto: false)
+      raw_s, type = RXFHelper.read(wiki, auto: false)
+      s = raw_s.strip
+      
       puts 'after rxfhelper s: ' + s.inspect if @debug
       
       puts ('type: ' + type.inspect).debug if debug
@@ -201,7 +205,7 @@ class WikiMd
     @dxsx.dx.all.map do |x| 
       
       puts 'x: ' + x.inspect if @debug
-      Entry.new(x)
+      Entry.new(x, debug: @debug)
       
     end
     
@@ -339,9 +343,12 @@ EOF
   def save(filename=@filename || 'mywiki.md')
     
     @filename = filename
-    @filepath = File.dirname(@filename)
+    puts '@filename: ' + @filename.inspect if @debug
     
-    FileX.write @filename=filename, dx_to_wmd(@dxsx.to_s)
+    @filepath = File.expand_path(File.dirname(@filename).to_s)
+    puts '@filepath: ' + @filepath.inspect if @debug
+    
+    FileX.write @filename=filename, dx_to_wmd(@dxsx.to_dx)
     
     puts ('before @dxsx save').debug if @debug
     @dxsx.save filename.sub(/\.md$/, '.xml')
@@ -370,11 +377,11 @@ EOF
   # generates an accordion menu in XML format. It can be rendered to 
   # HTML using the Martile gem
   #
-  def to_accordion()
+  def to_accordion(ascending: true)
     
     doc = Rexle.new('<accordion/>')
 
-    sort!()
+    sort!() if ascending
 
     entries.each do |x|
 
@@ -487,7 +494,7 @@ EOF
   
   def save_files()
     @filepath = File.dirname(@filename)
-    FileX.write @filename=filename, @dxsx.to_s    
+    FileX.write @filename=filename, dx_to_wmd(@dxsx.to_dx)
     @dx.save
   end
 
@@ -529,8 +536,21 @@ EOF
   def new_index(indexfile)
     
     dx = Dynarex.new 'entries[doc]/entry(title, url)', autosave: true, 
-        debug: @debug, order: 'title ascending'
-    dx.save indexfile    
+        debug: @debug, order: 'title ascending', filepath: indexfile
+
+    
+    entries.each do |entry|
+
+      record = {title: entry.heading + ' #' + entry.tags.join(' #'), 
+          url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],  
+                URI.escape(entry.heading.gsub(/ /,'_'))].join('/')}
+                
+      dx.create record    
+
+    end
+    
+    puts ('indexfile: ' + indexfile.inspect).debug if @debug
+    dx.save indexfile
     dx
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiki_md
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   N5hZmnA6M2h3NysLCPRtwS2vMJh8qq6OS5RjU9cc5V08vyIkQ7/YC/x+7kLm5Kn0
   kvoWXxa8gpUBS+qMlSYFDHlq
   -----END CERTIFICATE-----
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx