motiro 0.6.5 → 0.6.6

data/README

@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 --------------------------------------------------------------------------------
-Motiro version 0.6.5 - May 2007
+Motiro version 0.6.6 - June 2007
 
 Please refer to your preferred language README. Every text file below this
 directory is UTF-8 encoded. Please make sure to set up your reader accordingly.

data/app/controllers/report_controller.rb

@@ -30,12 +30,6 @@ class ReportController < ApplicationController
     end
   end
 
-  before_filter(:only => [:rss, :list]) do |me|
-    me.instance_eval do
-      @headlines = @chief_editor.latest_news_from @name
-    end
-  end
-  
   before_filter :drop_crumbs
   
   def initialize(chief_editor=ChiefEditor.new)
@@ -76,4 +70,14 @@ class ReportController < ApplicationController
                   :reporter => @name, :id => @headline.rid}}
   end
   
+  def list
+    @headlines = @chief_editor.latest_news_from(@name)
+    
+    respond_to do |format|
+      format.html
+      format.xml { render :action => 'rss'
+                   cache_page }
+    end
+  end
+
 end

data/app/controllers/wiki_controller.rb

@@ -23,10 +23,12 @@ class WikiController < ApplicationController
   before_filter :fetch_page, :fetch_revision
   before_filter :check_edit_access, :only => [:edit, :save]
   
-  cache_sweeper :page_sweeper, :only =>  [:edit, :save]
+  cache_sweeper :wiki_sweeper, :only =>  [:edit, :save]
 
   def choose_layout
-    return if params[:context] == 'partial' || params[:action] == 'properties_edit'
+    return if params[:context] == 'partial' ||
+              params[:action] == 'properties_edit' ||
+              params[:format] == 'xml'
     return 'application'
   end
     
@@ -90,6 +92,14 @@ class WikiController < ApplicationController
     end
   end
   
+  def history
+    respond_to do |format|
+      format.html
+      format.xml { render(:action => 'page_feed')
+                   cache_page}
+    end
+  end
+  
   def access_denied
     redirect_to :controller => 'wiki', :action => 'show',
                 :page_name => params[:page_name] 

data/app/core/version.rb

@@ -1 +1 @@
-MOTIRO_VERSION = '0.6.5'
+MOTIRO_VERSION = '0.6.6'

data/app/core/wiki_reporter.rb

@@ -68,7 +68,7 @@ private
   end
 
   def find_opts
-    { :conditions => "kind = '#{name.chop}'", :order => "#{column} DESC" }
+    { :conditions => "kind = '#{name.singularize}'", :order => "#{column} DESC" }
   end
   
   def to_headlines(pages)
@@ -76,7 +76,7 @@ private
       Headline.new(:rid => page.name,
                    :author => page.last_editor ? page.last_editor.login : DEFAULT_AUTHOR,
                    :happened_at => extract_happened_at(page) || DEFAULT_TIME,
-                   :description => page.title)
+                   :description => page.title + "\n\n" + page.text)
     end
   end
 

data/app/helpers/application_helper.rb

@@ -40,6 +40,13 @@ module ApplicationHelper
     content = capture(&block)
     b = Builder::XmlMarkup.new
     xml = b.div(:class => 'pagetext') do
+      b.a(:href => url_for(:controller => 'wiki', :action => 'history',
+                           :page_name => @page.name, :locale => @locale,
+                           :format => 'xml'),
+          :class => 'rss') do
+        b << image_tag("rss.png", :border => 0, :class => 'rss',
+                                  :alt => 'Changes to %s' / @page.name) 
+      end unless @page.nil?
       b.div(:id => 'crumbs') do
          b.text!('You are here: '.t)
          last = @crumbs.delete_at(@crumbs.length - 1)

data/app/models/feed_observer.rb

@@ -0,0 +1,27 @@
+#  Motiro - A project tracking tool
+#  Copyright (C) 2006-2007  Thiago Arrais
+#  
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  any later version.
+#  
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+class FeedObserver < ActiveRecord::Observer
+  
+  observe Page, Headline
+  
+  def after_save(record)
+    cache_dir = ActionController::Base.page_cache_directory
+    FileUtils.rm_r(Dir.glob(cache_dir+"/report/#{record.reported_by}")) rescue Errno::ENOENT
+  end
+  
+end

data/app/models/page.rb

@@ -46,6 +46,10 @@ class Page < ActiveRecord::Base
       ('MainPage' == self.name ? CONGRATS_TEXT : WIKI_NOT_FOUND_TEXT)  
   end
   
+  def reported_by
+    self.kind.pluralize
+  end
+  
   def after_initialize
     default('', :name)
     default('common', :kind)

data/app/models/{page_sweeper.rb → wiki_sweeper.rb}

@@ -15,12 +15,14 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-class PageSweeper < ActionController::Caching::Sweeper
+class WikiSweeper < ActionController::Caching::Sweeper
 
   observe Page
   
   def after_save(page)
     expire_fragment(/wiki\/show.*?#{page.name}/)
+    cache_dir = ActionController::Base.page_cache_directory
+    FileUtils.rm_r(Dir.glob(cache_dir+"/wiki/history/#{page.name}*")) rescue Errno::ENOENT
   end
 
-end
+end

data/app/reporters/darcs_reporter.rb

@@ -71,7 +71,7 @@ private
     
     headline.description = description
     headline.happened_at = time_from_darcs_date(info.attributes['date'])
-    headline.rid =  info.attributes['hash']
+    headline.rid =  info.attributes['hash'].chomp('.gz')
     headline.reported_by = self.name
     
     parse_changes(headline, @connection.diff(headline.rid))

data/app/views/report/list.rhtml

@@ -1,9 +1,7 @@
 <div class='channel-title'>
   <%= link_to( image_tag('rss.png', :border => 0, :class => 'rss'),
-               { :controller => 'report',
-                 :action => 'rss',
-                 :reporter => @name,
-                 :locale => @locale },
+               { :controller => 'report', :action => 'list', :reporter => @name,
+                 :format => 'xml', :locale => @locale },
                :class => 'feed' )
   %>
   <p><%= h(@reporter.channel_title) %></p>

data/app/views/wiki/page_feed.rxml

@@ -0,0 +1,25 @@
+xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
+
+xml.rss 'version' => '2.0',
+        'xmlns:dc' => 'http://purl.org/dc/elements/1.1/' do
+    xml.channel do
+      xml.title "Changes to %s" / @page.name
+      xml.description
+      xml.link server_url_for(:controller => 'root', :action => 'index')
+      xml.language current_locale
+      xml.generator 'Motiro'
+      xml.pubDate @page.modified_at.to_s(:rfc822)
+      xml.ttl '60'
+      @page.revisions.reverse[0..10].each do |rev|
+        xml.item do
+          xml.title h(rev.title)
+          xml.description @renderer.render_html(rev.text)
+          xml.pubDate h(rev.modified_at.to_s(:rfc822))
+          xml.dc :creator, h(rev.last_editor.login)
+          xml.guid server_url_for(:action => 'show', :page_name => @page.name,
+                                  :revision => rev.position) 
+        end
+    	end
+    end
+end
+  

data/config/environment.rb

@@ -31,7 +31,7 @@ Rails::Initializer.run do |config|
   config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/tmp/cache"
 
   # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector
+  config.active_record.observers = :feed_observer
 
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc

data/config/routes.rb

@@ -25,19 +25,13 @@ ActionController::Routing::Routes.draw do |map|
               :controller => 'report',
               :action => 'older'
 
-  map.connect 'report/:reporter',
-              :controller => 'report',
-              :action => 'list'
-  
-  map.connect 'report/:reporter/:id',
-              :controller => 'report', :action => 'show',
-              :requirements => { :id => /.*/ }
-
-  map.connect 'feed/:reporter/:locale',
-              :controller => 'report',
-              :action => 'rss',
-              :defaults => locale_defaults
+  map.with_options(:controller => 'report', :action => 'list')  do |report|
+    report.connect 'report/:reporter/:locale'
+    report.connect 'report/:reporter/:locale.:format'
+  end
               
+  map.connect 'show/:reporter/:id', :controller => 'report', :action => 'show'
+  
   map.connect 'wiki/new/:kind/:locale',
               :controller => 'wiki',
               :action => 'new',
@@ -53,8 +47,8 @@ ActionController::Routing::Routes.draw do |map|
               :requirements => { :action => /properties_(show|edit)/ },
               :defaults => locale_defaults
 
-  map.connect 'wiki/:action/:page_name/:locale', :controller => 'wiki',
-              :defaults => locale_defaults
+  map.connect 'wiki/:action/:page_name', :controller => 'wiki'
+  map.connect 'wiki/:action/:page_name.:format', :controller => 'wiki'
               
   map.connect '', locale_defaults.merge(:controller => 'root',
                                         :action => 'index')

data/public/stylesheets/motiro.css

@@ -96,6 +96,11 @@ div.channel-body-outer {
     background: #a0ccee;
 }
 
+div.pagetext a.rss {
+    float: right;
+    margin: .3em;
+}
+
 a.feed {
     display: block;
     float: right;

data/test/acceptance/account_test.rb

@@ -116,7 +116,7 @@ class AccountAcceptanceTest < AcceptanceTestCase
   
   def test_returns_to_previous_page_after_logged_in
     gita = headlines('gita')
-    open "/report/#{gita.reported_by}/#{gita.rid}"
+    open "/show/#{gita.reported_by}/#{gita.rid}"
     
     assert_text_present gita.description
     
@@ -125,7 +125,7 @@ class AccountAcceptanceTest < AcceptanceTestCase
     click 'login'
     wait_for_page_to_load 1500
     
-    assert_location "exact:http://localhost:3000/report/#{gita.reported_by}/#{gita.rid}"
+    assert_location "exact:http://localhost:3000/show/#{gita.reported_by}/#{gita.rid}"
     assert_text_present gita.description
   end
   
@@ -162,7 +162,7 @@ class AccountAcceptanceTest < AcceptanceTestCase
   def test_login_failure_shows_error_on_other_pages
     rid = headlines('gita').rid
     check_if_login_failure_shows_error_on_page(
-      "/report/subversion/#{rid}",
+      "/show/subversion/#{rid}",
       "Revision #{rid}")
   end
   

data/test/acceptance/events_test.rb

@@ -22,7 +22,7 @@ class EventsAcceptanceTest < AcceptanceTestCase
   fixtures :users, :headlines
   
   def test_no_error_on_development_mode
-    open '/report/events?locale=en'
+    open '/report/events/en'
     assert_text_present 'Scheduled events'
   end
   

data/test/acceptance/main_page_test.rb

@@ -20,9 +20,9 @@ class MainPageAcceptanceTest < SeleniumTestCase
   fixtures :pages
   
   def test_report_html
-    open '/report/subversion?locale=en'
+    open '/report/subversion/en'
     assert_text_present 'Latest news from Subversion'
-    assert_element_present "//a[@href = '/feed/subversion/en']/img[starts-with(@src, '/images/rss.png')]"
+    assert_element_present "//a[@href = '/report/subversion/en.xml']/img[starts-with(@src, '/images/rss.png')]"
   end
   
   def test_subversion_on_main

data/test/acceptance/subversion_test.rb

@@ -26,7 +26,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     
     @repo.mkdir('myproject', commit_msg)
     
-    open '/report/subversion?locale=en'
+    open '/report/subversion/en'
     assert_text_present @repo.username
     assert_text_present commit_msg
   end
@@ -51,7 +51,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     
     @repo.mkdir(dir_name, commit_msg)
     
-    open '/report/subversion?locale=en'
+    open '/report/subversion/en'
     assert_text_present commit_title
     click "//a[text() = \"#{commit_title}\"]"
     wait_for_page_to_load(2000)
@@ -76,7 +76,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     @repo.add_file(filename, file_contents)
     @repo.commit(commit_title)
     
-    open '/report/subversion?locale=en'
+    open '/report/subversion/en'
     click "//a[text() = '#{commit_title}']"
     wait_for_page_to_load(2000)
     
@@ -95,7 +95,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     @repo.put_file('a_file.txt', "These are the modified file contents\n" )
     @repo.commit(commit_title)
     
-    open '/report/subversion'
+    open '/report/subversion/en'
     click "//a[text() = '#{commit_title}']"
     wait_for_page_to_load(1500)
     
@@ -108,7 +108,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     
     @repo.mkdir('projectroot', commit_msg)
     
-    open '/report/subversion/r104?locale=en'
+    open '/show/subversion/r104?locale=en'
     assert_equal "Motiro: Welcome", get_title
     assert_text "//div[@id='notice']", 'The article r104 from the Subversion reporter could not be found'
   end
@@ -118,7 +118,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     
     @repo.mkdir('trunk', commit_title)
     
-    open '/report/subversion?locale=en'
+    open '/report/subversion/en'
     click "//a[text() = '#{commit_title}']"
     wait_for_page_to_load(1000)
     
@@ -139,7 +139,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     commit_title = 'files copied'
     @repo.copy('file_number_one.txt', 'file_number_two.txt', commit_title)
     
-    open '/report/subversion?locale=en'
+    open '/report/subversion/en'
     click "//a[text() = '#{commit_title}']"
     wait_for_page_to_load(2000)
     assert_text_present "Changes to file_number_two.txt"
@@ -153,7 +153,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     commit_title = 'renamed file'
     @repo.move('file_number_one.txt', 'file_number_two.txt', commit_title)
     
-    open '/report/subversion?locale=en'
+    open '/report/subversion/en'
     click "//a[text() = '#{commit_title}']"
     wait_for_page_to_load(2000)
     
@@ -170,7 +170,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     commit_title = 'added two files'
     @repo.commit(commit_title)
     
-    open '/report/subversion'
+    open '/report/subversion/en'
     click "//a[text() = '#{commit_title}']"
     wait_for_page_to_load(1000)
     
@@ -191,7 +191,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     commit_title = 'added alive.txt'
     @repo.commit(commit_title)
     
-    open '/report/subversion'
+    open '/report/subversion/en'
     click "//a[text() = '#{commit_title}']"
     wait_for_page_to_load(1000)
     
@@ -209,7 +209,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     commit_title = 'added daughter.txt'
     @repo.commit(commit_title)
     
-    open '/report/subversion/r1?locale=en'
+    open '/show/subversion/r1?locale=en'
     
     assert_equal "Revision details - #{commit_title} (Motiro)", get_title 
     assert_text_present 'Revision r1'
@@ -233,12 +233,12 @@ class SubversionAcceptanceTest < SeleniumTestCase
     commit_title = 'added daughter.txt'
     @repo.commit(commit_title)
     
-    open '/report/subversion/r30?locale=en'
+    open '/show/subversion/r30?locale=en'
     
     assert_equal "Motiro: Welcome", get_title
     assert_text "//div[@id='notice']", 'The article r30 from the Subversion reporter could not be found'
 
-    open '/report/subversion/r30?locale=pt-BR'
+    open '/show/subversion/r30?locale=pt-BR'
     
     assert_text "//div[@id='notice']", /o foi poss/
     assert_text "//div[@id='notice']", /vel encontrar o artigo r30 do rep/
@@ -259,7 +259,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
 
     @repo.commit(commit_comment)
     
-    open '/report/subversion?locale=pt-BR'
+    open '/report/subversion/pt-BR'
 
     assert_text_not_present('lyrics')
 
@@ -271,7 +271,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     assert_text_not_present('this')
     assert_text_not_present('originally released')
     
-    open '/report/subversion?locale=en'
+    open '/report/subversion/en'
     
     assert_text_not_present('letras')
     assert_text_not_present('musica')
@@ -293,7 +293,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
                  
     @repo.mkdir('wikitest', commit_msg)
 
-    open '/report/subversion'
+    open '/report/subversion/en'
     click "//a[text() = 'This is the comment title']"
     wait_for_page_to_load(2000)
     

data/test/fixtures/pages.yml

@@ -55,3 +55,9 @@ changed_page:
   name: ChangedPage
   kind: common
   modified_at: 2007-01-22 13:21:26
+
+multilanguage_page:
+  id: 12
+  name: MultiLanguagePage
+  kind: common
+  modified_at: 2007-06-14 12:06:38

data/test/fixtures/revisions.yml

@@ -133,4 +133,39 @@ release_event_creation:
   text: The 0.6.1 release will be a bug fixing one and will introduce editable
         event pages. This is included as part of the everything is a wiki page
         motto.
- 
+
+first_multilanguage_revision:
+  id: 15
+  page_id: 12
+  kind: common
+  modified_at: 2007-06-14 12:03:24
+  last_editor_id: 1000004 #john
+  editors: ""
+  title: Multi-language page
+  text: This is the first English version
+        
+        Here is some '''bold''' text.
+        
+        --- pt-br ------------
+        
+        Esta é a primeira versão em português
+        
+        Aqui está um pouco de texto em '''negrito'''.
+
+second_multilanguage_revision:
+  id: 16
+  page_id: 12
+  kind: common
+  modified_at: 2007-06-14 12:06:38
+  last_editor_id: 1000004 #john
+  editors: ""
+  title: Multi-language page
+  text: This is the second English version
+        
+        Here is some '''bold''' text.
+        
+        --- pt-br ------------
+        
+        Esta é a segunda versão em português
+        
+        Aqui está um pouco de texto em '''negrito'''.

data/test/functional/report_controller_test.rb

@@ -43,8 +43,8 @@ class ReportControllerTest < Test::Unit::TestCase
   end
   
   def test_routes_localized_feeds
-    assert_routing('/feed/subversion/en-gb',
-                   :controller => 'report', :action => 'rss',
+    assert_routing('/report/subversion/en-gb.xml',
+                   :controller => 'report', :action => 'list', :format => 'xml',
                    :reporter => 'subversion', :locale => 'en-gb' )
   end
   
@@ -79,7 +79,7 @@ class ReportControllerTest < Test::Unit::TestCase
   def test_include_headline_date_on_guid
     gita = headlines('gita')
     
-    get :rss, { :reporter => gita.reported_by }
+    get :list, :reporter => gita.reported_by, :locale => 'en', :format => 'xml'
     
     assert_xml_element "//guid[contains(text(), '#{gita.happened_at.strftime('%Y%m%d%H%M%S')}')]"
   end
@@ -93,7 +93,7 @@ class ReportControllerTest < Test::Unit::TestCase
     
     assert_xml_element "//div[@id = 'crumbs' and contains(text(), 'You are here')]/a[@href = '/' and text() = 'Home']"
     assert_xml_element "//div[@id = 'crumbs']/a[@href = '/report/older/subversion' and text() = 'Latest news from Subversion']"
-    assert_xml_element "//div[@id = 'crumbs']/a[@href = '/report/subversion/#{svn_demo.rid}' and text() = '#{svn_demo.title}']"
+    assert_xml_element "//div[@id = 'crumbs']/a[@href = '#{@controller.url_for(:controller => 'report', :action => 'show', :reporter => 'subversion', :id => svn_demo.rid, :only_path => true)}' and text() = '#{svn_demo.title}']"
   end
 
   def test_shows_breadcrumbs_trail_for_older_news_page

data/test/functional/report_features_test.rb

@@ -31,7 +31,7 @@ class ReportFeaturesTest < Test::Unit::TestCase
   end
 
   def test_links_to_feature_pages_from_rss_feed
-    get :rss, :reporter => 'features'
+    get :list, :reporter => 'features', :locale => 'en', :format => 'xml'
     assert_xml_element "//link[text() = 'http://test.host/wiki/show/ListLastModifiedFeatures']"
   end
   

data/test/functional/report_subversion_test.rb

@@ -39,7 +39,7 @@ class ReportSubversionTest < Test::Unit::TestCase
     
     @repo.mkdir('myproject', commit_msg)
     
-    get :rss, :reporter => 'subversion'
+    get :list, :reporter => 'subversion', :locale => 'en', :format => 'xml'
     assert_xml_element("//rss/channel/title[text() = 'Motiro - Subversion']")
     assert_xml_element("//rss/channel/generator[text() = 'Motiro']")
     assert_xml_element("//rss/channel/item/title[text() = '#{commit_title}']")
@@ -56,7 +56,7 @@ class ReportSubversionTest < Test::Unit::TestCase
     
     @repo.mkdir('myproject', commit_msg)
     
-    get :rss, :reporter => 'subversion'
+    get :list, :reporter => 'subversion', :locale => 'en', :format => 'xml'
     assert_no_xml_element("//description[contains(text(), 'pagetext')]")
   end
 
@@ -67,11 +67,11 @@ class ReportSubversionTest < Test::Unit::TestCase
     
     @repo.mkdir('myproject', commit_msg)
     
-    get :rss, :reporter => 'subversion', :locale => 'en'
+    get :list, :reporter => 'subversion', :locale => 'en', :format => 'xml'
     assert_xml_element("//rss/channel/item/title[text() = '#{english_msg}']")
     assert_no_xml_element("//rss/channel/item/title[text() = '#{portuguese_msg}']")
 
-    get :rss, :reporter => 'subversion', :locale => 'pt-br'
+    get :list, :reporter => 'subversion', :locale => 'pt-br', :format => 'xml'
     assert_xml_element("//rss/channel/item/title[text() = '#{portuguese_msg}']")
     assert_no_xml_element("//rss/channel/item/title[text() = '#{english_msg}']")
   end

data/test/functional/root_controller_test.rb

@@ -17,7 +17,7 @@ class RootControllerTest < Test::Unit::TestCase
   def test_version_number
     get :index, :locale => 'en'
     
-    assert_tag :content => /Motiro version 0.6.5/
+    assert_tag :content => /Motiro version 0.6.6/
   end
   
 

data/test/functional/wiki_controller_test.rb

@@ -40,11 +40,14 @@ class WikiControllerTest < Test::Unit::TestCase
                                           :page_name => 'MainPage')
   end
 
-  def test_routes_to_specified_locale_page
-    assert_routing('/wiki/show/MainPage/en', :controller => 'wiki',
-                                             :action => 'show',
-                                             :page_name => 'MainPage',
-                                             :locale => 'en')
+  def test_routes_to_locale_extracted_from_page_name
+    assert_routing('/wiki/show/MyGoodPage-en-gb',
+                  {:controller => 'wiki', :action => 'show',
+                   :page_name => 'MyGoodPage', :locale => 'en-gb'}) 
+    assert_routing('/wiki/history/MyGoodPage-pt-br.xml',
+                  {:controller => 'wiki', :action => 'history',
+                   :page_name => 'MyGoodPage', :locale => 'pt-br',
+                   :format => 'xml'}) 
   end
   
   def test_blocks_edition
@@ -339,6 +342,27 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_no_tag :content => 'Page history (1 revisions)'
     assert_no_tag :content => /Page has no history yet/
   end
+  
+  def test_page_history_translates_and_renders_page_contents
+    page_name = pages('multilanguage_page').name
+    get :history, :page_name => page_name, :locale => 'en', :format => 'xml'
+
+    assert_xml_element "//item/description[contains(text(), 'This is the first English version')]"
+    assert_xml_element "//item/description[contains(text(), 'Here is some &lt;b&gt;bold&lt;/b&gt; text')]"
+    assert_xml_element "//item/description[contains(text(), 'This is the second English version')]"
+
+    get :history, :page_name => page_name, :locale => 'pt-br', :format => 'xml'
+    assert_xml_element "//item/description[contains(text(), 'Esta &#233; a primeira vers&#227;o em portugu&#234;s')]"
+    assert_xml_element "//item/description[contains(text(), 'Esta &#233; a segunda vers&#227;o em portugu&#234;s')]"
+  end
+  
+  def test_history_links_to_page_revision
+    page_name = pages('changed_page').name
+    get :history, :page_name => page_name, :format => 'xml'
+    
+    assert_xml_element "//item/guid[text() = '#{@controller.url_for(:action => 'show', :page_name => page_name, :revision => '2')}'']"
+    assert_xml_element "//item/guid[text() = '#{@controller.url_for(:action => 'show', :page_name => page_name, :revision => '1')}'']"
+  end
 
 private