wiki_md 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2102023d5c0e53ad91044ab5be1699a4804c0929e691257be60c2b97a46244b4
-  data.tar.gz: cb2d830125bc67071eeb695c44f42bc1f19afaf6bdff3377922d9de6294d229a
+  metadata.gz: b52922c1d078c19d42b7796805e33bfd904f66640b72f3ea9f7bf6593851a07a
+  data.tar.gz: bfc54a71d573192f103503cdcd032fddcb8ad19e6029881c71d2572ffaeeac86
 SHA512:
-  metadata.gz: 48db7b3424eeacba6d855c97b8e49fc64040fe4700bd87afd7820612a5d439a5ff3ece826a6b750290f043dec0668042d37964fee6bb7e557f10f370301cb1a4
-  data.tar.gz: 78d6219952290cc62f7e4921472622b7711deb360e6db73bb3ab82780242efe7c39cfb98a9f261c59c49f3dd40fa4b2a22f51cece47eb1079d1a44c5ba7069cb
+  metadata.gz: 4061d8fbde7304fe6a26f4537c9ac93bb4d48636667281222ea0571fcfa68f9adc2ec0a1959b26f0abc6769bf97bb06f5b80cf00b1fead2b094043d277c71195
+  data.tar.gz: 1dbacc78c4f91252b0e17140eb42b3c0ffc24b244fa46ac52424f8f9617a9f3db6fa7026458f5bf909ec90634eac892abec0e86d453a339316328f3ae14031d3

data/lib/wiki_md.rb

@@ -13,15 +13,17 @@ class WikiMd
   attr_reader :active_heading, :filename, :dx
   
   def initialize(wiki=nil, domain: nil, debug: false, base_url: '', 
-                 tag_base_url: '/tag')
+                 tag_base_url: '/tag', order: 'ascending', title: 'MyWiki')
      
-    @domain, @debug, @base_url, @tag_base_url = domain, debug, base_url, 
-        tag_base_url
+    @domain, @debug, @base_url = domain, debug, base_url
+    @tag_base_url, @order, @title = tag_base_url, order, title
     
     if wiki then
       
       s, type = RXFHelper.read(wiki, auto: false)
       
+      puts ('type: ' + type.inspect).debug if debug
+      
       if debug then
         puts [
           's: ' + s.inspect,
@@ -30,10 +32,10 @@ class WikiMd
           .join("\n").debug
         puts ('file exists? ' + FileX.exists?(File.dirname(s)).inspect).debug
 
-      end
+      end      
       
-      if type == :unknown and s.lines.length == 1 and 
-          FileX.exists?(File.dirname(s)) then
+      if type == :unknown and (s.lines.length == 1 and 
+          FileX.exists?(File.dirname(s))) then
         puts 'before new_md()'.debug if debug
         new_md()
         @filename = wiki
@@ -43,7 +45,8 @@ class WikiMd
         @filename = wiki
         
         puts ('s: ' + s.inspect).debug if @debug
-        @dxsx = DxSectionX.new s, debug: debug, autosave: true
+        @dxsx = DxSectionX.new s, debug: debug, autosave: true, 
+            order: @order
         
         @filepath = File.dirname @filename
 
@@ -51,6 +54,11 @@ class WikiMd
         
         # check for the index.xml file      
         @dx = load_index(indexfile)        
+        save()
+        
+      else
+        
+        new_md(save: false)
         
       end      
       
@@ -60,7 +68,6 @@ class WikiMd
       
     end
     
-    save()
     
     @filepath ||= '.'
     
@@ -84,13 +91,19 @@ class WikiMd
     end
     
     @dxsx.create(x: s2)
+
+    puts ('@filename: ' + @filename.inspect).debug if @debug
+    
+    return unless @filename
     
     record = {title: title + ' #' + tagline.lstrip.split.join(' #'), 
         url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],  
               URI.escape(title)].join('/')}
     
     @dx.create record
-    FileX.write @filename, @dxsx.to_s if @filename
+    
+
+    FileX.write @filename, @dxsx.to_s
     @dxtags.add record
     
   end
@@ -142,7 +155,7 @@ class WikiMd
     @dxsx.dx.all.map {|section| section.x.lines.first.chomp[/(?<=# ).*/] }
   end
   
-  def new_md(x=nil, title: 'MyWiki')
+  def new_md(x=nil, title: @title, save: true)
     
     puts 'inside new_md'.debug if @debug
     
@@ -157,8 +170,7 @@ title: #{title}
 
 EOF
     
-    @dxsx = DxSectionX.new s, autosave: true, debug: @debug 
-
+    @dxsx = DxSectionX.new s, autosave: save, debug: @debug, order: @order
     
   end
   
@@ -318,7 +330,13 @@ EOF
             
     end
     
-  end    
+  end
+  
+  protected
+  
+  def dxsx()
+    @dxsx.dx
+  end
   
   private
   
@@ -327,7 +345,7 @@ EOF
     if FileX.exists? indexfile then
 
       puts ('file found: ' + indexfile.inspect).debug if @debug
-      Dynarex.new indexfile, autosave: true, debug: @debug
+      Dynarex.new indexfile, autosave: true, debug: @debug, order: @order
 
     else
 
@@ -340,7 +358,7 @@ EOF
   def new_index(indexfile)
     
     dx = Dynarex.new 'entries[doc]/entry(title, url)', autosave: true, 
-        debug: @debug
+        debug: @debug, order: @order
     dx.save indexfile    
     dx
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiki_md
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   nEQURKgvgTAqVg9tuqcjEE861mSCPc+12rmUHVBZDxMDQF6CQbnOxrYRIS+7fnia
   kikBQtN17cUMyGOrZTVRhVGR
   -----END CERTIFICATE-----
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx
@@ -43,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: dynarex-tags
   requirement: !ruby/object:Gem::Requirement