Pimki 1.3.092 → 1.4.092

data/app/models/web.rb

@@ -7,7 +7,10 @@ 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
+  attr_accessor :mind_map_size, :symbols_map, :links_map, :enable_dclick_edit, :check_pass_on_edit
+
+  # Mind Map defaults
+  attr_accessor :mm_prog, :mm_graph_type, :mm_show_missing, :mm_show_authors, :mm_show_leaves, :mm_selected_categories
   
   @@BLIKI_TEMPLATE = "Try a weekly worksheet:\n\n| / | *Morning* | *Afternoon* |\n" +
                      "| *Mon* | - | - |\n| *Tue* | - | - |\n| *Wed* | - | - |\n" +
@@ -38,6 +41,10 @@ class Web
     PageSet.new(self, @pages.values, accept)
   end
   
+  def select_bliki(&accept)
+    PageSet.new(self, bliki.values, accept)
+  end
+  
   def revised_on
     select.most_recent_revision
   end
@@ -63,7 +70,7 @@ class Web
         if page then "<a class=\"existingWikiWord\" href=\"#{link}.html\">#{text}</a>"
         else "<span class=\"newWikiWord\">#{text}</span>" end
       when :publish
-        if page then "<a class=\"existingWikiWord\" href=\"../show/#{link}\">#{text}</a>"
+        if page then "<a class=\"existingWikiWord\" href=\"../published/#{link}\">#{text}</a>"
         else "<span class=\"newWikiWord\">#{text}</span>" end
       else
         if page then "<a class=\"existingWikiWord\" href=\"../show/#{link}\">#{text}</a>"
@@ -81,6 +88,7 @@ class Web
   
   def refresh_revisions
     select.each { |page| page.revisions.each { |revision| revision.clear_display_cache } }
+    select_bliki.each { |page| page.revisions.each { |revision| revision.clear_display_cache } }
   end
   
   # Default values
@@ -88,14 +96,19 @@ 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_content()  @menu_content  || nil   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
-  
-
+  def mind_map_size()  (@mind_map_size == '0,0' ? '6,5' : @mind_map_size) end
+  def mm_prog()         @mm_prog         || 'neato'  end
+  def mm_graph_type()   @mm_graph_type   || 'normal' end
+  def mm_show_missing() @mm_show_missing || false    end
+  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)
     dotFile = File.expand_path("#{WikiService.storage_path}/graph.dot")

data/app/models/web_test.rb

@@ -1,53 +1,53 @@
-require "test/unit"
-require "wiki_service"
-
-class WebTest < Test::Unit::TestCase
-  def setup
-    @web = Web.new "Instiki", "instiki"
-  end
-
-  def test_wiki_word_linking
-    @web.add_page(Page.new(@web, "SecondPage", "Yo, yo. Have you EverBeenHated", Time.now, "DavidHeinemeierHansson"))
-    assert_equal(
-      "<p>Yo, yo. Have you <span class=\"newWikiWord\">Ever Been Hated<a href=\"../show/EverBeenHated\">?</a></span></p>",
-      @web.pages["SecondPage"].display_content
-    )
-    
-    @web.add_page(Page.new(@web, "EverBeenHated", "Yo, yo. Have you EverBeenHated", Time.now, "DavidHeinemeierHansson"))
-    assert_equal(
-      "<p>Yo, yo. Have you <a class=\"existingWikiWord\" href=\"../show/EverBeenHated\">Ever Been Hated</a></p>", 
-      @web.pages["SecondPage"].display_content
-    )
-  end
-  
-  def test_pages_by_revision
-    add_sample_pages
-    assert_equal "EverBeenHated", @web.select.by_revision.first.name
-  end
-  
-  def test_pages_by_match
-    add_sample_pages
-    assert_equal 2, @web.select { |page| page.content =~ /me/i }.length
-    assert_equal 1, @web.select { |page| page.content =~ /Who/i }.length
-    assert_equal 0, @web.select { |page| page.content =~ /none/i }.length
-  end
-  
-  def test_references
-    add_sample_pages
-    assert_equal 1, @web.select.pages_that_reference("EverBeenHated").length
-    assert_equal 0, @web.select.pages_that_reference("EverBeenInLove").length
-  end
-  
-  def test_delete
-    add_sample_pages
-    assert_equal 2, @web.pages.length
-    @web.remove_pages([ @web.pages["EverBeenInLove"] ])
-    assert_equal 1, @web.pages.length
-  end
-  
-  private
-    def add_sample_pages
-      @web.add_page(Page.new(@web, "EverBeenInLove", "Who am I me", Time.local(2004, 4, 4, 16, 50), "DavidHeinemeierHansson"))
-      @web.add_page(Page.new(@web, "EverBeenHated", "I am me EverBeenHated", Time.local(2004, 4, 4, 16, 51), "DavidHeinemeierHansson"))
-    end
+require "test/unit"
+require "wiki_service"
+
+class WebTest < Test::Unit::TestCase
+  def setup
+    @web = Web.new "Instiki", "instiki"
+  end
+
+  def test_wiki_word_linking
+    @web.add_page(Page.new(@web, "SecondPage", "Yo, yo. Have you EverBeenHated", Time.now, "DavidHeinemeierHansson"))
+    assert_equal(
+      "<p>Yo, yo. Have you <span class=\"newWikiWord\">Ever Been Hated<a href=\"../show/EverBeenHated\">?</a></span></p>",
+      @web.pages["SecondPage"].display_content
+    )
+    
+    @web.add_page(Page.new(@web, "EverBeenHated", "Yo, yo. Have you EverBeenHated", Time.now, "DavidHeinemeierHansson"))
+    assert_equal(
+      "<p>Yo, yo. Have you <a class=\"existingWikiWord\" href=\"../show/EverBeenHated\">Ever Been Hated</a></p>", 
+      @web.pages["SecondPage"].display_content
+    )
+  end
+  
+  def test_pages_by_revision
+    add_sample_pages
+    assert_equal "EverBeenHated", @web.select.by_revision.first.name
+  end
+  
+  def test_pages_by_match
+    add_sample_pages
+    assert_equal 2, @web.select { |page| page.content =~ /me/i }.length
+    assert_equal 1, @web.select { |page| page.content =~ /Who/i }.length
+    assert_equal 0, @web.select { |page| page.content =~ /none/i }.length
+  end
+  
+  def test_references
+    add_sample_pages
+    assert_equal 1, @web.select.pages_that_reference("EverBeenHated").length
+    assert_equal 0, @web.select.pages_that_reference("EverBeenInLove").length
+  end
+  
+  def test_delete
+    add_sample_pages
+    assert_equal 2, @web.pages.length
+    @web.remove_pages([ @web.pages["EverBeenInLove"] ])
+    assert_equal 1, @web.pages.length
+  end
+  
+  private
+    def add_sample_pages
+      @web.add_page(Page.new(@web, "EverBeenInLove", "Who am I me", Time.local(2004, 4, 4, 16, 50), "DavidHeinemeierHansson"))
+      @web.add_page(Page.new(@web, "EverBeenHated", "I am me EverBeenHated", Time.local(2004, 4, 4, 16, 51), "DavidHeinemeierHansson"))
+    end
 end

data/app/models/wiki_content.rb

@@ -1,120 +1,132 @@
-require 'cgi'
-require 'chunks/engines'
-require 'chunks/category'
-require 'chunks/include'
-require 'chunks/todo'
-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
-# it are protected from being rendered by later actions.
-#
-# When wiki content is rendered, it can be interrogated to find out 
-# which chunks were rendered. This means things like categories, wiki 
-# links, can be determined.
-#
-# Exactly how wiki content is rendered is determined by a number of 
-# settings that are optionally passed in to a constructor. The current
-# options are:
-#  * :engine 
-#    => The structural markup engine to use (Textile, Markdown, RDoc)
-#  * :engine_opts
-#    => A list of options to pass to the markup engines (safe modes, etc)
-#  * :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
-#  * :post_engine_actions
-#    => A list of render actions or chunks to apply after the markup 
-#       engine. By default these are:    
-#       Literal::Pre, Literal::Tags, WikiChunk::Word
-#       ToDo items
-#  * :mode
-#    => How should the content be rendered? For normal display (:display), 
-#       publishing (:publish) or export (:export)?
-#
-# AUTHOR: Mark Reid <mark @ threewordslong . com>
-# CREATED: 15th May 2004
-# UPDATED: 22nd May 2004
-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, Literal::Pre, WikiSymbol, 
-                          WikiChunk::Link, WikiChunk::BlikiLink ] 
-  POST_ENGINE_ACTIONS = [ Literal::Tags, WikiChunk::Word, URIChunk, Todo ]
-  
-
-  DEFAULT_OPTS = {
-    :pre_engine_actions  => PRE_ENGINE_ACTIONS,
-    :post_engine_actions => POST_ENGINE_ACTIONS,
-    :engine              => Engines::Textile,
-    :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
-
-  # Create a new wiki content string from the given one.
-  # The options are explained at the top of this file.
-  def initialize(revision, options = {})
-    @revision = revision
-    @web = @revision.page.web
-
-    # 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[:post_engine_actions].delete(WikiChunk::Word) if @web.brackets_only
-
-    super(@revision.content)
-
-    begin
-      render!(@options[:pre_engine_actions] + [@options[:engine]] + @options[:post_engine_actions])
-    rescue => e
-      @rendered = "<strong>#{e.message}</strong><br/><br/>#{e.backtrace.join('<br/>')}"
-    end
-  end
-
-  # Call @web.page_link using current options.
-  def page_link(name, text) 
-    @web.make_link(name, text, @options) 
-  end
-
-  # Find all the chunks of the given types
-  def find_chunks(chunk_type)
-    rendered.select { |chunk| chunk.kind_of?(chunk_type) }
-  end
-
-  # Render this content using the specified actions.
-  def render!(chunk_types)
-    @chunks = []
-    chunk_types.each { |chunk_type| self.apply_type!(chunk_type) }
-    
-    # unmasking order is reversed to allow chuncks that encapsulate other chunks,
-    # e.g. a ToDo item with a WikiWork link.
-    @rendered = @chunks.reverse.map { |chunk| chunk.unmask(self) }.compact
-    (@chunks - @rendered).each { |chunk| chunk.revert(self) }
-  end
-  
-  # Find all the chunks of the given type in this content
-  # Each time the type's pattern is matched, create a new
-  # chunk for it, and replace the occurance of the chunk
-  # in this content with its mask.
-  def apply_type!(chunk_type)
-    self.gsub!( chunk_type.pattern ) do |match|
-      @chunks << chunk_type.new($~, @revision)
-      @chunks.last.mask(self)
-    end
-  end
+require 'cgi'
+require 'chunks/engines'
+require 'chunks/category'
+require 'chunks/include'
+require 'chunks/todo'
+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
+# it are protected from being rendered by later actions.
+#
+# When wiki content is rendered, it can be interrogated to find out 
+# which chunks were rendered. This means things like categories, wiki 
+# links, can be determined.
+#
+# Exactly how wiki content is rendered is determined by a number of 
+# settings that are optionally passed in to a constructor. The current
+# options are:
+#  * :engine 
+#    => The structural markup engine to use (Textile, Markdown, RDoc)
+#  * :engine_opts
+#    => A list of options to pass to the markup engines (safe modes, etc)
+#  * :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
+#  * :post_engine_actions
+#    => A list of render actions or chunks to apply after the markup 
+#       engine. By default these are:    
+#       Literal::Pre, Literal::Tags, WikiChunk::Word
+#       ToDo items
+#  * :mode
+#    => How should the content be rendered? For normal display (:display), 
+#       publishing (:publish) or export (:export)?
+#
+# AUTHOR: Mark Reid <mark @ threewordslong . com>
+# CREATED: 15th May 2004
+# UPDATED: 22nd May 2004
+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, Literal::Pre, WikiSymbol, 
+                          WikiChunk::Link, WikiChunk::BlikiLink ] 
+  POST_ENGINE_ACTIONS = [ Literal::Tags, WikiChunk::Word, URIChunk, Todo ]
+  
+
+  DEFAULT_OPTS = {
+    :pre_engine_actions  => PRE_ENGINE_ACTIONS,
+    :post_engine_actions => POST_ENGINE_ACTIONS,
+    :engine              => Engines::Textile,
+    :engine_opts         => [],
+    :mode                => [:display]
+  }
+  
+  attr_reader :web, :options, :rendered
+
+  # Create a new wiki content string from the given one.
+  # The options are explained at the top of this file.
+  def initialize(revision, options = {})
+    @revision = revision
+    @web = @revision.page.web
+
+    # 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] = []
+    case @options[:engine]
+      when Engines::Textile
+        if RedCloth::VERSION >= '3.0.0'
+          # RedCloth v3 changes the default behaviour from not folding lines.
+          DEFAULT_OPTS[:engine_opts] = [:hard_breaks]
+        end
+        @options[:engine_opts] += (@web.safe_mode ? [:filter_html, :filter_styles] : [])
+        
+      when Engines::BlueMarkdown, Engines::RedMarkdown
+        @options[:engine_opts] += (@web.safe_mode ? [:filter_html, :filter_styles] : [])
+        
+      when Engines::RDoc
+        nil
+        
+    end
+    
+
+    @options[:post_engine_actions].delete(WikiChunk::Word) if @web.brackets_only
+
+    super(@revision.content)
+
+    begin
+      render!(@options[:pre_engine_actions] + [@options[:engine]] + @options[:post_engine_actions])
+    rescue => e
+      @rendered = "<strong>#{e.message}</strong><br/><br/>#{e.backtrace.join('<br/>')}"
+    end
+  end
+
+  # Call @web.page_link using current options.
+  def page_link(name, text) 
+    @web.make_link(name, text, @options) 
+  end
+
+  # Find all the chunks of the given types
+  def find_chunks(chunk_type)
+    rendered.select { |chunk| chunk.kind_of?(chunk_type) }
+  end
+
+  # Render this content using the specified actions.
+  def render!(chunk_types)
+    @chunks = []
+    chunk_types.each { |chunk_type| self.apply_type!(chunk_type) }
+    
+    # unmasking order is reversed to allow chuncks that encapsulate other chunks,
+    # e.g. a ToDo item with a WikiWork link.
+    @rendered = @chunks.reverse.map { |chunk| chunk.unmask(self) }.compact
+    (@chunks - @rendered).each { |chunk| chunk.revert(self) }
+  end
+  
+  # Find all the chunks of the given type in this content
+  # Each time the type's pattern is matched, create a new
+  # chunk for it, and replace the occurance of the chunk
+  # in this content with its mask.
+  def apply_type!(chunk_type)
+    self.gsub!( chunk_type.pattern ) do |match|
+      @chunks << chunk_type.new($~, @revision)
+      @chunks.last.mask(self)
+    end
+  end
 end

data/app/models/wiki_service.rb

@@ -1,4 +1,5 @@
 
+
 require "madeleine_service"
 require "web"
 require "page"
@@ -30,7 +31,10 @@ class WikiService < MadeleineService
   
   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)
+      mind_map_size="7,7", symbols_map=nil, links_map=nil, 
+      enable_dclick_edit=nil, 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
       @webs[new_address] = @webs[old_address]
       @webs.delete(old_address)
@@ -46,12 +50,20 @@ 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
+    web.enable_dclick_edit, web.check_pass_on_edit = enable_dclick_edit, 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
+
+    web.mm_show_authors, web.mm_show_leaves, web.mm_selected_categories = 
+      show_authors, show_leaves, selected_categories
+    
+    web.symbols_map, web.links_map = symbols_map, links_map
   end
 
   def read_page(web_address, page_name)
-    @webs[web_address].pages[page_name]
+    web = @webs[web_address]
+    web ? web.pages[page_name] : nil
   end
 
   def write_page(web_address, page_name, content, written_on, author)
@@ -60,9 +72,9 @@ class WikiService < MadeleineService
     page
   end
   
-  def revise_page(web_address, page_name, content, revised_on, author)
+  def revise_page(web_address, page_name, content, revised_on, author, edit_type)
     page = read_page(web_address, page_name)
-    page.revise(content, revised_on, author)
+    page.revise(content, revised_on, author, edit_type)
     page
   end
 
@@ -90,18 +102,21 @@ class WikiService < MadeleineService
     web.pages[new_page_name] = page
   end #}}}
   
-  def save_menu_pref(web_address, type, limit, content, category) #{{{
+  def save_menu_pref(web_address, type, limit, content, category, author) #{{{
     web = @webs[web_address]
-    web.menu_type = type
-    web.menu_limit = limit
-    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:
-      web.rendered_menu = Page.new(
+    web.menu_type              = type
+    web.menu_limit             = limit
+    web.menu_category          = category
+
+    if Page === web.menu_content
+      web.menu_content.revise( 
+        content, Time.now, '', author 
+      )
+    else
+      # Protect old Pimki storages.
+      web.menu_content = Page.new(
         web, 'menu', content, Time.now, ''
-      ).revisions.last.display_content
+      )
     end
   end #}}}