wiki_md 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 408698c62b969e712beb279dee3d60915fc46a023cf44b9b7d17d2d03ff4a32f
-  data.tar.gz: a72992cc840872a1dde3c8918d42d46f3ba83a03887b1527b3899dc5ac48f137
+  metadata.gz: f179c7fda9f033d0fd9480f52210a7fc7cdbd130284438382287dcf23a2ba86c
+  data.tar.gz: 8ad74ac23cf8e38085e52e1873358117cefc5f0785fd4031c5816dd8a05229ea
 SHA512:
-  metadata.gz: 43d2129e8231a72c2b29da45211980bfdf7bfacfed17ea1e7f46f8e68a09367b4cf27a1fc4b56354543b5e4f49b54d5e57b4a03e2bfbe51f54e376faca7d55f0
-  data.tar.gz: 9962124d7bf79537502b5aa2bb62eff4b48a36cfe3705ecd6e1bfaddc785f8c2b296c27a5fa200d433550c2f93f42293514a492ea6d0fe75acced2a44af0408a
+  metadata.gz: 0c970215b77aee87f6f4c553ae473eeacac64274f0f64465288a8cfa39699081e51d0fee84176b9b781e3b58f8926adf650711e67fd33fce7a731c0704f8728a
+  data.tar.gz: 68834b7e7629348c33c721e4fd191287b9162c830ffce2f88a89d86fc456a655d08f35ba70c1263286857973913de42432da2311597a667f4ffceeba84575b65

data/lib/wiki_md.rb

@@ -88,6 +88,8 @@ class WikiMd
 
       end      
       
+     
+      
       if type == :unknown and s.lines.length == 1 then 
           
         #if FileX.exists?(File.dirname(s)) then
@@ -109,7 +111,14 @@ class WikiMd
         
         @filename = wiki
 
-        valid, msg = validate s
+        valid, msg = if s =~ /^<\?wikimd\b/ then
+          true
+        else
+          validate(s)
+        end
+        
+
+      
         raise WikiMdReadError, msg unless valid
         
         puts ('s: ' + s.inspect).debug if @debug
@@ -120,15 +129,23 @@ class WikiMd
 
         indexfile = File.join(@filepath, 'index.xml')
         
+        if s != FileX.read(wiki) then
+          
+          puts '*** file changed! ***'.info if @debug
+          FileX.rm indexfile
+          FileX.rm File.join(@filepath, 'dxtags.xml')
+          
+        end        
+        
         # check for the index.xml file      
-        @dx = load_index(indexfile)        
-        save()
+        @dx = load_index(indexfile) if FileX.exists? indexfile
         
       else
         
         @dxsx = read_raw_document s
         
       end      
+
       
     else
       
@@ -136,10 +153,10 @@ class WikiMd
       
     end
     
-    
+      
     @filepath ||= '.'
     
-    @dxtags = DynarexTags.new(@filepath, debug: debug)
+    @dxtags = DynarexTags.new(@filepath, debug: debug) 
             
   end
 
@@ -348,7 +365,13 @@ EOF
     @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 'dx_to_wmd: ' + dx_to_wmd(@dxsx.to_dx) if @debug
+    
+    contents = dx_to_wmd(@dxsx.to_dx)
+    FileX.write @filename=filename, contents
+    
+    # make a backup file
+    FileX.write @filename.sub(/\.\w+$/,'.bak'), contents
     
     puts ('before @dxsx save').debug if @debug
     @dxsx.save filename.sub(/\.md$/, '.xml')
@@ -400,7 +423,7 @@ EOF
                         .gsub(/-{2,}/,'-').gsub(/^-|-$/,'')]
         end
 
-        OpenStruct.new(heading: key, body: body.join("\n"))
+        OpenStruct.new(heading: key + " (#{value.length})", body: body.join("\n"))
         
       end
       
@@ -570,6 +593,7 @@ EOF
     dx = Dynarex.new 'entries[doc]/entry(title, url)', autosave: true, 
         debug: @debug, order: 'title ascending', filepath: indexfile
 
+    @dxtags = DynarexTags.new(@filepath, debug: @debug) 
     
     entries.each do |entry|
 

metadata

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