wiki_md 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48d74d9d3dde58b596253dbf779021a392551d1efcfcb6aad84471f262030701
-  data.tar.gz: 6753153ad3063cbc7ecd5fea30e9dfc59a9b1809e4c8f77ac3de7cf0c1952bbd
+  metadata.gz: 4b60a7007c10767ee1798adb195e34cfffc69c384697428120dbd379f6fb315e
+  data.tar.gz: cd50df1dc362a16e0babe375154d29519a21bc60b715eb4df44d9d8fb2969645
 SHA512:
-  metadata.gz: c71a0c426a8d9f212c68b2024c3520d03d5ad01de48db8209a07dc8d9bba799e39692350aa87c0b133abc912be989134e73374e4a07429813b595d67b369f8e1
-  data.tar.gz: 5930d61119d430948b9820dd45fa8c79a15e7da322963a7292d15bbeb143718c76615b1fa104086f19fbb237ab2af8a60dddb84e9998ddd7e33cd4c122f994c6
+  metadata.gz: d1b9e4275ff9cc4c6d323bfc4faa4e681a2abab6922cc459ad1231dc5e77f62b21e9ef7e654e5728c9a60e5ab37eeaa042b280c78474e0edb4977a9c92928286
+  data.tar.gz: 8a1b78aa69fe3c3f02c13ba9a94345a1d2e53b010909807b1a1ceaec88192ccd52c861025248195a284b5dca109391b80090b43e33b9a8a5cd0519c8a31abf83

data/lib/wiki_md.rb

@@ -8,9 +8,9 @@ require 'dxsectionx'
 class WikiMd
   include RXFHelperModule
   
-  attr_reader :active_heading, :filename
+  attr_reader :active_heading, :filename, :dx
   
-  def initialize(wiki=nil, domain: nil, debug: false, base_url: '/', 
+  def initialize(wiki=nil, domain: nil, debug: false, base_url: '', 
                  tag_base_url: '/tag')
      
     @domain, @debug, @base_url, @tag_base_url = domain, debug, base_url, 
@@ -35,20 +35,48 @@ class WikiMd
       new_md()
       
     end
+    
+    save()
             
   end
-  
-  
+
   def create_section(s)
+
+    @active_heading = title = s[/(?<=^# ).*/]
+    url = [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],  
+              URI.escape(title)].join('/')
     
+    if s.rstrip.lines.last =~ /^\+\s+/ then
+      
+      @dxsx.create(x: s, url: url)
+      
+    else      
+
+      a = title.split(/ +/)
+      tag = a.length > 1 ? a.map(&:capitalize).join : a.first
+
+      @dxsx.create(x: s + "\n\n+ " + tag, url: url)
+      
+    end
+    
+    FileX.write @filename, @dxsx.to_s if @filename
+    
+  end  
+  
+  def create_section(s)
+
     @active_heading = title = s[/(?<=^# ).*/]
-    tag = title.split(/ +/).map(&:capitalize).join
 
-    @dxsx.create(x: s + "\n\n+ " + tag)
-    @dx.create title: title + ' #' + tag, 
-        url: [@base_url, File.basename(@filename),  
+    s2 = s.rstrip.lines.last =~ /^\+\s+/ ? s :  s + "\n\n+ " + tag
+    
+    @dxsx.create(x: s2)
+    
+    tag = s.rstrip.lines.last[/(?<=^\+\s).*/]
+    @dx.create title: title + ' #' + tag.lstrip, 
+        url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],  
               URI.escape(title)].join('/')
     FileX.write @filename, @dxsx.to_s if @filename
+    
   end
   
   alias add_section create_section
@@ -143,7 +171,7 @@ EOF
     end
   end
   
-  def save(filename=@filename)
+  def save(filename=@filename || 'mywiki.md')
     
     @filename = filename
     @filepath = File.dirname(@filename)
@@ -202,6 +230,42 @@ EOF
     content = val =~ /# / ? val : r.x.lines.first + "\n" + val
     @active_heading = content[/(?<=^# ).*/]
     r.x = content
+    
+    rx = @dx.all.find {|x| x.title =~ /#{q}/}
+    tagline1 = content.lines.last[/^\+\s+(.*)/,1]    
+
+    if rx then
+      
+      # update the index entry if the title or tags have been modified
+      
+      title, tagline2 = rx.title.split(/\s+#/)      
+
+      
+      if title != @active_heading or tagline2 != tagline1 then
+        
+        rx.update title: @active_heading + ' #' + tagline1.split.join(' #'), 
+            url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],
+                URI.escape(title)].join('/')
+        
+      end
+      
+      
+    else
+      
+      # create a new index entry
+      
+      newtagline  = if tagline1 then
+        tagline1.split.join(' #')
+      else
+        a = @active_heading.split(/ +/)
+        a.length > 1 ? a.map(&:capitalize).join : a.first        
+      end
+
+      @dx.create title: @active_heading + ' #' + newtagline, 
+          url: [@base_url, File.basename(@filename),  
+                URI.escape(@active_heading)].join('/')      
+    end
+    
   end    
   
   private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiki_md
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   nEQURKgvgTAqVg9tuqcjEE861mSCPc+12rmUHVBZDxMDQF6CQbnOxrYRIS+7fnia
   kikBQtN17cUMyGOrZTVRhVGR
   -----END CERTIFICATE-----
-date: 2018-11-01 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx