Pimki 1.1.092 → 1.2.092

data/README-PIMKI

@@ -66,6 +66,10 @@ Command-line options:
 Run "ruby pimki.rb --help"
 
 History:
+1.2.092 Bug-fix and minor enhancements release
+    - Fixed problem with free-content of menu. (Mark S)
+    - Fixed problem in persisting menu-type changes.
+    - Fixed broken images in Mind Map under Firefox 1.0
 
 1.1.092 Bug-fix and minor enhancements release
     - Changed storage path to be relative to CWD to avoid storing under gem

data/app/controllers/wiki.rb

@@ -218,7 +218,7 @@ class WikiController < ActionControllerServlet
           page.wiki_words.size > 0 
         }.sort_by { |page| page.name }
     end
-    if web.menu_limit
+    if web.menu_limit && @menu_pages
       @menu_pages = @menu_pages[0..web.menu_limit]
     end
   end #}}}
@@ -274,18 +274,30 @@ class WikiController < ActionControllerServlet
       limit -= 1 if limit >= 0
       
       # need to go through the WikiService to persist the command:
-      wiki.save_menu_pref web, type, limit, content, category
+      wiki.save_menu_pref web_address, type, limit, content, category
     end
 
     if web_address
-      redirect_show "HomePage"
+      # redirect to the most recently viewed page, or the home page.
+      pname = begin
+        web.select{ true }.by_last_visited.first.name
+      rescue
+        "HomePage"
+      end
+      redirect_show pname
     elsif wiki.webs.length == 1
+      # only one web, so go there.
       redirect_show "HomePage", wiki.webs.values.first.address
     else
       redirect_path "/web_list/"
     end
   end #}}}
   
+  def get_map_img
+    file_name = "map.png"
+    file_path = File.join WikiService.storage_path, file_name
+    send_export(file_name, file_path, "image/png")
+  end
 
   # Within a single page --------------------------------------------------------
   

data/app/models/page.rb

@@ -88,4 +88,6 @@ class Page
     def method_missing(method_symbol)
       revisions.last.send(method_symbol)
     end
-end
+end
+
+# jEdit :folding=indent:collapseFolds=1:

data/app/models/web.rb

@@ -103,8 +103,8 @@ class Web
     
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size="8,8";'
-      file.puts 'ratio=fill;'
+      file.puts 'size="7,5";'
+      #file.puts 'ratio=fill;'
       file.puts 'concentrate=true;'
       file.puts 'node [fontsize=10,fontname="Tahoma"];'
       file.puts 'edge [len=1.5];'
@@ -163,8 +163,8 @@ class Web
     
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size="8,8";'
-      file.puts 'ratio=fill;'
+      file.puts 'size="7,5";'
+      #file.puts 'ratio=fill;'
       file.puts 'concentrate=true;'
       file.puts 'node [fontsize=10,fontname="Tahoma"];'
       file.puts 'edge [len=1.5];'
@@ -201,8 +201,8 @@ class Web
     File.open(dotFile, "w") do |file|
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size="8,8";'
-      file.puts 'ratio=fill;'
+      file.puts 'size="7,5";'
+      #file.puts 'ratio=fill;'
       file.puts 'concentrate=true;'
       file.puts 'node [fontsize=10,fontname="Tahoma"];'
       file.puts 'edge [len=1.5];'

data/app/models/wiki_service.rb

@@ -86,15 +86,17 @@ class WikiService < MadeleineService
     web.pages[new_page_name] = page
   end #}}}
   
-  def save_menu_pref(web, type, limit, content, category) #{{{
+  def save_menu_pref(web_address, type, limit, content, category) #{{{
+    web = @webs[web_address]
     web.menu_type = type
     web.menu_limit = limit
-    web.menu_content = content
     web.menu_category = category
+    # TODO: persist revisions of user specified content.
+    web.menu_content = content
     if web.menu_type == 'user'
-      # only calculate the rendered content once:
+      # Only calculate the rendered content once:
       web.rendered_menu = Page.new(
-        web, 'menu', @params["content"], Time.now, ''
+        web, 'menu', content, Time.now, ''
       ).revisions.last.display_content
     end
   end #}}}

data/app/models/wiki_words.rb

@@ -14,13 +14,15 @@ module WikiWords
     "абвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљћќѝўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿҁҋҍҏґғҕҗҙқҝҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӀӂӄӆӈӊӌӎӑӓӕӗәӛӝӟӡӣӥӧөӫӭӯӱӳӵӹ" +
     "աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև"
 
-  WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + '][a-z' + I18N_LOWER_CASE_LETTERS + ']+[A-Z' + I18N_HIGHER_CASE_LETTERS + ']\w+'
+  DIGITS = "0123456789"
+
+  WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + ']+[a-z' + I18N_LOWER_CASE_LETTERS + DIGITS + ']+[A-Z' + I18N_HIGHER_CASE_LETTERS + DIGITS + ']\w+'
 
   def self.separate(wiki_word, ignore_separation = false)
     if ignore_separation
       wiki_word
     else
-      wiki_word.gsub(/([a-z#{I18N_LOWER_CASE_LETTERS}])([A-Z#{I18N_HIGHER_CASE_LETTERS}])/u, '\1 \2').gsub(/(\d+)/u, ' \1 ')
+        wiki_word.gsub(/([a-z#{I18N_LOWER_CASE_LETTERS}])([A-Z#{I18N_HIGHER_CASE_LETTERS}#{DIGITS}])/u, '\1 \2').gsub(/(\d+)/u, ' \1 ')
     end
   end
 end

data/app/views/menu.rhtml

@@ -1,4 +1,4 @@
-<div id="Menu">
+<div id="Menu" width="150">
   <p>
   <table>
   <% begin %>

data/app/views/static_style_sheet.rhtml

@@ -12,7 +12,7 @@
 
 #Menu th {
   color:      darkgreen;
-	font-size:  12px;
+  font-size:  12px;
   text-align: left
 }
 

data/app/views/wiki/list.rhtml

@@ -9,101 +9,96 @@
 </div>
 <% end %>
 
-<div id="allPages" style="float: left; width: 280px; margin-right: 30px">
-<% unless @pages_that_are_orphaned.empty? && @page_names_that_are_wanted.empty? %>
-  <h2>
-    All Pages
-    <br/><small style="font-size: 12px"><i>All pages in <%= @set_name %> listed alphabetically</i></small>
-  </h2>
-<% end %>
-
-<ul><% for page in @pages_by_name.sort_by { |p| p.name } %><li><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></li><% end %></ul>
-
-<% if @web.count_pages %>
-  <% total_chars = @pages_in_category.characters %>
-  <p><small>All content: <%= total_chars %> chars / <%= sprintf("%-.1f", (total_chars / 2275 )) %> pages</small></p>
-<% end %>
-</div>
-
-<div style="float: left; width: 500px">
-<% unless @page_names_that_are_wanted.empty? %>
-  <h2>
-    Wanted Pages
-    <br/><small style="font-size: 12px"><i>Unexisting pages that other pages in <%= @set_name %> reference</i></small>
-  </h2>
-
-  <ul style="margin-bottom: 10px">
-  <% for page_name in @page_names_that_are_wanted.sort_by { |pname| pname } %>
-    <li>
-      <a href="../show/<%= page_name %>"><%= truncate(WikiWords.separate(page_name), 35) %></a>
-      wanted by
-      <%= web.select.pages_that_reference(page_name).collect { |page| page.link }.join(", ") %>
-    </li>
+<div id="listsContainer" style="float: left; width: 300px;">
+  <% unless @pages_that_are_orphaned.empty? && @page_names_that_are_wanted.empty? %>
+    <h2>
+      All Pages
+      <br/><small style="font-size: 12px"><i>All pages in <%= @set_name %> listed alphabetically</i></small>
+    </h2>
+  <% end %>
+  
+  <ul><% for page in @pages_by_name.sort_by { |p| p.name } %><li><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></li><% end %></ul>
+  
+  <% if @web.count_pages %>
+    <% total_chars = @pages_in_category.characters %>
+    <p><small>All content: <%= total_chars %> chars / <%= sprintf("%-.1f", (total_chars / 2275 )) %> pages</small></p>
   <% end %>
-  </ul>
-<% end %>
 
-<% unless @pages_that_are_orphaned.empty? %>
-  <h2>
-    Orphaned Pages
-    <br/><small style="font-size: 12px"><i>Pages in <%= @set_name %> that no other page reference</i></small>
-  </h2>
 
-  <ul style="margin-bottom: 35px">
-    <% for page in @pages_that_are_orphaned.sort_by { |p| p.name } %><li><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></li><% end %>
-  </ul>
-<% end %>
+  <% unless @page_names_that_are_wanted.empty? %>
+    <h2>
+      Wanted Pages
+      <br/><small style="font-size: 12px"><i>Unexisting pages that other pages in <%= @set_name %> reference</i></small>
+    </h2>
+  
+    <ul style="margin-bottom: 10px">
+    <% for page_name in @page_names_that_are_wanted.sort_by { |pname| pname } %>
+      <li>
+        <a href="../show/<%= page_name %>"><%= truncate(WikiWords.separate(page_name), 35) %></a>
+        wanted by
+        <%= web.select.pages_that_reference(page_name).collect { |page| page.link }.join(", ") %>
+      </li>
+    <% end %>
+    </ul>
+  <% end %>
+  
+  <% unless @pages_that_are_orphaned.empty? %>
+    <h2>
+      Orphaned Pages
+      <br/><small style="font-size: 12px"><i>Pages in <%= @set_name %> that no other page reference</i></small>
+    </h2>
+  
+    <ul style="margin-bottom: 35px">
+      <% for page in @pages_that_are_orphaned.sort_by { |p| p.name } %><li><a href="../show/<%= page.name %>"><%= truncate(page.plain_name, 35) %></a></li><% end %>
+    </ul>
+  <% end %>
 </div>
 
-</td></tr>
-<tr><td>
-
+<div id="pageAdmin"style="float: right; width: 280px; vertical-align: top;">
   <script language="JavaScript1.2">
-  function validateSelection(fieldID) {
-    var selection = document.getElementById(fieldID).value;
-    if (selection == "noselect") {
-      alert("Please make a selection");
-      return false;
-    }
-    return true;
-  }
-  function validatePageName(fieldID) {
-    if (/^([A-Z][a-z]+[A-Z]\w+)$/.test(document.getElementById(fieldID).value)) {
+    function validateSelection(fieldID) {
+      var selection = document.getElementById(fieldID).value;
+      if (selection == "noselect") {
+        alert("Please make a selection");
+        return false;
+      }
       return true;
-    } else {
-      alert('You wrote "' + document.getElementById(fieldID).value + '" as a page name, but it needs to be a wiki word.');
-      return false;
     }
-  }
-  function verifyDelete() {
-    var del = confirm("Are you sure you want to delete " + document.getElementById('sel_delete').value + "?")
-    return del;
-  }
-  function verifyRename() {
-    if (!validatePageName('ren_newpage')) {
-      return false;
+    function validatePageName(fieldID) {
+      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.');
+        return false;
+      }
+    }
+    function verifyDelete() {
+      var del = confirm("Are you sure you want to delete " + document.getElementById('sel_delete').value + "?")
+      return del;
+    }
+    function verifyRename() {
+      if (!validatePageName('ren_newpage')) {
+        return false;
+      }
+      var ren = confirm("Are you sure you want to rename '" + document.getElementById('sel_rename').value +
+                        "' to '" + document.getElementById('ren_newpage').value +
+                        "'?\nNOTE: Links in other pages will have to be manually translated!")
+      return ren;
     }
-    var ren = confirm("Are you sure you want to rename '" + document.getElementById('sel_rename').value +
-                      "' to '" + document.getElementById('ren_newpage').value +
-                      "'?\nNOTE: Links in other pages will have to be manually translated!")
-    return ren;
-  }
   </script>
 
   <!-- hr -->
-  <h2><br />
-    Page Administration
-  </h2>
+  <h2>Page Administration</h2>
     
   <table border="0" style="font-size:10px">
-      <!-- Delete Page -->
+    <!-- Delete Page -->
+    <form class="navigation" action="list/" action="get" onSubmit="return validateSelection('sel_delete') && verifyDelete();">
       <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" style="width:190">
-              <option value="noselect">------------
+        <td><select id="sel_delete" name="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 value="<%= page.name %>"><%= page.name %></option>
               <% end %>
             </select>
         </td>
@@ -113,16 +108,16 @@
         <td align="right">
           <input type="submit" name="Action" value="Delete">
         </td>
-        </form>
       </tr>
-      <!-- Rename Page -->
+    </form>
+    <!-- Rename Page -->
+    <form class="navigation" action="../list/" action="get" onSubmit="return validateSelection('sel_rename') && verifyRename() && validatePageName('ren_newpage');">
       <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" style="width:190">
-              <option value="noselect">------------
+        <td><select id="sel_rename" name="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 value="<%= page.name %>"><%= page.name %></option>
               <% end %>
             </select>
         </td>
@@ -138,11 +133,11 @@
         <td  align="right">
           <input type="submit" name="Action" value="Rename">
         </td>
-        </form>
       </tr>
-      <!-- Create Page -->
+    </form>
+    <!-- Create Page -->
+    <form class="navigation" action="../list/" action="get" onSubmit="return validatePageName('newpage');">
       <tr>
-        <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">
@@ -154,11 +149,9 @@
           <input type="submit" name="Action" value="Create">
         </td>
         </td>
-        </form>
       </tr>
+    </form>
   </table>
-
-  </td></tr>
-</table>
+</div>
 
 <%= sub_template "bottom" %>

data/app/views/wiki/mind.rhtml

@@ -1,19 +1,18 @@
 <% @title = "Mind Map"
-   @style_additions = "img { width: 8in; }"
+   #@style_additions = "img { width: 8in; }"
 %>
 <%= sub_template "top" %>
 
 <h4>A "Mind Map" created from the Wiki links.</h4>
 
+<img src="../get_map_img" usemap="#graph.map" />
+<map name="graph.map" id="graph.map">
+<%= File.read(@mapFile) %>
+</map>
+
 <table border=0>
- <tr>
-  <td colspan='3' id='mapcell'>
-   <img src="file://<%= @pngFile %>" usemap="#graph.map" />
-   <map name="graph.map"><%= File.read(@mapFile) %></map>
-  </td>
- </tr>
- <tr>
-  <form name="input" action="../mind/" method="post">
+<form name="input" action="../mind/" method="post">
+  <tr>
     <td width="100" style="vertical-align:top;" >
       <input type="radio" name="draw_type" value="neato" <% if @prog == 'neato' %> checked <% end %>>Neato<br>
       <input type="radio" name="draw_type" value="dot"   <% if @prog == 'dot'   %> checked <% end %>>Dot</br>
@@ -30,9 +29,8 @@
       <input type="checkbox" name="missing" <% if @req.query['missing'] == 'on' %> checked <% end %>>Show missing pages<br>
       <input type="submit" value="Redraw" name="Go">
     </td>
-    </form>
-  </td>
  </tr>
+</form>
 </table>
 
 <p>Graphs generated with <a href='http://www.research.att.com/sw/tools/graphviz/'>GraphViz</a>. 

data/app/views/wiki/page.rhtml

@@ -16,7 +16,6 @@
   <%= @page.display_diff %>
 </div>
 
-
 <div class="byline">
   <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_at %> 
   by <%= @page.author_link %>

metadata

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