motiro 0.6.6 → 0.6.7

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.6 - June 2007
+Motiro version 0.6.7 - July 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

@@ -19,7 +19,7 @@ class WikiController < ApplicationController
 
   layout :choose_layout
 
-  before_filter :login_required, :except => [:show, :last, :history]
+  before_filter :login_required, :except => [:show, :last, :history, :diff]
   before_filter :fetch_page, :fetch_revision
   before_filter :check_edit_access, :only => [:edit, :save]
   
@@ -100,6 +100,19 @@ class WikiController < ApplicationController
     end
   end
   
+  def diff
+    redirect_to params.delete_if {|k,v| :btnCompare == k.to_sym} if params[:btnCompare]
+    @old_revision_num = params[:old_revision]
+    @new_revision_num = params[:new_revision]
+    @old_revision = @page.revisions[@old_revision_num.to_i - 1]
+    new_revision = @page.revisions[@new_revision_num.to_i - 1]
+    unless @old_revision && new_revision
+      flash[:notice] = '%s has no revision %s' / @page.name /
+        (@old_revision.nil? ? @old_revision_num : @new_revision_num)
+      redirect_to :action => 'show', :page_name => params[:page_name]
+    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.6'
+MOTIRO_VERSION = '0.6.7'

data/app/core/wiki_reporter.rb

@@ -18,9 +18,6 @@
 require 'core/reporter'
 require 'core/settings'
 
-DEFAULT_AUTHOR = 'someone'
-DEFAULT_TIME = Time.local(2007, 1, 3, 15, 10)
-
 class WikiReporter < MotiroReporter
 
   caching :off
@@ -40,12 +37,13 @@ class WikiReporter < MotiroReporter
   end
 
   def latest_headlines(rid='')
-    to_headlines @page_provider.find(:all, find_opts.merge(
-                                             :limit => @settings.package_size))
+    @page_provider.find(:all, find_opts.merge(
+                                :limit => @settings.package_size)).
+      map {|p| p.to_headline}
   end
   
   def headlines
-    to_headlines @page_provider.find(:all, find_opts)
+    @page_provider.find(:all, find_opts).map {|p| p.to_headline}
   end
   
   def params_for(page_name)
@@ -54,8 +52,6 @@ class WikiReporter < MotiroReporter
   
   def column; 'modified_at'; end
   
-  def extract_happened_at(page); page.modified_at; end
-  
 private
 
   def self.button_for_creating(kind)
@@ -71,13 +67,4 @@ private
     { :conditions => "kind = '#{name.singularize}'", :order => "#{column} DESC" }
   end
   
-  def to_headlines(pages)
-    pages.map do |page|
-      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 + "\n\n" + page.text)
-    end
-  end
-
 end

data/app/helpers/application_helper.rb

@@ -67,6 +67,39 @@ module ApplicationHelper
     end
     concat(xml, block.binding)
   end
+  
+  def render_diff_table(chunks)
+    Builder::XmlMarkup.new.table :class => 'diff', :cellspacing => '0' do |b|
+      b.colgroup do
+        b.col :class => 'line_number'
+        b.col :class => 'left'
+        b.col :class => 'right'
+        b.col :class => 'line_number'
+      end
+      chunks.each do |chunk|
+        if chunk.separator?
+          b.tbody :class => 'separator' do
+            b.tr do
+              b.td
+              b.td('%s more lines' / chunk.num_lines.to_s, :colspan => '2')
+              b.td
+            end
+          end
+        else  
+          b.tbody :class => chunk.action.to_s do
+            chunk.lines.each do |line|
+              b.tr do
+                b.td {b << (line.original_position || '&nbsp;').to_s}
+                b.td {b.pre{b << (h(line.original_text) || '&nbsp;')}}
+                b.td {b.pre{b << (h(line.modified_text) || '&nbsp;')}}
+                b.td {b << (line.modified_position || '&nbsp;').to_s}
+              end
+            end
+          end
+        end
+      end
+    end
+  end
 
 end
 

data/app/helpers/report_helper.rb

@@ -1,2 +1,41 @@
+#  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
+
 module ReportHelper
+
+  def render_diff(change)
+    return '' unless change.chunked_diff
+    Builder::XmlMarkup.new.div(:id => ref(change),
+                               :class => "diff-window") do |b|
+      b.h2 'Changes to %s' / change.resource_name
+      b << render_diff_table(change.chunked_diff)
+    end
+  end
+
+  def render_summary(change)
+    summary = html_escape(change.summary)
+    if (change.has_diff?)
+      "<a href='\#' onClick=\"showOnly('#{ref(change)}')\">#{summary}</a>"
+    else
+      summary
+    end
+  end
+
+  def ref(change)
+    "change" + change.summary.hash.to_s
+  end
 end

data/app/helpers/report_helper.rb.rej

@@ -0,0 +1,46 @@
+***************
+*** 22,57 ****
+      Builder::XmlMarkup.new.div(:id => ref(change),
+                                 :class => "diff-window") do |b|
+        b.h2 'Changes to %s' / change.resource_name
+-       b.table :class => 'diff', :cellspacing => '0' do
+-         b.colgroup do
+-           b.col :class => 'line_number'
+-           b.col :class => 'left'
+-           b.col :class => 'right'
+-           b.col :class => 'line_number'
+-         end
+-         change.chunked_diff.each do |chunk|
+-           if chunk.separator?
+-             b.tbody :class => 'separator' do
+-               b.tr do
+-                 b.td
+-                 b.td('%s more lines' / chunk.num_lines.to_s, :colspan => '2')
+-                 b.td
+-               end
+-             end
+-           else  
+-             b.tbody :class => chunk.action.to_s do
+-               chunk.lines.each do |line|
+-                 b.tr do
+-                   b.td {b << (line.original_position || '&nbsp;').to_s}
+-                   b.td {b.pre{b << (h(line.original_text) || '&nbsp;')}}
+-                   b.td {b.pre{b << (h(line.modified_text) || '&nbsp;')}}
+-                   b.td {b << (line.modified_position || '&nbsp;').to_s}
+-                 end
+-               end
+-             end
+-           end
+-         end
+-       end
+      end
+    end
+  
+--- 22,28 ----
+      Builder::XmlMarkup.new.div(:id => ref(change),
+                                 :class => "diff-window") do |b|
+        b.h2 'Changes to %s' / change.resource_name
++       b << render_diff_table(change.chunked_diff)
+      end
+    end
+  

data/app/helpers/wiki_helper.rb

@@ -4,7 +4,7 @@ module WikiHelper
     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,
+      else '| ' + link_to('Page history (%s revisions)'/page.revisions.size.to_s,
                           :controller => 'wiki', :action => 'history',
                           :page_name => page.name)
     end

data/app/models/change.rb

@@ -15,39 +15,12 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-require 'erb'
-
 class Change < ActiveRecord::Base
   
-  include ERB::Util
-  
-  def to_s
-    return summary
-  end
-  
-  def render_summary
-    if (has_diff?)
-      return "<a href='\#' onClick=\"showOnly('#{ref}')\">#{html_escape(summary)}</a>"
-    else
-      return summary
-    end
-  end
-  
-  def render_diff
-    if (has_diff?)
-      return "<div id='#{ref}' class='diff-window'>" +
-             "<center>" +
-             "<h2>#{'Changes to %s' / resource_name}</h2>\n" +
-             render_diff_table +
-             "</center>" +
-             "</div>"
-    else
-      return ''
-    end
-  end
-  
-  def render_diff_table
-    @differ ||= DiffTableBuilder.new
+  def chunked_diff
+    return nil unless has_diff?
+    return @chunked_diff if @chunked_diff
+    @differ ||= DiffChunkBuilder.new
     diff.split("\n").each do |line|
       c = line[0,1]
       line_text = line[1, line.length - 1]
@@ -64,7 +37,11 @@ class Change < ActiveRecord::Base
       end
     end
     
-    return @differ.render_diff_table
+    @chunked_diff = @differ.get_chunks
+  end
+  
+  def to_s
+    return summary
   end
   
   def qualified_resource_name
@@ -76,21 +53,15 @@ class Change < ActiveRecord::Base
   end
   
   def filled?
-    !self.resource_kind.nil? && ('dir' == self.resource_kind || !self.diff.nil?)
+    self.resource_kind && ('dir' == self.resource_kind || has_diff?)
   end
   
-  def use_differ(differ)
-    @differ = differ
-  end
-  
-  private
-  
   def has_diff?
     return ! (diff.nil? or diff.empty?)
   end
   
-  def ref
-    return "change" + summary.hash.to_s
+  def use_differ(differ)
+    @differ = differ
   end
   
 end

data/app/models/chunk.rb

@@ -0,0 +1,56 @@
+#  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 Chunk
+  attr_reader :lines, :action
+  
+  def initialize(action)
+    @action = action
+  end
+  
+  def unchanged?
+    :unchanged == action
+  end
+  
+  def separator?; false; end
+
+  def <<(line)
+    @lines ||= []
+    @lines << line
+  end
+end
+
+class Line
+  attr_reader :original_text, :original_position,
+              :modified_text, :modified_position
+  
+  def initialize(old_text, old_pos, new_text, new_pos)
+    @original_text, @modified_text = old_text, new_text
+    @original_position = old_text && old_pos
+    @modified_position = new_text && new_pos
+  end
+end
+
+class Separator
+  attr_reader :num_lines
+
+  def initialize(num_lines)
+    @num_lines = num_lines
+  end
+  
+  def separator?; true; end
+end

data/app/models/page.rb

@@ -16,6 +16,8 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 PLACE_HOLDER_TITLE = 'Insert page title here'
+DEFAULT_AUTHOR = 'someone'
+DEFAULT_TIME = Time.local(2007, 1, 3, 15, 10)
 
 class Page < ActiveRecord::Base
 
@@ -110,8 +112,23 @@ class Page < ActiveRecord::Base
     self
   end
   
+  def to_headline
+    #TODO (for 0.7): headlines and pages should _really_ be the same thing
+    #                reporters should write ordinary wiki pages
+    Headline.new(:rid => name,
+                 :author => last_editor ? last_editor.login : DEFAULT_AUTHOR,
+                 :happened_at => (kind == 'event' ? happens_at.to_t : modified_at) || DEFAULT_TIME,
+                 :description => inject_title_into_text)
+  end
+  
 private
   
+  def inject_title_into_text
+    title + "\n\n" +
+    text.gsub(/^--- (\S+) ----*[ \t\f]*\r?\n/,
+              "--- \\1 ---\n\n#{title}\n")
+  end
+  
   def name_from_title
     sequence(Page, drop_non_alpha(clean(title)).downcase.gsub(/ /, '_').camelize, 'name')
   end

data/app/models/revision.rb

@@ -15,6 +15,9 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+require 'diff/lcs'
+require 'diff/lcs/array'
+
 class Revision < ActiveRecord::Base
   belongs_to :page
   belongs_to :last_editor, :class_name => 'User', :foreign_key => 'last_editor_id'
@@ -23,5 +26,33 @@ class Revision < ActiveRecord::Base
   %w{name original_author revisions}.each do |method|
     define_method(method) { page.send(method) }
   end
+  
+  LCS_ACTION_TO_SYMBOL = {'=' => :unchanged, '!' => :modification,
+                          '-' => :removal, '+' => :addition}
+  
+  def diff(rev_num)
+    #position numbers are 1-based, but we want 0-based when indexing revisions
+    sdiffs = text.split($/).sdiff(page.revisions[rev_num - 1].text.split($/))
+    chunks = []
+    last_action = chunk = nil
+    sdiffs.each do |sdiff|
+      if chunk_break_needed(last_action, sdiff.action) 
+        chunk = Chunk.new(LCS_ACTION_TO_SYMBOL[sdiff.action])
+        chunks << chunk
+      end
+      last_action = sdiff.action
+      #lcs's position are 0-based, but we want 1-based when rendering
+      chunk << Line.new(sdiff.old_element, sdiff.old_position + 1,
+                        sdiff.new_element, sdiff.new_position + 1)
+    end
+
+    chunks
+  end
+
+private
+
+  def chunk_break_needed(prev, curr)
+    prev.nil? || curr != prev && [prev, curr].include?('=')
+  end
 
 end

data/app/reporters/events_reporter.rb

@@ -23,6 +23,4 @@ class EventsReporter < WikiReporter
 
   def column; 'happens_at'; end
   
-  def extract_happened_at(page); page.happens_at.to_t; end
-
 end

data/app/views/report/show.rhtml

@@ -4,7 +4,7 @@
     <%= @renderer.render_html(@headline.description(Translator.for(@locale))) %>
     <div id="summary">
       <% @headline.changes.each do |change| %>
-        <%= change.render_summary -%>
+        <%= render_summary(change) -%>
         <br/>
       <% end %>
     </div>
@@ -13,7 +13,7 @@
 <% cache(:action => 'show', :suffix => 'changes', :locale => @locale) do %>
   <div id="changes">
     <% @headline.changes.each do |change| %>
-      <%= change.render_diff %>
+      <%= render_diff(change) %>
     <% end %>
   </div>
 <% end %>

data/app/views/wiki/diff.rhtml

@@ -0,0 +1,4 @@
+<% pagetext(@page.title, '(Comparing revisions %s and %s)' / @old_revision_num / @new_revision_num) do %>
+  <%= render_diff_table(@old_revision.diff(@new_revision_num.to_i))%>
+  <%= render :partial => 'editbar' %>
+<% end %>

data/app/views/wiki/history.rhtml

@@ -1,26 +1,37 @@
 <% 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>
-    <% @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>
-        <td><%= content_tag :a, rev.title,
+  <% form_tag "/wiki/diff/#{params[:page_name]}", :method => 'get' do %>
+    <%= submit_tag 'Compare revisions'.t, :class => 'button',
+                                          :name => 'btnCompare' %>
+    <table class="oldernews">
+      <thead>
+       <tr>
+          <th/>
+          <th class="date"><%= 'Date'.t -%></th>
+          <th><%= 'Author'.t -%></th>
+        </tr>
+      </thead>
+      <tbody>
+      <% last_position = @page.revisions.last.position %>
+      <% @page.revisions.reverse.each do |rev| %>
+        <tr class="<%= rev.position % 2 == 0 ? 'odd' : 'even' -%>">
+          <td>
+            <input type="radio" name="old_revision" value="<%= rev.position-%>"
+              <%= 'checked="checked"' if last_position -1 == rev.position -%> />
+            <input type="radio" name="new_revision" value="<%= rev.position-%>"
+              <%= 'checked="checked"' if last_position == rev.position -%> />
+          </td>
+          <td class="date">
+            <%= content_tag :a, rev.modified_at,
                             :href => server_url_for(:controller => 'wiki',
                                                     :action => 'show',
                                                     :page_name => @page.name,
-                                                    :revision => rev.position) -%></td>
-      </tr>
-    <% end %>
-    </tbody>
-  </table>
+                                                    :revision => rev.position) %>
+            (<%= rev.modified_at.relative_to_now -%>)
+          </td>
+          <td><%= rev.last_editor.login %></td>
+        </tr>
+      <% end %>
+      </tbody>
+    </table>
+  <% end %>
 <% end %>

data/app/views/wiki/history.rhtml.rej

@@ -0,0 +1,63 @@
+***************
+*** 1,26 ****
+  <% 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>
+-     <% @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>
+-         <td><%= content_tag :a, rev.title,
+                              :href => server_url_for(:controller => 'wiki',
+                                                      :action => 'show',
+                                                      :page_name => @page.name,
+-                                                     :revision => rev.position) -%></td>
+-       </tr>
+-     <% end %>
+-     </tbody>
+-   </table>
+  <% end %>
+--- 1,34 ----
+  <% pagetext('Page history for %s' / @page.title) do %>
++   <% form_tag "/wiki/diff/#{params[:page_name]}", :method => 'get' do %>
++     <%= submit_tag 'Compare revisions'.t, :class => 'button',
++                                           :name => 'btnCompare' %>
++     <table class="oldernews">
++       <thead>
++        <tr>
++           <th/>
++           <th class="date"><%= 'Date'.t -%></th>
++           <th><%= 'Author'.t -%></th>
++         </tr>
++       </thead>
++       <tbody>
++       <% @page.revisions.reverse.each do |rev| %>
++         <tr class="<%= rev.position % 2 == 0 ? 'odd' : 'even' -%>">
++           <td>
++             <input type="radio" name="old_revision" value="<%= rev.position-%>" />
++             <input type="radio" name="new_revision" value="<%= rev.position-%>" />
++           </td>
++           <td class="date">
++             <%= content_tag :a, rev.modified_at,
+                              :href => server_url_for(:controller => 'wiki',
+                                                      :action => 'show',
+                                                      :page_name => @page.name,
++                                                     :revision => rev.position) %>
++             (<%= rev.modified_at.relative_to_now -%>)
++           </td>
++           <td><%= rev.last_editor.login %></td>
++         </tr>
++       <% end %>
++       </tbody>
++     </table>
++   <% end %>
+  <% end %>

data/config/motiro.yml

@@ -29,7 +29,7 @@ subversion:
   #
   # Tells the reporter where to find your project's repository
   # Default: https://svn.sourceforge.net/svnroot/motiro
-  repo: https://svn.sourceforge.net/svnroot/motiro
+  repo: https://motiro.svn.sourceforge.net/svnroot/motiro
 
   # subversion/{user,password}
   #

data/config/routes.rb

@@ -42,6 +42,9 @@ ActionController::Routing::Routes.draw do |map|
               :action => 'last',
               :defaults => locale_defaults.merge(:kind => 'common')
 
+  map.connect 'wiki/diff/:page_name/:old_revision/:new_revision',
+              :controller => 'wiki', :action => 'diff'
+
   map.connect 'wiki/:action/:locale',
               :controller => 'wiki',
               :requirements => { :action => /properties_(show|edit)/ },

data/db/translation/pt-BR.rb

@@ -44,6 +44,7 @@
 'Revision %s' => 'Revisão %s',
 'Changes to %s' => 'Alterações em %s',
 'The article %s from the %s reporter could not be found' => 'Não foi possível encontrar o artigo %s do repórter %s',
+'%s more lines' => '%s linhas a mais',
 
 # Event details and new event pages
 'Events' => 'Eventos',
@@ -70,10 +71,14 @@
 'event description' => 'descrição de evento', 
 '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.)',
+'(Comparing revisions %s and %s)' => '(Diferenças entre as revisões %s e %s)',
 
 # Older headlines and history pages
 'Author' => 'Autor',
+'Page has no history yet' => 'Página ainda sem histórico',
 'Page history for %s' => 'Histórico da página %s',
+'Page history (%s revisions)' => 'Histórico da página (%s revisões)',
 'Page history' => 'Histórico da página',
-'(Revision %s)' => '(Revisão %s)'
+'(Revision %s)' => '(Revisão %s)',
+'Compare revisions' => 'Comparar revisões'
 }