Pimki 1.2.092 → 1.3.092

data/README-PIMKI

@@ -66,6 +66,24 @@ Command-line options:
 Run "ruby pimki.rb --help"
 
 History:
+1.3.092 New features and bug fixes release
+    - Updated to RedCloth v3.0.0.
+    - Fixed problem with incorrect handling of some complex link formats and
+      <pre> tags. (Justin)
+    - Expanded search to look also in Bliki entries.
+    - Can now show diff between Bliki entry versions.
+    - Editing left-side menu is now password protected.
+    - Added capacity in Mind Map to filter displayed pages by category and/or
+      filter leaf nodes (i.e. pages that do not have links to other pages). This
+      cuts down on the anount of visual information to give a bit more topical
+      view of the web.
+    - Added custom symbols/elements: <:cbx> and <:cbxc> to display a checkbox
+      (and a checked checkbox).
+    - Added customization options through "Edit Web":
+          - Added capacity to set the prefered size of the Mind Map image.
+          - Customizable mapping of symbols/elements (in progress).
+          - Added capacity for custom link formats (in progress).
+
 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.

data/app/controllers/wiki.rb

@@ -61,17 +61,24 @@ class WikiController < ActionControllerServlet
     @categories = web.categories
     @category = @params["category"]
     @pages_in_category = web.select { |page| page.in_category?(@category) }
+    @pages_without_category = web.select { |page| page.categories.length == 0 }
+    if @category == 'none'
+      @pages_in_category = @pages_without_category
+    end
     @set_name = ( @categories.include?(@category) ? "category '#{@category}'" : "the web" )
     @category_links = @categories.map do |c| 
-      (@category == c ? "<span class=\"selected\">#{c}</span>" : "<a href=\"?category=#{c}\">#{c}</a>")
+      (@category == c ? "<span class=\"selected\">[#{c}]</span>" : "<a href=\"?category=#{c}\">#{c}</a>")
     end
   end
 
   def search
     set_menu_pages
-    @query   = @params["query"]
+    @query = @params["query"]
     rex = /#{@query}/i
     @results = web.select { |page| rex.match(page.name) or rex.match(page.content) }
+    @bliki_results = web.bliki.values.select do |entry|
+      rex.match(entry.name) or rex.match(entry.content)
+    end
     @results.length == 1 ? redirect_show(@results.first.name) : render
   end
 
@@ -164,7 +171,10 @@ class WikiController < ActionControllerServlet
       @params["password"].empty? ? nil : @params["password"],
       @params["published"] ? true : false, 
       @params["brackets_only"] ? true : false,
-      @params["count_pages"] ? true : false
+      @params["count_pages"] ? true : false,
+      @params['mind_map_size'],
+      @params['symbols_map'],
+      @params['links_map']
     )
 
     redirect_show("HomePage", @params["address"])
@@ -240,6 +250,7 @@ class WikiController < ActionControllerServlet
     @authors = web.authors
   end #}}}
   
+require 'pp'
   def mind #{{{
     parse_category
     set_menu_pages
@@ -247,12 +258,24 @@ class WikiController < ActionControllerServlet
     @prog = @req.query['draw_type'] || 'neato'
     @graph_type = @req.query['graph_type'] || 'normal'
     missing = @pages_in_category.wanted_pages if @req.query['missing']
-    show_authors = @req.query['show_authors'] == 'on'
+    show_authors = !@req.query.empty? && @req.query['show_authors'] == 'on'
+    show_leaves = @req.query.empty? || @req.query['show_leaves'] == 'on'
+    
+    # TODO: fix handling of multiple-select for whole application
+    @selected_categories = @req.body.split('&').map { |pair| 
+      pair.split('=') }.select  { |k,v| 
+        k == 'selected_categs' }.map { |k,v| v } if @req.body
+    @selected_categories ||= []
+    @selected_categories = [] if @selected_categories.include? 'all'
+
     @pngFile = @mapFile = nil
     case @graph_type
-      when 'normal'   then @pngFile, @mapFile = web.create_mind_map(@prog, missing, show_authors)
-      when 'author'   then @pngFile, @mapFile = web.create_author_graph(@prog)
-      when 'category' then @pngFile, @mapFile = web.create_category_graph(@prog, show_authors)
+      when 'normal'   then @pngFile, @mapFile = web.create_mind_map(@prog, missing,
+                             show_authors, show_leaves, @selected_categories)
+      when 'author'   then @pngFile, @mapFile = web.create_author_graph(@prog,
+                             @selected_categories)
+      when 'category' then @pngFile, @mapFile = web.create_category_graph(@prog,
+                             show_authors, @selected_categories)
     end
   end #}}}
   
@@ -264,6 +287,8 @@ class WikiController < ActionControllerServlet
   end #}}}
   
   def save_menu #{{{
+    redirect_show("HomePage") unless wiki.authenticate(@params["system_password"])
+
     unless @req.query['action'] == 'Cancel Update'
       type     = @req.query['type']
       content  = @req.query['content']
@@ -316,7 +341,11 @@ class WikiController < ActionControllerServlet
         redirect_action "edit/#{CGI.escape(page_name)}?msg=#{CGI.escape(e.message)}"
       end
     else
-      redirect_action "new/#{CGI.escape(page_name)}"
+      if page_name
+        redirect_action "new/#{CGI.escape(page_name)}"
+      else
+        redirect_show "HomePage"
+      end
     end
   end
   
@@ -400,7 +429,7 @@ class WikiController < ActionControllerServlet
   
   def bliki_delete
     wiki.delete_bliki_entry(web_address, page_name)
-    redirect_bliki("")
+    redirect_bliki
   end
 
   def bliki_edit
@@ -418,7 +447,7 @@ class WikiController < ActionControllerServlet
   def cancel_bliki_edit
     @page = wiki.read_bliki_entry(web_address, page_name)
     @page.unlock if @page
-    redirect_bliki(@page? @page.name : "")
+    redirect_bliki
   end
 
   def bliki_save
@@ -431,7 +460,7 @@ class WikiController < ActionControllerServlet
     end
 
     write_cookie("author", @params["author"])
-    redirect_bliki('')
+    redirect_bliki
   end
 
   def bliki_revision
@@ -471,8 +500,8 @@ class WikiController < ActionControllerServlet
       redirect_path "/#{web}/show/#{CGI.escape(page)}"
     end
     
-    def redirect_bliki(page = @page.name, web = web_address)
-      redirect_path "/#{web}/bliki/#{page}"
+    def redirect_bliki
+      redirect_path "/#{web_address}/bliki/"
     end
 
     def redirect_action(action, web = web_address)

data/app/models/chunks/engines.rb

@@ -8,16 +8,29 @@ module Engines
   class Textile < Chunk::Abstract
     def self.pattern() /^(.*)$/m end
     def mask(content)
-      RedCloth.new(text,content.options[:engine_opts]).to_html
+      #RedCloth.new(text,content.options[:engine_opts]).to_html
+      rc = RedCloth.new(text,content.options[:engine_opts])
+      rc.rules = [:textile]
+      rc.to_html
     end
     def unmask(content) self end
   end
 
   class Markdown < Chunk::Abstract
     def self.pattern() /^(.*)$/m end
-    def mask(content)
-      BlueCloth.new(text,content.options[:engine_opts]).to_html
+    
+    if RedCloth::VERSION >= '3.0.0'
+      def mask(content)
+        rc = RedCloth.new(text,content.options[:engine_opts])
+        rc.rules = [:markdown]
+        rc.to_html
+      end
+    else
+      def mask(content)
+        BlueCloth.new(text,content.options[:engine_opts]).to_html
+      end
     end
+
     def unmask(content) self end
   end
 

data/app/models/chunks/literal.rb

@@ -17,3 +17,4 @@ module Literal
     def self.pattern() Regexp.new('<(?:'+TAGS+')[^>]*?>', Regexp::MULTILINE) end
   end
 end
+

data/app/models/chunks/todo.rb

@@ -4,10 +4,11 @@ require 'parsedate'
 
 # ToDo items.
 class Todo < Chunk::Abstract
-  def self.pattern() /todo: ([^\n]+)/i end
+  def self.pattern() /todo: (.*?)(?=<br|\r|\n|\z)/i end
 
   def initialize(match_data, revision)
     super(match_data, revision)
+    @text = match_data[1]
   end
 
   def escaped_text() nil end
@@ -17,6 +18,6 @@ class Todo < Chunk::Abstract
       # the style 'todo' is bright-red to be eye catching. It is not expected that
       # there will be too many items on one page, but each is supposed to stand out.
       # The ToDo special page differentiates between the 'todo' and 'todoFuture' styles.
-      "<span class=\"todo\"><strong>TODO:</strong> #{@text.gsub(/todo:\s*/, '')}</span>" )
+      "<span class=\"todo\"><strong>TODO:</strong> #{@text}</span>" )
   end
 end

data/app/models/chunks/uri.rb

@@ -22,7 +22,7 @@ class URIChunk < Chunk::Abstract
   COUNTRY = '(?:au|at|be|ca|ch|de|dk|fr|hk|in|ir|it|jp|nl|no|pt|ru|se|sw|tv|tw|uk|us)'
 
   # These are needed otherwise HOST will match almost anything
-  TLDS = "\\.(?:#{GENERIC}|#{COUNTRY})" 
+  TLDS = "\\.(?:#{GENERIC}|#{COUNTRY})\b" 
 
   # Redefine USERINFO so that it must have non-zero length
   USERINFO = "(?:[#{UNRESERVED};:&=+$,]|#{ESCAPED})+"

data/app/models/chunks/wiki.rb

@@ -36,17 +36,20 @@ module WikiChunk
   # The +page_name+ method returns the matched WikiWord.
   class Word < WikiLink
     def self.pattern
-      Regexp.new('(\\\\)?(' + WikiWords::WIKI_WORD_PATTERN + ')\b', 0, "utf-8")
-    end
+      Regexp.new('(\\\\)?(' + WikiWords::WIKI_WORD_PATTERN + ')(</a>)?', 0, "utf-8")
+    end # (chunk\d+chunk)?
 
     attr_reader :page_name
 
     def initialize(match_data, revision)
       super(match_data, revision)
-      @escape = match_data[1]
-      @page_name = match_data[2]
+      @escape = match_data[1] || match_data[3]
+      # @chunk_text = match_data[2] || ''
+      @page_name = @link_text = match_data[2]
     end
 
+    def mask(content) pre_mask + post_mask; end
+    def regexp() Regexp.new(pre_mask + post_mask) end
     def escaped_text() (@escape.nil? ? nil : page_name) end
     def link_text() WikiWords.separate(page_name) end	
   end
@@ -69,15 +72,20 @@ module WikiChunk
     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
-	  # contents of the double brackets.
+      # 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
+      # contents of the double brackets.
       if match_data[1] =~ ALIASED_LINK_PATTERN
         @page_name, @link_text = $1, $2
       else
         @page_name, @link_text = match_data[1], match_data[1]
       end
     end
+
+    def mask(content) pre_mask + post_mask; end
+    def regexp() Regexp.new(pre_mask + post_mask) end
+    def escaped_text() (@escape.nil? ? nil : page_name) end
+    def link_text() WikiWords.separate(page_name) end	
   end
 
   # This chunk handles [bliki[entry name]].
@@ -96,7 +104,11 @@ module WikiChunk
       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>"
+        if entry.nil?
+          "<span style='background:lightgrey;font-style:italic'>Unknown Bliki entry: '#{page_name}'</span>"
+        else
+          "<a class='existingWikiWord' href='/#{web.address}/bliki_revision/#{entry.name}?rev=#{entry.revisions.size-1}'>#{entry.name}</a>"
+        end
       }
     end
   end

data/app/models/chunks/wiki_symbols.rb

@@ -0,0 +1,22 @@
+
+class WikiSymbol < Chunk::Abstract
+    def self.pattern() /<:(.*?)>/ end
+
+    attr_accessor :symbol_code
+
+    def initialize(match_data, revision)
+      super(match_data, revision)
+      @symbol_code = match_data[1]
+    end
+    
+    def unmask(content)
+      tag = case symbol_code
+        when 'cbx'  then '<input type="checkbox" disabled />'
+        when 'cbxc' then '<input type="checkbox" disabled checked />'
+        else symbol_code
+      end
+
+      return self if content.gsub!( Regexp.new(mask(content)), tag )
+    end
+end
+

data/app/models/revision_test.rb

@@ -141,7 +141,7 @@ class RevisionTest < Test::Unit::TestCase
       "DavidHeinemeierHansson"
     )
 
-	@revision_with_code_block = Revision.new(
+    @revision_with_code_block = Revision.new(
       @mock_page,
       1,
       "This is a code block:\n    def a_method(arg)\n    return ThatWay\n\nNice!",
@@ -151,7 +151,7 @@ class RevisionTest < Test::Unit::TestCase
 
     assert_equal "<h1>My Headline</h1>\n\n<p>that <span class=\"newWikiWord\">Smart Engine GUI<a href=\"../show/SmartEngineGUI\">?</a></span></p>", @revision.display_content
 
-	assert_equal "<p>This is a code block:</p>\n\n<pre><code>def a_method(arg)\nreturn ThatWay\n</code></pre>\n\n<p>Nice!</p>", @revision_with_code_block.display_content
+    assert_equal "<p>This is a code block:</p>\n\n<pre><code>def a_method(arg)\nreturn ThatWay\n</code></pre>\n\n<p>Nice!</p>", @revision_with_code_block.display_content
   end
 
   def test_rdoc

data/app/models/web.rb

@@ -7,6 +7,7 @@ require "zip/zip"
 class Web
   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
+  attr_accessor :mind_map_size, :symbols_map, :links_map
   
   @@BLIKI_TEMPLATE = "Try a weekly worksheet:\n\n| / | *Morning* | *Afternoon* |\n" +
                      "| *Mon* | - | - |\n| *Tue* | - | - |\n| *Wed* | - | - |\n" +
@@ -87,14 +88,16 @@ class Web
   def color()         @color  || "008B26" end
   def brackets_only() @brackets_only || false end
   def count_pages()   @count_pages   || false end
-  def menu_content()  @menu_content  || ''        end
-  def menu_limit()    @menu_limit    || 20        end
+  def menu_content()  @menu_content  || ''    end
+  def menu_limit()    @menu_limit    || 20    end
   def menu_type()
     (@menu_type.nil? || @menu_type.empty?) ? 'linkers' : @menu_type
   end
+  def mind_map_size() (@mind_map_size == '0,0' ? '6,5' : @mind_map_size) end
+  
 
   # create a Mind Map graph and return the PNG and HTML map files generated
-  def create_mind_map(prog, missing, show_authors)
+  def create_mind_map(prog, missing, show_authors, show_leaves, selected_categories)
     dotFile = File.expand_path("#{WikiService.storage_path}/graph.dot")
     mapFile = File.expand_path("#{WikiService.storage_path}/graph.map")
     pngFile = File.expand_path("#{WikiService.storage_path}/map.png")
@@ -103,28 +106,34 @@ class Web
     
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size="7,5";'
-      #file.puts 'ratio=fill;'
+      file.puts "size=\"#{mind_map_size}\";"
+      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];"
-    
       # Links and node properties:
-      nodes = pages.values
+      nodes = filter_categories(pages.values, selected_categories)
       auths = authors # avoid repeated selects
-      unless show_authors == 'on'
+      unless show_authors
         nodes.delete_if { |entry|
           auths.include? entry.name
         }
       end
+      unless show_leaves
+        nodes.delete_if { |page|
+          (page.wiki_words - [missing].flatten).size == 0
+        }
+      end
+
+      # Page Special nodes properties:
+      file.puts "HomePage [color=\"##{color}\",style=bold];" if nodes.map{ |p| p.name }.include? "HomePage"
+
       nodes.each do |page|
         file.puts "#{page.name} [URL=\"../show/#{page.name}\"];"
         page.references.each do |referer|
-          unless page.name == referer.name
-            unless show_authors != 'on' and auths.include? referer.name
+          unless page.name == referer.name or not nodes.include? referer
+            unless !show_authors and auths.include? referer.name
               file.puts "#{referer.name} -> #{page.name};"
             end
           end
@@ -133,28 +142,29 @@ class Web
     
       # find missing pages:
       if missing
-        missing.each do |wanted|
-          file.puts "#{wanted} [URL=\"/#{@address}/show/#{wanted}\", fontsize=10,style=filled,color=grey];"
-        end
-        pages.values.each do |page|
+        shown_missing = []
+        nodes.each do |page|
           missing.each do |wanted|
             if page.content =~ /#{wanted}/
               file.puts "#{page.name} -> #{wanted};"
+              shown_missing << wanted
             end
           end
         end
+        shown_missing.each do |wanted|
+          file.puts "#{wanted} [URL=\"/#{@address}/show/#{wanted}\", fontsize=10,style=filled,color=grey];"
+        end
       end
 
       file.puts "}"
     end
 
-    system("#{prog} -Tcmap #{dotFile} -o #{mapFile}")
-    system("#{prog} -Tpng #{dotFile} -o #{pngFile}")
+    call_graphviz(prog, dotFile, mapFile, pngFile)
     
     [pngFile, mapFile]
   end
 
-  def create_author_graph(prog)
+  def create_author_graph(prog, selected_categories)
     dotFile = File.expand_path("#{WikiService.storage_path}/graph.dot")
     mapFile = File.expand_path("#{WikiService.storage_path}/graph.map")
     pngFile = File.expand_path("#{WikiService.storage_path}/map.png")
@@ -163,7 +173,7 @@ class Web
     
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size="7,5";'
+      file.puts "size=\"#{mind_map_size}\";" if mind_map_size
       #file.puts 'ratio=fill;'
       file.puts 'concentrate=true;'
       file.puts 'node [fontsize=10,fontname="Tahoma"];'
@@ -175,8 +185,8 @@ class Web
         file.puts "#{auth} [style=filled,color=grey,URL=\"../show/#{auth}\"];"
       end
 
-      nodes = pages.values
-      nodes.delete_if { |entry| auths.include? entry.name }
+      nodes = pages.values.reject { |entry| auths.include? entry.name }
+      nodes = filter_categories(nodes, selected_categories)
       nodes.each do |page|
         file.puts "#{page.name} [URL=\"../show/#{page.name}\"];"
         page.authors.each do |auth|
@@ -187,13 +197,12 @@ class Web
       file.puts "}"
     end
 
-    system("#{prog} -Tcmap #{dotFile} -o #{mapFile}")
-    system("#{prog} -Tpng #{dotFile} -o #{pngFile}")
+    call_graphviz(prog, dotFile, mapFile, pngFile)
     
     [pngFile, mapFile]
   end
 
-  def create_category_graph(prog, show_authors) #{{{
+  def create_category_graph(prog, show_authors, selected_categories) #{{{
     dotFile = File.expand_path("#{WikiService.storage_path}/graph.dot")
     mapFile = File.expand_path("#{WikiService.storage_path}/graph.map")
     pngFile = File.expand_path("#{WikiService.storage_path}/map.png")
@@ -201,22 +210,22 @@ class Web
     File.open(dotFile, "w") do |file|
       # Graph properties:
       file.puts "digraph G {"
-      file.puts 'size="7,5";'
+      file.puts "size=\"#{mind_map_size}\";" if mind_map_size
       #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} [fontsize=20,style=filled,color=grey,comment=\"#{category}\"];"
+      categs = selected_categories.empty? ? categories : selected_categories
+      categs.each do |category|
+        file.puts "#{category} [fontsize=20,style=filled,color=grey,comment=\"#{category}\",URL=\"../list/?category=#{category}\"];"
       end
     
       # Links and node properties:
-      nodes = pages.values
+      nodes = filter_categories(pages.values, selected_categories)
       auths = authors # avoid repeated selects
-      unless show_authors == 'on'
+      unless show_authors
         nodes.delete_if { |entry|
           auths.include? entry.name
         }
@@ -231,11 +240,26 @@ class Web
       file.puts "}"
     end
 
-    system("#{prog} -Tcmap #{dotFile} -o #{mapFile}")
-    system("#{prog} -Tpng #{dotFile} -o #{pngFile}")
+    call_graphviz(prog, dotFile, mapFile, pngFile)
     
     [pngFile, mapFile]
   end #}}}
+
+  def filter_categories(pages, selected_categories) #{{{
+    nodes = pages
+    unless selected_categories.empty?
+      nodes = pages.reject { |page| (page.categories & selected_categories).empty? }
+      if selected_categories.include? 'none'
+        nodes += pages.select { |page| page.categories.empty? }
+      end
+    end
+    nodes
+  end #}}}
+  
+  def call_graphviz(prog, dotFile, mapFile, pngFile)
+    system("#{prog} -Tcmap \"#{dotFile}\" -o \"#{mapFile}\"")
+    system("#{prog} -Tpng  \"#{dotFile}\" -o \"#{pngFile}\"")
+  end
   
   ## Bliki methods
   

data/app/models/wiki_content.rb

@@ -7,6 +7,7 @@ require 'chunks/wiki'
 require 'chunks/literal'
 require 'chunks/uri'
 require 'chunks/nowiki'
+require 'chunks/wiki_symbols'
 
 # Wiki content is just a string that can process itself with a chain of
 # actions. The actions can modify wiki content so that certain parts of
@@ -26,11 +27,11 @@ require 'chunks/nowiki'
 #  * :pre_engine_actions
 #    => A list of render actions or chunks to be processed before the
 #       markup engine is applied. By default this is:    
-#       Category, Include, URIChunk, WikiChunk::Link, WikiChunk::Word
+#       Category, Include, URIChunk, WikiChunk::Link
 #  * :post_engine_actions
 #    => A list of render actions or chunks to apply after the markup 
 #       engine. By default these are:    
-#       Literal::Pre, Literal::Tags
+#       Literal::Pre, Literal::Tags, WikiChunk::Word
 #       ToDo items
 #  * :mode
 #    => How should the content be rendered? For normal display (:display), 
@@ -43,8 +44,9 @@ 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::BlikiLink, WikiChunk::Link, WikiChunk::Word ] 
-  POST_ENGINE_ACTIONS = [ Literal::Pre, Literal::Tags, URIChunk, Todo ]
+  PRE_ENGINE_ACTIONS  = [ NoWiki, Category, Include, Literal::Pre, WikiSymbol, 
+                          WikiChunk::Link, WikiChunk::BlikiLink ] 
+  POST_ENGINE_ACTIONS = [ Literal::Tags, WikiChunk::Word, URIChunk, Todo ]
   
 
   DEFAULT_OPTS = {
@@ -54,6 +56,11 @@ class WikiContent < String
     :engine_opts         => [],
     :mode                => [:display]
   }
+  
+  if RedCloth::VERSION >= '3.0.0'
+    # RedCloth v3 changes the default behaviour from not folding lines.
+    DEFAULT_OPTS[:engine_opts] = [:hard_breaks]
+  end
 
   attr_reader :web, :options, :rendered
 
@@ -66,9 +73,9 @@ class WikiContent < String
     # Deep copy of DEFAULT_OPTS to ensure that changes to PRE/POST_ENGINE_ACTIONS stay local
     @options = Marshal.load(Marshal.dump(DEFAULT_OPTS)).update(options)
     @options[:engine] = Engines::MAP[@web.markup] || Engines::Textile
-    @options[:engine_opts] = (@web.safe_mode ? [:filter_html, :filter_styles] : [])
+    @options[:engine_opts] += (@web.safe_mode ? [:filter_html, :filter_styles] : [])
 
-    @options[:pre_engine_actions].delete(WikiChunk::Word) if @web.brackets_only
+    @options[:post_engine_actions].delete(WikiChunk::Word) if @web.brackets_only
 
     super(@revision.content)
 

data/app/models/wiki_service.rb

@@ -29,7 +29,8 @@ class WikiService < MadeleineService
   end
   
   def update_web(old_address, new_address, name, markup, color, additional_style, safe_mode = false, 
-      password = nil, published = false, brackets_only = false, count_pages = false)
+      password = nil, published = false, brackets_only = false, count_pages = false,
+      mind_map_size="7,7", symbols_map=nil, links_map=nil)
     if old_address != new_address
       @webs[new_address] = @webs[old_address]
       @webs.delete(old_address)
@@ -44,6 +45,9 @@ class WikiService < MadeleineService
       
     web.password, web.published, web.brackets_only, web.count_pages =
       password, published, brackets_only, count_pages
+      
+    web.mind_map_size, web.symbols_map, web.links_map =
+      mind_map_size, symbols_map, links_map
   end
 
   def read_page(web_address, page_name)

data/app/models/wiki_words.rb

@@ -3,26 +3,26 @@
 module WikiWords
   # In order of appearance: Latin, greek, cyrillian, armenian
   I18N_HIGHER_CASE_LETTERS =
-    "ÀÁÂÃÄÅĀĄĂÆÇĆČĈĊĎĐÈÉÊËĒĘĚĔĖĜĞĠĢĤĦÌÍÎÏĪĨĬĮİIJĴĶŁĽĹĻĿÑŃŇŅŊÒÓÔÕÖØŌŐŎŒŔŘŖŚŠŞŜȘŤŢŦȚÙÚÛÜŪŮŰŬŨŲŴÝŶŸŹŽŻ" + 
-    "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ" + 
-    "ΆΈΉΊΌΎΏѠѢѤѦѨѪѬѮѰѲѴѶѸѺѼѾҀҊҌҎҐҒҔҖҘҚҜҞҠҢҤҦҨҪҬҮҰҲҴҶҸҺҼҾӁӃӅӇӉӋӍӐӒӔӖӘӚӜӞӠӢӤӦӨӪӬӮӰӲӴӸЖ" +
-    "ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՏՐՑՒՓՔՕՖ"
+    "À�?ÂÃÄÅĀĄĂÆÇĆČĈĊĎ�?ÈÉÊËĒĘĚĔĖĜĞĠĢĤĦÌ�?Î�?ĪĨĬĮİIJĴĶ�?ĽĹĻĿÑŃŇŅŊÒÓÔÕÖØŌ�?ŎŒŔŘŖŚŠŞŜȘŤŢŦȚÙÚÛÜŪŮŰŬŨŲŴ�?ŶŸŹŽŻ" + 
+    "ΑΒΓΔΕΖΗΘΙΚΛΜ�?ΞΟΠΡΣΤΥΦΧΨΩ" + 
+    "ΆΈΉΊΌΎ�?ѠѢѤѦѨѪѬѮѰѲѴѶѸѺѼѾҀҊҌҎ�?ҒҔҖҘҚҜҞҠҢҤҦҨҪҬҮҰҲҴҶҸҺҼҾ�?ӃӅӇӉӋ�?�?ӒӔӖӘӚӜӞӠӢӤӦӨӪӬӮӰӲӴӸЖ" +
+    "ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�?ՂՃՄՅՆՇՈՉՊՋՌ�?�?�?ՑՒՓՔՕՖ"
 
   I18N_LOWER_CASE_LETTERS =
-    "àáâãäåāąăæçćčĉċďđèéêëēęěĕėƒĝğġģĥħìíîïīĩĭįıijĵķĸłľĺļŀñńňņʼnŋòóôõöøōőŏœŕřŗśšşŝșťţŧțùúûüūůűŭũųŵýÿŷžżźÞþßſÐð" +
-    "άέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώΐ" +
-    "абвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљћќѝўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿҁҋҍҏґғҕҗҙқҝҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӀӂӄӆӈӊӌӎӑӓӕӗәӛӝӟӡӣӥӧөӫӭӯӱӳӵӹ" +
-    "աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև"
+    "àáâãäå�?ąăæçć�?ĉċ�?đèéêëēęěĕėƒ�?ğġģĥħìíîïīĩĭįıijĵķĸłľĺļŀñńňņʼnŋòóôõöø�?ő�?œŕřŗśšş�?șťţŧțùúûüūůűŭũųŵýÿŷžżźÞþßſ�?ð" +
+    "άέήίΰαβγδεζηθικλμνξοπ�?ςστυφχψωϊϋό�?ώ�?" +
+    "абвгдежзийклмнопр�?туфхцчшщъыь�?ю�?�?ёђѓєѕіїјљћќ�?ўџѡѣѥѧѩѫѭѯѱѳѵѷѹѻѽѿ�?ҋ�?�?ґғҕҗҙқ�?ҟҡңҥҧҩҫҭүұҳҵҷҹһҽҿӀӂӄӆӈӊӌӎӑӓӕӗәӛ�?ӟӡӣӥӧөӫӭӯӱӳӵӹ" +
+    "աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտր�?ւփքօֆև"
 
   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+'
+  WIKI_WORD_PATTERN = '[A-Z' + I18N_HIGHER_CASE_LETTERS + ']+[a-z' + I18N_LOWER_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}#{DIGITS}])/u, '\1 \2').gsub(/(\d+)/u, ' \1 ')
+        wiki_word.gsub(/([a-z#{I18N_LOWER_CASE_LETTERS}]|[A-Z]{3,})([A-Z#{I18N_HIGHER_CASE_LETTERS}#{DIGITS}])/u, '\1 \2').gsub(/(\d+)/u, ' \1 ')
     end
   end
 end

data/app/views/static_style_sheet.rhtml

@@ -150,10 +150,16 @@ ol.setup li {
 .diffdel {
   background: pink;
 }
+del.diffmod {
+  background: pink;
+}
 
 .diffins {
   background: lightgreen;
 }
+ins.diffmod {
+  background: lightgreen;
+}
 
 #TextileHelp table {
 	margin-bottom: 0;

data/app/views/wiki/bliki.rhtml

@@ -61,7 +61,7 @@
 <ul>
   <% @entries.each do |page| %>
     <li><a href="../bliki_revision/<%= page.name %>?rev=<%= page.revisions.length - 1 %>" class="navlink" accesskey="R"><%= page.plain_name %></a>
-        <small>[<%= page.author_link %>, <%=page.revisions.first.created_at.strftime("%d-%b-%Y") %>]</small>
+        <small>[<%= page.author_link %>, <%=page.revisions.first.created_at.strftime("%d-%b-%Y") %>, <%= page.revisions.length %> revision(s)]</small>
     </li>
   <% end %>
 </ul>

data/app/views/wiki/bliki_revision.rhtml

@@ -7,7 +7,21 @@
   <th><small><%= @revision.pretty_created_at %></small></th>
 </tr>
 <tr>
-  <td colspan="2"><%= @revision.display_content %></td>
+  <td colspan="2">
+    <div id="revision">
+      <%= @revision.display_content %>
+    </div>
+    <div id="changes" style="display: none">
+      <p style="background: #eee; padding: 3px; border: 1px solid silver">
+        <small>
+          Showing changes from revision #<%= @page.number - 1 %> to #<%= @page.number %>:
+          <ins class="diffins">Added</ins> | <del class="diffdel">Removed</del>
+        </small>
+      </p>
+    
+      <%= @revision.display_diff %>
+    </div>
+  </td>
 </tr>
 <tr style="background-color:efe">
   <th colspan="2" align="right"><small><%= web.make_link(@revision.author, nil, {}) %></small></th>
@@ -46,6 +60,32 @@
       | Referenced by: <%= @page.references.collect { |ref| "<a href='#{ref.name}'>#{ref.name}</a>" }.join(", ") %>
     </small>
   <% end %>
+  
+  <% if @page.revisions.length > 1 %>
+    <span id="show_changes">
+      | <a href="#" onClick="toggleChanges(); return false;">See changes</a>
+    </span>
+    <span id="hide_changes" style="display: none">
+      | <a href="#" onClick="toggleChanges(); return false;">Hide changes</a>
+    </span>
+  <% end %>
+
 </div>
 
+<script language="Javascript">
+  function toggleChanges() {
+    if (document.getElementById("changes").style.display == "none") {
+      document.getElementById("changes").style.display  = "block";
+      document.getElementById("revision").style.display = "none";
+      document.getElementById("show_changes").style.display  = "none";
+      document.getElementById("hide_changes").style.display = "inline";
+    } else {
+      document.getElementById("changes").style.display  = "none";
+      document.getElementById("revision").style.display = "block";
+      document.getElementById("show_changes").style.display  = "inline";
+      document.getElementById("hide_changes").style.display = "none";
+    }
+  }
+</script>
+
 <%= sub_template "bottom" %>

data/app/views/wiki/edit_menu.rhtml

@@ -26,10 +26,23 @@
 <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>
 </p>
-<p>
+
+<table width="400px">
+  <tr><td align="right">
+    <small>
+    Enter system password
+    <input style="font-size:small;" type="password" id="system_password" name="system_password">
+    and
     <input type="submit" name='action' value="Update">
-    <input type="submit" name='action' value="Cancel Update">
-</p>
+    </small>
+  </tr></td>
+  <tr><td align="right">
+    <small>
+    ...or forget changes and <input type="submit" name='action' value="Cancel Update">
+    </small>
+  </tr></td>
+</table>
+
 </form>
 
 <%= sub_template "bottom" %>

data/app/views/wiki/edit_web.rhtml

@@ -72,6 +72,29 @@
     <input type="checkbox" name="published"<%= " CHECKED" if @web.published %>> Publish this web
   </div>
 
+  <h2 style="margin-bottom: 3px">Customise this PIM (<%= @web.name %>)</h2>
+  <div class="help">
+    Here are a few setting you can use to tweak the appearance of your Pimki.
+  </div>
+  <div class="inputBox">
+    Limit the size of the Mind Map image. Format is "width,height" in inches. Leave blank for no size limit.<br />
+    <input type="text" name="mind_map_size" id="mind_map_size" value="<%= web.mind_map_size %>">
+
+    <!--
+
+    <br /><br />
+
+    Extra special symbols. The format of the map is: "code=text" on separate lines. This will map an element of <i>&lt;:code&gt;</i> to <i>text</i>, e.g. &lt;:cbx&gt; is mapped to &lt;input type="checkbox" disabled /&gt;<br />
+    <textarea name="symbols_map" id="symbols_map" style="width: 100%; height: 100px"></textarea>
+
+    <br /><br />
+
+    Extra special links. The format of the map is: "link_name=link_format" on separate lines. This will map an element of <i>[link_name[link_text]]</i> to your specified format. e.g. to use google's redirection enter: <pre>google=http://www.google.com/url?sa=D&amp;q=#{link_text}</pre> and use as: <pre>[[!goggle http://pimki.rubyforge.org/]]</pre> to map to: <pre>http://www.google.com/url?sa=D&amp;q=http://pimki.rubyforge.org/</pre><br />
+    <textarea name="links_map" id="links_map" style="width: 100%; height: 100px"></textarea>
+   
+    -->
+</div>
+
 <p align="right">
   <small>
     Enter system password
@@ -131,6 +154,12 @@ function validateSetup() {
     alert("The password and its verification doesn't match");
     return false;
   }
+
+  // if (document.getElementById('mind_map_size').value != "" &&
+  //     !/^\d+,\d+$/.test(document.getElementById('mind_map_size').value)) {
+  //   alert("The Mind Map size must be in the format of 'digit,digit'!");
+  //   return false;
+  // }
   
   return true;
 }

data/app/views/wiki/list.rhtml

@@ -3,8 +3,20 @@
 
 <% unless @categories.empty? %>
 <div id="categories">
-  <strong>Categories</strong>: 
-  [<a href=".">Any</a>]
+  <strong>Categories</strong>:
+  
+  <% if @params["category"].nil? %>
+    [Any]
+  <% else %>
+    <a href=".">Any</a>
+  <% end %>
+  
+  <% if @params["category"] == 'none' %>
+    [None]
+  <% else %>
+    <a href="?category=none">None</a>
+  <% end %>
+
   <%= @category_links.join(', ') %>
 </div>
 <% end %>

data/app/views/wiki/mind.rhtml

@@ -10,26 +10,45 @@
 <%= File.read(@mapFile) %>
 </map>
 
-<table border=0>
-<form name="input" action="../mind/" method="post">
+<table border="0" width="100%">
+<form name="mapOpts" id="mapOpts" action="../mind/" method="post">
+  <tr style="font-weight:bold;">
+    <td>Graph Type</td>
+    <td style="width:200px">Layout Type</td>
+    <td style="width:500px">Content Options</td>
+    <td>Categories</td>
+  </tr>
   <tr>
+    <td style="vertical-align:top;" width="30%">
+      <input type="radio" name="graph_type" value="normal"   <%= 'checked' if @graph_type == 'normal'   %>>Draw Normal Graph<br>
+      <input type="radio" name="graph_type" value="author"   <%= 'checked' if @graph_type == 'author'   %>>Draw Authors Graph<br>
+      <input type="radio" name="graph_type" value="category" <%= 'checked' if @graph_type == 'category' %>>Draw Category Graph<br>
+    </td>
     <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>
       <input type="radio" name="draw_type" value="circo" <% if @prog == 'circo' %> checked <% end %>>Circo</br>
       <input type="radio" name="draw_type" value="twopi" <% if @prog == 'twopi' %> checked <% end %>>Twopi</br>
     </td>
-    <td style="vertical-align:top;" width="40%">
-      <input type="radio" name="graph_type" value="normal" <% if @graph_type == 'normal' %> checked <% end %>>Draw Normal Graph<br>
-      <input type="radio" name="graph_type" value="author" <% if @graph_type == 'author' %> checked <% end %>>Draw Authors Graph<br>
-      <input type="radio" name="graph_type" value="category" <% if @graph_type == 'category' %> checked <% end %>>Draw Category Graph<br>
+    <td style="vertical-align:top;width:400px;">
+      <input type="checkbox" id="show_authors" name="show_authors" <%= 'checked' if @req.query['show_authors'] == 'on' %>>Show author pages<br>
+      <input type="checkbox" id="missing"      name="missing" <%= 'checked' if @req.query['missing'] == 'on' %>>Show missing pages<br>
+      <input type="checkbox" id="show_leaves"  name="show_leaves"  <%= 'checked' if @req.query.empty? || @req.query['show_leaves'] == 'on' %>>Show leaf pages<br>
+      <!-- <input type="checkbox" id="limit_categs" name="limit_categs" <%= 'checked' if @req.query['limit_categ'] == 'on' %>>Limit to selected cetegories<br> -->
     </td>
-    <td style="vertical-align:top;">
-      <input type="checkbox" name="show_authors" <% if @req.query['show_authors'] == 'on' %> checked <% end %>>Show author pages<br>
-      <input type="checkbox" name="missing" <% if @req.query['missing'] == 'on' %> checked <% end %>>Show missing pages<br>
-      <input type="submit" value="Redraw" name="Go">
+    <td>
+      <select id="selected_categs" name="selected_categs" size="4" style="width:120px;" multiple>
+        <option value="all" <%= 'selected' if @selected_categories.empty? %>>&lt;all categories&gt;</option>
+        <option value="none" <%= 'selected' if @selected_categories.include? 'none' %>>&lt;no categories&gt;</option>
+        <% for category in @categories %>
+          <option value="<%= category %>" <%= 'selected' if @selected_categories.include? category %>><%= category %></option>
+        <% end %>
+      </select>
     </td>
- </tr>
+   </tr>
+   <tr>
+     <td colspan='4' align='center'><input type="submit" value="Redraw" name="Go"></td>
+   </tr>
 </form>
 </table>
 

data/app/views/wiki/search.rhtml

@@ -1,6 +1,7 @@
 <% @title = @results.length > 0 ? "#{@results.length} pages contains \"#{@params["query"]}\"" : "No pages contains \"#{@query}\"" %><%= sub_template "top" %>
 
 <% if @results.length > 0 %>
+  <h3>Matching Pages:</h3>
   <ul>
     <% for page in @results %>
       <li><a href="../show/<%= page.name %>"><%= page.plain_name %></a><br />
@@ -17,7 +18,28 @@
       </li>
     <% end %>
   </ul>
-<% else %>
+<% end %>
+<% if @bliki_results.length > 0 %>
+  <h3>Matching Bliki Entries:</h3>
+  <ul>
+    <% for entry in @bliki_results %>
+      <li><a href="../bliki_revision/<%= entry.name %>?rev=<%= entry.revisions.size-1 %>"><%= entry.name %></a><br />
+      <% 
+        idxs = entry.content.scan(/.{0,30}#{@params["query"]}.{0,30}/im)
+        idxs.each do |i|
+          begin %>
+            ...<%= i.to_s %>...<br /><%
+          rescue Exception => e
+            %><%= e.message %><%
+          end
+        end
+      %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
+<% if @results.length == 0 && @bliki_results.length == 0 %>
   <p>Perhaps you should try expanding your query. Remember that Instiki searches for entire phrases, so if you search for "all that jazz" it will not match pages that contain these words in separation&mdash;only as a sentence fragment.</p>
 
   <p>If you're a high-tech computer wizard, you might even want try constructing a regular expression. That's actually what Instiki uses, so go right ahead and flex your "[a-z]*Leet?RegExpSkill(s|z)"</p>

data/pimki.rb

@@ -10,15 +10,34 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "libraries")
 begin
   require 'rubygems'
   require_gem 'madeleine'
-  require_gem 'redcloth', '~> 2.0.11'
+  require_gem 'RedCloth'
   require_gem 'rubyzip'
-  require_gem 'bluecloth'
 
-rescue LoadError
+rescue LoadError => detail
   # no rubygems, so load from the libraries directory
+  p detail
   require 'redcloth'
-  require 'bluecloth' 
+  require 'bluecloth'
 end
+
+### RedCloth Modifications:
+# Remove the "caps" spanning:
+RedCloth::GLYPHS.delete_if { |glyph| glyph[1] =~ /class=\"caps\"/ }
+# Fix missing hard_break
+if RedCloth::VERSION == '3.0.0'
+  class RedCloth #{{{
+    alias_method :old_clean_white_space, :clean_white_space
+    def clean_white_space text
+      old_clean_white_space text
+      hard_break text
+    end
+  end #}}}
+else
+  # Redcloth v3.0.0 can handle markdown, so BlueCloth is only required if we
+  # have an earlier redcloth version.
+  require 'BlueCloth'
+end
+
 # }}}
 
 # Handle command-line options: {{{

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.3
 specification_version: 1
 name: Pimki
 version: !ruby/object:Gem::Version 
-  version: 1.2.092
-date: 2004-12-10
+  version: 1.3.092
+date: 2004-12-26
 summary: A Personal Information Manager (PIM) based on the Wiki technology of Instiki.
 require_paths: 
   - libraries
-author: Assaph Mehr (based on work by David Heinemeier Hansson)
 email: assaph@gmail.com
 homepage: http://pimki.rubyforge.org
 rubyforge_project: pimki
@@ -25,6 +24,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: 
+  - Assaph Mehr (based on work by David Heinemeier Hansson)
 files: 
   - pimki.rb
   - README
@@ -63,6 +64,7 @@ files:
   - app/models/chunks/uri.rb
   - app/models/chunks/uri_test.rb
   - app/models/chunks/wiki.rb
+  - app/models/chunks/wiki_symbols.rb
   - app/models/chunks/wiki_test.rb
   - app/views/bottom.rhtml
   - app/views/markdown_help.rhtml
@@ -130,22 +132,12 @@ dependencies:
   - !ruby/object:Gem::Dependency 
     name: RedCloth
     version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - "~>"
-          - !ruby/object:Gem::Version 
-            version: 2.0.11
-      version: 
-  - !ruby/object:Gem::Dependency 
-    name: BlueCloth
-    version_requirement: 
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.0.3
+            version: 3.0.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: rubyzip