motiro 0.6.3 → 0.6.4

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.3 - March 2007
+Motiro version 0.6.4 - April 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

@@ -15,11 +15,11 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-class WikiController < EditionController
+class WikiController < ApplicationController
 
   layout :choose_layout
 
-  before_filter :login_required, :except => [:show, :last]
+  before_filter :login_required, :except => [:show, :last, :history]
   before_filter :fetch_page, :drop_crumbs
   before_filter :check_edit_access, :only => [:edit, :save]
   
@@ -75,15 +75,30 @@ class WikiController < EditionController
     render(:action => 'edit', :layout => 'application')
   end
   
-  def do_save
-    params[:page].delete(:original_author_id)
-    params[:page].delete(:editors) unless current_user.can_change_editors?(@page)
+  def save
+    if params['btnSave']
+      really_save
+    else
+      redirect_to :controller => 'root', :action => 'index'
+    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] 
+  end
+  
+private
 
-    @page.original_author ||= current_user
-    @page.last_editor = current_user
-    @page.modified_at = Time.now
-    @page.attributes = params[:page]
-    @page.save
+  def really_save
+    @page.revise(current_user, Time.now, params[:page])
 
     if 'MainPage' == @page.name
       redirect_to :controller => 'root', :action => 'index'
@@ -91,8 +106,6 @@ class WikiController < EditionController
       redirect_to :action => 'show', :page_name => @page.name
     end
   end
-  
-private
 
   def find_page(name, type)
     @real_page_provider.find_by_name(name) ||

data/app/core/version.rb

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

data/app/helpers/default_page_provider.rb

@@ -20,8 +20,6 @@ class DefaultPageProvider
   def find_by_name_and_type(name, type)
     class_name = type || 'Page'
     page = class_name.constantize.new(:name => name)
-    page.text = WIKI_NOT_FOUND_TEXT
-    page.text = CONGRATS_TEXT if 'MainPage' == name
     return page
   end
 

data/app/models/page.rb

@@ -19,13 +19,35 @@ PLACE_HOLDER_TITLE = 'Insert page title here'
 
 class Page < ActiveRecord::Base
 
-  belongs_to :last_editor, :class_name => 'User',
-                           :foreign_key => 'last_editor_id'
-  belongs_to :original_author, :class_name => 'User',
-                               :foreign_key => 'original_author_id'
+  has_many :revisions, :order => 'modified_at DESC, id DESC'
+  
+  def original_author
+    oldest(:last_editor)
+  end
+  
+  %w{modified_at last_editor}.each do |attr|
+    define_method attr do
+      most_recent(attr)
+    end
+  end
+
+  def title
+    result = most_recent(:title)
+    return title_from_name || PLACE_HOLDER_TITLE.t if result.nil? || result.empty?
+    return result
+  end
+  
+  def editors
+    most_recent(:editors) || ''
+  end
+  
+  def text
+    most_recent(:text) ||
+      ('MainPage' == self.name ? CONGRATS_TEXT : WIKI_NOT_FOUND_TEXT)  
+  end
   
   def after_initialize
-    default('', :editors, :text, :name, :title)
+    default('', :name)
     default('common', :kind)
   end
   
@@ -38,7 +60,7 @@ class Page < ActiveRecord::Base
   
   def before_save
     if title == PLACE_HOLDER_TITLE.t
-      write_attribute(:title, title_from_kind)  
+      revisions.first.title = title_from_kind  
     end
     
     write_attribute(:name, self.name)
@@ -51,29 +73,45 @@ class Page < ActiveRecord::Base
     return result
   end
   
-  def title; title_before_type_cast; end
-  def title_before_type_cast
-    result = read_attribute(:title)
-    return title_from_name || PLACE_HOLDER_TITLE.t if result.nil? || result.empty?
-    return result
-  end
-  
-  def use_parser(parser)
-    @parser = parser
-  end
-  
   def is_open_to_all?
     0 == editors.strip.size
   end
   
+  def revise(author, time, attrs)
+    #TODO ugly! ugly! ugly!
+    if !attrs[:happens_at] && attrs['happens_at(1i)'] && attrs['happens_at(2i)'] && attrs['happens_at(3i)'] 
+      attrs[:happens_at] =
+        Date.new(attrs['happens_at(1i)'].to_i, attrs['happens_at(2i)'].to_i,
+                 attrs['happens_at(3i)'].to_i)
+    end
+    unless revisions.size == 0 || original_author 
+      revisions.last.last_editor = author 
+      revisions.last.save
+    end
+    rev = Revision.new(:last_editor => author, :modified_at => time)
+    rev.editors = if author.can_change_editors?(self)
+      attrs[:editors]
+    else
+      revisions.first.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)
+    
+    save
+    self
+  end
+  
 private
   
   def name_from_title
-    sequence(drop_non_alpha(clean(title)).downcase.gsub(/ /, '_').camelize, 'name')
+    sequence(Page, drop_non_alpha(clean(title)).downcase.gsub(/ /, '_').camelize, 'name')
   end
   
   def title_from_kind
-    sequence(kind.capitalize + ' page ', 'title')
+    sequence(Revision, kind.capitalize + ' page ', 'title')
   end
   
   def title_from_name
@@ -82,24 +120,24 @@ private
     name && name.underscore.gsub(/_/, ' ').capitalize
   end
   
-  def sequence(target, attr)
+  def sequence(finder, target, attr)
     result = target.strip
     suffix = 2
-    while self.class.find(:first, :conditions => "#{attr} = '#{result}'")
+    while finder.find(:first, :conditions => "#{attr} = '#{result}'")
       result = target + suffix.to_s
       suffix += 1
     end
     return result    
   end
   
-  def renderer
-    @renderer ||= WikiRenderer.new
+  def most_recent(attr)
+    revisions.first && revisions.first.send(attr)  
   end
   
-  def my_parser
-    @parser ||= WikiParser.new
+  def oldest(attr)
+    revisions.last && revisions.last.send(attr)  
   end
-  
+
 private
 
   def clean(text)

data/app/models/revision.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 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|
+    define_method(method) { page.send(method) }
+  end
+
+end

data/app/views/javascript/motiro.rjs

@@ -56,6 +56,7 @@ function tooglePasswordConfirmation(show) {
 	var action = show ? '#{url_for :controller => 'account', :action => 'signup'}' : '#{url_for :controller => 'account', :action => 'login'}' ;
             
 	document.getElementById("user_password_confirmation").disabled = !show;
+	document.getElementById("authentication_errors").style.display = state;
 	document.forms[0].action = action;
 
 	elem.style.display = state;

data/app/views/wiki/_editbar.rhtml

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

data/app/views/wiki/history.rhtml

@@ -0,0 +1,28 @@
+<% pagetext('Page history for %s' / @page.title) do %>
+  <table class="oldernews">
+    <thead>
+     <tr>
+        <th class="date"><%= 'Date'.t -%></th>
+        <th class="relative"/>
+        <th><%= 'Author'.t -%></th>
+        <th><%= 'Title'.t -%></th>
+      </tr>
+    </thead>
+    <tbody>
+    <% i = 0 %>
+    <% @page.revisions.each do |rev| %>
+      <tr class="<%= i % 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>
+        <td><%= content_tag :a, rev.title,
+                            :href => server_url_for(:controller => 'wiki',
+                                                    :action => 'show',
+                                                    :page_name => @page.name,
+                                                    :revision => i) -%></td>
+      </tr>
+      <% i += 1 %>
+    <% end %>
+    </tbody>
+  </table>
+<% end %>

data/app/views/wiki/show.rhtml

@@ -1,7 +1,7 @@
 <% pagetext(@page.title) do %>
   <% cache(:controller=> 'wiki', :action => 'show',
-           :page => @page.name, :locale_suffix => @locale) do
-  %>
+           :page => @page.name, :locale_suffix => @locale,
+           :revision => @page_revision_id) do %>
     <%= render :partial => 'properties_show' %>
     <%= @renderer.render_html(@page.text) %>
   <% end %>

data/db/migrate/016_create_revisions.rb

@@ -0,0 +1,19 @@
+class CreateRevisions < ActiveRecord::Migration
+
+  def self.up
+    create_table :revisions do |t|
+      t.column 'page_id', :integer
+      t.column 'text', :text
+      t.column 'editors', :text
+      t.column 'kind', :text
+      t.column 'title', :text
+      t.column 'created_at', :timestamp
+      t.column 'revisor_id', :integer
+    end
+  end
+    
+  def self.down
+    drop_table :revisions
+  end
+
+end

data/db/migrate/017_revision_mimics_page.rb

@@ -0,0 +1,13 @@
+class RevisionMimicsPage < ActiveRecord::Migration
+
+  def self.up
+    rename_column :revisions, :revisor_id, :last_editor_id
+    rename_column :revisions, :created_at, :modified_at
+  end
+    
+  def self.down
+    rename_column :revisions, :last_editor_id, :revisor_id
+    rename_column :revisions, :modified_at, :created_at
+  end
+
+end

data/db/migrate/018_drop_redundant_page_columns.rb

@@ -0,0 +1,25 @@
+class DropRedundantPageColumns < ActiveRecord::Migration
+
+  def self.up
+    execute("INSERT INTO revisions (page_id, text, editors, kind, title, " +
+                                   "modified_at, last_editor_id) " +
+                         "SELECT id, text, editors, kind, title, " +
+                                "'2006-02-01 00:00:00', original_author_id " +
+                         "FROM   pages")
+    execute("INSERT INTO revisions (page_id, text, editors, kind, title, " +
+                                   "modified_at, last_editor_id) " +
+                         "SELECT id, text, editors, kind, title, " +
+                                "modified_at, last_editor_id " +
+                         "FROM   pages")
+    remove_column :pages, :text
+    remove_column :pages, :editors
+    remove_column :pages, :title
+    remove_column :pages, :last_editor_id
+    remove_column :pages, :original_author_id
+  end
+    
+  def self.down
+    raise IrreversibleMigration
+  end
+
+end

data/db/migrate/019_move_event_date_to_revision.rb

@@ -0,0 +1,13 @@
+class MoveEventDateToRevision < ActiveRecord::Migration
+
+  def self.up
+    add_column :revisions, :happens_at, :date
+    execute("UPDATE revisions " +
+            "SET happens_at = (select happens_at from pages p where p.id = page_id)")
+  end
+    
+  def self.down
+    remove_column :revisions, :happens_at
+  end
+
+end

data/db/schema_version

@@ -1 +1 @@
-15
+19

data/db/translation/pt-BR.rb

@@ -71,6 +71,8 @@
 'Who should be able to edit this page?' => 'Quem pode editar esta página?',
 '(Usernames separated by spaces. Blank for everyone)' => '(Nomes de usuário separados por espaços. Em branco para todos.)',
 
-# Older headlines page
-'Author' => 'Autor'
+# Older headlines and history pages
+'Author' => 'Autor',
+'Page history for %s' => 'Histórico da página %s',
+'Page history' => 'Histórico da página'
 }

data/test/acceptance/wiki_test.rb

@@ -66,7 +66,7 @@ class WikiAcceptanceTest < AcceptanceTestCase
     log_as(:bob)
     
     click "//a[text() = 'Edit']"
-    wait_for_page_to_load(1500)
+    wait_for_page_to_load(2000)
     
     type 'txaEditor', "= This title does not show =\n\n" +
                       "Neither does this text"
@@ -87,7 +87,7 @@ class WikiAcceptanceTest < AcceptanceTestCase
     type 'txaEditor', 'Original Text'
     type 'txtAuthorized', 'bob eric'
     click 'btnSave'
-    wait_for_page_to_load(1500)
+    wait_for_page_to_load(2000)
     
     log_out
     log_as(:john)
@@ -106,7 +106,7 @@ class WikiAcceptanceTest < AcceptanceTestCase
     
     type 'txtAuthorized', 'bob eric john'
     click 'btnSave'
-    wait_for_page_to_load(1500)
+    wait_for_page_to_load(2000)
     
     log_out
     log_as(:john)
@@ -134,7 +134,7 @@ class WikiAcceptanceTest < AcceptanceTestCase
     
     type 'txaEditor', 'New edited text for Nobody\'s Page'
     click 'btnSave'
-    wait_for_page_to_load(1500)
+    wait_for_page_to_load(2000)
     
     log_out
     log_as(:john)

data/test/fixtures/pages.yml

@@ -1,98 +1,58 @@
 main_page:
   id: 1
   name: MainPage
-  original_author_id: 1000001
-  editors:  ""
-  text: = Motiro =
-        
-        This is project motiro
 
 johns_page:
   id: 2
-  original_author_id: 1000004
   name: John_s
-  editors: john
-  text: This is John's page
   
 bob_and_erics_page:
   id: 3
   name: Bob_and_Eric_s
-  original_author_id: 1000001 #bob
-  editors: bob eric
-  text: This is Bob and Eric's page
   
 nobodys_page:
   id: 4
   name: Unclaimed
-  original_author_id:
-  editors: ""
-  text: This page was created before the wiki access control was in place
   
 test_page:
   id: 5
   name: TestPage
   kind: common
-  original_author_id: 1000001
-  editors: ""
-  title: 
-  text: This is the page text
   
 non_matching_title_page:
   id: 6
-  name: NonMatchingTitlePage
   kind: common
-  original_author_id: 1000001
-  editors: ""
-  title: The title does not match the name
-  text: This is the page text
+  name: NonMatchingTitlePage
   
 list_last_modified_features_page:
   id: 7
-  name: ListLastModifiedFeatures
   kind: feature
-  original_author_id: 1000001
+  name: ListLastModifiedFeatures
   modified_at: 2033-12-27 16:47:00
-  last_editor_id: 1000001
-  editors: ""
-  title: List last modified features
-  text: Motiro should list the last modified feature suggestion pages on the
-        main page
 
 provide_rss_feed_for_last_modified_pages_page:
   id: 8
-  name: ProvideRSSFeedForLastModifiedPages
   kind: feature
-  original_author_id: 1000001
+  name: ProvideRSSFeedForLastModifiedPages
   modified_at: 2033-12-27 12:33:48
-  last_editor_id: 1000004
-  editors: ""
-  title: Provide RSS feed for last modified pages
-  text: There could be an RSS feed for the last modified pages
-  
+
 events_are_just_special_pages_too_page:
   id: 9
-  name: EventsAreJustSpecialWikiPagesToo
   kind: feature
-  original_author_id: 1000001
+  name: EventsAreJustSpecialWikiPagesToo
   modified_at: 2033-12-25 18:43:31
-  last_editor_id: 1000005
-  editors: ""
-  title: Events are just special wiki pages too
-  text: Event descriptions can be treated just like other regular wiki pages,
-        in the same way that feature suggestion pages are
-        
+
 release_event:
   id: 10
+  kind: event
   name: FourteenthRelease
   kind: event
   type: Event
-  original_author_id: 1000004 #john
-  modified_at: 2007-01-18 13:28:47
-  last_editor_id: 1000004 #john
-  editors: ""
   happens_at: 2007-01-24
-  title: Fourteenth release
-  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.
- 
+  modified_at: 2007-01-18 13:28:47
+ 
+changed_page:
+  id: 11
+  name: ChangedPage
+  kind: common
+  modified_at: 2007-01-22 13:21:26