motiro 0.6.7 → 0.6.8

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.7 - July 2007
+Motiro version 0.6.8 - 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,8 +19,9 @@ class WikiController < ApplicationController
 
   layout :choose_layout
 
-  before_filter :login_required, :except => [:show, :last, :history, :diff]
+  before_filter :login_required, :only => [:new, :edit, :save]
   before_filter :fetch_page, :fetch_revision
+  before_filter :fetch_diff, :only => [:diff, :sourcediff]
   before_filter :check_edit_access, :only => [:edit, :save]
   
   cache_sweeper :wiki_sweeper, :only =>  [:edit, :save]
@@ -65,6 +66,19 @@ class WikiController < ApplicationController
     end
   end
   
+  def fetch_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 check_edit_access
     unless current_user.can_edit?(@page)
       flash[:not_authorized] = true
@@ -100,19 +114,6 @@ 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.7'
+MOTIRO_VERSION = '0.6.8'

data/app/models/revision.rb

@@ -15,9 +15,6 @@
 #  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'
@@ -27,32 +24,37 @@ class Revision < ActiveRecord::Base
     define_method(method) { page.send(method) }
   end
   
+  def diff(rev_num)
+    ChunkDiffer.new.diff(text.split($/),
+      #position numbers are 1-based, but we want 0-based when indexing revisions
+                         page.revisions[rev_num - 1].text.split($/))
+  end
+
+end
+
+class ChunkDiffer
+
+  def diff(old_lines, new_lines)
+    @chunks = []
+    Differ.new(self).diff(old_lines, new_lines)
+  end
+
   LCS_ACTION_TO_SYMBOL = {'=' => :unchanged, '!' => :modification,
-                          '-' => :removal, '+' => :addition}
+                          '-' => :deletion, '+' => :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
+  def start_new_chunk(action)
+    @chunk = Chunk.new(LCS_ACTION_TO_SYMBOL[action])
+    @chunks << @chunk
   end
 
-private
+  def store_diff(sdiff)
+    #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
 
-  def chunk_break_needed(prev, curr)
-    prev.nil? || curr != prev && [prev, curr].include?('=')
+  def get_result
+    @chunks
   end
 
 end

data/app/views/report/show.rhtml

@@ -1,7 +1,7 @@
 <% @title = "#{'Revision details'.t} - #{@headline.title(Translator.for(@locale))} (Motiro)" %>
 <% cache(:action => 'show', :suffix => 'summary', :locale => @locale) do %>
   <% pagetext('Revision %s' / truncate(@revision_id)) do %>
-    <%= @renderer.render_html(@headline.description(Translator.for(@locale))) %>
+    <%= @renderer.render_wiki_text(@headline.description(Translator.for(@locale))) %>
     <div id="summary">
       <% @headline.changes.each do |change| %>
         <%= render_summary(change) -%>

data/app/views/wiki/_diffbar.rhtml

@@ -0,0 +1,12 @@
+<div class='toolbar bottombar'>
+  <%= render :partial => 'editor' %>
+  <%= if 'diff' == params[:action] 
+        link_to 'View source diff'.t, params.merge(:action => 'sourcediff')
+      else
+        link_to 'View rendered diff'.t, params.merge(:action => 'diff')
+      end -%> |
+  <%= link_to 'View revision %s' / @new_revision_num,
+              :action => 'show', :page_name => @page.name,
+              :revision => @new_revision_num -%>
+  <%= page_history_link(@page) -%>
+</div>

data/app/views/wiki/_editbar.rhtml

@@ -1,10 +1,5 @@
-<div class='toolbar editbar'>
-  <% unless @page.last_editor.nil? || @page.modified_at.nil? %>
-    <p>
-      <i><%= 'Last update by %s at %s' / @page.last_editor.login /
-             @page.modified_at.to_s(:rfc822) -%></i>
-    </p>
-  <% end %>
+<div class='toolbar bottombar'>
+  <%= render :partial => 'editor' %>
   <% if current_user.nil? then %>
     <span class='disabled'>
       <%= 'Edit'.t -%> <%= '(requires authentication)'.t -%>

data/app/views/wiki/_editor.rhtml

@@ -0,0 +1,6 @@
+<% unless @page.last_editor.nil? || @page.modified_at.nil? %>
+  <p>
+    <i><%= 'Last update by %s at %s' / @page.last_editor.login /
+           @page.modified_at.to_s(:rfc822) -%></i>
+  </p>
+<% end %>

data/app/views/wiki/diff.rhtml

@@ -1,4 +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' %>
+  <%= @renderer.render_wiki_diff(@old_revision.text, @new_revision.text) %>
+  <%= render :partial => 'diffbar' %>
 <% end %>

data/app/views/wiki/page_feed.rxml

@@ -13,7 +13,12 @@ xml.rss 'version' => '2.0',
       @page.revisions.reverse[0..10].each do |rev|
         xml.item do
           xml.title h(rev.title)
-          xml.description @renderer.render_html(rev.text)
+          if rev.position > 1
+            xml.description @renderer.render_wiki_diff(
+              @page.revisions[rev.position - 2].text, rev.text)
+          else
+            xml.description @renderer.render_wiki_text(rev.text)
+          end
           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,

data/app/views/wiki/show.rhtml

@@ -3,7 +3,7 @@
            :page => @page.name, :locale_suffix => @locale,
            :revision => @page_revision_id) do %>
     <%= render :partial => 'properties_show' %>
-    <%= @renderer.render_html(@page.text) %>
+    <%= @renderer.render_wiki_text(@page.text) %>
   <% end %>
   <%= render :partial => 'editbar' %>
 <% end %>

data/app/views/wiki/sourcediff.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 => 'diffbar' %>
+<% end %>

data/config/routes.rb

@@ -42,8 +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/:page_name/:old_revision/:new_revision',
+              :controller => 'wiki',
+              :requirements => { :action => /(source)?diff/}
 
   map.connect 'wiki/:action/:locale',
               :controller => 'wiki',

data/db/translation/pt-BR.rb

@@ -71,7 +71,12 @@
 '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.)',
+
+# Wiki diff
 '(Comparing revisions %s and %s)' => '(Diferenças entre as revisões %s e %s)',
+'View rendered diff' => 'Ver comparativo renderizado',
+'View source diff' => 'Ver comparativo de código',
+'View revision %s' => 'Ver a revisão %s',
 
 # Older headlines and history pages
 'Author' => 'Autor',

data/lib/array_extensions.rb

@@ -0,0 +1,30 @@
+#  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 Array
+  
+  def xml_join
+    str = ''
+    each do |s|
+      str << ' ' unless str.empty? || s.empty? ||
+                        str.match(/<[^\/][^>]*>\Z/) || s.match(/\A<\//)
+      str << s
+    end
+    str
+  end
+  
+end

data/lib/differ.rb

@@ -0,0 +1,46 @@
+#  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
+
+require 'diff/lcs'
+require 'diff/lcs/array'
+
+Differ = Struct.new(:target)
+class Differ
+
+  def diff(old_elems, new_elems)
+    sdiffs = old_elems.sdiff(new_elems)
+    
+    last_action = nil
+    sdiffs.each do |sdiff|
+      if chunk_break_needed(last_action, sdiff.action)
+        target.start_new_chunk(sdiff.action)
+      end
+      last_action = sdiff.action
+      
+      target.store_diff(sdiff)
+    end
+
+    target.get_result
+  end
+  
+private
+
+  def chunk_break_needed(prev, curr)
+    prev.nil? || curr != prev && [prev, curr].include?('=')
+  end
+
+end

data/lib/string_extensions.rb

@@ -1,10 +1,37 @@
+#  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
+
 require 'rubygems'
 require 'mediacloth'
 
 class String
-  
+
   def medialize
     MediaCloth::wiki_to_html self
   end
-  
+
+  def xml_split
+    str = self
+    words = []
+    while(md = str.match(/<([^>]+)(\s+[^>]+)?>.*?<\/\1>|[^\s<]+/m))
+      words << md[0]
+      str = md.post_match
+    end
+    words
+  end
+
 end

data/lib/wiki_renderer.rb

@@ -18,6 +18,9 @@
 require 'rubygems'
 require 'mediacloth'
 
+require 'string_extensions'
+require 'array_extensions'
+
 class WikiRenderer
 
   include MediaCloth
@@ -27,16 +30,84 @@ class WikiRenderer
     @translator = Translator.for(locale_code)
   end
   
-  def render_html(text)
+  def render_wiki_text(text)
     localized_text = @translator.localize(text).delete("\r")
     expanded_text = expand_internal_links(localized_text)
     wiki_to_html(expanded_text)
   end
   
+  def render_wiki_diff(old_text, new_text)
+    old_result = render_wiki_text(old_text)    
+    new_result = render_wiki_text(new_text)
+
+    HtmlDiffRenderer.new.render_html_diff(old_result, new_result)
+  end
+
+private
+
   def expand_internal_links(text)
     text.gsub(/\[(\w+)([ \t]+([^\]]+))?\]/) do |substr|
       "[#{@url_generator.generate_url_for($1)} #{$2 ? $2: $1}]"
     end
   end
 
-end
+end
+
+class HtmlDiffRenderer
+
+  def render_html_diff(old_html, new_html)
+    @diff_words = @removed_text = @inserted_text = []
+    Differ.new(self).diff(old_html.xml_split, new_html.xml_split)
+  end
+  
+  def start_new_chunk(action)
+    inject(@diff_words, @removed_text.xml_join, @inserted_text.xml_join)
+    @removed_text = []
+    @inserted_text = []
+  end
+
+  def store_diff(sdiff)
+    if '=' == sdiff.action
+      @diff_words << sdiff.old_element
+    else
+      @removed_text  << sdiff.old_element unless sdiff.old_element.nil?
+      @inserted_text << sdiff.new_element unless sdiff.new_element.nil?
+    end
+  end
+
+  def get_result
+    inject(@diff_words, @removed_text.xml_join, @inserted_text.xml_join)
+    
+    @diff_words.xml_join
+  end
+
+private
+
+  HTML_ELEMENT = /<([^>]+)(\s+[^>]+)?>(.*?)<\/\1>/m
+
+  def inject(words, old_text, new_text)
+    match_old = old_text.match(HTML_ELEMENT)
+    match_new = new_text.match(HTML_ELEMENT)
+    if match_old && match_new && match_old[1..2] == match_new[1..2]
+      words << [HtmlDiffRenderer.new.render_html_diff(match_old.pre_match, match_new.pre_match),
+                "<#{match_old[1..2].join}>",
+                HtmlDiffRenderer.new.render_html_diff(match_old[3], match_new[3]),
+                "</#{match_old[1]}>",
+                HtmlDiffRenderer.new.render_html_diff(match_old.post_match, match_new.post_match)].xml_join
+    else
+      injection = ''
+      injection += enclose('#ffb8b8', old_text) unless old_text.empty? 
+      injection += enclose('#b8ffb8', new_text) unless new_text.empty? 
+      words << injection
+    end
+    words
+  end
+  
+  def enclose(color, text)
+    return "<span style=\"background: #{color}\">#{text}</span>" unless ?< == text[0]
+    match = text.match(HTML_ELEMENT)
+    [match.pre_match,
+     "<#{match[1..2].join}><span style=\"background: #{color}\">#{match[3]}</span></#{match[1]}>",
+     match.post_match].xml_join
+  end
+end

data/public/stylesheets/motiro.css

@@ -122,11 +122,11 @@ div.toolbar {
     font-size: 0.8em;
 }
 
-div.editbar {
+div.bottombar {
     border-top: 1px dotted #9C9C9C;
 }
 
-div.editbar p { margin-top: 0 }
+div.bottombar p { margin-top: 0 }
 
 div.channel_toolbar {
     border-bottom: 1px dotted #9C9C9C;

data/test/fixtures/revisions.yml

@@ -138,6 +138,7 @@ first_multilanguage_revision:
   id: 15
   page_id: 12
   kind: feature
+  position: 1
   modified_at: 2007-06-14 12:03:24
   last_editor_id: 1000004 #john
   editors: ""
@@ -156,6 +157,7 @@ second_multilanguage_revision:
   id: 16
   page_id: 12
   kind: feature
+  position: 2
   modified_at: 2007-06-14 12:06:38
   last_editor_id: 1000004 #john
   editors: ""

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

data/test/functional/wiki_controller_test.rb

@@ -155,11 +155,14 @@ class WikiControllerTest < Test::Unit::TestCase
   end
   
   def test_considers_last_chosen_language_when_displaying_not_found_page
-    get '/en'
-    
+    get :show, :page_name => 'MultiLanguagePage', :locale => 'en'
     get :show, :page_name => 'NotYetCreatedPage'
     assert_tag :content => /nothing to be read here/
-  end
+
+    get :show, :page_name => 'MultiLanguagePage', :locale => 'pt'
+    get :show, :page_name => 'NotYetCreatedPage'
+    assert_tag :content => /agora mesmo, basta clicar/
+end
   
   def test_auto_selects_page_kind
     log_as 'bob'
@@ -349,11 +352,11 @@ class WikiControllerTest < Test::Unit::TestCase
 
     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')]"
+    assert_xml_element "//item/description[contains(text(), 'This is the &lt;span style=\"background: #ffb8b8\"&gt;first&lt;/span&gt;&lt;span style=\"background: #b8ffb8\"&gt;second&lt;/span&gt; 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')]"
+    assert_xml_element "//item/description[contains(text(), 'Esta &#233; a &lt;span style=\"background: #ffb8b8\"&gt;primeira&lt;/span&gt;&lt;span style=\"background: #b8ffb8\"&gt;segunda&lt;/span&gt; vers&#227;o em portugu&#234;s')]"
   end
   
   def test_history_links_to_page_revision
@@ -403,6 +406,29 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_no_xml_element "//input[@name='old_revision' and @value!='#{n - 1}' and @checked='checked']"
     assert_no_xml_element "//input[@name='new_revision' and @value!='#{n}' and @checked='checked']"
   end
+  
+  def test_shows_rendered_diff
+    page = pages('changed_page')
+    get :diff, :page_name => page.name, :old_revision => 1, :new_revision => 2
+    
+    assert_tag :span, :attributes => {:style => 'background: #b8ffb8'},
+               :content => 'Eric changed the text that'
+    assert_tag :span, :attributes => {:style => 'background: #ffb8b8'},
+               :content => 'some text here'
+    assert_tag :a, :content => 'View source diff'
+    assert_tag :a, :content => 'View revision 2'
+  end
+  
+  def test_shows_source_diff
+    page = pages('changed_page')
+    get :sourcediff, :page_name => page.name,
+        :old_revision => 1, :new_revision => 2
+    
+    assert_tag :td, :content => /John entered some text here/
+    assert_tag :td, :content => /Eric changed the text that John entered/
+    assert_tag :a, :content => 'View rendered diff'
+    assert_tag :a, :content => 'View revision 2'
+  end
 
 private
 

data/test/unit/array_extensions_test.rb

@@ -0,0 +1,40 @@
+#  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
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'array_extensions'
+
+class ArrayExtensionsTest < Test::Unit::TestCase
+
+  def test_xml_joins_enclosing_elements
+    words = ['<p>', 'This', 'is', 'a', 'paragraph', '</p>']
+    assert_equal '<p>This is a paragraph</p>', words.xml_join
+  end
+  
+  def test_xml_joins_inline_elements_with_spaces
+    words = ['<p>', 'A', '<a href="http://www.motiro.org">', 'link', '</a>',
+             'here', '</p>']
+    assert_equal '<p>A <a href="http://www.motiro.org">link</a> here</p>',
+                 words.xml_join
+  end
+  
+  def test_xml_joins_empty_strings
+    words = ['<p>A paragraph</p>', '']
+    assert_equal '<p>A paragraph</p>', words.xml_join
+  end
+
+end

data/test/unit/revision_test.rb

@@ -185,7 +185,7 @@ class RevisionTest < Test::Unit::TestCase
     assert !chunks[1].unchanged?
     assert  chunks[2].unchanged?
     chunk = chunks[1]
-    assert_equal :removal, chunk.action
+    assert_equal :deletion, chunk.action
     assert_equal 1, chunk.lines.size
     assert_equal 2, chunk.lines.first.original_position
     assert_equal 'This is the second line', chunk.lines.first.original_text

data/test/unit/string_extensions_test.rb

@@ -1,3 +1,20 @@
+#  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
+
 require File.dirname(__FILE__) + '/../test_helper'
 
 class StringExtensionsTest < Test::Unit::TestCase
@@ -7,4 +24,26 @@ class StringExtensionsTest < Test::Unit::TestCase
     assert_equal '<h1>Motiro</h1><p>Another paragraph</p>', str.medialize
   end
 
+  def test_xml_splits_simple_elements
+    str = "<p>This is a paragraph</p><p>And another one</p>"
+    assert_equal ['<p>This is a paragraph</p>', '<p>And another one</p>'],
+                 str.xml_split
+  end
+
+  def test_xml_splits_elements_with_attributes
+    str = 'This is a paragraph with a <a href="http://www.motiro.org/">link</a> inside'
+    assert_equal ['This', 'is', 'a', 'paragraph', 'with', 'a',
+                  '<a href="http://www.motiro.org/">link</a>', 'inside'], str.xml_split
+  end
+  
+  def test_xml_splits_tag_with_line_break
+    str = "<p>This is a\nmultiline change</p>"
+    assert_equal ["<p>This is a\nmultiline change</p>"], str.xml_split
+  end
+  
+  def test_xml_splits_multiletter_tags
+    str = '<h2>Level 2 title</h2><p>Paragraph</p>'
+    assert_equal ['<h2>Level 2 title</h2>', '<p>Paragraph</p>'], str.xml_split
+  end
+
 end

data/test/unit/wiki_renderer_test.rb

@@ -28,7 +28,7 @@ class WikiRendererTest < Test::Unit::TestCase
   end
 
   def test_renders_title
-    assert_equal "<h1>Motiro</h1>", renderer.render_html('= Motiro =')
+    assert_equal "<h1>Motiro</h1>", renderer.render_wiki_text('= Motiro =')
   end
   
   def test_breaks_paragraphs_on_linebreak_and_return_feed
@@ -36,48 +36,187 @@ class WikiRendererTest < Test::Unit::TestCase
     feed_return_text = "= Motiro =\r\n\r\nThis is project Motiro"
     expected_text = '<h1>Motiro</h1><p>This is project Motiro</p>'
 
-    assert_equal expected_text, renderer.render_html(line_break_only_text)
-    assert_equal expected_text, renderer.render_html(feed_return_text)
+    assert_equal expected_text, renderer.render_wiki_text(line_break_only_text)
+    assert_equal expected_text, renderer.render_wiki_text(feed_return_text)
   end
   
   def test_render_external_links
     expected = "<p><a href=\"http://nowhere.com\" rel=\"nofollow\">Nowhere</a></p>"
-    assert_equal expected, renderer.render_html('[http://nowhere.com Nowhere]')
+    assert_equal expected, renderer.render_wiki_text('[http://nowhere.com Nowhere]')
   end
   
   def test_renders_multiple_languages
     wiki_text = "Bem-vindo ao Motiro\n\n" +
                 "--- en ---\n" +
                 "Welcome to Motiro"
-    assert_equal "<p>Bem-vindo ao Motiro</p>", renderer.render_html(wiki_text)
+    assert_equal "<p>Bem-vindo ao Motiro</p>", renderer.render_wiki_text(wiki_text)
     assert_equal "<p>Welcome to Motiro</p>",
-                 WikiRenderer.new(url_generator, 'en').render_html(wiki_text)
+                 WikiRenderer.new(url_generator, 'en').render_wiki_text(wiki_text)
   end
   
   def test_renders_internal_link
     expected = "<p><a href=\"http://test.host/wiki/show/AnotherPage\" rel=\"nofollow\">go somewhere else</a></p>"
-    assert_equal expected, renderer.render_html('[AnotherPage go somewhere else]')
+    assert_equal expected, renderer.render_wiki_text('[AnotherPage go somewhere else]')
   end
   
   def test_renders_multiple_internal_links
     expected = "<p><a href=\"http://test.host/wiki/show/InternalPage\" rel=\"nofollow\">go there</a> <a href=\"http://test.host/wiki/show/OtherInternalPage\" rel=\"nofollow\">and there</a></p>"
-    assert_equal expected, renderer.render_html("[InternalPage go there] " +
-                                                "[OtherInternalPage and there]")
+    assert_equal expected, renderer.render_wiki_text("[InternalPage go there] " +
+                                                     "[OtherInternalPage and there]")
   end
   
   def test_do_not_expand_links_when_there_is_a_break_inside_the_brackets
     expected = "<p>[ThisIsNotALink\nto anywhere]</p>"
-    assert_equal expected, renderer.render_html("[ThisIsNotALink\nto anywhere]")
+    assert_equal expected, renderer.render_wiki_text("[ThisIsNotALink\nto anywhere]")
   end
   
   def test_expands_internal_links_with_address_only
     expected = "<p><a href=\"http://test.host/wiki/show/AnotherPage\" rel=\"nofollow\">AnotherPage</a></p>"
-    assert_equal expected, renderer.render_html("[AnotherPage]")
+    assert_equal expected, renderer.render_wiki_text("[AnotherPage]")
   end
   
   def test_recover_from_unmatched_opening_bracket_inside_link_text
     assert_equal "<p><a href=\"http://test.host/wiki/show/SomeoneMistankenly\" rel=\"nofollow\">placed an opening bracket [ inside the link text, but Motiro managed to recover correctly</a></p>",
-                 renderer.render_html("[SomeoneMistankenly placed an opening bracket [ inside the link text, but Motiro managed to recover correctly]")
+                 renderer.render_wiki_text("[SomeoneMistankenly placed an opening bracket [ inside the link text, but Motiro managed to recover correctly]")
+  end
+  
+  def test_emphasizes_diffs_inside_pure_text_change
+    previous = "There is going to be some change inside this text"
+    current  = "There has been some change inside this text"
+    
+    assert_equal '<p>There <span style="background: #ffb8b8">is going to be</span>' +
+                 '<span style="background: #b8ffb8">has been</span> some change inside ' +
+                 'this text</p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+  
+  def test_emphasizes_diffs_in_multiple_changes
+    previous = "There is going to be more than one change inside this text"
+    current  = "There has been more than one change outside this text"
+    
+    assert_equal '<p>There <span style="background: #ffb8b8">is going to be</span>' +
+                 '<span style="background: #b8ffb8">has been</span> more than one ' +
+                 'change <span style="background: #ffb8b8">inside</span>' +
+                 '<span style="background: #b8ffb8">outside</span> ' +
+                 'this text</p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+  
+  def test_emphasizes_changes_next_to_html_tags
+    previous = "First version was good"
+    current = "Second version was bad"
+    
+    assert_equal '<p><span style="background: #ffb8b8">First</span>' +
+                 '<span style="background: #b8ffb8">Second</span> version was ' +
+                 '<span style="background: #ffb8b8">good</span>' +
+                 '<span style="background: #b8ffb8">bad</span></p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+
+  def test_emphasizes_changes_inside_html_tags
+    previous = "Some ''long emphasized'' text"
+    current = "Some ''short emphasized'' text"
+    
+    assert_equal '<p>Some <i><span style="background: #ffb8b8">long</span>' +
+                 '<span style="background: #b8ffb8">short</span> emphasized</i> text</p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+
+  def test_emphasizes_changes_to_html_tags
+    previous = "Some ''emphasized'' text"
+    current = "Some '''emphasized''' text"
+    
+    assert_equal '<p>Some <i><span style="background: #ffb8b8">emphasized</span></i>' +
+                 '<b><span style="background: #b8ffb8">emphasized</span></b> text</p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+
+  def test_emphasizes_changes_inside_partially_changed_html_tags
+    previous = "Here is a [http://www.motiro.org link]"
+    current = "Here is a [http://www.motiro.com link]"
+    
+    assert_equal '<p>Here is a <a href="http://www.motiro.org" rel="nofollow"><span style="background: #ffb8b8">link</span></a>' +
+                 '<a href="http://www.motiro.com" rel="nofollow"><span style="background: #b8ffb8">link</span></a></p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+  
+  def test_emphasizes_changed_html_tags_after_changed_text
+    previous = "Here is my ''long text''"
+    current = "Here is your ''long article''"
+
+    assert_equal '<p>Here is <span style="background: #ffb8b8">my</span>' +
+                 '<span style="background: #b8ffb8">your</span> ' +
+                 '<i>long <span style="background: #ffb8b8">text</span>' +
+                 '<span style="background: #b8ffb8">article</span></i>' +
+                 '</p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+
+  def test_emphasizes_changed_html_tags_before_changed_text
+    previous = "Here is some ''long text'' that is yours"
+    current = "Here is some ''long article'' that is mine"
+
+    assert_equal '<p>Here is some ' +
+                 '<i>long <span style="background: #ffb8b8">text</span>' +
+                 '<span style="background: #b8ffb8">article</span></i> ' +
+                 'that is <span style="background: #ffb8b8">yours</span>' +
+                 '<span style="background: #b8ffb8">mine</span>' +
+                 '</p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+
+  def test_emphasizes_line_breaked_changes_as_one
+    previous = "This is a\nmultiline change"
+    current = "This is an\nenvious change"
+    
+    assert_equal '<p>This is <span style="background: #ffb8b8">a multiline</span>' +
+                 '<span style="background: #b8ffb8">an envious</span> change</p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+
+  def test_emphasizes_text_deletions
+    previous = "Here is something deleted"
+    current = "Here is something"
+
+    assert_equal '<p>Here is something <span style="background: #ffb8b8">deleted</span></p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+
+  def test_emphasizes_text_additions
+    previous = "Here is something"
+    current = "Here is the place I added something"
+
+    assert_equal '<p>Here is <span style="background: #b8ffb8">the place I added</span> something</p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+  
+  def test_emphasizes_addition_and_deletions_inside_tags
+    previous = "Here is some ''text in italics''"
+    current = "Here is some ''very good text''"
+    
+    assert_equal '<p>Here is some <i><span style="background: #b8ffb8">very good</span> ' +
+                 'text <span style="background: #ffb8b8">in italics</span></i></p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+  
+  def test_emphasizes_paragraph_addition_and_deletion
+    previous = "First paragraph\n\nSecond paragraph"
+    current  = "Second paragraph\n\nThird paragraph"
+    
+    assert_equal '<p><span style="background: #ffb8b8">First paragraph</span></p> ' +
+                 '<p>Second paragraph</p> ' +
+                 '<p><span style="background: #b8ffb8">Third paragraph</span></p>',
+                 renderer.render_wiki_diff(previous, current)
+  end
+  
+  def test_emphasize_change_inside_title_tag
+    previous = "== Sub title ==\n\nParagraph"
+    current  = "== Super title ==\n\nParagraph"
+    
+    assert_equal '<h2><span style="background: #ffb8b8">Sub</span>' +
+                 '<span style="background: #b8ffb8">Super</span> title</h2> ' +
+                 '<p>Paragraph</p>',
+                 renderer.render_wiki_diff(previous, current)
   end
 
 private

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: motiro
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
-date: 2007-07-13 00:00:00 -03:00
+  version: 0.6.8
+date: 2007-07-25 00:00:00 -03:00
 summary: Simple project tracking tool
 require_paths: 
 - .
@@ -68,7 +68,6 @@ files:
 - db/translation
 - db/migrate
 - db/translation/pt-BR.rb
-- db/translation/pt-BR.rb.rej
 - db/migrate/018_drop_redundant_page_columns.rb
 - db/migrate/013_nullify_initial_page_attributes.rb
 - db/migrate/017_revision_mimics_page.rb
@@ -117,14 +116,16 @@ files:
 - app/views/report
 - app/views/wiki/diff.rhtml
 - app/views/wiki/_editbar.rhtml
+- app/views/wiki/sourcediff.rhtml
 - app/views/wiki/history.rhtml
 - app/views/wiki/page_feed.rxml
+- app/views/wiki/_diffbar.rhtml
 - app/views/wiki/_properties_show.rhtml
 - app/views/wiki/properties_edit.rhtml
 - app/views/wiki/edit.rhtml
 - app/views/wiki/show.rhtml
-- app/views/wiki/history.rhtml.rej
 - app/views/wiki/_properties_edit.rhtml
+- app/views/wiki/_editor.rhtml
 - app/views/account/_availability.rhtml
 - app/views/account/logout.rhtml
 - app/views/account/availability.rhtml
@@ -170,7 +171,6 @@ files:
 - app/helpers/root_helper.rb
 - app/helpers/account_helper.rb
 - app/helpers/default_page_provider.rb
-- app/helpers/report_helper.rb.rej
 - app/reporters/svn_connection.rb
 - app/reporters/svn_settings.rb
 - app/reporters/darcs_settings.rb
@@ -188,6 +188,7 @@ files:
 - app/controllers/application.rb
 - lib/diff_chunk_builder.rb
 - lib/tick_daemon.rb
+- lib/array_extensions.rb
 - lib/import_translations.rb
 - lib/translator.rb
 - lib/stub_hash.rb
@@ -195,12 +196,12 @@ files:
 - lib/login_system.rb
 - lib/tasks
 - lib/wiki_url_generator.rb
+- lib/differ.rb
 - lib/wiki_renderer.rb
 - lib/string_extensions.rb
 - lib/tasks/packaging.rake
 - lib/tasks/testing.rake
 - doc/README_FOR_APP
-- public/wiki
 - public/dispatch.fcgi
 - public/dispatch.rb
 - public/favicon.ico
@@ -211,12 +212,9 @@ files:
 - public/500.html
 - public/dispatch.cgi
 - public/404.html
-- public/wiki/history
-- public/wiki/history/OtherPage-en-us.xml
 - public/images/rss.png
 - public/images/calendar.png
 - public/stylesheets/niftyCorners.css
-- public/stylesheets/motiro.css.rej
 - public/stylesheets/scaffold.css
 - public/stylesheets/motiro.css
 - public/javascripts/dragdrop.js
@@ -283,6 +281,7 @@ files:
 - test/unit/caching_test.rb
 - test/unit/settings_test.rb
 - test/unit/default_page_provider_test.rb
+- test/unit/array_extensions_test.rb
 - test/stubs/svn_settings.rb
 - test/stubs/url_generator.rb
 - test/fixtures/revisions.yml

data/app/helpers/report_helper.rb.rej

@@ -1,46 +0,0 @@
-***************
-*** 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/views/wiki/history.rhtml.rej

@@ -1,63 +0,0 @@
-***************
-*** 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/db/translation/pt-BR.rb.rej

@@ -1,26 +0,0 @@
-***************
-*** 71,80 ****
-  '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.)',
-  
-  # Older headlines and history pages
-  'Author' => 'Autor',
-  'Page history for %s' => 'Histórico da página %s',
-  'Page history' => 'Histórico da página',
-  '(Revision %s)' => '(Revisão %s)'
-  }
---- 71,83 ----
-  '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)'
-  }

data/public/stylesheets/motiro.css.rej

@@ -1,37 +0,0 @@
-***************
-*** 182,187 ****
-  }
-  
-  table.oldernews {
-    border-spacing: 0;
-    text-align: left;
-    font-size: .85em;
---- 183,189 ----
-  }
-  
-  table.oldernews {
-+   margin: .8em 0;
-    border-spacing: 0;
-    text-align: left;
-    font-size: .85em;
-***************
-*** 190,198 ****
-        
-  table.oldernews tr.even { background-color: #fff; }
-          
-- table.oldernews tr.odd { background-color: #eee; }
-        
-- table.oldernews thead { background-color: #d0d0d0; }
-        
-  table.oldernews tbody th { border: 1px #c9c9c9 solid; }
-  
---- 192,200 ----
-        
-  table.oldernews tr.even { background-color: #fff; }
-          
-+ table.oldernews tr.odd { background-color: #e0eeff; }
-        
-+ table.oldernews thead { background-color: #66a0e0; }
-        
-  table.oldernews tbody th { border: 1px #c9c9c9 solid; }
-  

data/public/wiki/history/OtherPage-en-us.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
-  <channel>
-    <title>Changes to OtherPage</title>
-    <description/>
-    <link>http://localhost:3000/en-us</link>
-    <language>en-us</language>
-    <generator>Motiro</generator>
-    <pubDate>Wed, 04 Jul 2007 00:14:13 -0300</pubDate>
-    <ttl>60</ttl>
-    <item>
-      <title>Another page</title>
-      <description>&lt;p&gt;This is the modified English version.&lt;/p&gt;&lt;p&gt;And I have modified it once more, but that version was not recorded.&lt;/p&gt;</description>
-      <pubDate>Wed, 04 Jul 2007 00:14:13 -0300</pubDate>
-      <dc:creator>thiagoarrais</dc:creator>
-      <guid>http://localhost:3000/wiki/show/OtherPage?revision=4</guid>
-    </item>
-    <item>
-      <title>Another page</title>
-      <description>&lt;p&gt;This is the modified English version.&lt;/p&gt;&lt;p&gt;And I have modified it once more&lt;/p&gt;</description>
-      <pubDate>Thu, 14 Jun 2007 00:48:09 -0300</pubDate>
-      <dc:creator>thiagoarrais</dc:creator>
-      <guid>http://localhost:3000/wiki/show/OtherPage?revision=3</guid>
-    </item>
-    <item>
-      <title>Another page</title>
-      <description>&lt;p&gt;This is the modified English version&lt;/p&gt;</description>
-      <pubDate>Thu, 14 Jun 2007 00:47:45 -0300</pubDate>
-      <dc:creator>thiagoarrais</dc:creator>
-      <guid>http://localhost:3000/wiki/show/OtherPage?revision=2</guid>
-    </item>
-    <item>
-      <title>Another page</title>
-      <description>&lt;p&gt;This is the English version&lt;/p&gt;</description>
-      <pubDate>Wed, 13 Jun 2007 21:37:54 -0300</pubDate>
-      <dc:creator>thiagoarrais</dc:creator>
-      <guid>http://localhost:3000/wiki/show/OtherPage?revision=1</guid>
-    </item>
-  </channel>
-</rss>