motiro 0.6.4 → 0.6.5

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.4 - April 2007
+Motiro version 0.6.5 - May 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/wiki_controller.rb

@@ -20,7 +20,7 @@ class WikiController < ApplicationController
   layout :choose_layout
 
   before_filter :login_required, :except => [:show, :last, :history]
-  before_filter :fetch_page, :drop_crumbs
+  before_filter :fetch_page, :fetch_revision
   before_filter :check_edit_access, :only => [:edit, :save]
   
   cache_sweeper :page_sweeper, :only =>  [:edit, :save]
@@ -42,18 +42,25 @@ class WikiController < ApplicationController
   end
   
   def fetch_page
-    type = params[:page] ? params[:page][:type] : nil
-    @page = find_page(params[:page_name], type)
-  end
-  
-  def drop_crumbs
+    @page = find_page(params[:page_name])
     unless 'common' == @page.kind 
       @crumbs <<{ @page.kind.pluralize.capitalize.t  =>
                   {:controller => 'report', :action => 'older',
                    :reporter => @page.kind.pluralize}}
     end
     @crumbs <<{ @page.title => {:controller => 'wiki', :action => 'show',
-                                :page_name => @page.name} }   
+                                :page_name => @page.name} }
+  end
+  
+  def fetch_revision
+    rev = params[:revision]
+    unless rev.nil?
+      @page = @page.revisions[rev.to_i - 1]
+      @page_revision_id = @page.id
+      @crumbs << { 'Revision %s' / rev =>
+                   { :controller => 'wiki', :action => 'show',
+                     :page_name => @page.name, :revision => rev} }
+    end
   end
   
   def check_edit_access
@@ -83,13 +90,6 @@ class WikiController < ApplicationController
     end
   end
   
-  def show
-    if params[:revision]
-      @page = @page.revisions[params[:revision].to_i]
-      @page_revision_id = @page.id
-    end
-  end
-  
   def access_denied
     redirect_to :controller => 'wiki', :action => 'show',
                 :page_name => params[:page_name] 
@@ -107,9 +107,9 @@ private
     end
   end
 
-  def find_page(name, type)
+  def find_page(name)
     @real_page_provider.find_by_name(name) ||
-    @default_page_provider.find_by_name_and_type(name, type)
+    @default_page_provider.find_by_name(name)
   end
     
 end

data/app/core/version.rb

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

data/app/core/wiki_reporter.rb

@@ -39,7 +39,7 @@ class WikiReporter < MotiroReporter
     klass.add(button_for_creating(klass.reporter_name.chop))
   end
 
-  def latest_headlines
+  def latest_headlines(rid='')
     to_headlines @page_provider.find(:all, find_opts.merge(
                                              :limit => @settings.package_size))
   end

data/app/helpers/application_helper.rb

@@ -36,7 +36,7 @@ module ApplicationHelper
                                                  :action => script_name) })
   end
   
-  def pagetext(title, &block)
+  def pagetext(title, revision=nil, &block)
     content = capture(&block)
     b = Builder::XmlMarkup.new
     xml = b.div(:class => 'pagetext') do
@@ -51,7 +51,11 @@ module ApplicationHelper
          b.a(last.keys.first,
              :href => url_for(last.values.first.update(:only_path => true)))
       end unless params[:context] == 'partial'
-      b.h1(title)
+      b.div(:class => 'page-title') do
+        b.span(title, :class => 'page-title')
+        b << ' '
+        b.span(revision, :id => 'revision') unless revision.nil?
+      end
       b << content
     end
     concat(xml, block.binding)

data/app/helpers/default_page_provider.rb

@@ -17,10 +17,8 @@
 
 class DefaultPageProvider
 
-  def find_by_name_and_type(name, type)
-    class_name = type || 'Page'
-    page = class_name.constantize.new(:name => name)
-    return page
+  def find_by_name(name)
+    Page.new(:name => name)
   end
 
 end

data/app/helpers/wiki_helper.rb

@@ -1,3 +1,13 @@
 module WikiHelper
 
+  def page_history_link(page)
+    case page.revisions.size
+      when 0 then ''
+      when 1 then '| ' + 'Page has no history yet'.t
+      else '| ' + link_to('Page history (%d revisions)' / page.revisions.size,
+                          :controller => 'wiki', :action => 'history',
+                          :page_name => page.name)
+    end
+  end
+
 end

data/app/models/page.rb

@@ -19,7 +19,7 @@ PLACE_HOLDER_TITLE = 'Insert page title here'
 
 class Page < ActiveRecord::Base
 
-  has_many :revisions, :order => 'modified_at DESC, id DESC'
+  has_many :revisions, :order => 'modified_at, id'
   
   def original_author
     oldest(:last_editor)
@@ -60,9 +60,10 @@ class Page < ActiveRecord::Base
   
   def before_save
     if title == PLACE_HOLDER_TITLE.t
-      revisions.first.title = title_from_kind  
+      revisions.last.title = title_from_kind  
     end
     
+    write_attribute(:modified_at, self.modified_at)
     write_attribute(:name, self.name)
   end
   
@@ -85,20 +86,21 @@ class Page < ActiveRecord::Base
                  attrs['happens_at(3i)'].to_i)
     end
     unless revisions.size == 0 || original_author 
-      revisions.last.last_editor = author 
-      revisions.last.save
+      revisions.first.last_editor = author 
+      revisions.first.save
     end
-    rev = Revision.new(:last_editor => author, :modified_at => time)
+    rev = Revision.new(:last_editor => author, :modified_at => time,
+                       :position => self.revisions.size + 1)
     rev.editors = if author.can_change_editors?(self)
       attrs[:editors]
     else
-      revisions.first.editors
+      revisions.last.editors
     end
     self.kind = attrs[:kind] if attrs[:kind]
     self.happens_at = attrs[:happens_at] if attrs[:happens_at]
     rev.kind, rev.happens_at = self.kind, self.happens_at
     rev.title, rev.text = attrs[:title], attrs[:text]
-    self.revisions.unshift(rev)
+    self.revisions << rev
     
     save
     self
@@ -131,15 +133,13 @@ private
   end
   
   def most_recent(attr)
-    revisions.first && revisions.first.send(attr)  
+    revisions.last && revisions.last.send(attr)  
   end
   
   def oldest(attr)
-    revisions.last && revisions.last.send(attr)  
+    revisions.first && revisions.first.send(attr)  
   end
 
-private
-
   def clean(text)
     text.tr('ãàáâäÃÀÁÂÄèéêëÈÉÊËĩìíîïĨÌÍÎÏÿýÝŸõòóôöÕÒÓÔÖũùúûüŨÙÚÛÜñńÑŃćçÇĆśŕ埌ŔĹŹ',
             'aaaaaAAAAAeeeeEEEEiiiiiIIIIIyyYYoooooOOOOOuuuuuUUUUUnnNNccCCsrlzSRLZ')

data/app/models/revision.rb

@@ -18,9 +18,9 @@
 class Revision < ActiveRecord::Base
   belongs_to :page
   belongs_to :last_editor, :class_name => 'User', :foreign_key => 'last_editor_id'
-  
+
   #Delegate methods to parent page
-  %w{name original_author}.each do |method|
+  %w{name original_author revisions}.each do |method|
     define_method(method) { page.send(method) }
   end
 

data/app/reporters/darcs_reporter.rb

@@ -27,7 +27,7 @@ class DarcsReporter < MotiroReporter
     @connection = conn
   end
   
-  def latest_headlines
+  def latest_headlines(rid='')
     @connection.pull
     parse_headlines(@connection.changes)
   end

data/app/views/wiki/_editbar.rhtml

@@ -23,7 +23,5 @@
                      :action => 'edit',
                      :page_name => @page.name } )%>
   <% end %>
-  |
-  <%= link_to('Page history'.t, :controller => 'wiki', :action => 'history',
-                                :page_name => @page.name) -%>
+  <%= page_history_link(@page) -%>
 </div>

data/app/views/wiki/history.rhtml

@@ -9,9 +9,8 @@
       </tr>
     </thead>
     <tbody>
-    <% i = 0 %>
-    <% @page.revisions.each do |rev| %>
-      <tr class="<%= i % 2 == 0 ? 'odd' : 'even' -%>">
+    <% @page.revisions.reverse.each do |rev| %>
+      <tr class="<%= rev.position % 2 == 0 ? 'odd' : 'even' -%>">
         <td class="date"><%= rev.modified_at-%></td>
         <td class="relative"><%= rev.modified_at.relative_to_now %></td>
         <td><%= rev.last_editor.login %></td>
@@ -19,9 +18,8 @@
                             :href => server_url_for(:controller => 'wiki',
                                                     :action => 'show',
                                                     :page_name => @page.name,
-                                                    :revision => i) -%></td>
+                                                    :revision => rev.position) -%></td>
       </tr>
-      <% i += 1 %>
     <% end %>
     </tbody>
   </table>

data/app/views/wiki/show.rhtml

@@ -1,4 +1,4 @@
-<% pagetext(@page.title) do %>
+<% pagetext(@page.title, @page.respond_to?(:position) ? '(Revision %s)' / @page.position.to_s : nil) do %>
   <% cache(:controller=> 'wiki', :action => 'show',
            :page => @page.name, :locale_suffix => @locale,
            :revision => @page_revision_id) do %>

data/config/motiro.yml

@@ -1,3 +1,8 @@
+# motiro.yml: Configuration for your Motiro installation
+# 
+# This is an YAML file, so leading whitespace does make a difference. Please
+# make sure to KEEP THE EXISTING WHITESPACE when uncommenting lines.
+
 # package_size
 #
 # How many headlines should be shown for each reporter?
@@ -20,24 +25,24 @@ update_interval: 40
 # Subversion specific settings
 subversion:
 
-# subversion/repo
-#
-# Tells the reporter where to find your project's repository
-# Default: https://svn.sourceforge.net/svnroot/motiro
+  # subversion/repo
+  #
+  # Tells the reporter where to find your project's repository
+  # Default: https://svn.sourceforge.net/svnroot/motiro
   repo: https://svn.sourceforge.net/svnroot/motiro
 
-# subversion/{user,password}
-#
-# Credentials to use for authentication with Subversion server. Uncomment and set
-# them only if your server requires authorization for read access. Motiro's
-# doesn't so they are commented out here. 
-#   user: harry
-#   password: harryssecret
+  # subversion/{user,password}
+  #
+  # Credentials to use for authentication with Subversion server. Uncomment and
+  # set them only if your server requires authorization for read access.
+  # Motiro's doesn't, so they are commented out here. 
+  # user: harry
+  # password: harryssecret
   
 # Darcs specific settings
 # Uncomment the lines below to activate darcs reporting
 # darcs:
 
-# darcs/repo
-# Tells the reporter where to find the project's central repository
-#   repo: http://motiro.sf.net/darcsrepos/trunk
+  # darcs/repo
+  # Tells the reporter where to find the project's central repository
+  # repo: http://motiro.sf.net/darcsrepos/trunk

data/db/migrate/020_fix_modification_dates_for_old_pages.rb

@@ -0,0 +1,11 @@
+class FixModificationDatesForOldPages < ActiveRecord::Migration
+
+  def self.up
+    Page.find(:all).each do |page|
+      page.save
+    end
+  end
+    
+  def self.down; end
+
+end

data/db/migrate/021_drop_type_column_from_pages_table.rb

@@ -0,0 +1,11 @@
+class DropTypeColumnFromPagesTable < ActiveRecord::Migration
+
+  def self.up
+    remove_column :pages, :type
+  end
+    
+  def self.down;
+    raise IrreversibleMigration
+  end
+
+end

data/db/migrate/022_provide_revision_position.rb

@@ -0,0 +1,19 @@
+class ProvideRevisionPosition < ActiveRecord::Migration
+
+  def self.up
+    add_column :revisions, :position, :integer
+    Page.find(:all).each do |pg|
+      position = 0
+      pg.revisions.each do |rev|
+        rev.position = position
+        rev.save
+        position += 1
+      end
+    end
+  end
+    
+  def self.down;
+    remove_column :revisions, :position
+  end
+
+end

data/db/migrate/023_increment_revision_positions.rb

@@ -0,0 +1,11 @@
+class IncrementRevisionPositions < ActiveRecord::Migration
+
+  def self.up
+    execute('UPDATE revisions SET position = position + 1')
+  end
+    
+  def self.down;
+    execute('UPDATE revisions SET position = position - 1')
+  end
+
+end

data/db/schema_version

@@ -1 +1 @@
-19
+23

data/db/translation/pt-BR.rb

@@ -74,5 +74,6 @@
 # Older headlines and history pages
 'Author' => 'Autor',
 'Page history for %s' => 'Histórico da página %s',
-'Page history' => 'Histórico da página'
+'Page history' => 'Histórico da página',
+'(Revision %s)' => '(Revisão %s)'
 }

data/public/stylesheets/motiro.css

@@ -54,11 +54,26 @@ div.channel div.pagetext, div.pagetext div.pagetext {
 
 div#crumbs {
     border-bottom: solid #d0d0d0 1px;
-    margin-bottom: -1em;
     padding: .2em 0 .2em 0;
     color: #808080
 }
 
+div.page-title {
+    margin-top: .4em;
+    margin-bottom: 1em;
+}
+
+span.page-title {
+    font-size: 2em;
+    font-weight: bold;
+}
+
+span#revision {
+    color: #808080;
+    font-size: 1em;
+    white-space: nowrap;
+}
+
 #mainpage {
     margin: 4px 332px 4px 0;
 }

data/test/acceptance/subversion_test.rb

@@ -57,7 +57,7 @@ class SubversionAcceptanceTest < SeleniumTestCase
     wait_for_page_to_load(2000)
     
     assert_equal "Revision details - #{commit_title} (Motiro)", get_title 
-    assert_element_present "//h1[text() = 'Revision r1']"
+    assert_element_present "//span[@class='page-title' and text() = 'Revision r1']"
     assert_text_present commit_title
     assert_text_present 'This project dir will hold everything needed to build and'
     assert_text_present 'deploy our project from source code'

data/test/fixtures/pages.yml

@@ -47,7 +47,6 @@ release_event:
   kind: event
   name: FourteenthRelease
   kind: event
-  type: Event
   happens_at: 2007-01-24
   modified_at: 2007-01-18 13:28:47
  

data/test/fixtures/revisions.yml

@@ -7,6 +7,7 @@ page_creation:
   editors: ""
   title: This page has been created
   text: John entered some text here
+  position: 1
 
 page_edition:
   id: 2
@@ -17,6 +18,7 @@ page_edition:
   editors: ""
   title: This page has been edited since creation
   text: Eric changed the text that John entered
+  position: 2
 
 main_page_creation:
   id: 3

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.4/
+    assert_tag :content => /Motiro version 0.6.5/
   end
   
 

data/test/functional/wiki_controller_test.rb

@@ -174,13 +174,15 @@ class WikiControllerTest < Test::Unit::TestCase
                                                  :value => 'Brand new page' }
   end
   
-  def test_shows_page_title_as_level_one_header
+  def test_shows_page_title_with_page_title_class
     non_matching_title_page = pages('non_matching_title_page')
     get :show, :page_name => pages('test_page').name
-    assert_tag :tag => 'h1', :content => 'Test page'
-    
+    assert_tag :tag => 'span', :content => 'Test page',
+               :attributes => { :class => 'page-title' }    
+
     get :show, :page_name => non_matching_title_page.name
-    assert_tag :tag => 'h1', :content => non_matching_title_page.title
+    assert_tag :tag => 'span', :content => non_matching_title_page.title,
+               :attributes => { :class => 'page-title' }    
   end
   
   def test_saves_last_editor_and_modification_date
@@ -255,6 +257,13 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_xml_element "//div[@id = 'crumbs']/a[@href = '/wiki/show/#{test_page.name}' and text() = '#{test_page.title}']"
   end
   
+  def test_follows_breadcrumbs_trail_til_the_revision_number
+    page = pages('changed_page')
+    get :show, :page_name => page.name, :revision => '1'
+    
+    assert_xml_element "//div[@id = 'crumbs']/a[@href = '/wiki/show/#{page.name}?revision=1' and text() = 'Revision 1']"
+  end
+
   def test_shows_breadcrumbs_trail_for_special_wiki_pages
     release_event = pages('release_event')
     get :show, :page_name => release_event.name
@@ -293,24 +302,50 @@ class WikiControllerTest < Test::Unit::TestCase
     get :show, :page_name => 'RevisedPage', :revision => '1'
     assert_tag :content => /Some very boring text/
 
-    get :show, :page_name => 'RevisedPage', :revision => '0'
+    get :show, :page_name => 'RevisedPage', :revision => '2'
     assert_tag :content => /A little more exciting text/
   end
   
   def test_displays_old_text_when_showing_revisions
-    get :show, :page_name => pages('changed_page').name, :revision => '0'
+    get :show, :page_name => pages('changed_page').name, :revision => '1'
+    assert_tag :content => revisions('page_creation').text
+
+    get :show, :page_name => pages('changed_page').name, :revision => '2'
     assert_tag :content => revisions('page_edition').text
+  end
 
+  def test_shows_version_number_for_page_revisions
     get :show, :page_name => pages('changed_page').name, :revision => '1'
-    assert_tag :content => revisions('page_creation').text
+    assert_tag :content => '(Revision 1)'
+
+    get :show, :page_name => pages('changed_page').name, :revision => '2'
+    assert_tag :content => '(Revision 2)'
   end
-  
+
+  def tests_shows_number_of_available_revisions
+    get :show, :page_name => pages('changed_page').name
+
+    assert_tag :content => 'Page history (2 revisions)'
+  end
+
+  def test_does_not_show_page_history_link_for_missing_or_edited_once_pages
+    get :show, :page_name => pages('test_page').name
+
+    assert_no_tag :content => 'Page history (1 revisions)'
+    assert_tag :content => /Page has no history yet/
+
+    get :show, :page_name => 'TestingBrandNewPage'
+
+    assert_no_tag :content => 'Page history (1 revisions)'
+    assert_no_tag :content => /Page has no history yet/
+  end
+
 private
 
   def log_as(user_name)
     @request.session[:user] = users(user_name)
   end
-  
+
   def log_out
     @request.session[:user] = nil
   end

data/test/unit/darcs_reporter_test.rb

@@ -71,7 +71,7 @@ class DarcsReporterTest  < Test::Unit::TestCase
   def test_empty_change_log
     @darcs_changes = P_EMPTY
     
-    hls = @reporter.latest_headlines
+    hls = @reporter.latest_headlines('')
     
     assert_equal 0, hls.size
   end

data/test/unit/default_page_provider_test.rb

@@ -23,22 +23,13 @@ class DefaultPageProviderTest < Test::Unit::TestCase
     @provider = DefaultPageProvider.new    
   end
   
-  def test_nil_type_creates_common_page
-    assert_equal Page, @provider.find_by_name_and_type('MainPage', nil).class
-  end
-  
-  def test_event_type_creates_event_page
-    klass = @provider.find_by_name_and_type('MainPage', 'Event').class
-    assert_equal Event, klass
-  end
-  
   def test_provides_congratulations_page_for_main_page
-    page_text = @provider.find_by_name_and_type('MainPage', nil).text
+    page_text = @provider.find_by_name('MainPage').text
     assert page_text.match(/Congratulations/)
   end
 
   def test_provides_you_can_edit_this_page_for_random_pages
-    page_text = @provider.find_by_name_and_type('AnyPage', nil).text
+    page_text = @provider.find_by_name('AnyPage').text
     assert page_text.match(/nothing to be read here/)
     assert page_text.match(/But you can write something right now/)
   end

data/test/unit/page_test.rb

@@ -191,8 +191,8 @@ class PageTest < Test::Unit::TestCase
                 :editors => '')
     
     assert_equal 2, page.revisions.size
-    assert_equal 'Page revision number 2', page.revisions.first.text
-    assert_equal 'Page revision number 1', page.revisions.last.text
+    assert_equal 'Page revision number 2', page.revisions.last.text
+    assert_equal 'Page revision number 1', page.revisions.first.text
   end
   
   def test_copies_previous_editors_list_when_not_provided
@@ -209,8 +209,8 @@ class PageTest < Test::Unit::TestCase
   
   def test_most_recent_revision_comes_first
     page = pages('changed_page')
-    assert_equal revisions('page_creation'), page.revisions[1]
-    assert_equal revisions('page_edition'), page.revisions[0]
+    assert_equal revisions('page_creation'), page.revisions[0]
+    assert_equal revisions('page_edition'), page.revisions[1]
   end
   
   def test_records_original_author_for_pages_without_author
@@ -239,8 +239,8 @@ class PageTest < Test::Unit::TestCase
     event.revise(bob, now, :happens_at => new_time)
     
     assert_equal new_time, event.happens_at
-    assert_equal new_time, event.revisions.first.happens_at
-    assert_equal old_time, event.revisions.last.happens_at
+    assert_equal new_time, event.revisions.last.happens_at
+    assert_equal old_time, event.revisions.first.happens_at
   end
   
   def test_rbab
@@ -252,7 +252,30 @@ class PageTest < Test::Unit::TestCase
     assert_equal date, page.happens_at
   end
   
-  #TODO it seems that event pages do not get their happens_at attribute revised
+  def test_writes_modification_time_to_own_table_too
+    written_page = revise_brand_new_page(:title => 'Modified page',
+                                         :kind => 'common',
+                                         :text => 'Modified now')
+    
+    assert_equal now, written_page.modified_at
+    
+    read_page = Page.find_by_modified_at_and_name(now, 'ModifiedPage')
+    
+    assert_not_nil read_page
+    assert_equal written_page, read_page
+  end
+  
+  def test_numbers_revisions
+    page = create_page_with_one_revision
+    
+    assert_equal 1, page.revisions.size
+    assert_equal 1, page.revisions[0].position
+    
+    page.revise(bob, now, :text => 'Modified text')
+
+    assert_equal 2, page.revisions.size
+    assert_equal 2, page.revisions[1].position
+  end
   
 private