wiki_md 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d102bbd2d97c198ed236ce9c8c5e89167091cc402b583943e1bd8b596f5bc23
-  data.tar.gz: 7ebd2fcca491e92a3154a1a0616a1fca32fef966e5fb9b0ab0772a8cd3654627
+  metadata.gz: 39807ec060776358c5aced8404ef1ea984764344f62f3e2780fba7f643eb1ac5
+  data.tar.gz: b3cf99153dd820c632300f47727c3201b657f500be7798cfbf62e6651b0e699a
 SHA512:
-  metadata.gz: 45093acbd1e81207e314ae89d86e4a2eca90927f07fbf1929cc7e6abd80d677b29d7957f2d3aba668b76f1f98a0c44205c44faef153abcf8db9bc3aee4920a4b
-  data.tar.gz: 1a134e25327c88c02e746e270e26ab5eccb7e3ef5933534ca1fbc660d601835fb0b77e997cf3d43897b26ab1594f92b51b75516695d230e2dae6147cebb15032
+  metadata.gz: 77b76727a5f71fcbf949d93f87b992bf5f0b2ef774994a69b6e0b3301629f0e759d7fac63c0f95f3b4c76c03475894e55b390c560307c9052e229a809c6a67ff
+  data.tar.gz: 46ed0505da571590568c795c8e5794a3edeb59470b80f5a67649789c9302a43f26f2bfd7dc80650615ed574cd84b96f15420e592b4d4e790351dc76b98e81e74

data/lib/wiki_md.rb

@@ -12,6 +12,47 @@ class WikiMd
   
   attr_reader :active_heading, :filename, :dx
   
+  class Entry
+    
+    attr_reader :heading, :body, :footer, :tags, :x
+    
+    def initialize(rx)
+      
+      @rx = rx
+      @x = @rx.x
+      parse_x()
+      
+    end
+    
+    def body=(s)
+      text_entry = "%s\n\n%s\n\n%s" % [self.heading, s, self.footer]
+      self.x = text_entry
+    end
+    
+    def footer=(s)
+      a = @x.lines
+      a[-1] = s
+      self.x = a.join
+    end    
+    
+    def x=(s)
+      @rx.x = s
+      parse_x()
+    end
+    
+    private
+    
+    def parse_x()
+      
+      a = @rx.x.lines
+      @heading, @footer, @body = a.shift.chomp[/(?<=# ).*/], a.pop, 
+          a.join.strip
+      @tags = @footer[1..-1].strip.split
+      
+    end
+    
+  end
+  
   def initialize(wiki=nil, domain: nil, debug: false, base_url: '', 
                  tag_base_url: '/tag', order: 'ascending', title: 'MyWiki')
      
@@ -136,16 +177,17 @@ class WikiMd
   def find(q)
     
     puts ('WikiMd::find q: ' + q.inspect).debug if @debug
-    return @dxsx.dx.find q if q =~ /^\d+$/
+    return Entry.new(@dxsx.dx.find q) if q =~ /^\d+$/
     regex = q.is_a?(String) ? /#{q}/i : q
     r = @dxsx.dx.all.find {|section| section.x.lines.first =~ regex }
     puts ('  r: ' + r.inspect).debug if @debug
     return unless r
     
     heading2 = r.x.lines.last[/(?<=redirect ).*/]
-    heading2 ? find(heading2) : r
+    heading2 ? find(heading2) : Entry.new(r)
     
-  end  
+  end
+
 
   def find_tag(tag)
     @dxtags.find tag
@@ -228,7 +270,7 @@ EOF
     @dxsx.save filename.sub(/\.md$/, '.xml')
     @dx = new_index(File.join(@filepath, 'index.xml')) unless @dx
     
-  end
+  end  
   
   def title()
     @dxsx.dx.title()
@@ -297,18 +339,7 @@ EOF
       
       # 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
-        
-        record = {title: @active_heading + ' #' + tagline1.split.join(' #'), 
-            url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],
-                URI.escape(title)].join('/')}
-        rx.update record
-        @dxtags.add record
-        
-      end
+      update_index(rx, tagline1, @active_heading)
       
       
     else
@@ -338,6 +369,28 @@ EOF
     @dxsx.dx
   end
   
+  def save_files()
+    @filepath = File.dirname(@filename)
+    FileX.write @filename=filename, @dxsx.to_s    
+    @dx.save
+  end
+
+  def update_index(rx, tagline1, active_heading=nil)
+    
+    title, tagline2 = rx.title.split(/\s+#/)      
+    active_heading ||= title
+    
+    if title != active_heading or tagline2 != tagline1 then      
+      
+      record = {title: active_heading + ' #' + tagline1.split.join(' #'), 
+          url: [@base_url, File.basename(@filename)[/.*(?=\.\w+)/],
+              URI.escape(title.gsub(/ /,'_'))].join('/')}
+      rx.update record
+      @dxtags.add record
+      
+    end    
+  end
+  
   private
   
   def load_index(indexfile)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiki_md
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   nEQURKgvgTAqVg9tuqcjEE861mSCPc+12rmUHVBZDxMDQF6CQbnOxrYRIS+7fnia
   kikBQtN17cUMyGOrZTVRhVGR
   -----END CERTIFICATE-----
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dxsectionx