wikisys 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e012e479a9c126dbdb7077f87aede11c5393c1ee777f345941ac44388f8ee0db
-  data.tar.gz: d8784d168321d261aed29fc2e0f48d534f39945fcd2b9b9b97a974c49d091db9
+  metadata.gz: 58d2c1e764d883278d6cc59cc30701bec9e60e54f40f5d74a2c2ca9de24aaaa3
+  data.tar.gz: 3ce2675464a445aaaa1ae9e5061b34fab9d36556c8d7a37ae06d8cd5a03c9d4d
 SHA512:
-  metadata.gz: 2ead29b9039b19e62300e33941021265837f8ddcc1be96da4050a9f32991f7826727b4ee5e60b1361faa0cc537f004d4fc193d06cea8d1fd911b413dec6d6627
-  data.tar.gz: 3ce9e75cee22a1e6d2e8023a7fb2e694f7d27f65c176cd95d9591bdd625baf5b735c15e5967d1b68992f4f183252f331df81efbbecc07396e8b1eda34b5cc022
+  metadata.gz: e67d2e605bfb300d986730021834943b5467b3de637cbcc0257602bb9c1939227add73b3d57de71d13cb6b1e2153bc59e2046c6623fc4f3b421583b71e0292ed
+  data.tar.gz: c0d03e1ae012d972ae452a0b8252b444df51c7f3d1d7c55375db126673c4821a96f244090ec4e2c0990c64f063fd9a68546b4c5dedacaba8c7f490ca08c45680

data/stylesheet/pg.css

@@ -0,0 +1,75 @@
+
+
+/* begin breadcrumb.css */
+
+body {font-family: Arial;}
+
+/* Style the list */
+ul.breadcrumb {
+  padding: 10px 16px;
+  list-style: none;
+  background-color: #eee;
+}
+
+/* Display list items side by side */
+ul.breadcrumb li {
+  display: inline;
+  font-size: 18px;
+}
+
+/* Add a slash symbol (/) before/behind each list item */
+ul.breadcrumb li+li:before {
+  padding: 8px;
+  color: black;
+  content: "/\00a0";
+}
+
+/* Add a color to all links inside the list */
+ul.breadcrumb li a {
+  color: #0275d8;
+  text-decoration: none;
+}
+
+/* Add a color on mouse-over */
+ul.breadcrumb li a:hover {
+  color: #01447e;
+  text-decoration: underline;
+}
+
+/* end breadcrumb */
+
+article {
+  background-color: rgba(255,255,255,0.5);
+  padding: 1.1em;
+  margin: 0.4em;
+}
+
+header div {text-align: right}
+#tags {
+  background-color: transparent;
+  padding: 2.5em 1.0em;
+  margin: 1.0em 0em;
+  list-style-type: none
+}
+#tags li {
+  background-color: transparent;
+  display: inline;
+  padding: 0.1em;
+  margin: 1.3em 0.1em;
+  color: #fff;
+}
+
+#tags li a {
+  background-color: #eee;
+  color: #a95; 
+  text-decoration: none;
+  font-family: "Courier";
+  font-weight: 600;
+  font-size: 0.9em;
+  padding: 0.4em 0.6em;
+  margin: 0.3em;
+
+}
+
+#tags li:hover {background-color: transparent; }
+#tags li a:hover { background-color: #ededed;  color: #66e; }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikisys
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -66,7 +66,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: martile
   requirement: !ruby/object:Gem::Requirement
@@ -97,13 +97,33 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.6
+- !ruby/object:Gem::Dependency
+  name: hashcache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.10
 description: 
 email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/wikisys.rb
+- stylesheet/pg.css
 homepage: https://github.com/jrobertson/wikisys
 licenses:
 - MIT

data/lib/wikisys.rb

@@ -1,379 +0,0 @@
-#!/usr/bin/env ruby
-
-# file: wikisys.rb
-
-require 'dxlite'
-require 'dir-to-xml'
-require 'mindwords'
-require 'martile'
-
-module Wikisys
-
-  class Wiki
-    using ColouredText
-    
-    attr_accessor :title, :content, :tags
-    attr_reader :to_xml
-
-    def initialize(filepath='.', entries: 'entries.json', debug: false)
-
-      @filepath = filepath
-      @page = ''
-      @debug = debug
-      
-      @hc = HashCache.new(size:30)
-
-      @entries = if entries.is_a? DxLite then
-      
-        entries
-        
-      elsif File.exists?(entries) then
-      
-        DxLite.new(entries)
-
-      else
-
-        DxLite.new('entries/entry(title, tags)')
-
-      end
-    
-    end
-    
-    def create_breadcrumb(filepath, links)
-  
-      doc = Rexle.new(read_file(filepath))
-      heading = doc.root.element('heading')
-      
-      menu = Rexle.new(HtmlCom::Menu.new(:breadcrumb, links).to_html)
-      
-      heading.insert_before menu.root
-      write_file filepath, doc.root.xml
-          
-    end
-    
-
-    def page(title)
-
-      r = @entries.find_by_title title   
-      @page = r ? read_md(title) : make_page(title)
-      @to_xml = build_xml @page
-      @entries.save
-      
-      return @page
-
-    end
-    
-    def page=(raw_content)
-      
-      title = raw_content.lines.first.chomp
-      
-      r = @entries.find_by_title title
-      make_page(title, raw_content.lines.last.chomp[/(?<=\+ )/]) unless r
-                   
-      write_md title, raw_content
-      title, content, tags = read_md()
-      @to_xml = build_xml title, content, tags
-      write_xml title, @to_xml
-
-      
-      @entries.save
-      @page = raw_content
-      
-    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
-    
-    def read_file(file='index.html')
-      @hc.read(file) { File.read(file) }
-    end
-    
-    private
-    
-    def read_md(filename)
-      
-      filepath = File.join(@filepath, 'md', filename)
-      return unless File.exists? filepath
-      
-      s = read_file(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   
-    
-    def build_xml(title, content, tags)
-      
-      puts 'content: ' + content.inspect if @debug
-      s = content.gsub(/\[\[[^\]]+\]\]/) do |raw_link|
-        
-        r = @entries.find_by_title title            
-        
-        e = Rexle::Element.new('a').add_text title
-        e.attributes[:href] = title.gsub(/ +/, '_')
-        
-        if r then
-          
-          e.attributes[:title] = title.capitalize
-          
-        else
-          
-          make_page(title.capitalize)
-          e.attributes[:class] = 'new'
-          e.attributes[:title] = title.capitalize + ' (page does not exist)'
-          
-        end
-                
-        e.xml
-
-      end         
-      
-      
-      heading = "<heading>%s</heading>" % title
-      
-      if tags.any? then
-      
-        list = tags.map {|tag| "    <tag>%s</tag>" % tag}
-        tags = "<tags>\n%s\n  </tags>" % list.join("\n")
-        
-        body = "<body>\n    %s  </body>" % \
-            Martile.new(s.lines[1..-2].join.strip).to_html
-        
-      else
-        
-        body = "<body>%s</body>" % Martile.new(s.lines[1..-1].join.strip).to_html
-
-      end
-            
-      "<article>\n  %s\n  %s\n  %s\n</article>" % [heading, body, tags]
-      
-      
-    end
-    
-    def write_xml(title, content)
-      
-      filepath = File.join(File.absolute_path(@filepath), 'xml', 
-                           title.downcase.gsub(/ +/,'_') + '.xml')
-      FileUtils.mkdir_p File.dirname(filepath)      
-      #File.write filepath, content
-      write_file filepath, content
-      
-    end          
-    
-    def write_file(filepath, content)
-      
-      puts 'writing file: ' + filepath.inspect if @debug
-      File.write filepath, content
-      @hc.write(filepath) { content }      
-    end
-    
-    def make_page(title, raw_tags=title.downcase.gsub(/['\.\(\)]/,''))
-      
-      tags = raw_tags.split.join(' ')
-      s = "#{title}\n\n\n+ " + tags
-      write_md title, s
-      write_xml title, build_xml(s)
-      
-      @entries.create title: title, tags: tags      
-      
-      return s
-      
-    end          
-    
-    def read_md_file(filename)
-      
-      filepath = File.join(@filepath, 'md', filename)
-      File.read(filepath)
-      
-    end
-    
-    def write_md(title, content)
-      
-      filepath = File.join(File.absolute_path(@filepath), 'md', 
-                           title.gsub(/ +/,'_') + '.md')
-      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
-    
-    private        
-
-    
-    # Check if any of the md files have been modified or newly created
-    #
-    def scan_md_files()
-      
-      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
-      
-      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
-
-      @mw.save if @mw.lines.any?      
-      outline_filepath = File.join(@filepath, 'myoutline.txt')
-      
-      File.write outline_filepath, @mw.to_outline
-      
-      (h[:new] + h[:modified]).each do |filename|
-        
-        filepath = File.join(@filepath, 'xml',filename.sub(/\.md$/,'.xml'))
-        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)
-        
-        next unless found
-        
-        links = found.breadcrumb.map {|x| [x, x.downcase.gsub(/ +/,'-') + '.html']}
-        pg.create_breadcrumb(filepath, links)
-        
-      end
-      
-      @entries.save
-
-      
-    end # /scan_md_files       
-    
-    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
-    
-    def view_file(file='index.html')
-      @hc.read(file) { File.read(file) }
-    end
-
-  end
-end