Pimki 1.7.092 → 1.8.092

data/app/models/page.rb

@@ -1,125 +1,125 @@
-require "date"
-require "page_lock"
-require "revision"
-require "wiki_words"
-require "chunks/wiki"
-
-class Page
-  include PageLock
-
-  CONTINOUS_REVISION_PERIOD = 30 * 60 # 30 minutes
-
-  attr_accessor :name, :last_visited, :viewed
-  attr_reader   :revisions, :web
-  
-  def initialize(web, name, content, created_at, author)
-    @web, @name, @revisions = web, name, []
-    revise(content, created_at, author)
-  end
-
-  def revise(content, created_at, author, edit_type='default')
-    case edit_type
-      when 'major'
-        revise_major(content, created_at, author)
-      
-      when 'minor'
-        if !@revisions.empty? # sanity check
-          revise_minor(content, created_at, author)
-        else
-          revise_major(content, created_at, author)
-        end
-        
-      when 'default'
-        if !@revisions.empty? && continous_revision?(created_at, author)
-          revise_minor(content, created_at, author)
-        else
-          revise_major(content, created_at, author)
-        end
-        
-      else
-        revise_major(content, created_at, author)
-    end
-    
-    web.refresh_pages_with_references(name) if @revisions.length == 1
-  end
-  
-  def rollback(revision_number, created_at, author_ip = nil)
-    roll_back_revision = @revisions[revision_number].dup
-    revise(roll_back_revision.content, created_at, Author.new(roll_back_revision.author, author_ip))
-  end
-  
-  def revisions?
-    revisions.length > 1
-  end
-  
-  def revised_on
-    created_on
-  end
-  
-  def pretty_revised_on
-    DateTime.new(revised_on.year, revised_on.mon, revised_on.day).strftime "%B %e, %Y" 
-  end
-  
-  def in_category?(cat)
-    cat.nil? || cat.empty? || categories.include?(cat)
-  end
-
-  def categories
-    display_content.find_chunks(Category).map { |cat| cat.list }.flatten
-  end
-  
-  def authors
-    revisions.collect { |rev| rev.author }
-  end
-
-  def references
-    web.select.pages_that_reference(name)
-  end
-  
-  def bliki_references
-    web.select_bliki.pages_that_reference(name)
-  end
-
-  # Returns the original wiki-word name as separate words, so "MyPage" becomes "My Page".
-  def plain_name
-    WikiWords.separate(name, web.brackets_only)
-  end
-
-  def link(options = {})
-    web.make_link(name, nil, options)
-  end
-  
-  def author_link(options = {})
-    web.make_link(author, nil, options)
-  end
-  
-  def last_visited()  @last_visited || revisions.last.created_at end
-  def viewed() @viewed ||= 0 end
-  
-  def has_todos?
-    not display_content.find_chunks(Todo).empty?
-  end
-  
-  private
-    def continous_revision?(created_at, author)
-      @revisions.last.author == author && @revisions.last.created_at + CONTINOUS_REVISION_PERIOD > created_at
-    end
-  
-    # Forward method calls to the current revision, so the page responds to all revision calls
-    def method_missing(method_symbol)
-      revisions.last.send(method_symbol)
-    end
-    
-    def revise_minor(content, created_at, author) #{{{
-      @revisions.last.created_at = created_at
-      @revisions.last.content    = content
-      @revisions.last.clear_display_cache
-    end #}}}
-    
-    def revise_major(content, created_at, author) #{{{
-      @revisions << Revision.new(self, @revisions.length, content, created_at, author)
-    end #}}}
-
-end
-
+require "date"
+require "page_lock"
+require "revision"
+require "wiki_words"
+require "chunks/wiki"
+
+class Page
+  include PageLock
+
+  CONTINOUS_REVISION_PERIOD = 30 * 60 # 30 minutes
+
+  attr_accessor :name, :last_visited, :viewed
+  attr_reader   :revisions, :web
+  
+  def initialize(web, name, content, created_at, author)
+    @web, @name, @revisions = web, name, []
+    revise(content, created_at, author)
+  end
+
+  def revise(content, created_at, author, edit_type='default')
+    case edit_type
+      when 'major'
+        revise_major(content, created_at, author)
+      
+      when 'minor'
+        if !@revisions.empty? # sanity check
+          revise_minor(content, created_at, author)
+        else
+          revise_major(content, created_at, author)
+        end
+        
+      when 'default'
+        if !@revisions.empty? && continous_revision?(created_at, author)
+          revise_minor(content, created_at, author)
+        else
+          revise_major(content, created_at, author)
+        end
+        
+      else
+        revise_major(content, created_at, author)
+    end
+    
+    web.refresh_pages_with_references(name) if @revisions.length == 1
+  end
+  
+  def rollback(revision_number, created_at, author_ip = nil)
+    roll_back_revision = @revisions[revision_number].dup
+    revise(roll_back_revision.content, created_at, Author.new(roll_back_revision.author, author_ip))
+  end
+  
+  def revisions?
+    revisions.length > 1
+  end
+  
+  def revised_on
+    created_on
+  end
+  
+  def pretty_revised_on
+    DateTime.new(revised_on.year, revised_on.mon, revised_on.day).strftime "%B %e, %Y" 
+  end
+  
+  def in_category?(cat)
+    cat.nil? || cat.empty? || categories.include?(cat)
+  end
+
+  def categories
+    display_content.find_chunks(Category).map { |cat| cat.list }.flatten
+  end
+  
+  def authors
+    revisions.collect { |rev| rev.author }
+  end
+
+  def references
+    web.select.pages_that_reference(name)
+  end
+  
+  def bliki_references
+    web.select_bliki.pages_that_reference(name)
+  end
+
+  # Returns the original wiki-word name as separate words, so "MyPage" becomes "My Page".
+  def plain_name
+    WikiWords.separate(name, web.brackets_only)
+  end
+
+  def link(options = {})
+    web.make_link(name, nil, options)
+  end
+  
+  def author_link(options = {})
+    web.make_link(author, nil, options)
+  end
+  
+  def last_visited()  @last_visited || revisions.last.created_at end
+  def viewed() @viewed ||= 0 end
+  
+  def has_todos?
+    not display_content.find_chunks(Todo).empty?
+  end
+  
+  private
+    def continous_revision?(created_at, author)
+      @revisions.last.author == author && @revisions.last.created_at + CONTINOUS_REVISION_PERIOD > created_at
+    end
+  
+    # Forward method calls to the current revision, so the page responds to all revision calls
+    def method_missing(method_symbol)
+      revisions.last.send(method_symbol)
+    end
+    
+    def revise_minor(content, created_at, author) #{{{
+      @revisions.last.created_at = created_at
+      @revisions.last.content    = content
+      @revisions.last.clear_display_cache
+    end #}}}
+    
+    def revise_major(content, created_at, author) #{{{
+      @revisions << Revision.new(self, @revisions.length, content, created_at, author)
+    end #}}}
+
+end
+
 # jEdit :folding=indent:collapseFolds=1:

data/app/models/revision.rb

@@ -1,92 +1,92 @@
-
-
-require "diff/diff"
-
-require "wiki_content"
-require "chunks/wiki"
-
-require "date"
-require "author"
-require "page"
-
-class Revision
-  attr_accessor :page, :number, :content, :created_at, :author
-
-  def initialize(page, number, content, created_at, author)
-    @page, @number, @created_at, @author = page, number, created_at, author
-    self.content = content
-  end
-
-  # Ensure that the wiki content is parsed when ever it is updated.
-  def content=(content)
-    @content = content
-  end
-
-  def created_on
-    Date.new(@created_at.year, @created_at.mon, @created_at.day)
-  end
-
-  def pretty_created_at
-    # Must use DateTime because Time doesn't support %e on at least some platforms
-    DateTime.new(
-      @created_at.year, @created_at.mon, @created_at.day, @created_at.hour, @created_at.min
-    ).strftime "%B %e, %Y %H:%M" 
-  end
-
-  def next_revision
-    page.revisions[number + 1]
-  end
-
-  def previous_revision
-    number - 1 >= 0 && page.revisions[number - 1]
-  end
-
-  # Returns an array of all the WikiWords present in the content of this 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
-  end  
-
-  # Returns an array of all the WikiWords present in the content of this revision.
-  # that already exists as a page in the web.
-  def existing_pages
-    wiki_words.select { |wiki_word| page.web.pages[wiki_word] }
-  end
-
-  # Returns an array of all the WikiWords present in the content of this revision
-  # that *doesn't* already exists as a page in the web.
-  def unexisting_pages
-    wiki_words - existing_pages
-  end  
-
-	# Explicit check for new type of display cache with find_chunks method.
-	# Ensures new version works with older snapshots.
-  def display_content
-    unless @display_cache && @display_cache.respond_to?(:find_chunks)
-      @display_cache = WikiContent.new(self)
-    end
-    @display_cache
-  end
-
-  def display_diff
-    previous_revision ? HTMLDiff.diff(previous_revision.display_content, display_content) : display_content
-  end
-
-  def clear_display_cache
-    @display_cache = @published_cache = @wiki_words_cache = nil
-  end
-  
-  def display_published
-    @published_cache ||= WikiContent.new(self, {:mode => :publish})
-  end
-
-  def display_content_for_export
-    WikiContent.new(self, {:mode => :export} )
-  end
-
-end
+
+
+require "diff/diff"
+
+require "wiki_content"
+require "chunks/wiki"
+
+require "date"
+require "author"
+require "page"
+
+class Revision
+  attr_accessor :page, :number, :content, :created_at, :author
+
+  def initialize(page, number, content, created_at, author)
+    @page, @number, @created_at, @author = page, number, created_at, author
+    self.content = content
+  end
+
+  # Ensure that the wiki content is parsed when ever it is updated.
+  def content=(content)
+    @content = content
+  end
+
+  def created_on
+    Date.new(@created_at.year, @created_at.mon, @created_at.day)
+  end
+
+  def pretty_created_at
+    # Must use DateTime because Time doesn't support %e on at least some platforms
+    DateTime.new(
+      @created_at.year, @created_at.mon, @created_at.day, @created_at.hour, @created_at.min
+    ).strftime "%B %e, %Y %H:%M" 
+  end
+
+  def next_revision
+    page.revisions[number + 1]
+  end
+
+  def previous_revision
+    number - 1 >= 0 && page.revisions[number - 1]
+  end
+
+  # Returns an array of all the WikiWords present in the content of this 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
+  end  
+
+  # Returns an array of all the WikiWords present in the content of this revision.
+  # that already exists as a page in the web.
+  def existing_pages
+    wiki_words.select { |wiki_word| page.web.pages[wiki_word] }
+  end
+
+  # Returns an array of all the WikiWords present in the content of this revision
+  # that *doesn't* already exists as a page in the web.
+  def unexisting_pages
+    wiki_words - existing_pages
+  end  
+
+	# Explicit check for new type of display cache with find_chunks method.
+	# Ensures new version works with older snapshots.
+  def display_content
+    unless @display_cache && @display_cache.respond_to?(:find_chunks)
+      @display_cache = WikiContent.new(self)
+    end
+    @display_cache
+  end
+
+  def display_diff
+    previous_revision ? HTMLDiff.diff(previous_revision.display_content, display_content) : display_content
+  end
+
+  def clear_display_cache
+    @display_cache = @published_cache = @wiki_words_cache = nil
+  end
+  
+  def display_published
+    @published_cache ||= WikiContent.new(self, {:mode => :publish})
+  end
+
+  def display_content_for_export
+    WikiContent.new(self, {:mode => :export} )
+  end
+
+end

data/app/models/web.rb

@@ -1,317 +1,315 @@
-require "cgi"
-require "page"
-require "page_set"
-require "wiki_words"
-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, :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
-  
-  @@BLIKI_TEMPLATE = "Try a weekly worksheet:\n\n| / | *Morning* | *Afternoon* |\n" +
-                     "| *Mon* | - | - |\n| *Tue* | - | - |\n| *Wed* | - | - |\n" +
-                     "| *Thu* | - | - |\n| *Fri* | - | - |\n"
-  
-  def bliki
-    @bliki ||= Hash.new
-  end
-  
-  def initialize(name, address, password = nil)
-    @name, @address, @password, @safe_mode = name, address, password, false
-    @pages = {}
-  end
-
-  def add_page(page)
-    @pages[page.name] = page
-  end
-
-  def remove_pages(pages_to_be_removed)
-    pages.delete_if { |page_name, page| pages_to_be_removed.include?(page) }
-  end
-  
-  def revised_on
-    pages.values.sort_by { |page| [page.created_at] }.reverse.first.created_at
-  end
-  
-  def select(&accept)
-    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
-    
-  def authors 
-    select.authors 
-  end
-
-  def categories
-    select.map { |page| page.categories }.flatten.uniq.sort
-  end
-
-  # Create a link for the given page name and link text based
-  # on the render mode in options and whether the page exists
-  # in the this web.
-  def make_link(name, text = nil, options = {})
-    page = pages[name]
-    text = text || WikiWords.separate(name)
-    link = CGI.escape(name)
-    
-    case options[:mode]
-      when :export
-        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=\"../published/#{link}\">#{text}</a>"
-        else "<span class=\"newWikiWord\">#{text}</span>" end
-      else
-        if page then "<a class=\"existingWikiWord\" href=\"../show/#{link}\">#{text}</a>"
-        else "<span class=\"newWikiWord\">#{text}<a href=\"../show/#{link}\">?</a></span>" end
-    end
-  end
-
-
-  # Clears the display cache for all the pages with references to 
-  def refresh_pages_with_references(page_name)
-    select.pages_that_reference(page_name).each { |page| 
-      page.revisions.each { |revision| revision.clear_display_cache }
-    }
-  end
-  
-  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
-  def markup()        @markup || :textile end
-  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
-  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, 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:
-      output_graph_header_to file, mm_size
-    
-      # Links and node properties:
-      nodes = filter_categories(pages.values, selected_categories)
-      auths = authors # avoid repeated selects
-      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 %{"Home Page" [color=\"##{color}\",style=bold];} if nodes.map{ |p| p.name }.include? "HomePage"
-
-      nodes.each do |page|
-        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.plain_name}" -> "#{page.plain_name}";}
-            end
-          end
-        end
-      end
-    
-      # find missing pages:
-      if missing
-        shown_missing = []
-        nodes.each do |page|
-          missing.each do |wanted|
-            if page.content =~ /#{wanted}/
-              file.puts %{"#{page.plain_name}" -> "#{WikiWords.separate wanted}";}
-              shown_missing << wanted
-            end
-          end
-        end
-        shown_missing.each do |wanted|
-          file.puts %{"#{WikiWords.separate wanted}" [URL="/#{@address}/show/#{wanted}", fontsize=10,style=filled,color=grey];}
-        end
-      end
-
-      output_graph_footer_to file
-    end
-
-    call_graphviz(prog, dotFile, mapFile, pngFile)
-    
-    [pngFile, mapFile]
-  end
-
-  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")
-    
-    File.open(dotFile, "w") do |file|
-    
-      # Graph properties:
-      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}"];}
-      end
-
-      nodes = pages.values.reject { |entry| auths.include? entry.name }
-      nodes = filter_categories(nodes, selected_categories)
-      nodes.each do |page|
-        file.puts %{"#{page.plain_name}" [URL="../show/#{page.name}"];}
-        page.authors.each do |auth|
-          file.puts %{"#{auth}" -> "#{page.plain_name}";}
-        end
-      end
-
-      output_graph_footer_to file
-    end
-
-    call_graphviz(prog, dotFile, mapFile, pngFile)
-    
-    [pngFile, mapFile]
-  end
-
-  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:
-      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}"];}
-      end
-    
-      # Links and node properties:
-      nodes = filter_categories(pages.values, selected_categories)
-      auths = authors # avoid repeated selects
-      unless show_authors
-        nodes.delete_if { |entry|
-          auths.include? entry.name
-        }
-      end
-      nodes.each do |page|
-        file.puts %{"#{page.plain_name}" [URL=\"../show/#{page.name}\"];}
-        page.categories.each do |category|
-          file.puts %{"#{category}" -> "#{page.plain_name}";}
-        end
-      end
-
-      output_graph_footer_to file
-    end
-
-    call_graphviz(prog, dotFile, mapFile, pngFile)
-    
-    [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?
-      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
-  
-  def add_bliki_entry(page)
-    bliki[page.name] = page
-  end
-  
-  def bliki_entries_by_date
-    bliki.values.sort_by { |page| page.revisions.first.created_at }.reverse
-  end
-  
-  def bliki_entries_by_name
-    pages.values.sort_by { |page| [page.name] }
-  end
-  
-  def bliki_entries_that_match(regexp)
-    bliki.values.select { |page| page.content =~ /#{regexp}/i }
-  end
-
-  def bliki_entries_that_reference(page_name)
-    bliki.values.select { |page| page.wiki_words.include?(page_name) }
-  end
-
-  def bliki_entries_authored_by(author)
-    bliki.values.select { |page| page.authors.include?(author) }
-  end
-
-  ## End bliki methods
-
-  private
-    # Returns an array of all the wiki words in any current revision
-    def wiki_words
-      pages.values.inject([]) { |wiki_words, page| wiki_words << page.wiki_words }.flatten.uniq
-    end
-    
-    # Returns an array of all the page names on this web
-    def page_names
-      pages.keys
-    end
-end
-
+require "cgi"
+require "page"
+require "page_set"
+require "wiki_words"
+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, :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
+  
+  @@BLIKI_TEMPLATE = "Try a weekly worksheet:\n\n| / | *Morning* | *Afternoon* |\n" +
+                     "| *Mon* | - | - |\n| *Tue* | - | - |\n| *Wed* | - | - |\n" +
+                     "| *Thu* | - | - |\n| *Fri* | - | - |\n"
+  
+  def bliki
+    @bliki ||= Hash.new
+  end
+  
+  def initialize(name, address, password = nil)
+    @name, @address, @password, @safe_mode = name, address, password, false
+    @pages = {}
+  end
+
+  def add_page(page)
+    @pages[page.name] = page
+  end
+
+  def remove_pages(pages_to_be_removed)
+    pages.delete_if { |page_name, page| pages_to_be_removed.include?(page) }
+  end
+  
+  def revised_on
+    pages.values.sort_by { |page| [page.created_at] }.reverse.first.created_at
+  end
+  
+  def select(&accept)
+    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
+    
+  def authors 
+    select.authors 
+  end
+
+  def categories
+    select.map { |page| page.categories }.flatten.uniq.sort
+  end
+
+  # Create a link for the given page name and link text based
+  # on the render mode in options and whether the page exists
+  # in the this web.
+  def make_link(name, text = nil, options = {})
+    page = pages[name]
+    text = text || WikiWords.separate(name)
+    link = CGI.escape(name)
+    
+    case options[:mode]
+      when :export
+        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=\"../published/#{link}\">#{text}</a>"
+        else "<span class=\"newWikiWord\">#{text}</span>" end
+      else
+        if page then "<a class=\"existingWikiWord\" href=\"../show/#{link}\">#{text}</a>"
+        else "<span class=\"newWikiWord\">#{text}<a href=\"../show/#{link}\">?</a></span>" end
+    end
+  end
+
+
+  # Clears the display cache for all the pages with references to 
+  def refresh_pages_with_references(page_name)
+    select.pages_that_reference(page_name).each { |page| 
+      page.revisions.each { |revision| revision.clear_display_cache }
+    }
+  end
+  
+  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
+  def markup()        @markup || :textile end
+  def color()         @color  || "008B26" end
+  def brackets_only() @brackets_only || false end
+  def count_pages()   @count_pages   || false 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
+  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_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, 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:
+      output_graph_header_to file, mm_size
+    
+      # Links and node properties:
+      nodes = filter_categories(pages.values, selected_categories)
+      auths = authors # avoid repeated selects
+      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 %{"Home Page" [color=\"##{color}\",style=bold];} if nodes.map{ |p| p.name }.include? "HomePage"
+
+      nodes.each do |page|
+        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.plain_name}" -> "#{page.plain_name}";}
+            end
+          end
+        end
+      end
+    
+      # find missing pages:
+      if missing
+        shown_missing = []
+        nodes.each do |page|
+          missing.each do |wanted|
+            if page.content =~ /#{wanted}/
+              file.puts %{"#{page.plain_name}" -> "#{WikiWords.separate wanted}";}
+              shown_missing << wanted
+            end
+          end
+        end
+        shown_missing.each do |wanted|
+          file.puts %{"#{WikiWords.separate wanted}" [URL="/#{@address}/show/#{wanted}", fontsize=10,style=filled,color=grey];}
+        end
+      end
+
+      output_graph_footer_to file
+    end
+
+    call_graphviz(prog, dotFile, mapFile, pngFile)
+    
+    [pngFile, mapFile]
+  end
+
+  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")
+    
+    File.open(dotFile, "w") do |file|
+    
+      # Graph properties:
+      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}"];}
+      end
+
+      nodes = pages.values.reject { |entry| auths.include? entry.name }
+      nodes = filter_categories(nodes, selected_categories)
+      nodes.each do |page|
+        file.puts %{"#{page.plain_name}" [URL="../show/#{page.name}"];}
+        page.authors.each do |auth|
+          file.puts %{"#{auth}" -> "#{page.plain_name}";}
+        end
+      end
+
+      output_graph_footer_to file
+    end
+
+    call_graphviz(prog, dotFile, mapFile, pngFile)
+    
+    [pngFile, mapFile]
+  end
+
+  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:
+      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}"];}
+      end
+    
+      # Links and node properties:
+      nodes = filter_categories(pages.values, selected_categories)
+      auths = authors # avoid repeated selects
+      unless show_authors
+        nodes.delete_if { |entry|
+          auths.include? entry.name
+        }
+      end
+      nodes.each do |page|
+        file.puts %{"#{page.plain_name}" [URL=\"../show/#{page.name}\"];}
+        page.categories.each do |category|
+          file.puts %{"#{category}" -> "#{page.plain_name}";}
+        end
+      end
+
+      output_graph_footer_to file
+    end
+
+    call_graphviz(prog, dotFile, mapFile, pngFile)
+    
+    [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?
+      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
+  
+  def add_bliki_entry(page)
+    bliki[page.name] = page
+  end
+  
+  def bliki_entries_by_date
+    bliki.values.sort_by { |page| page.revisions.first.created_at }.reverse
+  end
+  
+  def bliki_entries_by_name
+    pages.values.sort_by { |page| [page.name] }
+  end
+  
+  def bliki_entries_that_match(regexp)
+    bliki.values.select { |page| page.content =~ /#{regexp}/i }
+  end
+
+  def bliki_entries_that_reference(page_name)
+    bliki.values.select { |page| page.wiki_words.include?(page_name) }
+  end
+
+  def bliki_entries_authored_by(author)
+    bliki.values.select { |page| page.authors.include?(author) }
+  end
+
+  ## End bliki methods
+
+  private
+    # Returns an array of all the wiki words in any current revision
+    def wiki_words
+      pages.values.inject([]) { |wiki_words, page| wiki_words << page.wiki_words }.flatten.uniq
+    end
+    
+    # Returns an array of all the page names on this web
+    def page_names
+      pages.keys
+    end
+end
+
 # jEdit :folding=indent:collapseFolds=1: