wikisys 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1d9909e650b607db0429fcf09233a3775f1493fca6ae612354c205e4dccf69d
-  data.tar.gz: 646db1e4c483057d9b7d220edbd0164d9f9dce8e90408faf55da71aea2e661b4
+  metadata.gz: efc308c07d4ba81540d515d9e0ea02f7c60c74aedeea31e771a228af9c29b436
+  data.tar.gz: fccd8271b207195f628a8f0bd7aea544545b02aead003bfd401cb51b1b589ac2
 SHA512:
-  metadata.gz: 856dfe0a483521ef2db25f220df0891f23ad2bb99d5b77b136a18df40965c9a51cc2ac1ac7789cc8345ac372fd4768b4ff93b656fc22f418479bf7351f96579f
-  data.tar.gz: 3cab93f28ea693edd42c273f8a5a387ed8811825943e7859a3e0ff38e3c2be877f226fd5bde967aac8d766d40dfecfbf3e71803dbabbaf4dee81d0cdd128eeee
+  metadata.gz: 25bfc39f238a76d18e37d62b104abb495adb83739a1cb2122c03078b92d1b6b353b5331f7bd483aeb6760ac580fa7823b82c9f1d9bfe2ae59f68b5b7718bd46a
+  data.tar.gz: 0b0e0335c7e15496b52b8f09bd14442f1bf9877671de04e46f47d7e73f610711052896c967f0fe05569322ed2b3d11377449731cbbafca593fcb957e47fa3c13

data/lib/wikisys.rb

@@ -6,10 +6,33 @@ require 'dxlite'
 require 'dir-to-xml'
 require 'mindwords'
 require 'martile'
+require 'hashcache'
+
+module FileFetch
+
+  def fetch_filepath(filename)
+
+    lib = File.dirname(__FILE__)    
+    File.join(lib,'..','stylesheet',filename)
+
+  end  
+  
+  def fetch_file(filename)
+
+    filepath = fetch_filepath filename
+    read filepath
+  end  
+
+  def read(s)
+    RXFHelper.read(s).first
+  end
+end
 
 module Wikisys
 
-  class Wiki
+  class Wiki    
+    include FileFetch
+    using ColouredText
     
     attr_accessor :title, :content, :tags
     attr_reader :to_xml
@@ -19,6 +42,8 @@ module Wikisys
       @filepath = filepath
       @page = ''
       @debug = debug
+      
+      @hc = HashCache.new(size:30)
 
       @entries = if entries.is_a? DxLite then
       
@@ -36,6 +61,17 @@ module Wikisys
     
     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)
 
@@ -68,16 +104,24 @@ module Wikisys
     
     def modify_build(filename)
       
+      puts 'inside modify_buld' if @debug
+      
       @title, @content, @tags = read_md(filename)
       
       # find the entry
       # modify the tags if necessary
+      puts '@title: ' + @title.inspect if @debug
+      puts '_ @content: ' + @content.inspect if @debug
       
       r = @entries.find_by_title @title
       puts 'r: ' + r.inspect if @debug
-      return unless r
       
-      write_xml(@title, build_xml(@title, @content, @tags))
+      if r.nil? then
+        r = @entries.create title: @title, tags: @tags.join(' ')
+      end
+      
+      xmlfile = filename.sub(/\.md$/,'.xml')
+      write_xml(xmlfile, build_xml(@title, @content, @tags))
       
       r.tags = @tags.join(' ') if r.tags != @tags
       
@@ -93,20 +137,45 @@ module Wikisys
       
     end
     
+    def read_file(file='index.html')
+      @hc.read(file) { File.read(file) }
+    end
+    
+    def to_css()
+      fetch_file 'pg.css'
+    end
+    
+    def write_html(filename)
+
+      FileUtils.mkdir_p File.join(@filepath, 'html')
+      
+      xml = read_file File.join(@filepath, 'xml', filename)
+      puts 'about to fetch_file' if @debug
+      xsl = fetch_file 'pg.xsl'
+      puts 'xsl: ' + xsl.inspect if @debug
+      
+      html_file = File.join(@filepath, 'html', filename.sub(/\.xml$/,'.html'))
+      write_file(html_file, transform(xsl, xml))
+
+    end
+    
     private
     
     def read_md(filename)
       
       filepath = File.join(@filepath, 'md', filename)
+      puts 'filepath : ' + filepath.inspect if @debug
       return unless File.exists? filepath
       
-      s = File.read(filepath).strip
+      s = read_file(filepath).strip.gsub(/\r/,'')
+      puts 's: ' + s.inspect if @debug
       
       # read the title
       title = s.lines.first.chomp.sub(/^# +/,'')
       
       # read the hashtags if there is any
       tagsline = s.lines.last[/^ *\+ +(.*)/,1]
+      puts 'tagsline: ' + tagsline.inspect if @debug
       
       if tagsline then
         
@@ -114,14 +183,13 @@ module Wikisys
       
       else
         
-        [title, s.lines[1..--1].join, []]
+        [title, s.lines[1..-1].join, []]
         
       end
       
-    end                  
-
+    end   
     
-    def build_xml(title, content, tags)
+    def build_xml(title, content, rawtags)
       
       puts 'content: ' + content.inspect if @debug
       s = content.gsub(/\[\[[^\]]+\]\]/) do |raw_link|
@@ -150,7 +218,7 @@ module Wikisys
       
       heading = "<heading>%s</heading>" % title
       
-      if tags.any? then
+      if rawtags.any? then
       
         list = tags.map {|tag| "    <tag>%s</tag>" % tag}
         tags = "<tags>\n%s\n  </tags>" % list.join("\n")
@@ -161,23 +229,43 @@ module Wikisys
       else
         
         body = "<body>%s</body>" % Martile.new(s.lines[1..-1].join.strip).to_html
+        tags = ''
 
       end
             
-      "<article>\n  %s\n  %s\n  %s\n</article>" % [heading, body, tags]
+      "<article id='%s'>\n  %s\n  %s\n  %s\n</article>" % \
+          [title.gsub(/ +/,'-'), heading, body, tags]
       
       
     end
     
-    def write_xml(title, content)
+    
+    def transform(xsl, xml)
+
+      doc   = Nokogiri::XML(xml)
+      xslt  = Nokogiri::XSLT(xsl)
+
+      xslt.transform(doc)      
+      
+    end    
+    
+    def write_xml(s, content)
       
-      filepath = File.join(File.absolute_path(@filepath), 'xml', 
-                           title.gsub(/ +/,'_') + '.xml')
+      filename = s =~ /\.xml$/ ? s :  s.gsub(/ +/,'_') + '.xml'
+      filepath = File.join(File.absolute_path(@filepath), 'xml', filename)
       FileUtils.mkdir_p File.dirname(filepath)      
-      File.write filepath, content
+      #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(' ')
@@ -200,8 +288,9 @@ module Wikisys
     
     def write_md(title, content)
       
-      filepath = File.join(File.absolute_path(@filepath), 'md', 
-                           title.gsub(/ +/,'_') + '.md')
+      puts 'inside write_md' if @debug
+      filename = s =~ /\.md$/ ? s :  s.gsub(/ +/,'_') + '.md'
+      filepath = File.join(File.absolute_path(@filepath), 'md', filename)
       FileUtils.mkdir_p File.dirname(filepath)      
       File.write filepath, content
       
@@ -236,10 +325,26 @@ module Wikisys
         @mw.filepath = mindwords_file
       end
       
-      scan_md_files()
+      @pg = Wiki.new @filepath, entries: @entries, debug: @debug
+      
+      #scan_md_files()
       
     end
     
+    def new_pg(filename)
+      
+      @pg.new_build(filename)
+      update_mw(@pg.title, @pg.tags)
+      
+    end
+    
+    def update_pg(filename)
+      
+      @pg.modify_build(filename)
+      update_mw(@pg.title, @pg.tags)
+      
+    end    
+    
     private        
 
     
@@ -253,25 +358,41 @@ module Wikisys
       h = dir.activity
       puts 'h: ' + h.inspect if @debug
       
-      pg = Wiki.new @filepath, entries: @entries
-                    
+      return if (h[:new] + h[:modified]).empty?
       
-      h[:new].each do |filename|
+      h[:new].each {|filename| new_pg(filename) }
+      h[:modified].each {|filename| update_pg(filename) }
 
-        pg.new_build(filename)
-        update_mw(pg.title, pg.tags)
-        
-      end
+      @mw.save if @mw.lines.any?      
+      outline_filepath = File.join(@filepath, 'myoutline.txt')
       
-      h[:modified].each do |filename|
+      File.write outline_filepath, @mw.to_outline
+      
+      (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
         
-        pg.modify_build(filename)
-        update_mw(pg.title, pg.tags)
-                
       end
       
       @entries.save
-      @mw.save if @mw.lines.any?
+
       
     end # /scan_md_files       
     
@@ -324,5 +445,11 @@ module Wikisys
       end                            
       
     end
+
+    
+    def view_file(file='index.html')
+      @hc.read(file) { File.read(file) }
+    end
+
   end
 end

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; }

data/stylesheet/pg.xsl

@@ -0,0 +1,52 @@
+<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+
+  <xsl:template match='article'>
+      
+    <html>
+      <head>
+        <link rel="stylesheet" type="text/css" href=pg.css"/>
+      </head>
+      <body>
+        <xsl:variable name='id' select='@id'/>
+        <header><div><a href='../edit?id={$id}'>edit</a></div></header>
+        <div>
+        <xsl:copy-of select='ul[@class="breadcrumb"]' />
+        </div>
+        <article>
+          <xsl:apply-templates select='heading' />
+          <xsl:copy-of select='body/*' />
+        </article>
+          <xsl:apply-templates select='tags' />
+      </body>
+    </html>
+
+  </xsl:template>
+
+  <xsl:template match='heading'>
+
+    <h1><xsl:value-of select='.' /></h1>
+
+  </xsl:template>
+
+  <xsl:template match='tags'>
+
+    <ul id='tags'>
+      <xsl:apply-templates select='tag' />
+    </ul>
+
+  </xsl:template>
+
+  <xsl:template match='tag'>
+
+    <li>
+      <xsl:element name='a'>
+        <xsl:attribute name='href'>
+          ../hashtags.html#<xsl:value-of select='.' />
+        </xsl:attribute>
+        <xsl:value-of select='.' />
+      </xsl:element>
+    </li>
+
+  </xsl:template>
+
+</xsl:stylesheet>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikisys
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   O3SRDzvvWXrwDFGyRDmGqdEw51FKHPw/6pk4ci0QPIvQEgOyPKfdSesPWmNmtxpf
   KX/89ohIpftt89vtcCI21R5u
   -----END CERTIFICATE-----
-date: 2021-01-29 00:00:00.000000000 Z
+date: 2021-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dir-to-xml
@@ -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,6 +97,26 @@ 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: []
@@ -104,6 +124,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/wikisys.rb
+- stylesheet/pg.css
+- stylesheet/pg.xsl
 homepage: https://github.com/jrobertson/wikisys
 licenses:
 - MIT