wikisys 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efc308c07d4ba81540d515d9e0ea02f7c60c74aedeea31e771a228af9c29b436
-  data.tar.gz: fccd8271b207195f628a8f0bd7aea544545b02aead003bfd401cb51b1b589ac2
+  metadata.gz: ae7927009247eb0c4ba3820315c78e8a1f822ba201ccd20ed29fc909068a8f95
+  data.tar.gz: 5f153c0f68c9c1497fed420e6569d731932d8ea9666a8cd8b76d5324c65775d4
 SHA512:
-  metadata.gz: 25bfc39f238a76d18e37d62b104abb495adb83739a1cb2122c03078b92d1b6b353b5331f7bd483aeb6760ac580fa7823b82c9f1d9bfe2ae59f68b5b7718bd46a
-  data.tar.gz: 0b0e0335c7e15496b52b8f09bd14442f1bf9877671de04e46f47d7e73f610711052896c967f0fe05569322ed2b3d11377449731cbbafca593fcb957e47fa3c13
+  metadata.gz: 10f1a4712a081beff1b802960a7930ca6f69be9363671ba2191ea1ac4e2098a6538cfd68f07ae1852d1b7f690febae6de9e2441376bdcb1b17a4bf34e97d2b49
+  data.tar.gz: c5c771e88170a318f3972e34314e14d91db806cfe951649bcd2e87db40c8656f18e309975c00025ebb610dea2722e5813efef13aacf3aaaa5d77d152ea2477dc

data/lib/wikisys.rb

@@ -28,11 +28,24 @@ module FileFetch
   end
 end
 
+module StringCase
+  
+  refine String do
+    
+    def capitalize2()
+      self.sub(/^[a-z]/) {|x| x.upcase }
+    end
+    
+  end
+  
+end
+
 module Wikisys
 
   class Wiki    
     include FileFetch
     using ColouredText
+    using StringCase
     
     attr_accessor :title, :content, :tags
     attr_reader :to_xml
@@ -201,13 +214,13 @@ module Wikisys
         
         if r then
           
-          e.attributes[:title] = title.capitalize
+          e.attributes[:title] = title.capitalize2
           
         else
           
-          make_page(title.capitalize)
+          make_page(title.capitalize2)
           e.attributes[:class] = 'new'
-          e.attributes[:title] = title.capitalize + ' (page does not exist)'
+          e.attributes[:title] = title.capitalize2 + ' (page does not exist)'
           
         end
                 
@@ -334,19 +347,51 @@ module Wikisys
     def new_pg(filename)
       
       @pg.new_build(filename)
+      @entries.save
+      
       update_mw(@pg.title, @pg.tags)
+      @mw.save if @mw.lines.any?        
+      
+      build_html(filename)
       
     end
     
     def update_pg(filename)
       
       @pg.modify_build(filename)
+      @entries.save
+      
       update_mw(@pg.title, @pg.tags)
+      @mw.save if @mw.lines.any?        
+      
+      build_html(filename)
       
     end    
     
     private        
 
+    def build_html(filename)
+      
+      xml_file = filename.sub(/\.md$/,'.xml')
+      filepath = File.join(@filepath, 'xml', xml_file)
+      s = @pg.read_file filepath
+      title = Rexle.new(s).root.text('heading')
+      puts 'about to search title: ' + title.inspect if @debug
+      found = @mw.search(title)
+
+      if found then
+
+        links = found.breadcrumb.map do |x|
+          [x, x.gsub(/ +/,'-') + '.html']
+        end
+
+        @pg.create_breadcrumb(filepath, links)
+
+      end
+      
+      @pg.write_html xml_file
+      
+    end
     
     # Check if any of the md files have been modified or newly created
     #
@@ -370,24 +415,7 @@ module Wikisys
       
       (h[:new] + h[:modified]).each do |filename|
         
-        xml_file = filename.sub(/\.md$/,'.xml')
-        filepath = File.join(@filepath, 'xml', xml_file)
-        s = pg.read_file filepath
-        title = Rexle.new(s).root.text('heading')
-        puts 'about to search title: ' + title.inspect if @debug
-        found = @mw.search(title)
-        
-        if found then
-        
-          links = found.breadcrumb.map do |x| 
-            [x, x.gsub(/ +/,'-') + '.html']
-          end
-                    
-          pg.create_breadcrumb(filepath, links)
-          
-        end
-        
-        pg.write_html xml_file
+        build_html filename
         
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikisys
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   O3SRDzvvWXrwDFGyRDmGqdEw51FKHPw/6pk4ci0QPIvQEgOyPKfdSesPWmNmtxpf
   KX/89ohIpftt89vtcCI21R5u
   -----END CERTIFICATE-----
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dir-to-xml