Pimki 1.3.092 → 1.4.092

data/app/models/page_set.rb

@@ -1,73 +1,73 @@
-# Container for a set of pages with methods for manipulation.
-class PageSet < Array
-  attr_reader :web
-
-  def initialize(web, pages, accept_proc)
-    @web = web
-    if accept_proc.nil? then 
-      super(pages)
-    else
-      super(pages.select { |page| accept_proc[page] })
-    end
-  end
-
-  def most_recent_revision
-    self.sort_by { |page| [page.created_at] }.reverse.first.created_at
-  end
-
-  def by_name
-    self.sort_by { |page| [page.name] } 
-  end
-
-  def by_revision
-    self.sort_by { |page| [page.created_at] }.reverse 
-  end
-  
-  def by_last_visited #{{{
-    self.sort_by { |page| [page.last_visited] }.reverse
-  end #}}}
-  
-  def by_most_viewed #{{{
-    self.sort_by { |page| [page.viewed] }.reverse
-  end #}}}
-  
-
-  def pages_that_reference(page_name)
-    self.select { |page| page.wiki_words.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
-  def orphaned_pages
-    references = web.select.wiki_words + ["HomePage"] + web.select.authors
-    self.reject { |page| references.include?(page.name) } 
-  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
+# Container for a set of pages with methods for manipulation.
+class PageSet < Array
+  attr_reader :web
+
+  def initialize(web, pages, accept_proc)
+    @web = web
+    if accept_proc.nil? then 
+      super(pages)
+    else
+      super(pages.select { |page| accept_proc[page] })
+    end
+  end
+
+  def most_recent_revision
+    self.sort_by { |page| [page.created_at] }.reverse.first.created_at
+  end
+
+  def by_name
+    self.sort_by { |page| [page.name] } 
+  end
+
+  def by_revision
+    self.sort_by { |page| [page.created_at] }.reverse 
+  end
+  
+  def by_last_visited #{{{
+    self.sort_by { |page| [page.last_visited] }.reverse
+  end #}}}
+  
+  def by_most_viewed #{{{
+    self.sort_by { |page| [page.viewed] }.reverse
+  end #}}}
+  
+
+  def pages_that_reference(page_name)
+    self.select { |page| page.wiki_words.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
+  def orphaned_pages
+    references = web.select.wiki_words + ["HomePage"] + web.select.authors
+    self.reject { |page| references.include?(page.name) } 
+  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/page_test.rb

@@ -1,76 +1,76 @@
-require "test/unit"
-require "web"
-require "page"
-
-class MockWeb < Web
-  def initialize() super('test','test') end
-  def [](wiki_word) %w( MyWay ThatWay SmartEngine ).include?(wiki_word) end
-  def refresh_pages_with_references(name) end
-end
-
-class PageTest < Test::Unit::TestCase
-  def setup
-    @page = Page.new(
-      MockWeb.new,
-      "FirstPage", 
-      "HisWay would be MyWay in kinda ThatWay in HisWay though MyWay \\OverThere -- see SmartEngine in that SmartEngineGUI", 
-      Time.local(2004, 4, 4, 16, 50),
-      "DavidHeinemeierHansson"
-    )
-  end
-
-  def test_basics
-    assert_equal "First Page", @page.plain_name
-    assert_equal "April  4, 2004", @page.pretty_revised_on
-  end
-
-  def test_locking
-    assert !@page.locked?(Time.local(2004, 4, 4, 16, 50))
-
-    @page.lock(Time.local(2004, 4, 4, 16, 30), "DavidHeinemeierHansson")
-
-    assert @page.locked?(Time.local(2004, 4, 4, 16, 50))
-    assert !@page.locked?(Time.local(2004, 4, 4, 17, 1))
-
-    @page.unlock
-
-    assert !@page.locked?(Time.local(2004, 4, 4, 16, 50))
-  end
-  
-  def test_locking_duration
-    @page.lock(Time.local(2004, 4, 4, 16, 30), "DavidHeinemeierHansson")
-
-    assert_equal 15, @page.lock_duration(Time.local(2004, 4, 4, 16, 45))
-  end
-  
-  def test_revision
-    @page.revise("HisWay would be MyWay in kinda lame", Time.local(2004, 4, 4, 16, 55), "MarianneSyhler")
-    assert_equal 2, @page.revisions.length, "Should have two revisions"
-    assert_equal "MarianneSyhler", @page.author, "Mary should be the author now"
-    assert_equal "DavidHeinemeierHansson", @page.revisions.first.author, "David was the first author"
-  end
-  
-  def test_rollback
-    @page.revise("spot two", Time.now, "David")
-    @page.revise("spot three", Time.now + 2000, "David")
-    assert_equal 3, @page.revisions.length, "Should have three revisions"
-    @page.rollback(1, Time.now)
-    assert_equal "spot two", @page.content
-  end
-  
-  def test_continous_revision
-    @page.revise("HisWay would be MyWay in kinda lame", Time.local(2004, 4, 4, 16, 55), "MarianneSyhler")
-    assert_equal 2, @page.revisions.length
-
-    @page.revise("HisWay would be MyWay in kinda update", Time.local(2004, 4, 4, 16, 57), "MarianneSyhler")
-    assert_equal 2, @page.revisions.length
-    assert_equal "HisWay would be MyWay in kinda update", @page.revisions.last.content
-
-    @page.revise("HisWay would be MyWay in the house", Time.local(2004, 4, 4, 16, 58), "DavidHeinemeierHansson")
-    assert_equal 3, @page.revisions.length
-    assert_equal "HisWay would be MyWay in the house", @page.revisions.last.content
-
-    @page.revise("HisWay would be MyWay in my way", Time.local(2004, 4, 4, 17, 30), "DavidHeinemeierHansson")
-    assert_equal 4, @page.revisions.length
-  end
+require "test/unit"
+require "web"
+require "page"
+
+class MockWeb < Web
+  def initialize() super('test','test') end
+  def [](wiki_word) %w( MyWay ThatWay SmartEngine ).include?(wiki_word) end
+  def refresh_pages_with_references(name) end
+end
+
+class PageTest < Test::Unit::TestCase
+  def setup
+    @page = Page.new(
+      MockWeb.new,
+      "FirstPage", 
+      "HisWay would be MyWay in kinda ThatWay in HisWay though MyWay \\OverThere -- see SmartEngine in that SmartEngineGUI", 
+      Time.local(2004, 4, 4, 16, 50),
+      "DavidHeinemeierHansson"
+    )
+  end
+
+  def test_basics
+    assert_equal "First Page", @page.plain_name
+    assert_equal "April  4, 2004", @page.pretty_revised_on
+  end
+
+  def test_locking
+    assert !@page.locked?(Time.local(2004, 4, 4, 16, 50))
+
+    @page.lock(Time.local(2004, 4, 4, 16, 30), "DavidHeinemeierHansson")
+
+    assert @page.locked?(Time.local(2004, 4, 4, 16, 50))
+    assert !@page.locked?(Time.local(2004, 4, 4, 17, 1))
+
+    @page.unlock
+
+    assert !@page.locked?(Time.local(2004, 4, 4, 16, 50))
+  end
+  
+  def test_locking_duration
+    @page.lock(Time.local(2004, 4, 4, 16, 30), "DavidHeinemeierHansson")
+
+    assert_equal 15, @page.lock_duration(Time.local(2004, 4, 4, 16, 45))
+  end
+  
+  def test_revision
+    @page.revise("HisWay would be MyWay in kinda lame", Time.local(2004, 4, 4, 16, 55), "MarianneSyhler")
+    assert_equal 2, @page.revisions.length, "Should have two revisions"
+    assert_equal "MarianneSyhler", @page.author, "Mary should be the author now"
+    assert_equal "DavidHeinemeierHansson", @page.revisions.first.author, "David was the first author"
+  end
+  
+  def test_rollback
+    @page.revise("spot two", Time.now, "David")
+    @page.revise("spot three", Time.now + 2000, "David")
+    assert_equal 3, @page.revisions.length, "Should have three revisions"
+    @page.rollback(1, Time.now)
+    assert_equal "spot two", @page.content
+  end
+  
+  def test_continous_revision
+    @page.revise("HisWay would be MyWay in kinda lame", Time.local(2004, 4, 4, 16, 55), "MarianneSyhler")
+    assert_equal 2, @page.revisions.length
+
+    @page.revise("HisWay would be MyWay in kinda update", Time.local(2004, 4, 4, 16, 57), "MarianneSyhler")
+    assert_equal 2, @page.revisions.length
+    assert_equal "HisWay would be MyWay in kinda update", @page.revisions.last.content
+
+    @page.revise("HisWay would be MyWay in the house", Time.local(2004, 4, 4, 16, 58), "DavidHeinemeierHansson")
+    assert_equal 3, @page.revisions.length
+    assert_equal "HisWay would be MyWay in the house", @page.revisions.last.content
+
+    @page.revise("HisWay would be MyWay in my way", Time.local(2004, 4, 4, 17, 30), "DavidHeinemeierHansson")
+    assert_equal 4, @page.revisions.length
+  end
 end

data/app/models/revision.rb

@@ -1,4 +1,5 @@
 
+
 require "diff/diff"
 
 require "wiki_content"
@@ -65,7 +66,6 @@ class Revision
 	# Ensures new version works with older snapshots.
   def display_content
     unless @display_cache && @display_cache.respond_to?(:find_chunks)
-      #$stderr << "Rendering: #{page.name}\n"
       @display_cache = WikiContent.new(self)
     end
     @display_cache

data/app/models/revision_test.rb

@@ -1,252 +1,252 @@
-require "web"
-require "test/unit"
-require "revision"
-
-class MockWeb < Web; 
-  attr_accessor :markup
-  def pages() MockPages.new end
-  def safe_mode() false end
-end
-class MockPages
-  def [](wiki_word) %w( MyWay ThatWay SmartEngine ).include?(wiki_word) end
-end
-class MockPage
-  attr_accessor :web, :revisions
-  def name() "page" end
-end
-
-class RevisionTest < Test::Unit::TestCase
-
-  def setup
-    @mock_page = MockPage.new
-    @mock_web  = MockWeb.new
-    @mock_page.web = @mock_web
-
-    @mock_web.markup = :textile
-
-    @revision = Revision.new(
-      @mock_page,
-      1,
-      "HisWay would be MyWay in kinda ThatWay in HisWay though MyWay \\OverThere -- see SmartEngine in that SmartEngineGUI", 
-      Time.local(2004, 4, 4, 16, 50),
-      "DavidHeinemeierHansson"
-    )
-    
-    @revision_with_auto_links = Revision.new(
-      @mock_page,
-      1,
-      "http://www.loudthinking.com/ points to ThatWay from david@loudthinking.com", 
-      Time.local(2004, 4, 4, 16, 50),
-      "DavidHeinemeierHansson"
-    )
-
-	@revision_with_aliased_links = Revision.new(
-	  @mock_page,
-	  1,
-      "Would a [[SmartEngine|clever motor]] go by any other name?",
-      Time.local(2004, 4, 4, 16, 50),
-      "MarkReid"
-	)
-
-	@revision_with_wiki_word_in_em = Revision.new(
-	  @mock_page,
-	  1,
-      "_should we go ThatWay or ThisWay _",
-      Time.local(2004, 4, 4, 16, 50),
-      "MarkReid"      
-    )
-
-	@revision_with_pre_blocks = Revision.new(
-	  @mock_page,
-	  1,
-      "A <code>class SmartEngine end</code> would not mark up <pre>CodeBlocks</pre>",
-      Time.local(2004, 4, 4, 16, 50),
-      "MarkReid"
-	)
-
-	@revision_with_wikiword_in_tag = Revision.new(
-	  @mock_page,
-	  1,
-      "That is some <em style=\"WikiWord\">Stylish Emphasis</em>",
-      Time.local(2004, 4, 4, 16, 50),
-      "MarkReid"
-	)
-
-	@revision_with_autolink_in_parentheses = Revision.new(
-	  @mock_page,
-      1,
-      'The W3C body (http://www.w3c.org) sets web standards',
-      Time.local(2004, 4, 4, 16, 50),
-      "MarkReid"														 
-	)
-
-	@revision_with_link_in_parentheses = Revision.new(
-	  @mock_page,
-      1,
-      'Instiki is a "Wiki Clone":http://www.c2.com/cgi/wiki?WikiWikiClones ("What is a wiki?":http://wiki.org/wiki.cgi?WhatIsWiki) that\'s so easy to setup',
-	  Time.local(2004, 4, 4, 16, 50),
-      "MarkReid"
-    )
-
-	@revision_with_image_link = Revision.new(
-	  @mock_page,
-      1,
-      'This !http://hobix.com/sample.jpg! is a Textile image link.',
-	  Time.local(2004, 4, 4, 16, 50),
-      "MarkReid"
-    )
-
-	@revision_with_nowiki_text = Revision.new(
-	  @mock_page,
-	  1,
-	  'Do not mark up <nowiki>[[this text]]</nowiki> or <nowiki>http://www.thislink.com</nowiki>.',
-	  Time.local(2004, 4, 4, 16, 50),
-	  "MarkReid"
-	)
-
-	@revision_with_bracketted_wiki_word = Revision.new(
-	  @mock_page,
-	  1,
-	  'This is a WikiWord and a tricky name [[Sperberg-McQueen]].',
-	  Time.local(2004, 4, 4, 16, 50),
-	  "MarkReid"
-    )
-
-  end
-
-  def test_wiki_words
-    assert_equal %w( HisWay MyWay SmartEngine SmartEngineGUI ThatWay ), @revision.wiki_words.sort
-  end
-  
-  def test_existing_pages
-    assert_equal %w( MyWay SmartEngine ThatWay ), @revision.existing_pages.sort
-  end
-  
-  def test_unexisting_pages
-    assert_equal %w( HisWay SmartEngineGUI ), @revision.unexisting_pages.sort
-  end
-  
-  def test_content_with_wiki_links
-    assert_equal "<p><span class=\"newWikiWord\">His Way<a href=\"../show/HisWay\">?</a></span> would be <a class=\"existingWikiWord\" href=\"../show/MyWay\">My Way</a> in kinda <a class=\"existingWikiWord\" href=\"../show/ThatWay\">That Way</a> in <span class=\"newWikiWord\">His Way<a href=\"../show/HisWay\">?</a></span> though <a class=\"existingWikiWord\" href=\"../show/MyWay\">My Way</a> OverThere&#8212;see <a class=\"existingWikiWord\" href=\"../show/SmartEngine\">Smart Engine</a> in that <span class=\"newWikiWord\">Smart Engine <span class=\"caps\">GUI</span><a href=\"../show/SmartEngineGUI\">?</a></span></p>", @revision.display_content
-  end
-
-  def test_bluecloth
-    @mock_web.markup = :markdown
-
-    @revision = Revision.new(
-      @mock_page,
-      1,
-      "My Headline\n===========\n\n that SmartEngineGUI", 
-      Time.local(2004, 4, 4, 16, 50),
-      "DavidHeinemeierHansson"
-    )
-
-    @revision_with_code_block = Revision.new(
-      @mock_page,
-      1,
-      "This is a code block:\n    def a_method(arg)\n    return ThatWay\n\nNice!",
-      Time.local(2004, 4, 4, 16, 50),
-      "MarkReid"      
-    )
-
-    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
-  end
-
-  def test_rdoc
-    @mock_web.markup = :rdoc
-
-    @revision = Revision.new(
-      @mock_page,
-      1,
-      "+hello+ that SmartEngineGUI", 
-      Time.local(2004, 4, 4, 16, 50),
-      "DavidHeinemeierHansson"
-    )
-
-    assert_equal "<tt>hello</tt> that <span class=\"newWikiWord\">Smart Engine GUI<a href=\"../show/SmartEngineGUI\">?</a></span>\n\n", @revision.display_content
-  end
-  
-  def test_content_with_auto_links
-    assert_equal "<p><a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a> points to <a class=\"existingWikiWord\" href=\"../show/ThatWay\">That Way</a> from <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a></p>", @revision_with_auto_links.display_content
-  end  
-
-  def test_content_with_aliased_links
-	assert_equal "<p>Would a <a class=\"existingWikiWord\" href=\"../show/SmartEngine\">clever motor</a> go by any other name?</p>", @revision_with_aliased_links.display_content
-  end
-
-  def test_content_with_wikiword_in_em
-	assert_equal "<p><em>should we go <a class=\"existingWikiWord\" href=\"../show/ThatWay\">That Way</a> or <span class=\"newWikiWord\">This Way<a href=\"../show/ThisWay\">?</a></span> </em></p>", @revision_with_wiki_word_in_em.display_content
-  end
-
-  def test_content_with_wikiword_in_tag
-    assert_equal "<p>That is some <em style=\"WikiWord\">Stylish Emphasis</em></p>", @revision_with_wikiword_in_tag.display_content
-  end
-
-  def test_content_with_pre_blocks
-	assert_equal "A <code>class SmartEngine end</code> would not mark up <pre>CodeBlocks</pre>", @revision_with_pre_blocks.display_content
-  end
-
-  def test_content_with_autolink_in_parentheses
-	assert_equal '<p>The <span class="caps">W3C</span> body (<a href="http://www.w3c.org">http://www.w3c.org</a>) sets web standards</p>', @revision_with_autolink_in_parentheses.display_content
-  end
-
-  def test_content_with_link_in_parentheses
-	assert_equal '<p>Instiki is a <a href="http://www.c2.com/cgi/wiki?WikiWikiClones">Wiki Clone</a> (<a href="http://wiki.org/wiki.cgi?WhatIsWiki">What is a wiki?</a>) that&#8217;s so easy to setup</p>', @revision_with_link_in_parentheses.display_content
-  end
-
-  def test_content_with_image_link
-	assert_equal '<p>This <img src="http://hobix.com/sample.jpg" alt="" /> is a Textile image link.</p>', @revision_with_image_link.display_content
-  end
-
-  def test_content_with_nowiki_text
-	assert_equal '<p>Do not mark up [[this text]] or http://www.thislink.com.</p>', @revision_with_nowiki_text.display_content
-  end
-
-  def test_content_with_bracketted_wiki_word
-	@mock_web.brackets_only = true
-	assert_equal '<p>This is a WikiWord and a tricky name <span class="newWikiWord">Sperberg-McQueen<a href="../show/Sperberg-McQueen">?</a></span>.</p>', @revision_with_bracketted_wiki_word.display_content
-  end
-
-  def test_content_for_export
-    assert_equal "<p><span class=\"newWikiWord\">His Way</span> would be <a class=\"existingWikiWord\" href=\"MyWay.html\">My Way</a> in kinda <a class=\"existingWikiWord\" href=\"ThatWay.html\">That Way</a> in <span class=\"newWikiWord\">His Way</span> though <a class=\"existingWikiWord\" href=\"MyWay.html\">My Way</a> OverThere&#8212;see <a class=\"existingWikiWord\" href=\"SmartEngine.html\">Smart Engine</a> in that <span class=\"newWikiWord\">Smart Engine <span class=\"caps\">GUI</span></span></p>", @revision.display_content_for_export
-  end
-
-  def test_double_replacing
-    @revision.content = "VersionHistory\r\n\r\ncry VersionHistory"
-    assert_equal(
-      "<p><span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a></span></p>\n\n\t<p>cry <span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a></span></p>", 
-      @revision.display_content
-    )
-
-    @revision.clear_display_cache
-
-    @revision.content = "f\r\nVersionHistory\r\n\r\ncry VersionHistory"
-    assert_equal(
-      "<p>f<br />\n<span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a></span></p>\n\n\t<p>cry <span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a></span></p>", 
-      @revision.display_content
-    )
-  end  
-
-  def test_difficult_wiki_words
-    @revision.content = "[[It's just awesome GUI!]]"
-    assert_equal(
-      "<p><span class=\"newWikiWord\">It&#8217;s just awesome <span class=\"caps\">GUI</span>!<a href=\"../show/It%27s+just+awesome+GUI%21\">?</a></span></p>", 
-      @revision.display_content
-    )
-  end
-  
-  def test_revisions_diff
-    page = MockPage.new
-    web  = MockWeb.new
-    web.markup = :textile
-    page.web = web
-
-    page.revisions = [ 0 ] 
-    page.revisions << Revision.new(page, 1, "What a blue and lovely morning", Time.local(2004, 4, 4, 16, 50), "DavidHeinemeierHansson")
-    page.revisions << Revision.new(page, 2, "What a red and lovely morning today", Time.local(2004, 4, 4, 16, 50), "DavidHeinemeierHansson")
-    
-    assert_equal "<p>What a <del class=\"diffmod\">blue </del><ins class=\"diffmod\">red </ins>and lovely <del class=\"diffmod\">morning</del><ins class=\"diffmod\">morning today</ins></p>", page.revisions.last.display_diff
-  end
+require "web"
+require "test/unit"
+require "revision"
+
+class MockWeb < Web; 
+  attr_accessor :markup
+  def pages() MockPages.new end
+  def safe_mode() false end
+end
+class MockPages
+  def [](wiki_word) %w( MyWay ThatWay SmartEngine ).include?(wiki_word) end
+end
+class MockPage
+  attr_accessor :web, :revisions
+  def name() "page" end
+end
+
+class RevisionTest < Test::Unit::TestCase
+
+  def setup
+    @mock_page = MockPage.new
+    @mock_web  = MockWeb.new
+    @mock_page.web = @mock_web
+
+    @mock_web.markup = :textile
+
+    @revision = Revision.new(
+      @mock_page,
+      1,
+      "HisWay would be MyWay in kinda ThatWay in HisWay though MyWay \\OverThere -- see SmartEngine in that SmartEngineGUI", 
+      Time.local(2004, 4, 4, 16, 50),
+      "DavidHeinemeierHansson"
+    )
+    
+    @revision_with_auto_links = Revision.new(
+      @mock_page,
+      1,
+      "http://www.loudthinking.com/ points to ThatWay from david@loudthinking.com", 
+      Time.local(2004, 4, 4, 16, 50),
+      "DavidHeinemeierHansson"
+    )
+
+	@revision_with_aliased_links = Revision.new(
+	  @mock_page,
+	  1,
+      "Would a [[SmartEngine|clever motor]] go by any other name?",
+      Time.local(2004, 4, 4, 16, 50),
+      "MarkReid"
+	)
+
+	@revision_with_wiki_word_in_em = Revision.new(
+	  @mock_page,
+	  1,
+      "_should we go ThatWay or ThisWay _",
+      Time.local(2004, 4, 4, 16, 50),
+      "MarkReid"      
+    )
+
+	@revision_with_pre_blocks = Revision.new(
+	  @mock_page,
+	  1,
+      "A <code>class SmartEngine end</code> would not mark up <pre>CodeBlocks</pre>",
+      Time.local(2004, 4, 4, 16, 50),
+      "MarkReid"
+	)
+
+	@revision_with_wikiword_in_tag = Revision.new(
+	  @mock_page,
+	  1,
+      "That is some <em style=\"WikiWord\">Stylish Emphasis</em>",
+      Time.local(2004, 4, 4, 16, 50),
+      "MarkReid"
+	)
+
+	@revision_with_autolink_in_parentheses = Revision.new(
+	  @mock_page,
+      1,
+      'The W3C body (http://www.w3c.org) sets web standards',
+      Time.local(2004, 4, 4, 16, 50),
+      "MarkReid"														 
+	)
+
+	@revision_with_link_in_parentheses = Revision.new(
+	  @mock_page,
+      1,
+      'Instiki is a "Wiki Clone":http://www.c2.com/cgi/wiki?WikiWikiClones ("What is a wiki?":http://wiki.org/wiki.cgi?WhatIsWiki) that\'s so easy to setup',
+	  Time.local(2004, 4, 4, 16, 50),
+      "MarkReid"
+    )
+
+	@revision_with_image_link = Revision.new(
+	  @mock_page,
+      1,
+      'This !http://hobix.com/sample.jpg! is a Textile image link.',
+	  Time.local(2004, 4, 4, 16, 50),
+      "MarkReid"
+    )
+
+	@revision_with_nowiki_text = Revision.new(
+	  @mock_page,
+	  1,
+	  'Do not mark up <nowiki>[[this text]]</nowiki> or <nowiki>http://www.thislink.com</nowiki>.',
+	  Time.local(2004, 4, 4, 16, 50),
+	  "MarkReid"
+	)
+
+	@revision_with_bracketted_wiki_word = Revision.new(
+	  @mock_page,
+	  1,
+	  'This is a WikiWord and a tricky name [[Sperberg-McQueen]].',
+	  Time.local(2004, 4, 4, 16, 50),
+	  "MarkReid"
+    )
+
+  end
+
+  def test_wiki_words
+    assert_equal %w( HisWay MyWay SmartEngine SmartEngineGUI ThatWay ), @revision.wiki_words.sort
+  end
+  
+  def test_existing_pages
+    assert_equal %w( MyWay SmartEngine ThatWay ), @revision.existing_pages.sort
+  end
+  
+  def test_unexisting_pages
+    assert_equal %w( HisWay SmartEngineGUI ), @revision.unexisting_pages.sort
+  end
+  
+  def test_content_with_wiki_links
+    assert_equal "<p><span class=\"newWikiWord\">His Way<a href=\"../show/HisWay\">?</a></span> would be <a class=\"existingWikiWord\" href=\"../show/MyWay\">My Way</a> in kinda <a class=\"existingWikiWord\" href=\"../show/ThatWay\">That Way</a> in <span class=\"newWikiWord\">His Way<a href=\"../show/HisWay\">?</a></span> though <a class=\"existingWikiWord\" href=\"../show/MyWay\">My Way</a> OverThere&#8212;see <a class=\"existingWikiWord\" href=\"../show/SmartEngine\">Smart Engine</a> in that <span class=\"newWikiWord\">Smart Engine <span class=\"caps\">GUI</span><a href=\"../show/SmartEngineGUI\">?</a></span></p>", @revision.display_content
+  end
+
+  def test_bluecloth
+    @mock_web.markup = :blue_markdown
+
+    @revision = Revision.new(
+      @mock_page,
+      1,
+      "My Headline\n===========\n\n that SmartEngineGUI", 
+      Time.local(2004, 4, 4, 16, 50),
+      "DavidHeinemeierHansson"
+    )
+
+    @revision_with_code_block = Revision.new(
+      @mock_page,
+      1,
+      "This is a code block:\n    def a_method(arg)\n    return ThatWay\n\nNice!",
+      Time.local(2004, 4, 4, 16, 50),
+      "MarkReid"      
+    )
+
+    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
+  end
+
+  def test_rdoc
+    @mock_web.markup = :rdoc
+
+    @revision = Revision.new(
+      @mock_page,
+      1,
+      "+hello+ that SmartEngineGUI", 
+      Time.local(2004, 4, 4, 16, 50),
+      "DavidHeinemeierHansson"
+    )
+
+    assert_equal "<tt>hello</tt> that <span class=\"newWikiWord\">Smart Engine GUI<a href=\"../show/SmartEngineGUI\">?</a></span>\n\n", @revision.display_content
+  end
+  
+  def test_content_with_auto_links
+    assert_equal "<p><a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a> points to <a class=\"existingWikiWord\" href=\"../show/ThatWay\">That Way</a> from <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a></p>", @revision_with_auto_links.display_content
+  end  
+
+  def test_content_with_aliased_links
+	assert_equal "<p>Would a <a class=\"existingWikiWord\" href=\"../show/SmartEngine\">clever motor</a> go by any other name?</p>", @revision_with_aliased_links.display_content
+  end
+
+  def test_content_with_wikiword_in_em
+	assert_equal "<p><em>should we go <a class=\"existingWikiWord\" href=\"../show/ThatWay\">That Way</a> or <span class=\"newWikiWord\">This Way<a href=\"../show/ThisWay\">?</a></span> </em></p>", @revision_with_wiki_word_in_em.display_content
+  end
+
+  def test_content_with_wikiword_in_tag
+    assert_equal "<p>That is some <em style=\"WikiWord\">Stylish Emphasis</em></p>", @revision_with_wikiword_in_tag.display_content
+  end
+
+  def test_content_with_pre_blocks
+	assert_equal "A <code>class SmartEngine end</code> would not mark up <pre>CodeBlocks</pre>", @revision_with_pre_blocks.display_content
+  end
+
+  def test_content_with_autolink_in_parentheses
+	assert_equal '<p>The <span class="caps">W3C</span> body (<a href="http://www.w3c.org">http://www.w3c.org</a>) sets web standards</p>', @revision_with_autolink_in_parentheses.display_content
+  end
+
+  def test_content_with_link_in_parentheses
+	assert_equal '<p>Instiki is a <a href="http://www.c2.com/cgi/wiki?WikiWikiClones">Wiki Clone</a> (<a href="http://wiki.org/wiki.cgi?WhatIsWiki">What is a wiki?</a>) that&#8217;s so easy to setup</p>', @revision_with_link_in_parentheses.display_content
+  end
+
+  def test_content_with_image_link
+	assert_equal '<p>This <img src="http://hobix.com/sample.jpg" alt="" /> is a Textile image link.</p>', @revision_with_image_link.display_content
+  end
+
+  def test_content_with_nowiki_text
+	assert_equal '<p>Do not mark up [[this text]] or http://www.thislink.com.</p>', @revision_with_nowiki_text.display_content
+  end
+
+  def test_content_with_bracketted_wiki_word
+	@mock_web.brackets_only = true
+	assert_equal '<p>This is a WikiWord and a tricky name <span class="newWikiWord">Sperberg-McQueen<a href="../show/Sperberg-McQueen">?</a></span>.</p>', @revision_with_bracketted_wiki_word.display_content
+  end
+
+  def test_content_for_export
+    assert_equal "<p><span class=\"newWikiWord\">His Way</span> would be <a class=\"existingWikiWord\" href=\"MyWay.html\">My Way</a> in kinda <a class=\"existingWikiWord\" href=\"ThatWay.html\">That Way</a> in <span class=\"newWikiWord\">His Way</span> though <a class=\"existingWikiWord\" href=\"MyWay.html\">My Way</a> OverThere&#8212;see <a class=\"existingWikiWord\" href=\"SmartEngine.html\">Smart Engine</a> in that <span class=\"newWikiWord\">Smart Engine <span class=\"caps\">GUI</span></span></p>", @revision.display_content_for_export
+  end
+
+  def test_double_replacing
+    @revision.content = "VersionHistory\r\n\r\ncry VersionHistory"
+    assert_equal(
+      "<p><span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a></span></p>\n\n\t<p>cry <span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a></span></p>", 
+      @revision.display_content
+    )
+
+    @revision.clear_display_cache
+
+    @revision.content = "f\r\nVersionHistory\r\n\r\ncry VersionHistory"
+    assert_equal(
+      "<p>f<br />\n<span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a></span></p>\n\n\t<p>cry <span class=\"newWikiWord\">Version History<a href=\"../show/VersionHistory\">?</a></span></p>", 
+      @revision.display_content
+    )
+  end  
+
+  def test_difficult_wiki_words
+    @revision.content = "[[It's just awesome GUI!]]"
+    assert_equal(
+      "<p><span class=\"newWikiWord\">It&#8217;s just awesome <span class=\"caps\">GUI</span>!<a href=\"../show/It%27s+just+awesome+GUI%21\">?</a></span></p>", 
+      @revision.display_content
+    )
+  end
+  
+  def test_revisions_diff
+    page = MockPage.new
+    web  = MockWeb.new
+    web.markup = :textile
+    page.web = web
+
+    page.revisions = [ 0 ] 
+    page.revisions << Revision.new(page, 1, "What a blue and lovely morning", Time.local(2004, 4, 4, 16, 50), "DavidHeinemeierHansson")
+    page.revisions << Revision.new(page, 2, "What a red and lovely morning today", Time.local(2004, 4, 4, 16, 50), "DavidHeinemeierHansson")
+    
+    assert_equal "<p>What a <del class=\"diffmod\">blue </del><ins class=\"diffmod\">red </ins>and lovely <del class=\"diffmod\">morning</del><ins class=\"diffmod\">morning today</ins></p>", page.revisions.last.display_diff
+  end
 end