Pimki 1.5.092 → 1.6.092

data/README-PIMKI

@@ -68,6 +68,16 @@ version 2.0.11 by default. Version 3.0.1 is a bit experimental. You can select
 which version of redcloth via --redcloth command line argument.
 
 History:
+1.6.092 Mainly bug fixes with some minor enhancements
+    - Squashed horrible restart bug
+    - Several bug fixes
+    - Upgraded to RedCloth 3.0.3, which seems stable enough
+    - RSS includes Bliki
+    - Added capacity to stop server through the edit_web template
+    - Added an error reporting template
+    - Can now display just the Mind Map image for printing
+    - Minor improvements to the publish interface, e.g. displaying menu
+
 1.5.092 Bug fixes & new features release
     - Several bug fixes
     - RedCloth is now defaulting to 2.0.11. Controllable thru commandline.
@@ -75,7 +85,6 @@ History:
     - c2 wiki links via [c2[PageName]]
     - FavIcon (working in Firefox)
     - Madeleine Snapshot Controls (thru edit_web)
-    
 
 1.4.092 New features release
     - Added a major/minor edit override for the default 'continous edit' when

data/app/controllers/wiki.rb

@@ -57,6 +57,21 @@ class WikiController < ActionControllerServlet
 
   def static_style_sheet() render "static_style_sheet" end
 
+  def stop
+    redirect_show("HomePage") unless wiki.authenticate(@params["system_password"])
+
+    begin
+      secs = @params['seconds'].to_i
+      raise if secs.zero?
+      @logger.warn "Pimki server will stop in #{secs} seconds!"
+      WikiService.request_stop
+      render_text "Pimki server will stop in #{secs} seconds!"
+      Thread.new { sleep secs; Kernel.exit! }
+    rescue
+      redirect_show("HomePage")
+    end
+  end
+
   # Within a single web ---------------------------------------------------------
 
   def parse_category
@@ -164,6 +179,7 @@ class WikiController < ActionControllerServlet
 
   def rss_with_content
     @pages_by_revision = web.select.by_revision.first(15)
+    @bliki_entries = web.bliki_entries_by_date
     @uri = @req.request_uri
     host = @req.meta_vars["HTTP_X_FORWARDED_HOST"] || "#{@uri.host}:#{@uri.port.to_s}"
     @web_url = "#{@uri.scheme}://#{host}/#{@web.address}"
@@ -188,14 +204,14 @@ class WikiController < ActionControllerServlet
 
       case @req.query['Action']
         when 'Delete' # Handle page deletion
-          wiki.delete_page(web_address, @req.query['sel_page_name'])
+          wiki.delete_page(web_address, @req.query['del_sel_page_name'])
           redirect_action "list/"
         
         when 'Create' # Handle page creation
           redirect_show @req.query['newpage']
     
         when 'Rename' # Handle page rename
-          wiki.rename_page(web_address, @req.query['sel_page_name'], @req.query['newpage'])
+          wiki.rename_page(web_address, @req.query['ren_sel_page_name'], @req.query['newpage'])
           redirect_action "list/"
       end
     end
@@ -238,7 +254,7 @@ class WikiController < ActionControllerServlet
   def edit_web #{{{
     parse_category
     set_mm_options
-    @snapshot_interval = MadeleineService.snapshot_interval_hours
+    @snapshot_interval = WikiService.snapshot_interval_hours
   end #}}}
   
   def update_web
@@ -278,10 +294,10 @@ class WikiController < ActionControllerServlet
           clear_render_cache true
         
         when 'Force Data Snapshot'
-          MadeleineService.take_snapshot
+          WikiService.take_snapshot
           
         when 'Clean Storage'
-          MadeleineService.clean_old_snapshots
+          WikiService.clean_old_snapshots
         
       end
       @message = 'Operation succeeded'
@@ -372,7 +388,7 @@ class WikiController < ActionControllerServlet
     redirect_path "/#{web_address}/edit_web/" unless dont_redirect
   end
   
-  def set_menu_pages #{{{
+  def set_menu_pages published = false #{{{
     parse_category
     @all_pages = web.select { true }
     @menu_pages = case web.menu_type
@@ -387,6 +403,7 @@ class WikiController < ActionControllerServlet
         else
           web.menu_content
         end
+        @menu_content = @menu_content.gsub('/show/', '/published/').gsub( %r{<a href="../published/.*?">\?</a>}, '') if published
         nil
       when 'linkers'
         web.select { |page|
@@ -465,7 +482,6 @@ class WikiController < ActionControllerServlet
     end
   end #}}}
   
-  
   def edit_menu #{{{
     @menu_type = web.menu_type
     @menu_content = web.menu_content
@@ -538,6 +554,7 @@ class WikiController < ActionControllerServlet
   end
   
   def published
+    set_menu_pages true
     if web.published then @page = wiki.read_page(web_address, page_name || "HomePage") else redirect_show("HomePage") end
   end
   

data/app/models/revision.rb

@@ -80,8 +80,7 @@ class Revision
   end
   
   def display_published
-    @published_cache = WikiContent.new(self, {:mode => :publish}) if @published_cache.nil?
-    @published_cache
+    @published_cache ||= WikiContent.new(self, {:mode => :publish})
   end
 
   def display_content_for_export

data/app/models/wiki_service.rb

@@ -46,7 +46,7 @@ class WikiService < MadeleineService
       @webs[new_address].address = new_address
     end
 
-    MadeleineService.snapshot_interval_hours = snapshots_interval
+    self.class.snapshot_interval_hours = snapshots_interval
     
     web = @webs[new_address]
     web.refresh_revisions if settings_changed?(web, markup, safe_mode, brackets_only)
@@ -104,7 +104,7 @@ class WikiService < MadeleineService
   def rename_page(web_address, old_page_name, new_page_name) #{{{
     web = @webs[web_address]
     page = web.pages.delete(old_page_name)
-    page or raise "unknown page: #{old_page_name.to_s};; #{pages.keys.join(',')}"
+    page or raise "unknown page: #{old_page_name.to_s}; #{web.pages.keys.join(',')}"
     page.name = new_page_name
     web.pages[new_page_name] = page
   end #}}}

data/app/views/error.rhtml

@@ -0,0 +1,35 @@
+<% def html_escape str
+     str.gsub( '<', '&lt;').gsub( '>', '&gt;').gsub('&', '&amp;')
+   end %>
+
+<?xml version="1.0" encoding="UTF-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>Internal Error</title>
+
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <link rel="Stylesheet" href="../../static_style_sheet/" type="text/css" media="screen" />
+</head>
+<body>
+
+<h3>An error has occured!</h3>
+
+<p>We're sorry, we're not perfect... but we want to be! If you have the time, please go to the pimki <a href="http://rubyforge.org/tracker/?atid=1750&group_id=447&func=browse">BUG tracker</a> at RubyForge and open a bug report. Please supply a short description of what you did when this happended, the system you're on, etc. and paste everything below this line in the bug report. It will greatly help in development. Thank you for your efforts!</p>
+
+<hr />
+
+<p><b>Error message:</b>
+  <code style="color:red"><%= html_escape @error_details.message %></code>
+</p>
+
+<p><b>Action:</b> <%= @action_name %></p>
+
+<p><b>Backtrace:</b><br />
+  <table border="0">
+  <% for line in @error_details.backtrace %>
+       <tr><td><code><%= line.sub(/(.*)\/(\w+\.rb):(\d+):in (.*)/, '\1/<b>\2</b>:\3:in <b>\4</b>') %></code></td></tr>
+  <% end %>
+</p>
+
+</body>
+</html>

data/app/views/menu.rhtml

@@ -1,15 +1,19 @@
 <div id="Menu" width="150">
   <p>
   <table>
-  <% begin %>
+  <% published = @action_name =~ /published/
+     show_by = published ? '../published/' : '../show/'
+     begin %>
         <tr><th><%= @web.name %> Quick Links</th></tr>
-        <tr><td><a href='../edit_menu/' style="font-size: 9px;">Edit Menu Contents</a></td></tr>
+        <% unless published %>
+             <tr><td><a href='<%= "/#{web.address}/edit_menu/" %>' style="font-size: 9px;">Edit Menu Contents</a></td></tr>
+        <% end %>
         <tr><td>&nbsp;</td></tr>
         <% if @menu_pages.nil? %>
             <tr><td><%= @menu_content %></td></tr>
         <% else %>
           <% for page in @menu_pages %>
-            <tr><td><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></td></tr>
+            <tr><td><a href="<%= show_by + page.name %>"><%= truncate(page.plain_name, 35) %></a></td></tr>
           <% end %>
         <% end %>
   <% rescue Exception

data/app/views/static_style_sheet.rhtml

@@ -17,9 +17,10 @@
 }
 
 #Container {
-	float: left;
-	margin: 0 auto;
-	text-align: center;
+	float:         left;
+	margin:        0 auto;
+	text-align:    center;
+    margin-left:   10px;
 }
 
 #Content {

data/app/views/top.rhtml

@@ -32,13 +32,13 @@
   </style>
 </head>
 
-<% if @web && @page && @web.enable_dclick_edit %>
+<% if @web && @page && @web.enable_dclick_edit && @action_name!='edit' %>
   <body ondblclick="location.href='../edit/<%= @page.name %>'">
 <% else %>
   <body>
 <% end %>
 
-<%= sub_template "menu" unless @hide_navigation %>
+<%= sub_template "menu" unless @hide_menu %>
 
 <div id="Container">
   <div id="Content">

data/app/views/wiki/bliki_edit.rhtml

@@ -2,6 +2,7 @@
   @title = "Editing #{@page.plain_name}"
   @content_width = 720
   @hide_navigation = true
+  @hide_menu = true
 %>
 <%= sub_template "top" %>
 

data/app/views/wiki/bliki_new.rhtml

@@ -2,6 +2,7 @@
   @title = "Creating new bliki entry"
   @content_width = 720
   @hide_navigation = true
+  @hide_menu = true
 %>
 <%= sub_template "top" %>
 

data/app/views/wiki/edit.rhtml

@@ -2,6 +2,7 @@
   @title = "Editing #{@page.plain_name}"
   @content_width = 810
   @hide_navigation = true
+  @hide_menu = true
   @style_additions = "#Content, #Container {padding-left:100px;}"
 %>
 <%= sub_template "top" %>

data/app/views/wiki/edit_menu.rhtml

@@ -2,6 +2,7 @@
   @title = "Editing Left-Side Menu Options"
   @content_width = 700
   @hide_navigation = true
+  @hide_menu = true
 %>
 <%= sub_template "top" %>
 

data/app/views/wiki/edit_web.rhtml

@@ -1,4 +1,7 @@
-<% @title = "Edit Web" %>
+<% @title = "Edit Web"
+   @hide_menu = true
+   @style_additions = "#Container { width: 600px; margin-left: 180px;}"
+%>
 <%= sub_template "top" %>
 
 <%= "<p style='font-size: 15px; font-variant: italic; color: red;'>#{@message}</span>" if @message %>
@@ -181,7 +184,20 @@
 
 <p style='font-size: 10px;'>...or forget all your changes and <a href="/new_web/">create a new web</a>.</p>
 
-      
+<h2>Stop Pimki</h2>
+<p style="color:red">Please note that stopping the server will stop all pimki webs running on this server! It is a also a forced exit, so any changes currently being made by other users will be lost!</p>
+<form action="../stop" id="stop" method="post">
+  <p style="font-size: 10px;">
+      Enter system password
+      <input type="password" id="system_password" name="system_password">
+      and
+      <input type="submit" name='stop' value="Stop Pimki">
+      in
+      <input type="text" name='seconds' value='3' size='5' align='right'>
+      seconds.
+   </p>
+</form>
+
 <script>
 function proposeAddress() {
   document.getElementById('address').value =

data/app/views/wiki/list.rhtml

@@ -78,7 +78,7 @@
       return true;
     }
     function validatePageName(fieldID) {
-      if (/^([A-Z][a-z]+[A-Z]\w+)$/.test(document.getElementById(fieldID).value)) {
+      if (/^([A-Z]+[a-z]+[A-Z]\w+)$/.test(document.getElementById(fieldID).value)) {
         return true;
       } else {
         alert('You wrote "' + document.getElementById(fieldID).value + '" as a page name, but it needs to be a wiki word.');
@@ -113,7 +113,7 @@
       <!-- Delete Page -->
       <tr>
         <td>Delete page:</td>
-        <td><select id="sel_delete" name="sel_page_name" size="1" style="width:195">
+        <td><select id="del_sel_page_name" name="del_sel_page_name" size="1" style="width:195">
               <option value="noselect">------------</option>
               <% for page in @pages_by_name %>
                 <option value="<%= page.name %>"><%= page.name %></option>
@@ -130,7 +130,7 @@
       <!-- Rename Page -->
       <tr>
         <td>Rename:</td>
-        <td><select id="sel_rename" name="sel_page_name" size="1" style="width:195">
+        <td><select id="ren_sel_page_name" name="ren_sel_page_name" size="1" style="width:195">
               <option value="noselect">------------</option>
               <% for page in @pages_by_name %>
                 <option value="<%= page.name %>"><%= page.name %></option>

data/app/views/wiki/login.rhtml

@@ -1,4 +1,8 @@
-<% @title = "#{@web_name} Login" %><% @hide_navigation = true %><%= sub_template "top" %>
+<% @title = "#{@web_name} Login" 
+   @hide_navigation = true
+   @hide_menu = true
+%>
+<%= sub_template "top" %>
 
 <form action="authenticate" method="post">
 <p>

data/app/views/wiki/mind.rhtml

@@ -4,6 +4,7 @@
 <%= sub_template "top" %>
 
 <h4>A "Mind Map" created from the Wiki links.</h4>
+<p style="font-size: 9px; margin-top: -20px; margin-bottom: 10px;">A printable version (just the image) can be found <a href="../get_map_img">here</a>.</p>
 
 <img src="../get_map_img" usemap="#graph.map" />
 <map name="graph.map" id="graph.map">

data/app/views/wiki/new.rhtml

@@ -2,6 +2,7 @@
   @title = "Creating #{WikiWords.separate(CGI.unescape(@page_name))}"
   @content_width = 800
   @hide_navigation = true
+  @hide_menu = true
   @style_additions = "#Container, #Content {padding-left:100px;}"
 %>
 <%= sub_template "top" %>

data/app/views/wiki/print.rhtml

@@ -1,6 +1,7 @@
 <% 
   @title = @page.plain_name
   @hide_navigation = true
+  @hide_menu = true
   @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
   @inline_style = true
 %><%= sub_template "top" %>

data/app/views/wiki/published.rhtml

@@ -1,10 +1,11 @@
 <%
   @title = @page.plain_name
   @hide_navigation = true
-  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }
+  @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
                       #Container, #Content { width: 600px; padding-left: 180px;}"
   @inline_style = true
-%><%= sub_template "top" %>
+%>
+<%= sub_template "top" %>
 
 <%= @page.display_published %>
 

data/app/views/wiki/rollback.rhtml

@@ -2,6 +2,7 @@
   @title = "Rollback to #{@page.plain_name} Rev ##{@revision.number}"
   @content_width = 720
   @hide_navigation = true
+  @hide_menu = true
 %><%= sub_template "top" %>
 
 <%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{@params["msg"]}</small></p>" if @params["msg"] %>

data/app/views/wiki/rss_feed.rhtml

@@ -3,16 +3,28 @@
 	<channel>
 		<title><%= @web.name %></title>
 		<link><%= "#{@web_url}/show/HomePage" %></link>
-		<description>An Instiki wiki</description>
+		<description>Pimki - a PIM based on Instiki's wiki technology</description>
 		<language>en-us</language>
 		<ttl>40</ttl>
+  <% for entry in @bliki_entries %>
+    <item>
+      <title>Bliki: <%= entry.plain_name %></title>
+    <% unless @hide_description %>
+      <description><%= CGI.escapeHTML(entry.display_content) %></description>
+    <% end %>
+      <pubDate><%= ctime = entry.created_at; ctime.strftime "%a, %e %b %Y %H:%M:%S #{ctime.gmt_offset/3600}" %></pubDate>
+      <guid><%= "#{@web_url}/bliki_revision/#{entry.name}?rev=#{entry.revisions.length-1}" %></guid>
+      <link><%= "#{@web_url}/bliki_revision/#{entry.name}?rev=#{entry.revisions.length-1}" %></link>
+      <dc:creator><%= WikiWords.separate(entry.author) %></dc:creator>
+    </item>
+  <% end %>
   <% for page in @pages_by_revision %>
-		<item>
+    <item>
       <title><%= page.plain_name %></title>
     <% unless @hide_description %>
       <description><%= CGI.escapeHTML(page.display_content) %></description>
     <% end %>
-      <pubDate><%= page.created_at.strftime "%a, %e %b %Y %H:%M:%S %Z" %></pubDate>
+      <pubDate><%= ctime = page.created_at; ctime.strftime "%a, %e %b %Y %H:%M:%S #{ctime.gmt_offset/3600}" %></pubDate>
       <guid><%= "#{@web_url}/show/#{page.name}" %></guid>
       <link><%= "#{@web_url}/show/#{page.name}" %></link>
       <dc:creator><%= WikiWords.separate(page.author) %></dc:creator>

data/libraries/action_controller_servlet.rb

@@ -137,8 +137,14 @@ class ActionControllerServlet < HTTPServlet::AbstractServlet
       elsif template_exists_for_action
         render
       else
-        raise "No action responded to #{action_name}", caller
+        raise RuntimeError, "No action responded to #{action_name}", caller
       end
+      
+      rescue Exception => details
+        raise if ['WEBrick', 'Net'].include? details.class.name.split('::')[0]
+        @error_details = details
+        render 'error'
+
     end
 
     def add_instance_variables_to_assigns

data/libraries/madeleine/automatic.rb

@@ -179,7 +179,7 @@ module Madeleine
 # outside the system.
 #
       def method_missing(symbol, *args, &block)
-#      print "Sending #{symbol} to #{@thing.to_s}, myid=#{@myid}, sysid=#{@sysid}\n"
+        #print "Sending #{symbol} to #{@thing.to_s}, myid=#{@myid}, sysid=#{@sysid}\n"
         raise NoMethodError, "Undefined method" unless @thing.respond_to?(symbol)
         if (Thread.current[:system])
           @thing.send(symbol, *args, &block)

data/libraries/madeleine_service.rb

@@ -103,7 +103,7 @@ class MadeleineServer
   end
 
   def command_log_present?
-    not Dir[storage_path + '/*.command_log'].empty?
+    not Dir[File.join(File.expand_path(storage_path), '*.command_log')].empty?
   end
 
   def force_snapshot

data/pimki.rb

@@ -16,7 +16,8 @@ begin
 
 rescue LoadError => detail
   # no rubygems, so load from the libraries directory
-  p detail
+  p detail if $DEBUG
+  puts 'Unable to load libraries through RubyGems. Loading from ./libraries directory'
   require 'bluecloth'
   require 'zip/zip'
 end
@@ -47,7 +48,7 @@ OPTIONS = {
   :port        => 2500,
   :storage     => "#{Dir.pwd}/storage",
   :pdflatex    => pdflatex_available,
-  :redcloth    => '2.0.11'
+  :redcloth    => '3'
 }
 
 ARGV.options do |opts|
@@ -65,7 +66,7 @@ ARGV.options do |opts|
   opts.on("-t", "--storage=storage", String,
           "Makes Instiki use the specified directory for storage.",
           "Default: [cwd]/storage/[port]\n") { |OPTIONS[:storage]| }
-  opts.on("-r", "--redcloth VERSION", Integer,
+  opts.on("-r", "--redcloth VERSION", String,
           "Makes Instiki use the specified RedCloth version.",
           "You can specify major version only (2 or 3)",
           "Default: 2.0.11\n") { |OPTIONS[:redcloth]| }
@@ -84,7 +85,11 @@ Socket.do_not_reverse_lookup = true
 
 # RedCloth + Modifications: {{{
 begin
-  require_gem 'RedCloth', "~> #{OPTIONS[:redcloth]}"
+  if Gem.source_index.search('redcloth').map { |s| s.version.version }.include? OPTIONS[:redcloth]
+    require_gem 'RedCloth', "#{OPTIONS[:redcloth]}"
+  else
+    require_gem 'RedCloth', "~> #{OPTIONS[:redcloth]}"
+  end
 
 rescue LoadError => detail
   if OPTIONS[:redcloth] < '3'
@@ -148,6 +153,7 @@ if ['3.0.0', '3.0.1'].include? RedCloth::VERSION
     end #}}}
   end #}}}
 end #}}}
+puts RedCloth::VERSION
 
 # Start the application: {{{
 storage_dir = OPTIONS[:storage] + "/" + OPTIONS[:port].to_s
@@ -159,7 +165,7 @@ WikiController.template_root = "#{cdir}/app/views/"
 
 on_exit = lambda {
   WebControllerServer::the_active_server.shutdown
-  MadeleineService.request_stop
+  WikiService.request_stop
 }
 
 trap "INT", on_exit

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.8
 specification_version: 1
 name: Pimki
 version: !ruby/object:Gem::Version 
-  version: 1.5.092
-date: 2005-02-02
+  version: 1.6.092
+date: 2005-03-17
 summary: "A Personal Information Manager (PIM) based on Instiki's Wiki technology."
 require_paths: 
   - libraries
@@ -68,6 +68,7 @@ files:
   - app/models/chunks/wiki_symbols.rb
   - app/models/chunks/wiki_test.rb
   - app/views/bottom.rhtml
+  - app/views/error.rhtml
   - app/views/markdown_help.rhtml
   - app/views/menu.rhtml
   - app/views/navigation.rhtml