Pimki 1.6.092 → 1.7.092

data/app/models/chunks/acronym.rb

@@ -0,0 +1,19 @@
+
+# This chunk is supposed to pick up acronyms that have been defined on another
+# page and define them on this page. See glossary for more details.
+class Acronym < Chunk::Abstract
+    def self.pattern() %r{([A-Z]+)(<\/acronym>)?} end
+
+    def initialize(match_data, revision)
+      super(match_data, revision)
+      @acronym, @defined = match_data[1], match_data[2]
+    end
+    
+    def unmask(content)
+      return self if @defined
+
+      definitions = revision.page.web.glossary_items.inject({}) { |hsh, (ac,df), pg| hsh[ac] = df }
+      return self if content.gsub!( Regexp.new(mask(content)), "<acronym title='#{definitions[@acronym]}'>#{@acronym}</acronym>" )
+    end
+end
+

data/app/models/chunks/category.rb

@@ -25,7 +25,9 @@ class Category < Chunk::Abstract
   # If the chunk is hidden, erase the mask and return this chunk
   # otherwise, surround it with a 'div' block.
   def unmask(content)
-    replacement = ( hidden ? '' : '<div class="property">category:\1</div>' )
-    self if content.sub!( Regexp.new( pre_mask+'(.*)?'+post_mask ), replacement )
+    #replacement = ( hidden ? '' : '<div class="property">category:\1</div>' )
+    self if content.sub!( Regexp.new( pre_mask+'(.*)?'+post_mask ) ) {
+      "<div class='property'>category:#{$1.split(',').map { |c| c.strip!; "<a href='../list/?category=#{c}'>#{c}</a> " }}</div>"
+    }
   end
 end

data/app/models/chunks/todo.rb

@@ -27,7 +27,6 @@ class Todo < Chunk::Abstract
         @due_date = Date.new(*d)
       end
     rescue => detail
-      p ['==>', detail, @text]
       @due_date = nil
     end
   end

data/app/models/chunks/wiki.rb

@@ -80,21 +80,27 @@ module WikiChunk
       else
         @page_name, @link_text = match_data[1], match_data[1]
       end
+      
+      @link_text = WikiWords.separate(@link_text) if @link_text.match /^#{WikiWords::WIKI_WORD_PATTERN}$/
     end
   end
 
   # This chunk handles [bliki[entry name]].
-  # This format can be easily duplicated for any other pre-configured redirection.
+  # This format has been extended for some other pre-configured redirection.
+  # Probably a bad name now, as we're using this for any link outside the current
+  # web, but if I change the class name it'll break existing storages.
   class BlikiLink < WikiLink
     def self.pattern() /\[(\w+)\[([\w\d\s]+)\]\]/ end
 
     attr_reader :page_name, :link_text, :entry
-
+  
     def initialize(match_data, revision)
       super(match_data, revision)
       @target, @page_name, @link_text = match_data[1], match_data[2], match_data[2]
     end
 
+    def mask(content) pre_mask + post_mask end
+
     def unmask(content)
       return self if content.sub!(regexp) { |match|
         case @target
@@ -102,14 +108,22 @@ module WikiChunk
           web = revision.page.web
           entry = web.bliki[page_name]
           if entry.nil?
-            "<span style='background:lightgrey;font-style:italic'>Unknown Bliki entry: '#{page_name}'</span>"
+            #"<span style='background:lightgrey;font-style:italic'>Unknown Bliki entry: '#{page_name}'</span>"
+            "<a class='newWikiWord' href='/#{web.address}/bliki_new/?entry_name=#{CGI::escape page_name}'>Bliki::#{page_name}</a>"
           else
-            "<a class='existingWikiWord' href='/#{web.address}/bliki_revision/#{entry.name}?rev=#{entry.revisions.size-1}'>#{entry.name}</a>"
+            "<a class='existingWikiWord' href='/#{web.address}/bliki_revision/#{entry.name}?rev=#{entry.revisions.size-1}'>Bliki::#{entry.name}</a>"
           end
           
         when 'c2'
           "<a href='http://c2.com/cgi/wiki?#{@page_name}'>C2::#{@page_name}</a>"
-      end
+          
+        else
+          if web = WikiService.instance.webs[@target]
+            "<a href='/#{web.address}@/show/#@page_name'>#{web.name}::#@page_name</a>"
+          else
+            "<i>#@text</i>"
+          end
+        end
       }
     end
   end

data/app/models/revision.rb

@@ -45,6 +45,8 @@ class Revision
   def wiki_words
     unless @wiki_words_cache 
       wiki_chunks = display_content.find_chunks(WikiChunk::WikiLink)
+      # BlikiLinks are used to link outside the wiki, so are not WikiLinks.
+      wiki_chunks.reject! { |chunk| chunk.kind_of? WikiChunk::BlikiLink }
       @wiki_words_cache = wiki_chunks.map { |c| ( c.escaped_text ? nil : c.page_name ) }.compact.uniq
     end
     @wiki_words_cache

data/app/models/web.rb

@@ -6,8 +6,8 @@ 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, :enable_dclick_edit, :check_pass_on_edit
+  attr_accessor :markup, :color, :safe_mode, :additional_style, :published, :default_to_published, :brackets_only, :count_pages
+  attr_accessor :mind_map_size, :symbols_map, :links_map, :enable_dclick_edit, :check_pass_on_edit, :enable_menu
 
   # Mind Map defaults
   attr_accessor :mm_prog, :mm_graph_type, :mm_show_missing, :mm_show_authors, :mm_show_leaves, :mm_selected_categories
@@ -96,8 +96,10 @@ class Web
   def color()         @color  || "008B26" end
   def brackets_only() @brackets_only || false end
   def count_pages()   @count_pages   || false end
+  def enable_menu()   @enable_menu   || true  end
   def menu_content()  @menu_content  || nil   end
   def menu_limit()    @menu_limit    || 20    end
+  def default_to_published()   @default_to_published || false end
   def menu_type()
     (@menu_type.nil? || @menu_type.empty?) ? 'linkers' : @menu_type
   end
@@ -108,9 +110,9 @@ class Web
   def mm_show_authors() @mm_show_authors || false    end
   def mm_show_leaves()  @mm_show_leaves  || true     end
   def mm_selected_categories() @mm_selected_categories || [] end
-    
+
   # create a Mind Map graph and return the PNG and HTML map files generated
-  def create_mind_map(prog, missing, show_authors, show_leaves, selected_categories)
+  def create_mind_map(prog, missing, show_authors, show_leaves, selected_categories, mm_size)
     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")
@@ -118,12 +120,7 @@ class Web
     File.open(dotFile, "w") do |file|
     
       # Graph properties:
-      file.puts "digraph G {"
-      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];'
+      output_graph_header_to file, mm_size
     
       # Links and node properties:
       nodes = filter_categories(pages.values, selected_categories)
@@ -140,14 +137,14 @@ class Web
       end
 
       # Page Special nodes properties:
-      file.puts "HomePage [color=\"##{color}\",style=bold];" if nodes.map{ |p| p.name }.include? "HomePage"
+      file.puts %{"Home Page" [color=\"##{color}\",style=bold];} if nodes.map{ |p| p.name }.include? "HomePage"
 
       nodes.each do |page|
-        file.puts "#{page.name} [URL=\"../show/#{page.name}\"];"
+        file.puts %{"#{page.plain_name}" [URL=\"../show/#{page.name}\"];}
         page.references.each do |referer|
           unless page.name == referer.name or not nodes.include? referer
             unless !show_authors and auths.include? referer.name
-              file.puts "#{referer.name} -> #{page.name};"
+              file.puts %{"#{referer.plain_name}" -> "#{page.plain_name}";}
             end
           end
         end
@@ -159,17 +156,17 @@ class Web
         nodes.each do |page|
           missing.each do |wanted|
             if page.content =~ /#{wanted}/
-              file.puts "#{page.name} -> #{wanted};"
+              file.puts %{"#{page.plain_name}" -> "#{WikiWords.separate 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];"
+          file.puts %{"#{WikiWords.separate wanted}" [URL="/#{@address}/show/#{wanted}", fontsize=10,style=filled,color=grey];}
         end
       end
 
-      file.puts "}"
+      output_graph_footer_to file
     end
 
     call_graphviz(prog, dotFile, mapFile, pngFile)
@@ -177,7 +174,7 @@ class Web
     [pngFile, mapFile]
   end
 
-  def create_author_graph(prog, selected_categories)
+  def create_author_graph(prog, selected_categories, mm_size)
     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")
@@ -185,29 +182,24 @@ class Web
     File.open(dotFile, "w") do |file|
     
       # Graph properties:
-      file.puts "digraph G {"
-      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];'
+      output_graph_header_to file, mm_size
     
       # Links and node properties:
       auths = authors # avoid repeated selects
       auths.each do |auth|
-        file.puts "#{auth} [style=filled,color=grey,URL=\"../show/#{auth}\"];"
+        file.puts %{"#{auth}" [style=filled,color=grey,URL="../show/#{auth}"];}
       end
 
       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}\"];"
+        file.puts %{"#{page.plain_name}" [URL="../show/#{page.name}"];}
         page.authors.each do |auth|
-          file.puts "#{auth} -> #{page.name};"      
+          file.puts %{"#{auth}" -> "#{page.plain_name}";}
         end
       end
 
-      file.puts "}"
+      output_graph_footer_to file
     end
 
     call_graphviz(prog, dotFile, mapFile, pngFile)
@@ -215,24 +207,19 @@ class Web
     [pngFile, mapFile]
   end
 
-  def create_category_graph(prog, show_authors, selected_categories) #{{{
+  def create_category_graph(prog, show_authors, selected_categories, mm_size) #{{{
     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")
     
     File.open(dotFile, "w") do |file|
       # Graph properties:
-      file.puts "digraph G {"
-      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];'
+      output_graph_header_to file, mm_size
     
       # Page Special nodes properties:
       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}\"];"
+        file.puts %{"#{category}" [fontsize=20,style=filled,color=grey,comment="#{category}",URL="../list/?category=#{category}"];}
       end
     
       # Links and node properties:
@@ -244,13 +231,13 @@ class Web
         }
       end
       nodes.each do |page|
-        file.puts "#{page.name} [URL=\"../show/#{page.name}\"];"
+        file.puts %{"#{page.plain_name}" [URL=\"../show/#{page.name}\"];}
         page.categories.each do |category|
-          file.puts "#{category} -> #{page.name};"
+          file.puts %{"#{category}" -> "#{page.plain_name}";}
         end
       end
 
-      file.puts "}"
+      output_graph_footer_to file
     end
 
     call_graphviz(prog, dotFile, mapFile, pngFile)
@@ -258,6 +245,19 @@ class Web
     [pngFile, mapFile]
   end #}}}
 
+  def output_graph_header_to file, mm_size
+    file.puts "digraph G {"
+    file.puts "size=\"#{mm_size}\";" if mm_size
+    file.puts 'ratio=fill;'
+    file.puts 'concentrate=true;'
+    file.puts 'node [fontsize=10,fontname="Tahoma"];'
+    file.puts 'edge [len=1.5];'
+  end
+  
+  def output_graph_footer_to file
+    file.puts "}"
+  end
+  
   def filter_categories(pages, selected_categories) #{{{
     nodes = pages
     unless selected_categories.empty?

data/app/models/web_test.rb

@@ -3,7 +3,7 @@ require "wiki_service"
 
 class WebTest < Test::Unit::TestCase
   def setup
-    @web = Web.new "Instiki", "instiki"
+    @web = Web.new "Pimki", "pimki"
   end
 
   def test_wiki_word_linking

data/app/models/wiki_service.rb

@@ -7,6 +7,7 @@ require "author"
 
 class WikiService < MadeleineService
   attr_reader :webs, :system
+  attr_accessor :default_web
 
   # These methods do not change the state of persistent objects, and 
   # should not be logged by Madeleine
@@ -21,7 +22,7 @@ class WikiService < MadeleineService
   end
 
   def authenticate(password)
-    password == (@system["password"] || "instiki")
+    password == (@system["password"] || "pimki")
   end
 
   def setup(password, web_name, web_address)
@@ -34,10 +35,10 @@ 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,
-      mind_map_size="7,7", symbols_map=nil, links_map=nil,
+      password = nil, published = false, default_to_published = false, brackets_only = false,
+      count_pages = false, mind_map_size="7,7", symbols_map=nil, links_map=nil,
       snapshots_interval = 1,
-      enable_dclick_edit=nil, check_pass_on_edit=false,
+      enable_dclick_edit=nil, enable_menu=true, check_pass_on_edit=false,
       prog=nil, graph_type=nil, missing=nil, show_authors=nil, show_leaves=nil, selected_categories=nil) 
 
     if old_address != new_address
@@ -54,10 +55,10 @@ class WikiService < MadeleineService
     web.name, web.markup, web.color, web.additional_style, web.safe_mode = 
       name, markup, color, additional_style, safe_mode
       
-    web.password, web.published, web.brackets_only, web.count_pages =
-      password, published, brackets_only, count_pages
+    web.password, web.published, web.default_to_published, web.brackets_only, web.count_pages =
+      password, published, default_to_published, brackets_only, count_pages
       
-    web.enable_dclick_edit, web.check_pass_on_edit = enable_dclick_edit, check_pass_on_edit
+    web.enable_dclick_edit, web.enable_menu, web.check_pass_on_edit = enable_dclick_edit, enable_menu, check_pass_on_edit
     
     web.mind_map_size, web.mm_prog, web.mm_graph_type, web.mm_show_missing =
       mind_map_size, prog, graph_type, missing

data/app/models/wiki_words.rb

@@ -17,12 +17,13 @@ module WikiWords
   DIGITS = "0123456789"
 
   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+'
+  CAMEL_CASED_WORD_BORDER = /([a-z#{I18N_LOWER_CASE_LETTERS}#{DIGITS}]|[A-Z#{I18N_HIGHER_CASE_LETTERS}]{2,})(?=[A-Z#{I18N_HIGHER_CASE_LETTERS}]\B)/u
 
   def self.separate(wiki_word, ignore_separation = false)
-    if ignore_separation
+    if ignore_separation or wiki_word.match(/^[A-Z#{I18N_HIGHER_CASE_LETTERS}]+$/) or wiki_word.match(/\s/)
       wiki_word
     else
-      wiki_word.gsub(/([a-z#{I18N_LOWER_CASE_LETTERS}#{DIGITS}]|[A-Z#{I18N_HIGHER_CASE_LETTERS}]{2,})(?=[A-Z#{I18N_HIGHER_CASE_LETTERS}])/u, '\1 \2').gsub(/(\d+)/u, ' \1')
+      wiki_word.gsub(CAMEL_CASED_WORD_BORDER, '\1 \2').gsub(/(.)(\d+)/u) { $1 == '_' ? "#$1#$2" : "#$1 #$2" }
     end
   end
 end

data/app/models/wiki_words_test.rb

@@ -9,4 +9,14 @@ class WikiWordsTest < Test::Unit::TestCase
     assert_equal "Æe ÅØle Øen", WikiWords.separate("ÆeÅØleØen")
     assert_equal "Legetøj", WikiWords.separate("Legetøj")
   end
+  
+  def test_pimki_wiki_words
+    assert_equal "XYZ", WikiWords.separate("XYZ")
+    assert_equal "WXYZ", WikiWords.separate("WXYZ")
+    assert_equal "XYZ to XML", WikiWords.separate("XYZ to XML")
+    assert_equal "WXYZ to XML", WikiWords.separate("WXYZ to XML")
+    assert_equal "XML Schema Stuff", WikiWords.separate("XMLSchemaStuff")
+    assert_equal "Schema XML Stuff", WikiWords.separate("SchemaXMLStuff")
+    assert_equal "Schema Stuff XML", WikiWords.separate("SchemaStuffXML")
+  end
 end

data/app/views/error.rhtml

@@ -24,8 +24,10 @@
 
 <p><b>Action:</b> <%= @action_name %></p>
 
-<p><b>Backtrace:</b><br />
-  <table border="0">
+<p><b>Request:</b> <%= @req %></p>
+
+<p><b>Backtrace:</b></p>
+<p><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 %>

data/app/views/menu.rhtml

@@ -1,14 +1,10 @@
 <div id="Menu" width="150">
-  <p>
   <table>
   <% published = @action_name =~ /published/
      show_by = published ? '../published/' : '../show/'
      begin %>
         <tr><th><%= @web.name %> Quick Links</th></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>
+        <tr><th>&nbsp;</th></tr>
         <% if @menu_pages.nil? %>
             <tr><td><%= @menu_content %></td></tr>
         <% else %>

data/app/views/navigation.rhtml

@@ -11,17 +11,17 @@ end
 <form id="navigationForm" class="navigation" action="../search/" method="get" style="font-size: 10px">  
   <%= list_item "Home Page", "../show/HomePage", "Home, Sweet Home", "H" %> | 
   <%= list_item "All Pages", "../list/", "Alphabetically sorted list of pages", "A" %> |
-  <% if `dot -V 2>&1` =~ /dot version/ %>
+  <% if OPTIONS[:graphviz_available] %>
     <%= list_item "Mind Map", "../mind/", "A 'Mind Map' graph of wiki pages", "M" %> |
   <% end %>
   <%= list_item "Bliki", "../bliki/", "Bliki", "B" %> |
   <%= list_item "ToDo", "../todo/", "Todo items from all pages", "T" %> |
   <%= list_item "Recently Revised", "../recently_revised/", "Pages sorted by when they were last changed", "U" %> |
-  <!-- Moved to bottom of HomePage:
-  <%= list_item "Authors", "../authors/", "Who wrote what" %> | 
-  <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %> | 
+  <%= list_item "Authors", "../authors/", "Who wrote what" %> |
+  <%= list_item "Feeds", "../feeds/", "Subscribe to changes by RSS" %> |
+  <%= list_item "Glossary", "../glossary/", "Acronyms used in this web" %> |
+  <%= list_item "Web Setup", "../edit_web/", "Edit this web's options" %> |
   <%= list_item "Export", "../export/", "Download a zip with all the pages in this wiki", "X" %> |
-  -->
   <input type="text" id="searchField" name="query" style="font-size: 10px" value="Search" onClick="this.value == 'Search' ? this.value = '' : true">
-  <%= list_item "<small>(Adv)</small>", "../adv_search/", "Advanced Search" %>
+    <%= list_item "<small>(Adv)</small>", "../adv_search/", "Advanced Search" %>
 </form>

data/app/views/static_style_sheet.rhtml

@@ -3,6 +3,7 @@
   margin:     0 auto;
   text-align: left;
   width:      180px;
+  margin-top: 15px;
 }
 
 #Menu a, existingWikiWord, newWikiWord {
@@ -16,11 +17,22 @@
   text-align: left
 }
 
+#Menu a {
+  text-decoration:none;
+  color: #555;
+}
+#Menu a:hover {
+  color: #fff;
+}
+#Menu td {
+  line-height: 90%;
+}
+
 #Container {
 	float:         left;
 	margin:        0 auto;
-	text-align:    center;
-    margin-left:   10px;
+	text-align:    left;
+	padding-left:   <%= web && web.enable_menu ? "10px" : "180px" %>;
 }
 
 #Content {
@@ -51,7 +63,7 @@ a:hover { color: #fff; background-color:#000; }
 
 
 h1, h2, h3 { color: #333; font-family: georgia, verdana; }
-h1 { font-size: 28px; color: blue }
+h1 { font-size: 24px; color: blue }
 h2 { font-size: 19px; color: darkblue }
 h3 { font-size: 16px; color: darkblue }
 
@@ -107,7 +119,7 @@ li { margin-bottom: 7px }
 .inputBox {
 	font-family: verdana, arial, helvetica, sans-serif;
 	font-size: 11px;
-  background-color: #eee;
+  background-color: #eef;
   padding: 5px;
   margin-bottom: 20px;
 }
@@ -141,7 +153,8 @@ ol.setup li {
   font-size: 10px;
   font-style: italic;  
   margin-bottom: 10px;
-  color: #999;
+  padding-left: 5px;
+  color: grey;
 }
 
 .references {
@@ -162,6 +175,13 @@ ins.diffmod {
   background: lightgreen;
 }
 
+#TextileHelp {
+  float: right;
+  width: 250px;
+  margin-top: 5px
+  padding-left: 5px
+}
+
 #TextileHelp table {
 	margin-bottom: 0;
 }