Pimki 1.0.092 → 1.1.092

data/README-PIMKI

@@ -1,10 +1,11 @@
-<pre>
 What is Pimki?
 ================
 
 Pimki is a Personal Information Manager based on Instiki's Wiki technology.
 
-It has some added features over Instiki, while keeping the simplicity of 
+It has some added features over Instiki, while keeping (most of) the simplicity 
+of Instiki. Add added complication is installing GraphViz on the path. GraphViz
+is available from: http://www.research.att.com/sw/tools/graphviz.
 
 Instiki Features:
 * Regular expression search: Find deep stuff really fast
@@ -24,19 +25,21 @@ Instiki Features:
 Pimki added features:
 * Mind Map: a graph of wiki connections (made with GraphViz). All graphs can be 
   laid-out with the 4 GraphViz engines. Graph contents can be arranged as:
-   * Page ? linked pages
-   * Authors ? pages
-   * Categories ? pages
+   * Page -> linked pages
+   * Authors -> pages
+   * Categories -> pages
 * Bliki: a blog integrated with the wiki. Blog entries are simply wiki-pages in
-  a special space. Can link from an entry to wiki pages.
+  a special space. Can link from an entry to wiki pages via PageName or [[page name]]
+  and from pages to Bliki entries via [bliki[page name]].
 * Todo Items & List:
-   * �todo:� items are highlighted on each page.
+   * 'todo:' items are highlighted on each page.
    * Added a capacity to pull and list todo items from all pages.
    * On main list, items are highlighted according to date (if there is one).
 * Added capacity to (persistently :) delete/rename pages through the 'All Pages'
   list.
 * Added left-side menu. Content options are:
    * Only pages that reference other pages (default)
+   * Only pages that belong to a specific category
    * All pages: by name
    * All pages: recently revised
    * All pages: recently visited
@@ -47,15 +50,16 @@ Pimki added features:
    * Now showing part of sentance around match in search-results page
 * Removed unnecessary (for me) stuff from the nav-bar: RSS, authors, export. 
   Moved to bottom of Home Page.
+* Minor stylesheet tweaks.
 
 Missing:
 
 * Expand todo with more task types?
 * Expand Search
-   * Highlight on individual page when clicked form search results
+   * Highlight match on individual page when clicked form search results
    * Advanced Search (not just regexp, case sensitivity)?
 * Editable left-side menu options: by search results? by author?
-* Bliki: allow linking from wiki-pages to bliki entries.
+* Bliki entries revision diff.
 
 
 Command-line options:
@@ -63,15 +67,40 @@ Run "ruby pimki.rb --help"
 
 History:
 
+1.1.092 Bug-fix and minor enhancements release
+    - Changed storage path to be relative to CWD to avoid storing under gem
+      version directory. When running/installing service should normally
+      provide the --storage command-line parameter. (Chad)
+    - Fixed a problem with the bliki_new form that prevented saving the entry
+      due to debug code in the JS validation code of the entry name. (PragDave)
+    - Fixed problem with export and storage path relating to app-dir instead
+      of storage dir in Instiki core. (Prag Dave)
+    - Fixed problem of missing files in in tgz packaging (rake needs 
+      PackagingTask defined _before_ GemPackageTask). (Ruben)
+    - Fixed require 'YAML' to correct 'yaml' in Instiki core. (Chad)
+    - Added capability to link from pages to Bliki entries. To use link via:
+      [bliki[entry name]]
+    - ToDo list picks up items from bliki entries and links to the entry (Ruben)
+    - Menu can be set as all pages belonging to a specific category. If you set
+      some page to a category e.g. 'menu', only those pages will appear on the
+      left-side menu.
+
+1.0.092 Updated Initial Release
+    - Finalized Numbering scheme.
+    - Made available as a gem.
+
 0.9.2-7 Initial Public Release
-        I have been working on Pimki for my own use for quite some time. It is
-        fairly mature and stable. The version number reflects the base Instiki
-        version (0.9.2; or actually the latest CVS that's markes so) and the
-        running number of my feature-addition releases.
+    I have been working on Pimki for my own use for quite some time. It is
+    fairly mature and stable. The version number reflects the base Instiki
+    version (0.9.2; or actually the latest CVS that's markes so) and the
+    running number of my feature-addition releases.
 
 
 Download latest from: 
-<a href="http://rubyforge.org/project/showfiles.php?group_id=447">http://rubyforge.org/project/showfiles.php?group_id=447</a>
+http://rubyforge.org/project/showfiles.php?group_id=447
+
+Or go the Gem way and install through:
+gem install pimki
 
 Visit the official Pimki home page at:
 http://pimki.rubyforge.org/
@@ -84,4 +113,4 @@ License is the same as Ruby's.
 --
 Assaph Mehr
 assaph@gmail.com
-</pre>
+

data/app/controllers/wiki.rb

@@ -2,7 +2,7 @@ require "cgi"
 require "redcloth_for_tex"
 
 class WikiController < ActionControllerServlet
-  EXPORT_DIRECTORY = File.dirname(__FILE__) + "/../../storage/" unless const_defined?("EXPORT_DIRECTORY")
+  EXPORT_DIRECTORY = WikiService.storage_path unless const_defined?("EXPORT_DIRECTORY")
 
   def index
     if web_address
@@ -184,6 +184,7 @@ class WikiController < ActionControllerServlet
     set_menu_pages
     @pages_by_name = @pages_in_category.by_name
     @todo_items = Hash.new { Array.new }
+    @bliki_todo_items = Hash.new { Array.new }
     @pages_by_name.each do |page|
       if page.content =~ Todo.pattern
         # Page has todo items. Get the rendered version (marked-up and with links):
@@ -192,16 +193,26 @@ class WikiController < ActionControllerServlet
       end
     end
     @todo_items = @todo_items.sort_by { |page, items| page.name }
+    web.bliki.each do |pname, entry|
+      if entry.content =~ Todo.pattern
+        # Entry has todo items. Get the rendered version (marked-up and with links):
+        content = entry.revisions.last.display_content
+        @bliki_todo_items[entry] = content.scan /<span class="todo"><strong>TODO:<\/strong> (.*?)<\/span>/
+      end
+    end
+    @bliki_todo_items = @bliki_todo_items.sort_by { |entry, items| entry.name }
   end #}}}
   
   def set_menu_pages #{{{
     parse_category
+    @all_pages = web.select { true }
     @menu_pages = case web.menu_type
-      when 'all'     then @pages_in_category.by_name 
-      when 'recent'  then @pages_in_category.by_last_visited
-      when 'viewed'  then @pages_in_category.by_most_viewed
-      when 'revised' then @pages_in_category.by_revision
-      when 'user'    then @menu_content = web.rendered_menu; nil
+      when 'all'      then @all_pages.by_name 
+      when 'recent'   then @all_pages.by_last_visited
+      when 'viewed'   then @all_pages.by_most_viewed
+      when 'revised'  then @all_pages.by_revision
+      when 'user'     then @menu_content = web.rendered_menu; nil
+      when 'category' then web.select { |page| page.in_category?(web.menu_category) } 
       when 'linkers'
         web.select { |page|
           page.wiki_words.size > 0 
@@ -254,15 +265,16 @@ class WikiController < ActionControllerServlet
   
   def save_menu #{{{
     unless @req.query['action'] == 'Cancel Update'
-      type    = @req.query['type']
-      content = @req.query['content']
+      type     = @req.query['type']
+      content  = @req.query['content']
+      category = @req.query['category']
       
       limit = @req.query['limit'].to_i rescue nil
       limit = 20 unless limit
       limit -= 1 if limit >= 0
       
       # need to go through the WikiService to persist the command:
-      wiki.save_menu_pref web, type, limit, content
+      wiki.save_menu_pref web, type, limit, content, category
     end
 
     if web_address
@@ -417,7 +429,7 @@ class WikiController < ActionControllerServlet
   
   def rollback_bliki
     @page = wiki.read_bliki_entry(web_address, page_name)
-    wiki.rollback_bliki_entry(web_address, page_name, @params["rev"].to_i-1, Time.now)
+    wiki.rollback_bliki_entry(web_address, page_name, @params["rev"].to_i, Time.now)
     redirect_bliki
   end
 
@@ -455,7 +467,10 @@ class WikiController < ActionControllerServlet
       redirect_path "/#{web}/#{action}"
     end
 
-
+    def link_to_bliki(entry, web = web_address) #{{{
+      "<a class='existingWikiWord' href='/#{web}/bliki_revision/#{entry.name}?rev=#{entry.revisions.size-1}'>#{entry.name}</a>"
+    end #}}}
+    
 
   private
     def wiki

data/app/models/chunks/category.rb

@@ -12,8 +12,8 @@ class Category < Chunk::Abstract
 
   attr_reader :hidden, :list
 
-  def initialize(match_data)
-    super(match_data)
+  def initialize(match_data, revision)
+    super(match_data, revision)
     @hidden = match_data[1]
     @list = match_data[2].split(',').map { |c| c.strip }
   end

data/app/models/chunks/chunk.rb

@@ -8,9 +8,9 @@ require 'uri/common'
 # match by its pattern. 
 module Chunk
   class Abstract
-	attr_reader :text
+	attr_reader :text, :revision
 
-	def initialize(match_data) @text = match_data[0] end
+	def initialize(match_data, revision) @text = match_data[0]; @revision = revision end
 	def pre_mask() "chunk#{self.id}start " end
 	def post_mask() " chunk#{self.id}end" end
 	def mask(content) "chunk#{self.id}chunk" end

data/app/models/chunks/include.rb

@@ -11,8 +11,8 @@ class Include < WikiChunk::WikiLink
 
   attr_reader :page_name
 
-  def initialize(match_data)
-    super(match_data)
+  def initialize(match_data, revision)
+    super(match_data, revision)
     @page_name = match_data[1].strip
   end
 

data/app/models/chunks/nowiki.rb

@@ -19,8 +19,8 @@ class NoWiki < Chunk::Abstract
 
   attr_reader :plain_text
 
-  def initialize(match_data)
-	super(match_data)
+  def initialize(match_data, revision)
+	super(match_data, revision)
 	@plain_text = match_data[1]
   end
   

data/app/models/chunks/todo.rb

@@ -6,8 +6,8 @@ require 'parsedate'
 class Todo < Chunk::Abstract
   def self.pattern() /todo: ([^\n]+)/i end
 
-  def initialize(match_data)
-    super(match_data)
+  def initialize(match_data, revision)
+    super(match_data, revision)
   end
 
   def escaped_text() nil end

data/app/models/chunks/uri.rb

@@ -52,8 +52,8 @@ class URIChunk < Chunk::Abstract
 
   attr_reader :uri, :scheme, :user, :host, :port, :path, :query, :fragment, :link_text
   
-  def initialize(match_data)
-    super(match_data)
+  def initialize(match_data, revision)
+    super(match_data, revision)
     # Since the URI_PATTERN is tried twice, there are two sets of
     # groups, one from \1 to \7 and the second from \8 to \14.
     # The fields are set by which ever group matches.

data/app/models/chunks/wiki.rb

@@ -41,8 +41,8 @@ module WikiChunk
 
     attr_reader :page_name
 
-    def initialize(match_data)
-      super(match_data)
+    def initialize(match_data, revision)
+      super(match_data, revision)
       @escape = match_data[1]
       @page_name = match_data[2]
     end
@@ -66,8 +66,8 @@ module WikiChunk
 
     attr_reader :page_name, :link_text
 
-    def initialize(match_data)
-      super(match_data)
+    def initialize(match_data, revision)
+      super(match_data, revision)
 
 	  # If the like is aliased, set the page name to the first bit
 	  # and the link text to the second, otherwise set both to the
@@ -79,4 +79,25 @@ module WikiChunk
       end
     end
   end
+
+  # This chunk handles [bliki[entry name]].
+  # This format can be easily duplicated for any other pre-configured redirection.
+  class BlikiLink < WikiLink
+    def self.pattern() /\[bliki\[([\w\d\s]+)\]\]/ end
+
+    attr_reader :page_name, :link_text, :entry
+
+    def initialize(match_data, revision)
+      super(match_data, revision)
+      @page_name, @link_text = match_data[1], match_data[1]
+    end
+
+    def unmask(content)
+      return self if content.sub!(regexp) { |match|
+        web = revision.page.web
+        entry = web.bliki[page_name]
+        "<a class='existingWikiWord' href='/#{web.address}/bliki_revision/#{entry.name}?rev=#{entry.revisions.size-1}'>#{entry.name}</a>"
+      }
+    end
+  end
 end

data/app/models/web.rb

@@ -5,7 +5,7 @@ require "wiki_words"
 require "zip/zip"
 
 class Web
-  attr_accessor :pages, :name, :address, :password, :menu_type, :menu_content, :rendered_menu, :menu_limit
+  attr_accessor :pages, :name, :address, :password, :menu_type, :menu_content, :rendered_menu, :menu_limit, :menu_category
   attr_accessor :markup, :color, :safe_mode, :additional_style, :published, :brackets_only, :count_pages
   
   @@BLIKI_TEMPLATE = "Try a weekly worksheet:\n\n| / | *Morning* | *Afternoon* |\n" +
@@ -103,9 +103,10 @@ class Web
     
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size = "9,11";'
-      file.puts 'concentrate = true;'
-      file.puts 'node [fontsize=8,fontname="Tahoma"];'
+      file.puts 'size="8,8";'
+      file.puts 'ratio=fill;'
+      file.puts 'concentrate=true;'
+      file.puts 'node [fontsize=10,fontname="Tahoma"];'
       file.puts 'edge [len=1.5];'
     
       # Page Special nodes properties:
@@ -133,7 +134,7 @@ class Web
       # find missing pages:
       if missing
         missing.each do |wanted|
-          file.puts "#{wanted} [URL=\"/#{@address}/show/#{wanted}\", fontsize=8,style=filled,color=grey];"
+          file.puts "#{wanted} [URL=\"/#{@address}/show/#{wanted}\", fontsize=10,style=filled,color=grey];"
         end
         pages.values.each do |page|
           missing.each do |wanted|
@@ -162,9 +163,10 @@ class Web
     
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size = "9,11";'
-      file.puts 'concentrate = true;'
-      file.puts 'node [fontsize=8,fontname="Tahoma"];'
+      file.puts 'size="8,8";'
+      file.puts 'ratio=fill;'
+      file.puts 'concentrate=true;'
+      file.puts 'node [fontsize=10,fontname="Tahoma"];'
       file.puts 'edge [len=1.5];'
     
       # Links and node properties:
@@ -199,15 +201,16 @@ class Web
     File.open(dotFile, "w") do |file|
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size = "9,11";'
-      file.puts 'concentrate = true;'
-      file.puts 'node [fontsize=8,fontname="Tahoma"];'
+      file.puts 'size="8,8";'
+      file.puts 'ratio=fill;'
+      file.puts 'concentrate=true;'
+      file.puts 'node [fontsize=10,fontname="Tahoma"];'
       file.puts 'edge [len=1.5];'
     
       # Page Special nodes properties:
       file.puts "HomePage [color=\"##{color}\",style=bold];"
       categories.each do |category|
-        file.puts "#{category} [style=filled,color=grey];"
+        file.puts "#{category} [fontsize=20,style=filled,color=grey,comment=\"#{category}\"];"
       end
     
       # Links and node properties:

data/app/models/wiki_content.rb

@@ -43,7 +43,7 @@ class WikiContent < String
 
   # Moved URIChunk from pre-engine to post-engine, as it clashed with the textile
   # markup of "link":URL.
-  PRE_ENGINE_ACTIONS  = [ NoWiki, Category, Include, WikiChunk::Link, WikiChunk::Word ] 
+  PRE_ENGINE_ACTIONS  = [ NoWiki, Category, Include, WikiChunk::BlikiLink, WikiChunk::Link, WikiChunk::Word ] 
   POST_ENGINE_ACTIONS = [ Literal::Pre, Literal::Tags, URIChunk, Todo ]
   
 
@@ -106,7 +106,7 @@ class WikiContent < String
   # in this content with its mask.
   def apply_type!(chunk_type)
     self.gsub!( chunk_type.pattern ) do |match|
-      @chunks << chunk_type.new($~)
+      @chunks << chunk_type.new($~, @revision)
       @chunks.last.mask(self)
     end
   end

data/app/models/wiki_service.rb

@@ -86,10 +86,11 @@ class WikiService < MadeleineService
     web.pages[new_page_name] = page
   end #}}}
   
-  def save_menu_pref(web, type, limit, content) #{{{
+  def save_menu_pref(web, type, limit, content, category) #{{{
     web.menu_type = type
     web.menu_limit = limit
     web.menu_content = content
+    web.menu_category = category
     if web.menu_type == 'user'
       # only calculate the rendered content once:
       web.rendered_menu = Page.new(

data/app/views/wiki/bliki_new.rhtml

@@ -21,8 +21,7 @@
 | *Tue* | - | - |
 | *Wed* | - | - |
 | *Thu* | - | - |
-| *Fri* | - | - |
-      </textarea></td>
+| *Fri* | - | - |</textarea></td>
     </tr>
     <tr style="background-color:efe">
       <th colspan="2" align="right">
@@ -39,17 +38,17 @@
   </p>
 </form>
 
-<script language="JavaScript1.2">
+<script language="JavaScript">
 function validateWikiWords() {
-  alert(escape(document.getElementById('newPageName').value));
-  return false;
+  // alert(escape(document.getElementById('newPageName').value));
+  // return false;
   if (/^([A-Z][a-z]+[A-Z]\w+)$/.test(document.getElementById('authorName').value)) {
     // return true; skip to validate page name
   } else {
     alert('You wrote "' + document.getElementById('authorName').value + '" as your name, but it needs to be a wiki word. Try concating first name and last name, like DavidHeinemeierHansson.');
     return false;
   }
-  if (/^[\w\s\d]+)$/.test(document.getElementById('newPageName').value)) {
+  if (/^([\w\s\d]+)$/.test(document.getElementById('newPageName').value)) {
     return true;
   } else {
     alert('You wrote "' + document.getElementById('newPageName').value + '" as the entry name, but it can only contain letters, digits and space.');

data/app/views/wiki/bliki_revision.rhtml

@@ -20,23 +20,23 @@
 </div>
 
 <div class="navigation">
+  <a href="../bliki_edit/<%= @page.name %>" class="navlink">Edit</a> |
   <% if @revision.previous_revision %>
        <a href="../bliki_revision/<%= @page.name %>?rev=<%= @revision.previous_revision.number %>" class="navlink">Lower</a>
-  <%   @lower = true
-     end
-     if @revision.next_revision
-       if @lower %>
-         -
-       <% end %>
-    <a href="../bliki_revision/<%= @page.name %>?rev=<%= @revision.next_revision.number %>" class="navlink">Higher</a>
+  <% else %>
+       <span style="color:grey">Lower</span>
+  <% end %> -
+  <% if @revision.next_revision %>
+       <a href="../bliki_revision/<%= @page.name %>?rev=<%= @revision.next_revision.number %>" class="navlink">Higher</a>
+  <% else %>
+       <span style="color:grey">Higher</span>
   <% end %>
   
   <%= '|' if @revision.previous_revision or @revision.next_revision %> 
   <a href="../bliki_delete/<%= @page.name %>" class="navlink" onClick="return confirm('Are you sure you want delete this entry completely?')">Delete All</a>
   <% if @revision.next_revision %>
-     | <a href="../bliki_revision/<%= @page.name %>?rev=<%= @page.revisions.length - 1 %>" class="navlink">Back to current</a>
-  <% else %>
-    | <a href="../rollback_bliki/<%= @page.name %>?rev=<%= @revision.number - 1 %>" 
+    | <a href="../bliki_revision/<%= @page.name %>?rev=<%= @page.revisions.length - 1 %>" class="navlink">Back to current</a>
+    | <a href="../rollback_bliki/<%= @page.name %>?rev=<%= @revision.number %>" 
          class="navlink" onClick="return confirm('Are you sure you want reset the page to this revision?')">Rollback to here</a>
   <% end %>
 

data/app/views/wiki/edit_menu.rhtml

@@ -9,11 +9,19 @@
 
 <form id="editForm" action="../save_menu" method="post">
 <p>Please choose the format you prefer for the left-size menu:</p>
+<p><input type="radio" name="type" value="linkers" <%= 'checked' if @menu_type == 'linkers' %>>Only pages that link other pages (default)</p>
 <p><input type="radio" name="type" value="all" <%= 'checked' if @menu_type == 'all' %>>All Pages</p>
 <p><input type="radio" name="type" value="revised" <%= 'checked' if @menu_type == 'revised' %>>Recently revised pages</p>
 <p><input type="radio" name="type" value="recent" <%= 'checked' if @menu_type == 'recent' %>>Recently visited pages</p>
 <p><input type="radio" name="type" value="viewed" <%= 'checked' if @menu_type == 'viewed' %>>Most viewed pages</p>
-<p><input type="radio" name="type" value="linkers" <%= 'checked' if @menu_type == 'linkers' %>>Only pages that link other pages (default)</p>
+<p><input type="radio" name="type" value="category" <%= 'checked' if @menu_type == 'category' %>>Pages in a specific category: 
+   <select id="category" name="category" size="1" style="width:190">
+     <option value="noselect">------------
+     <% for category in web.categories %>
+       <option value="<%= category %>"><%= category %>
+     <% end %>
+   </select>
+</p>
 <p>For the above options you can choose if you want to limit the number of results. Enter the number of items you wish, or 0 for all items: <input type="textfield" size="20", name="limit" value="<%= @list_limit %>" /></p>
 <p><input type="radio" name="type" value="user" <%= 'checked' if @menu_type == 'user' %>>Or just write your own menu contents (as a regular Wiki page):
     <textarea name="content" style="width: 400px; height: 300px"><%= @menu_content %></textarea>

data/app/views/wiki/list.rhtml

@@ -100,7 +100,7 @@
       <tr>
         <form class="navigation" action="list/" action="get" onSubmit="return validateSelection('sel_delete') && verifyDelete();">
         <td>Delete page:</td>
-        <td><select id="sel_delete" name="sel_page_name" size="1">
+        <td><select id="sel_delete" name="sel_page_name" size="1" style="width:190">
               <option value="noselect">------------
               <% for page in @pages_by_name %>
                 <option value="<%= page.name %>"><%= page.name %>
@@ -119,7 +119,7 @@
       <tr>
         <form class="navigation" action="../list/" action="get" onSubmit="return validateSelection('sel_rename') && verifyRename() && validatePageName('ren_newpage');">
         <td>Rename:</td>
-        <td><select id="sel_rename" name="sel_page_name" size="1">
+        <td><select id="sel_rename" name="sel_page_name" size="1" style="width:190">
               <option value="noselect">------------
               <% for page in @pages_by_name %>
                 <option value="<%= page.name %>"><%= page.name %>
@@ -130,7 +130,7 @@
       <tr>
         <td align="center">To:</td>
         <td>
-          <input type="text" name="newpage" id="ren_newpage" size=28>
+          <input type="text" name="newpage" id="ren_newpage" size="28">
         </td>
       </tr>
       <tr>
@@ -145,7 +145,7 @@
         <form class="navigation" action="../list/" action="get" onSubmit="return validatePageName('newpage');">
         <td>Create New Page:</td>
         <td>
-          <input type="text" name="newpage" id="newpage"  size=28>
+          <input type="text" name="newpage" id="newpage"  size="28">
         </td>
       </tr>
       <tr>

data/app/views/wiki/mind.rhtml

@@ -1,12 +1,14 @@
-<% @title = "Mind Map" %>
+<% @title = "Mind Map"
+   @style_additions = "img { width: 8in; }"
+%>
 <%= sub_template "top" %>
 
 <h4>A "Mind Map" created from the Wiki links.</h4>
 
 <table border=0>
  <tr>
-  <td colspan=3>
-   <img src="file://<%= @pngFile %>" usemap="#graph.map">
+  <td colspan='3' id='mapcell'>
+   <img src="file://<%= @pngFile %>" usemap="#graph.map" />
    <map name="graph.map"><%= File.read(@mapFile) %></map>
   </td>
  </tr>

data/app/views/wiki/new_system.rhtml

@@ -15,8 +15,8 @@
     </div>
     <div class="inputBox">
       Name: <input type="text" id="web_name" name="web_name" value="Wiki" onChange="proposeAddress();" 
-          onClick="this.value == 'Wiki' ? this.value = '' : true"> &nbsp;&nbsp;
-      Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();" value="wiki">
+          onClick="this.value == 'Pimki' ? this.value = '' : true"> &nbsp;&nbsp;
+      Address: <input type="text" id="web_address" name="web_address" onChange="cleanAddress();" value="pimki">
     </div>
   </li>
 

data/app/views/wiki/todo.rhtml

@@ -1,8 +1,9 @@
 <% @title = "ToDo" %>
 <%= sub_template "top" %>
-
-<% num_items = @todo_items.inject(0) { |n, (p,i)| n += i.size } %>
-<h3>There <%= num_items == 1 ? 'is' : 'are' %> <%= num_items.zero? ? "no" : @todo_items.size %> ToDo item<%= num_items != 1 ? 's' : '' %>.
+<% num_items = @todo_items.inject(0) { |n, (p,i)| n += i.size }
+   num_items += @bliki_todo_items.inject(0) { |n, (p,i)| n += i.size }
+%>
+<h3>There <%= num_items == 1 ? 'is' : 'are' %> <%= num_items.zero? ? "no" : num_items %> ToDo item<%= num_items != 1 ? 's' : '' %>.
 </h3>
 
 <ul>
@@ -29,6 +30,33 @@
 <% end %>
 </ul>
 
+<% if @bliki_todo_items.size > 0 %>
+  <h4>ToDo items from Bliki:</h4>
+  <ul>
+  <% @bliki_todo_items.each do |page, items| %>
+    <li><%= link_to_bliki(page) %>
+        <ul>
+          <% items.each do |item|
+               # default is the muted 'darkred', to prevent to many bright red
+               # items on one page: (See also chunks/todo.rb)
+               tclass = "todoFuture"
+               # next check is the item is dated:
+               d = ParseDate.parsedate(item[0]) rescue nil
+               if not d.nil? and not d.all? { |x| x.nil? }
+                 # there's a date in the todo. display it accordingly
+                 d[0] ||= today.year    # make sure there's a 'year' component
+                 d = Date.new(*d[0..2])  rescue nil
+                 tclass = 'todo' if (not d.nil?) and ((today <=> d) > -1)
+               end %>
+               <li class="<%= tclass %>"><%= item %></li>
+          <% end %>
+        </ul>
+    </li>
+  <% end %>
+  </ul>
+<% end %>
+
+
 <% if num_items == 0  %>
   <p>To make ToDo items appear here insert a 'todo' item in any page. Simply write at the start of any line 'todo' followed by a colon (':'), followed by a space and some text. For example:
   <pre>todo: some text</pre></p>

data/libraries/madeleine_service.rb

@@ -1,7 +1,7 @@
 require 'madeleine/automatic'
 require 'madeleine'
 require 'singleton'
-require 'YAML'
+require 'yaml'
 
 class MadeleineService
   include Madeleine::Automatic::Interceptor
@@ -34,7 +34,7 @@ class MadeleineService
 end
 
 class MadeleineServer
-  SNAPSHOT_INTERVAL   = 60 * 60 # Each hour * 24 # Each day
+  SNAPSHOT_INTERVAL   = 60 * 60 * 24 # seconds * minutes * hours => Each day
   AUTOMATIC_SNAPSHOTS = true
 
   # Clears all the command_log and snapshot files located in the storage directory, so the

data/pimki.rb

@@ -44,7 +44,7 @@ end
 OPTIONS = {
   :server_type => fork_available ? Daemon : SimpleServer,
   :port        => 2500,
-  :storage     => "#{cdir}/storage",
+  :storage     => "#{Dir.pwd}/storage",
   :pdflatex    => pdflatex_available
 }
 
@@ -62,7 +62,7 @@ ARGV.options do |opts|
           ) { OPTIONS[:server_type] = SimpleServer }
   opts.on("-t", "--storage=storage", String,
           "Makes Instiki use the specified directory for storage.",
-          "Default: ./storage/[port]") { |OPTIONS[:storage]| }
+          "Default: [cwd]/storage/[port]") { |OPTIONS[:storage]| }
 
   opts.separator ""
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: Pimki
 version: !ruby/object:Gem::Version 
-  version: 1.0.092
-date: 2004-11-24
+  version: 1.1.092
+date: 2004-12-04
 summary: A Personal Information Manager (PIM) based on the Wiki technology of Instiki.
 require_paths: 
   - libraries