instiki 0.10.0 → 0.10.1

data/app/models/page_lock.rb

@@ -1,23 +1,23 @@
-# Contains all the lock methods to be mixed in with the page
-module PageLock
-  LOCKING_PERIOD = 30 * 60 # 30 minutes
-
-  attr_reader :locked_by
-
-  def lock(time, locked_by)
-    @locked_at, @locked_by = time, locked_by
-  end
-  
-  def lock_duration(time)
-    ((time - @locked_at) / 60).to_i unless @locked_at.nil?
-  end
-  
-  def unlock
-    @locked_at = nil
-  end
-  
-  def locked?(comparison_time)
-    @locked_at + LOCKING_PERIOD > comparison_time unless @locked_at.nil?
-  end
-
+# Contains all the lock methods to be mixed in with the page
+module PageLock
+  LOCKING_PERIOD = 30 * 60 # 30 minutes
+
+  attr_reader :locked_by
+
+  def lock(time, locked_by)
+    @locked_at, @locked_by = time, locked_by
+  end
+  
+  def lock_duration(time)
+    ((time - @locked_at) / 60).to_i unless @locked_at.nil?
+  end
+  
+  def unlock
+    @locked_at = nil
+  end
+  
+  def locked?(comparison_time)
+    @locked_at + LOCKING_PERIOD > comparison_time unless @locked_at.nil?
+  end
+
 end

data/app/models/page_set.rb

@@ -1,89 +1,89 @@
-# Container for a set of pages with methods for manipulation.
-
-class PageSet < Array
-  attr_reader :web
-
-  def initialize(web, pages = nil, condition = nil)
-    @web = web
-    # if pages is not specified, make a list of all pages in the web
-    if pages.nil?
-      super(web.pages.values)
-    # otherwise use specified pages and condition to produce a set of pages
-    elsif condition.nil?
-      super(pages)
-    else
-      super(pages.select { |page| condition[page] })
-    end
-  end
-
-  def most_recent_revision
-    self.map { |page| page.created_at }.max || Time.at(0)
-  end
-
-
-  def by_name
-    PageSet.new(@web, sort_by { |page| page.name })
-  end
-
-  alias :sort :by_name
-
-  def by_revision
-    PageSet.new(@web, sort_by { |page| page.created_at }).reverse 
-  end
-  
-  def pages_that_reference(page_name)
-    self.select { |page| page.wiki_references.include?(page_name) }
-  end
-  
-  def pages_that_link_to(page_name)
-    self.select { |page| page.wiki_words.include?(page_name) }
-  end
-
-  def pages_that_include(page_name)
-    self.select { |page| page.wiki_includes.include?(page_name) }
-  end
-
-  def pages_authored_by(author)
-    self.select { |page| page.authors.include?(author) }
-  end
-
-  def characters
-    self.inject(0) { |chars,page| chars += page.content.size }
-  end
-
-  # Returns all the orphaned pages in this page set. That is,
-  # pages in this set for which there is no reference in the web.
-  # The HomePage and author pages are always assumed to have
-  # references and so cannot be orphans
-  # Pages that refer to themselves and have no links from outside are oprphans.
-  def orphaned_pages
-    never_orphans = web.select.authors + ['HomePage']
-    self.select { |page|
-      if never_orphans.include? page.name
-        false
-      else
-        references = pages_that_reference(page.name)
-        references.empty? or references == [page]
-      end
-    }
-  end
-
-  # Returns all the wiki words in this page set for which
-  # there are no pages in this page set's web
-  def wanted_pages
-    wiki_words - web.select.names
-  end
-
-  def names
-    self.map { |page| page.name }
-  end
-
-  def wiki_words
-    self.inject([]) { |wiki_words, page| wiki_words << page.wiki_words }.flatten.uniq
-  end
-
-  def authors
-    self.inject([]) { |authors, page| authors << page.authors }.flatten.uniq.sort
-  end
-
-end
+# Container for a set of pages with methods for manipulation.
+
+class PageSet < Array
+  attr_reader :web
+
+  def initialize(web, pages = nil, condition = nil)
+    @web = web
+    # if pages is not specified, make a list of all pages in the web
+    if pages.nil?
+      super(web.pages.values)
+    # otherwise use specified pages and condition to produce a set of pages
+    elsif condition.nil?
+      super(pages)
+    else
+      super(pages.select { |page| condition[page] })
+    end
+  end
+
+  def most_recent_revision
+    self.map { |page| page.created_at }.max || Time.at(0)
+  end
+
+
+  def by_name
+    PageSet.new(@web, sort_by { |page| page.name })
+  end
+
+  alias :sort :by_name
+
+  def by_revision
+    PageSet.new(@web, sort_by { |page| page.created_at }).reverse 
+  end
+  
+  def pages_that_reference(page_name)
+    self.select { |page| page.wiki_references.include?(page_name) }
+  end
+  
+  def pages_that_link_to(page_name)
+    self.select { |page| page.wiki_words.include?(page_name) }
+  end
+
+  def pages_that_include(page_name)
+    self.select { |page| page.wiki_includes.include?(page_name) }
+  end
+
+  def pages_authored_by(author)
+    self.select { |page| page.authors.include?(author) }
+  end
+
+  def characters
+    self.inject(0) { |chars,page| chars += page.content.size }
+  end
+
+  # Returns all the orphaned pages in this page set. That is,
+  # pages in this set for which there is no reference in the web.
+  # The HomePage and author pages are always assumed to have
+  # references and so cannot be orphans
+  # Pages that refer to themselves and have no links from outside are oprphans.
+  def orphaned_pages
+    never_orphans = web.select.authors + ['HomePage']
+    self.select { |page|
+      if never_orphans.include? page.name
+        false
+      else
+        references = pages_that_reference(page.name)
+        references.empty? or references == [page]
+      end
+    }
+  end
+
+  # Returns all the wiki words in this page set for which
+  # there are no pages in this page set's web
+  def wanted_pages
+    wiki_words - web.select.names
+  end
+
+  def names
+    self.map { |page| page.name }
+  end
+
+  def wiki_words
+    self.inject([]) { |wiki_words, page| wiki_words << page.wiki_words }.flatten.uniq
+  end
+
+  def authors
+    self.inject([]) { |authors, page| authors << page.authors }.flatten.uniq.sort
+  end
+
+end

data/app/models/revision.rb

@@ -1,123 +1,123 @@
-require '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
-    @display_cache = nil
-  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 > 0 ? page.revisions[number - 1] : nil
-  end
-
-  # Returns an array of all the WikiIncludes present in the content of this revision.
-  def wiki_includes
-    unless @wiki_includes_cache 
-      chunks = display_content.find_chunks(Include)
-      @wiki_includes_cache = chunks.map { |c| ( c.escaped? ? nil : c.page_name ) }.compact.uniq
-    end
-    @wiki_includes_cache
-  end  
-
-  # Returns an array of all the WikiReferences present in the content of this revision.
-  def wiki_references
-    unless @wiki_references_cache 
-      chunks = display_content.find_chunks(WikiChunk::WikiReference)
-      @wiki_references_cache = chunks.map { |c| ( c.escaped? ? nil : c.page_name ) }.compact.uniq
-    end
-    @wiki_references_cache
-  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)
-      @wiki_words_cache = wiki_chunks.map { |c| ( c.escaped? ? 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 chunks_by_type method.
-  # Ensures new version works with older snapshots.
-  def display_content
-    unless @display_cache && @display_cache.respond_to?(:chunks_by_type)
-      @display_cache = WikiContent.new(self)
-      @display_cache.render!
-    end
-    @display_cache
-  end
-
-  def display_diff
-    previous_revision ? HTMLDiff.diff(previous_revision.display_content, display_content) : display_content
-  end
-
-  def clear_display_cache
-    @wiki_words_cache = @published_cache = @display_cache = @wiki_includes_cache = 
-      @wiki_references_cache = nil
-  end
-
-  def display_published
-    unless @published_cache && @published_cache.respond_to?(:chunks_by_type)
-      @published_cache = WikiContent.new(self, {:mode => :publish})
-      @published_cache.render!
-    end
-    @published_cache
-  end
-
-  def display_content_for_export
-    WikiContent.new(self, {:mode => :export} ).render!
-  end
-  
-  def force_rendering
-    begin
-      display_content.render!
-    rescue Exception => e
-      ApplicationController.logger.error "Failed rendering page #{@name}"
-      ApplicationController.logger.error e
-      message = e.message.gsub(/\n/, '<br/>')
-      # substitute content with an error message
-      content = <<-EOL
-          <p>Markup engine has failed to render this page, raising the following error:</p>
-          <p>#{message}</p>
-      EOL
-      raise e
-    end
-  end
-
-end
+require '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
+    @display_cache = nil
+  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 > 0 ? page.revisions[number - 1] : nil
+  end
+
+  # Returns an array of all the WikiIncludes present in the content of this revision.
+  def wiki_includes
+    unless @wiki_includes_cache 
+      chunks = display_content.find_chunks(Include)
+      @wiki_includes_cache = chunks.map { |c| ( c.escaped? ? nil : c.page_name ) }.compact.uniq
+    end
+    @wiki_includes_cache
+  end  
+
+  # Returns an array of all the WikiReferences present in the content of this revision.
+  def wiki_references
+    unless @wiki_references_cache 
+      chunks = display_content.find_chunks(WikiChunk::WikiReference)
+      @wiki_references_cache = chunks.map { |c| ( c.escaped? ? nil : c.page_name ) }.compact.uniq
+    end
+    @wiki_references_cache
+  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)
+      @wiki_words_cache = wiki_chunks.map { |c| ( c.escaped? ? 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 chunks_by_type method.
+  # Ensures new version works with older snapshots.
+  def display_content
+    unless @display_cache && @display_cache.respond_to?(:chunks_by_type)
+      @display_cache = WikiContent.new(self)
+      @display_cache.render!
+    end
+    @display_cache
+  end
+
+  def display_diff
+    previous_revision ? HTMLDiff.diff(previous_revision.display_content, display_content) : display_content
+  end
+
+  def clear_display_cache
+    @wiki_words_cache = @published_cache = @display_cache = @wiki_includes_cache = 
+      @wiki_references_cache = nil
+  end
+
+  def display_published
+    unless @published_cache && @published_cache.respond_to?(:chunks_by_type)
+      @published_cache = WikiContent.new(self, {:mode => :publish})
+      @published_cache.render!
+    end
+    @published_cache
+  end
+
+  def display_content_for_export
+    WikiContent.new(self, {:mode => :export} ).render!
+  end
+  
+  def force_rendering
+    begin
+      display_content.render!
+    rescue Exception => e
+      ApplicationController.logger.error "Failed rendering page #{@name}"
+      ApplicationController.logger.error e
+      message = e.message.gsub(/\n/, '<br/>')
+      # substitute content with an error message
+      content = <<-EOL
+          <p>Markup engine has failed to render this page, raising the following error:</p>
+          <p>#{message}</p>
+      EOL
+      raise e
+    end
+  end
+
+end