wikisys 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffc9856824a5b8afe8648ea585e3fbe2400ff94e7d0c0fbb0f622b138b8f7e6
-  data.tar.gz: c2acad35e8fe2361cadabe919004a2f203bf687a1efdc43e061351a3fda11678
+  metadata.gz: c1d9909e650b607db0429fcf09233a3775f1493fca6ae612354c205e4dccf69d
+  data.tar.gz: 646db1e4c483057d9b7d220edbd0164d9f9dce8e90408faf55da71aea2e661b4
 SHA512:
-  metadata.gz: 0fc14b79eb6eca3034f904be493787d8058e8d85699f612d0c1749e2bc4536c20fa7c08b36e81b04f0ac7c8ae8955884f86565a3a027348c218acd181898bc3e
-  data.tar.gz: 9f499b325c14ed3dc204d21c928756a5b27cae725c824f718056cdece85c1729b44f62734d1723a1282585ad5b7bf5fc71c035647851b88bcdf09b0430b9b71b
+  metadata.gz: 856dfe0a483521ef2db25f220df0891f23ad2bb99d5b77b136a18df40965c9a51cc2ac1ac7789cc8345ac372fd4768b4ff93b656fc22f418479bf7351f96579f
+  data.tar.gz: 3cab93f28ea693edd42c273f8a5a387ed8811825943e7859a3e0ff38e3c2be877f226fd5bde967aac8d766d40dfecfbf3e71803dbabbaf4dee81d0cdd128eeee

data/lib/wikisys.rb

@@ -3,12 +3,15 @@
 # file: wikisys.rb
 
 require 'dxlite'
+require 'dir-to-xml'
+require 'mindwords'
 require 'martile'
 
 module Wikisys
 
   class Wiki
     
+    attr_accessor :title, :content, :tags
     attr_reader :to_xml
 
     def initialize(filepath='.', entries: 'entries.json', debug: false)
@@ -17,17 +20,22 @@ module Wikisys
       @page = ''
       @debug = debug
 
-      @entries = if File.exists?(entries) then
+      @entries = if entries.is_a? DxLite then
+      
+        entries
+        
+      elsif File.exists?(entries) then
       
         DxLite.new(entries)
 
       else
 
-        DxLite.new('entries/entry(title, tags)', filepath: entries)
+        DxLite.new('entries/entry(title, tags)')
 
       end
     
     end
+    
 
     def page(title)
 
@@ -48,8 +56,8 @@ module Wikisys
       make_page(title, raw_content.lines.last.chomp[/(?<=\+ )/]) unless r
                    
       write_md title, raw_content
-      
-      @to_xml = build_xml raw_content      
+      title, content, tags = read_md()
+      @to_xml = build_xml title, content, tags
       write_xml title, @to_xml
 
       
@@ -58,13 +66,65 @@ module Wikisys
       
     end    
     
+    def modify_build(filename)
+      
+      @title, @content, @tags = read_md(filename)
+      
+      # find the entry
+      # modify the tags if necessary
+      
+      r = @entries.find_by_title @title
+      puts 'r: ' + r.inspect if @debug
+      return unless r
+      
+      write_xml(@title, build_xml(@title, @content, @tags))
+      
+      r.tags = @tags.join(' ') if r.tags != @tags
+      
+    end        
+    
+    def new_build(filename)
+      
+      @title, @content, @tags = read_md(filename)      
+      @entries.create title: @title, tags: @tags.join(' ')
+
+      puts 'md contents: ' + [@title, @content, @tags].inspect if @debug
+      write_xml(@title, build_xml(@title, @content, @tags))      
+      
+    end
+    
     private
     
-    def build_xml(content)
+    def read_md(filename)
       
-      s = content.gsub(/\[\[[^\]]+\]\]/) do |raw_link|
+      filepath = File.join(@filepath, 'md', filename)
+      return unless File.exists? filepath
+      
+      s = File.read(filepath).strip
+      
+      # read the title
+      title = s.lines.first.chomp.sub(/^# +/,'')
+      
+      # read the hashtags if there is any
+      tagsline = s.lines.last[/^ *\+ +(.*)/,1]
+      
+      if tagsline then
+        
+        [title, s.lines[1..-2].join, tagsline.split]
+      
+      else
+        
+        [title, s.lines[1..--1].join, []]
+        
+      end
+      
+    end                  
 
-        title = raw_link[2..-3].strip
+    
+    def build_xml(title, content, tags)
+      
+      puts 'content: ' + content.inspect if @debug
+      s = content.gsub(/\[\[[^\]]+\]\]/) do |raw_link|
         
         r = @entries.find_by_title title            
         
@@ -88,12 +148,11 @@ module Wikisys
       end         
       
       
-      heading = "<heading>%s</heading>" % s.lines.first.chomp
-      tags = ''
+      heading = "<heading>%s</heading>" % title
       
-      if s.lines.last[0] = '+' then
+      if tags.any? then
       
-        list = s.lines.last[2..-1].split.map {|tag| "    <tag>%s</tag>" % tag}
+        list = tags.map {|tag| "    <tag>%s</tag>" % tag}
         tags = "<tags>\n%s\n  </tags>" % list.join("\n")
         
         body = "<body>\n    %s  </body>" % \
@@ -110,6 +169,15 @@ module Wikisys
       
     end
     
+    def write_xml(title, content)
+      
+      filepath = File.join(File.absolute_path(@filepath), 'xml', 
+                           title.gsub(/ +/,'_') + '.xml')
+      FileUtils.mkdir_p File.dirname(filepath)      
+      File.write filepath, content
+      
+    end          
+    
     def make_page(title, raw_tags=title.downcase.gsub(/['\.\(\)]/,''))
       
       tags = raw_tags.split.join(' ')
@@ -121,13 +189,12 @@ module Wikisys
       
       return s
       
-    end
+    end          
     
-    def read_md(title)
-            
-      filepath = File.join(File.absolute_path(@filepath), 'md', 
-                           title.gsub(/ +/,'_') + '.md')      
-      File.read(title.gsub(/ +/,'_') + '.md')
+    def read_md_file(filename)
+      
+      filepath = File.join(@filepath, 'md', filename)
+      File.read(filepath)
       
     end
     
@@ -138,17 +205,124 @@ module Wikisys
       FileUtils.mkdir_p File.dirname(filepath)      
       File.write filepath, content
       
+    end      
+    
+  end
+  
+  class Pages
+    
+    attr_accessor :mw, :entries
+
+    def initialize(filepath='.', debug: false)
+      
+      @filepath, @debug = filepath, debug
+      
+      entries_file = File.join(@filepath, 'entries.txt')
+      
+      if File.exists?(entries_file) then
+        @entries = DxLite.new(entries_file)
+      else
+        @entries = DxLite.new('entries/entry(title, tags)')
+        @entries.save entries_file
+      end
+
+      # check for the mindwords raw document file
+      mindwords_file = File.join(@filepath, 'mindwords.txt')
+      
+      if File.exists?(mindwords_file) then 
+        @mw = MindWords.new(mindwords_file)
+      else
+        @mw = MindWords.new
+        @mw.filepath = mindwords_file
+      end
+      
+      scan_md_files()
+      
     end
     
-    def write_xml(title, content)
+    private        
+
+    
+    # Check if any of the md files have been modified or newly created
+    #
+    def scan_md_files()
       
-      filepath = File.join(File.absolute_path(@filepath), 'xml', 
-                           title.gsub(/ +/,'_') + '.xml')
-      FileUtils.mkdir_p File.dirname(filepath)      
-      File.write filepath, content
+      filepath = File.join(@filepath, 'md')
+      puts 'about to scan ' + filepath.inspect if @debug
+      dir = DirToXML.new(filepath, index: 'dir.json', debug: @debug)
+      h = dir.activity
+      puts 'h: ' + h.inspect if @debug
       
-    end    
+      pg = Wiki.new @filepath, entries: @entries
+                    
+      
+      h[:new].each do |filename|
+
+        pg.new_build(filename)
+        update_mw(pg.title, pg.tags)
+        
+      end
+      
+      h[:modified].each do |filename|
+        
+        pg.modify_build(filename)
+        update_mw(pg.title, pg.tags)
+                
+      end
+      
+      @entries.save
+      @mw.save if @mw.lines.any?
+      
+    end # /scan_md_files       
     
-  end
+    def update_mw(title, line_tags)
+      
+      # read the file
 
+      tags = line_tags.reject {|x| x =~ /#{title.strip}/i}
+      puts 'tags: '  + tags.inspect if @debug
+      puts 'title: ' + title.inspect if @debug
+      
+      return if tags.empty?
+      
+      line = title + ' ' + tags.map {|x| "#" + x }.join(' ') + "\n"
+      puts 'line: ' + line.inspect if @debug
+      
+      # does the tagsline contain the topic hashtag?
+      
+      #if tagsline =~ /#/ # not yet implemented
+        
+
+                            
+      # check if the title already exists
+      found = @mw.lines.grep(/^#{title} +(?=#)/i)
+      
+      if found.any? then
+        
+        found_tags = found.first.scan(/(?<=#)\w+/)
+        
+        if @debug then
+          
+          puts 'tags: ' + tags.inspect
+          puts 'found_tags: ' + found_tags.inspect
+        
+        end
+
+        new_tags = tags - found_tags   
+        
+        # add the new tags to the mindwords line
+        
+        hashtags = (found_tags + new_tags).map {|x| '#' + x }.join(' ')
+
+        i = @mw.lines.index(found.first)
+        @mw.lines[i] = line
+        
+      else
+        
+        @mw.lines <<  line
+        
+      end                            
+      
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikisys
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,28 +35,48 @@ cert_chain:
   O3SRDzvvWXrwDFGyRDmGqdEw51FKHPw/6pk4ci0QPIvQEgOyPKfdSesPWmNmtxpf
   KX/89ohIpftt89vtcCI21R5u
   -----END CERTIFICATE-----
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2021-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dxlite
+  name: dir-to-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: mindwords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +86,7 @@ dependencies:
         version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +96,7 @@ dependencies:
         version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 1.4.6
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -103,7 +123,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: A poor man's wiki.