wikisys 0.3.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e012e479a9c126dbdb7077f87aede11c5393c1ee777f345941ac44388f8ee0db
-  data.tar.gz: d8784d168321d261aed29fc2e0f48d534f39945fcd2b9b9b97a974c49d091db9
+  metadata.gz: ae7927009247eb0c4ba3820315c78e8a1f822ba201ccd20ed29fc909068a8f95
+  data.tar.gz: 5f153c0f68c9c1497fed420e6569d731932d8ea9666a8cd8b76d5324c65775d4
 SHA512:
-  metadata.gz: 2ead29b9039b19e62300e33941021265837f8ddcc1be96da4050a9f32991f7826727b4ee5e60b1361faa0cc537f004d4fc193d06cea8d1fd911b413dec6d6627
-  data.tar.gz: 3ce9e75cee22a1e6d2e8023a7fb2e694f7d27f65c176cd95d9591bdd625baf5b735c15e5967d1b68992f4f183252f331df81efbbecc07396e8b1eda34b5cc022
+  metadata.gz: 10f1a4712a081beff1b802960a7930ca6f69be9363671ba2191ea1ac4e2098a6538cfd68f07ae1852d1b7f690febae6de9e2441376bdcb1b17a4bf34e97d2b49
+  data.tar.gz: c5c771e88170a318f3972e34314e14d91db806cfe951649bcd2e87db40c8656f18e309975c00025ebb610dea2722e5813efef13aacf3aaaa5d77d152ea2477dc

data/lib/wikisys.rb

@@ -6,11 +6,46 @@ 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 StringCase
+  
+  refine String do
+    
+    def capitalize2()
+      self.sub(/^[a-z]/) {|x| x.upcase }
+    end
+    
+  end
+  
+end
 
 module Wikisys
 
-  class Wiki
+  class Wiki    
+    include FileFetch
     using ColouredText
+    using StringCase
     
     attr_accessor :title, :content, :tags
     attr_reader :to_xml
@@ -49,8 +84,7 @@ module Wikisys
       heading.insert_before menu.root
       write_file filepath, doc.root.xml
           
-    end
-    
+    end    
 
     def page(title)
 
@@ -83,16 +117,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
       
@@ -112,20 +154,41 @@ module Wikisys
       @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 = read_file(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
         
@@ -133,13 +196,13 @@ module Wikisys
       
       else
         
-        [title, s.lines[1..--1].join, []]
+        [title, s.lines[1..-1].join, []]
         
       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|
@@ -151,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
                 
@@ -168,7 +231,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")
@@ -179,18 +242,30 @@ 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)      
       
-      filepath = File.join(File.absolute_path(@filepath), 'xml', 
-                           title.downcase.gsub(/ +/,'_') + '.xml')
+    end    
+    
+    def write_xml(s, content)
+      
+      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
       write_file filepath, content
@@ -226,8 +301,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
       
@@ -262,12 +338,60 @@ 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)
+      @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
     #
@@ -279,22 +403,10 @@ 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|
-
-        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
+      h[:new].each {|filename| new_pg(filename) }
+      h[:modified].each {|filename| update_pg(filename) }
 
       @mw.save if @mw.lines.any?      
       outline_filepath = File.join(@filepath, 'myoutline.txt')
@@ -303,16 +415,7 @@ module Wikisys
       
       (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)
+        build_html filename
         
       end
       
@@ -370,6 +473,7 @@ module Wikisys
       end                            
       
     end
+
     
     def view_file(file='index.html')
       @hc.read(file) { File.read(file) }

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.1
+  version: 0.4.4
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   O3SRDzvvWXrwDFGyRDmGqdEw51FKHPw/6pk4ci0QPIvQEgOyPKfdSesPWmNmtxpf
   KX/89ohIpftt89vtcCI21R5u
   -----END CERTIFICATE-----
-date: 2021-01-30 00:00:00.000000000 Z
+date: 2021-02-01 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