motiro 0.6.6 → 0.6.7

data/db/translation/pt-BR.rb.rej

@@ -0,0 +1,26 @@
+***************
+*** 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/lib/diff_chunk_builder.rb

@@ -0,0 +1,98 @@
+#  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 DiffChunkBuilder
+
+  def initialize
+    @chunks = []
+    @unmatched_deletions = []
+    @old_line_num = @new_line_num = 1
+    needs_new_chunk!
+  end
+
+  def start_line(old_line_num, new_line_num=old_line_num)
+    consume_unmatched_deletions
+    needs_new_chunk!
+    @chunks << Separator.new(old_line_num - @old_line_num) unless @chunks.empty?
+    @old_line_num, @new_line_num = old_line_num, new_line_num 
+  end
+
+  def push_deletion(text)
+    @unmatched_deletions << [text, @old_line_num]
+    @old_line_num += 1
+  end
+ 
+  def push_unchanged(text)
+    consume_unmatched_deletions
+    target_chunk_for(:unchanged) << Line.new(text, @old_line_num,
+                                             text, @new_line_num)
+    @old_line_num += 1
+    @new_line_num += 1
+  end
+
+  def push_addition(text)
+    unless @unmatched_deletions.empty?
+      chunk = target_chunk_for(:modification)
+      old_text, old_position = @unmatched_deletions.shift
+      chunk << Line.new(old_text, old_position, text, @new_line_num)
+    else
+      target_chunk_for(:addition) << Line.new(nil, @old_line_num,
+                                              text, @new_line_num)
+    end
+    @new_line_num += 1
+  end
+
+  def get_chunks
+    consume_unmatched_deletions
+    @chunks
+  end
+
+private
+
+  def consume_unmatched_deletions
+    return if @unmatched_deletions.empty?
+    chunk = target_chunk_for(:deletion)
+    @unmatched_deletions.each do |old_text, old_position|
+      chunk << Line.new(old_text, old_position, nil, nil)
+    end
+    @unmatched_deletions = []
+  end
+
+  def needs_new_chunk!(need=true)
+    @should_create_new_chunk = need
+  end
+  
+  def needs_new_chunk?
+    @should_create_new_chunk
+  end
+
+  ACCEPTABLE_PREVIOUS_ACTION = {:modification => [:modification],
+                                :addition => [:addition, :modification],
+                                :deletion => [:deletion, :modification],
+                                :unchanged => [:unchanged]}
+
+  def target_chunk_for(action)
+    chunk = @chunks.last
+
+    @chunks << chunk = Chunk.new(action) if needs_new_chunk? ||
+      !ACCEPTABLE_PREVIOUS_ACTION[action].include?(chunk.action)
+
+    needs_new_chunk!(false)
+    chunk
+  end
+
+end

data/lib/tasks/packaging.rake

@@ -49,7 +49,7 @@ unless MOTIRO_VERSION.include? 'dev'
     s.platform = Gem::Platform::RUBY 
     s.executables = ['motiro']
 
-    s.add_dependency("rails", "= 1.2.2")
+    s.add_dependency("rails", "= 1.2.3")
     s.add_dependency("mediacloth", ">= 0.0.2")
     s.add_dependency("daemons", ">= 1.0.4")
     s.add_dependency("Platform", ">= 0.4.0")
@@ -58,6 +58,7 @@ unless MOTIRO_VERSION.include? 'dev'
     s.add_dependency("sqlite3-ruby", ">= 1.2.1")
     s.add_dependency("flexmock", ">= 0.5")
     s.add_dependency("rails-app-installer", "= 0.2.0")
+    s.add_dependency("diff-lcs", ">= 1.1.2")
   end
 
   packaging = Rake::GemPackageTask.new(spec) do |p|

data/public/stylesheets/motiro.css

@@ -149,42 +149,73 @@ div.channel_toolbar {
 table.diff {
     border: solid gray;
     border-width: 1px 0 1px 0;
+    border-collapse: collapse;
     font-family: monospace;
-    font-size: 0.72em;
+    font-size: 0.8em;
+    margin: 0 0 1em 0;
 }
 
 table.diff pre {
     margin: 0;
     padding: 0;
     text-align: left;
+    white-space: pre-wrap;      /* CSS 3 */
+    white-space: -moz-pre-wrap; /* Mozilla, 1999+ */
+    white-space: -pre-wrap;     /* Opera 4-6 */
+    white-space: -o-pre-wrap;   /* Opera 7 */
+    word-wrap: break-word;      /* IE 5.5+ */
 }
 
-table.diff tr {
-    margin: 0 0 0 0;
-    padding: 0 0 0 0;
-    border: 0;
+table.diff td {
+    padding: .05em .4em .05em .4em;
 }
 
-table.diff td {
-    padding: 0 0.4em 0 0.4em;
+table.diff col.line_number {
+    text-align: center;
+    border: solid gray;
+    border-width: 0 1px 0 1px;
 }
 
-table.diff td.left {
-    border:solid;
-    border-color: black gray black black;
+table.diff col.left {
+    border-right: 1px solid gray;
+    width: 50%;
 }
 
-table.diff td.right {
-    border:solid black;
+table.diff col.right {
+    width: 50%;
 }
 
-table.diff td.line_number {
-    text-align: center;
-    border:solid gray;
-    border-width: 0 1px 0 1px;
+tbody.unchanged {
+    background: #FFF;
+}
+
+tbody.modification {
+    background: #ffffb8;
+    border: #606060 solid;
+    border-width: 1px 0 1px 0;
+}
+
+tbody.addition {
+    background: #b8ffb8;
+    border: #606060 solid;
+    border-width: 1px 0 1px 0;
+}
+
+tbody.deletion {
+    background: #ffb8b8;
+    border: #606060 solid;
+    border-width: 1px 0 1px 0;
+}
+
+tbody.separator {
+   background: #d0d0c4;
+   text-align: center;
+   border: #606060 solid;
+   border-width: 1px 0 1px 0;
 }
 
 table.oldernews {
+  margin: .8em 0;
   border-spacing: 0;
   text-align: left;
   font-size: .85em;
@@ -193,9 +224,9 @@ table.oldernews {
       
 table.oldernews tr.even { background-color: #fff; }
         
-table.oldernews tr.odd { background-color: #eee; }
+table.oldernews tr.odd { background-color: #e0eeff; }
       
-table.oldernews thead { background-color: #d0d0d0; }
+table.oldernews thead { background-color: #66a0e0; }
       
 table.oldernews tbody th { border: 1px #c9c9c9 solid; }
 

data/public/stylesheets/motiro.css.rej

@@ -0,0 +1,37 @@
+***************
+*** 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

@@ -0,0 +1,40 @@
+<?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>

data/test/fixtures/pages.yml

@@ -59,5 +59,5 @@ changed_page:
 multilanguage_page:
   id: 12
   name: MultiLanguagePage
-  kind: common
+  kind: feature
   modified_at: 2007-06-14 12:06:38

data/test/fixtures/revisions.yml

@@ -137,11 +137,11 @@ release_event_creation:
 first_multilanguage_revision:
   id: 15
   page_id: 12
-  kind: common
+  kind: feature
   modified_at: 2007-06-14 12:03:24
   last_editor_id: 1000004 #john
   editors: ""
-  title: Multi-language page
+  title: Translated page
   text: This is the first English version
         
         Here is some '''bold''' text.
@@ -155,11 +155,11 @@ first_multilanguage_revision:
 second_multilanguage_revision:
   id: 16
   page_id: 12
-  kind: common
+  kind: feature
   modified_at: 2007-06-14 12:06:38
   last_editor_id: 1000004 #john
   editors: ""
-  title: Multi-language page
+  title: Translated page
   text: This is the second English version
         
         Here is some '''bold''' text.
@@ -169,3 +169,14 @@ second_multilanguage_revision:
         Esta é a segunda versão em português
         
         Aqui está um pouco de texto em '''negrito'''.
+
+second_page_edition:
+  id: 17
+  page_id: 11
+  kind: common
+  modified_at: 2007-07-13 11:33:41
+  last_editor_id: 1000005 #eric
+  editors: ""
+  title: This page has been edited since creation
+  text: Eric changed the text that John entered. Twice.
+  position: 3

data/test/functional/report_features_test.rb

@@ -16,13 +16,14 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 require File.dirname(__FILE__) + '/../test_helper'
+require 'report_controller'
 
 # Re-raise errors caught by the controller.
 class ReportController; def rescue_action(e) raise e end; end
 
 class ReportFeaturesTest < Test::Unit::TestCase
   
-  fixtures :pages
+  fixtures :pages, :revisions
 
   def setup
     @controller = ReportController.new
@@ -35,4 +36,9 @@ class ReportFeaturesTest < Test::Unit::TestCase
     assert_xml_element "//link[text() = 'http://test.host/wiki/show/ListLastModifiedFeatures']"
   end
   
+  def test_shows_title_for_second_language
+    get :older, :reporter => 'features', :locale => 'pt-br'
+    assert_tag :content => /Translated page/
+  end
+  
 end

data/test/functional/root_controller_test.rb

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

data/test/functional/wiki_controller_test.rb

@@ -298,8 +298,7 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_tag :tag => 'a', :attributes => {
                  :href => @controller.url_for(
                    :controller => 'wiki', :action => 'show',
-                   :page_name => 'RevisedPage', :revision => '1')},
-               :content => /The title will be changed/
+                   :page_name => 'RevisedPage', :revision => '1')}
     assert_tag :content => /The title was changed/
 
     get :show, :page_name => 'RevisedPage', :revision => '1'
@@ -326,9 +325,10 @@ class WikiControllerTest < Test::Unit::TestCase
   end
 
   def tests_shows_number_of_available_revisions
-    get :show, :page_name => pages('changed_page').name
+    page = pages('changed_page')
+    get :show, :page_name => page.name
 
-    assert_tag :content => 'Page history (2 revisions)'
+    assert_tag :content => "Page history (#{page.revisions.size} revisions)"
   end
 
   def test_does_not_show_page_history_link_for_missing_or_edited_once_pages
@@ -363,6 +363,46 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_xml_element "//item/guid[text() = '#{@controller.url_for(:action => 'show', :page_name => page_name, :revision => '2')}'']"
     assert_xml_element "//item/guid[text() = '#{@controller.url_for(:action => 'show', :page_name => page_name, :revision => '1')}'']"
   end
+  
+  def test_redirects_ugly_urls_to_pretty_ones
+    page_name = pages('changed_page').name
+    get :diff, :page_name => page_name, :btnCompare => 'Compare revisions',
+        :new_revision => 2, :old_revision=> 1
+    
+    assert_redirected_to "/wiki/diff/#{page_name}/1/2"
+    follow_redirect
+    
+    assert assigns(:old_revision)
+  end
+  
+  def test_shows_error_message_when_unable_to_find_specified_revision
+    page = pages('changed_page')
+    n = page.revisions.size
+    get :diff, :page_name => page.name, :new_revision => n,
+        :old_revision => n + 1
+    
+    assert_redirected_to :controller => 'wiki', :action => 'show',
+                         :page_name => page.name
+    assert_equal "#{page.name} has no revision #{n + 1}", flash[:notice]
+    
+    get :diff, :page_name => page.name,
+        :new_revision => n + 3, :old_revision => n
+
+    assert_redirected_to :controller => 'wiki', :action => 'show',
+                         :page_name => page.name
+    assert_equal "#{page.name} has no revision #{n + 3}", flash[:notice]
+  end
+  
+  def test_defaults_to_last_revision_diff
+    page = pages('changed_page')
+    n = page.revisions.size
+    get :history, :page_name => page.name
+    
+    assert_xml_element "//input[@type='radio' and @name='old_revision' and @value='#{n - 1}' and @checked='checked']"
+    assert_xml_element "//input[@type='radio' and @name='new_revision' and @value='#{n}' and @checked='checked']"
+    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
 
 private
 

data/test/unit/change_test.rb

@@ -19,41 +19,46 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class ChangeTest < Test::Unit::TestCase
   
-  def test_render_diff_with_unset_diff
-    change = Change.new(:summary => 'A /directory', :diff => nil)
-    
-    assert_equal '', change.render_diff
+  def test_unset_diff
+    assert_nil Change.new(:summary => 'A /directory', :diff => nil).chunked_diff
   end
   
-  def test_render_diff_with_empty_diff
-    change = Change.new(:summary => 'A /directory', :diff => '')
-    
-    assert_equal '', change.render_diff
+  def test_empty_diff
+    assert_nil Change.new(:summary => 'A /directory', :diff => '').chunked_diff
   end
   
-  def test_render_diff_with_non_empty_diff
+  def test_parses_addition_only
     diff_output = "@@ -0,0 +1 @@\n" +
                   "+These are the file_contents"
     change = Change.new(:summary => 'A /a_file.txt', :diff => diff_output)
-    
-    actual_rendered_output = change.render_diff
-    
-    md = actual_rendered_output.match /\A<div id='((\w|\d|-)+)' class='diff-window'><center><h2>Changes to a_file.txt<\/h2>/
-    
-    assert_not_nil md
-    
-    remain = md.post_match
-    
-    md = remain.match /<\/div>\Z/
-    
-    assert_not_nil md
+#    
+#    actual_rendered_output = change.render_diff
+#    
+#    md = actual_rendered_output.match /\A<div id='((\w|\d|-)+)' class='diff-window'><center><h2>Changes to a_file.txt<\/h2>/
+#    
+#    assert_not_nil md
+#    
+#    remain = md.post_match
+#    
+#    md = remain.match /<\/div>\Z/
+#    
+#    assert_not_nil md
+    chunks = change.chunked_diff
+    
+    assert_equal 1, chunks.size
+    assert_equal :addition, chunks.first.action
+    assert_equal 1, chunks.first.lines.size
+    line = chunks.first.lines.first
+    assert_nil line.original_position
+    assert_nil line.original_text
+    assert_equal 1, line.modified_position
+    assert_equal 'These are the file_contents', line.modified_text
   end
   
   def test_passes_lines_numbers_to_differ
     FlexMock.use do |differ|
       differ.should_receive(:start_line).once.with(22, 34)
-      differ.should_receive(:render_diff_table).once.
-      and_return('rendered table')
+      differ.should_receive(:get_chunks).once.and_return('chunked diffs')
       differ.should_ignore_missing
       
       change = Change.new(:summary => 'A /a_file.txt',
@@ -61,42 +66,10 @@ class ChangeTest < Test::Unit::TestCase
                                    "+These are the file_contents")
       
       change.use_differ(differ)
-      assert_equal 'rendered table', change.render_diff_table
+      assert_equal 'chunked diffs', change.chunked_diff
     end
   end
   
-  def test_render_summary_with_unset_diff
-    change = Change.new(:summary => 'A /directory', :diff => nil)
-    
-    assert_equal 'A /directory', change.render_summary
-  end
-  
-  def test_render_summary_with_non_empty_diff
-    diff_output = "@@ -0,0 +1 @@\n" +
-                  "+These are the file_contents"
-    change = Change.new(:summary => 'A /a_file.txt', :diff => diff_output)
-    
-    actual_rendered_output = change.render_summary
-    
-    md = actual_rendered_output.match /\A<a href='\#' onClick="showOnly\('((\w|\d|-)+)'\)">A \/a_file.txt<\/a>\Z/
-    
-    assert_not_nil md
-  end
-  
-  def test_renders_summary_and_diff_using_the_same_ref
-    diff_output = "@@ -0,0 +1 @@\n" +
-                  "+These are the file_contents"
-    change = Change.new(:summary => 'A /a_file.txt', :diff => diff_output)
-    
-    md = change.render_summary.match /\A<a href='\#' onClick="showOnly\('((\w|\d|-)+)'\)/
-    summary_ref = md[1]
-    
-    md = change.render_diff.match /\A<div id='((\w|\d|-)+)'/
-    diff_ref = md[1]
-    
-    assert_equal summary_ref, diff_ref
-  end
-  
   def test_simple_prefixed_qualified_resource_name
     change = Change.new(:summary => 'A /a_file.txt')
     assert_equal '/a_file.txt', change.qualified_resource_name