motiro 0.6.10 → 0.6.11

data/app/core/reporter.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems'
 require 'active_support'
@@ -102,4 +101,4 @@ public
   
   add button[:older]
   
-end
+end

data/app/core/reporter_driver.rb

@@ -2,17 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program. If not, see <http://www.gnu.org/licenses/>.
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 require 'core/reporter_fetcher'

data/app/core/reporter_fetcher.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require_dependency 'core/settings'
 require_dependency 'ports/reporter_loader'
@@ -36,4 +35,4 @@ class ReporterFetcher
     reporters << EventsReporter.new
   end
 
-end
+end

data/app/core/settings.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'yaml'
 

data/app/core/version.rb

@@ -1 +1 @@
-MOTIRO_VERSION = '0.6.10'
+MOTIRO_VERSION = '0.6.11'

data/app/core/wiki_reporter.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'core/reporter'
 require 'core/settings'

data/app/helpers/application_helper.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
@@ -38,13 +37,12 @@ module ApplicationHelper
   
   def pagetext(title, revision=nil, &block)
     content = capture(&block)
-    b = Builder::XmlMarkup.new
     xml = b.div(:class => 'pagetext') do
       b.a(:href => url_for(:controller => 'wiki', :action => 'history',
                            :page_name => @page.name, :locale => @locale,
                            :format => 'xml'),
           :class => 'rss') do
-        b << image_tag("rss.png", :border => 0, :class => 'rss',
+        b << image_tag("rss.gif", :border => 0, :class => 'rss',
                                   :alt => 'Changes to %s' / @page.name) 
       end unless @page.nil?
       b.div(:id => 'crumbs') do
@@ -68,12 +66,25 @@ module ApplicationHelper
     concat(xml, block.binding)
   end
   
+  def parsing_error_box
+    content_tag(:div,
+                  image_tag('error.gif') +
+                  content_tag(:p, ('The following wiki code contains an ' +
+                                   'error that prevents it from being ' +
+                                   'correctly formatted.').t),
+                :class => 'message wikierror')
+  end
+
   def render_wiki(text)
-    @renderer.render_wiki_text(text)
+    begin
+      @renderer.render_wiki_text(text)
+    rescue
+      parsing_error_box + content_tag(:pre, h(text), :class => 'wikisource')
+    end
   end
   
   def render_diff_table(chunks)
-    Builder::XmlMarkup.new.table :class => 'diff', :cellspacing => '0' do |b|
+    b.table :class => 'diff', :cellspacing => '0' do |b|
       b.colgroup do
         b.col :class => 'line_number'
         b.col :class => 'left'
@@ -84,19 +95,19 @@ module ApplicationHelper
         if chunk.separator?
           b.tbody :class => 'separator' do
             b.tr do
-              b.td
+              b.th
               b.td('%s more lines' / chunk.num_lines.to_s, :colspan => '2')
-              b.td
+              b.th
             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}
+                b.th {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.th {b << (line.modified_position || '&nbsp;').to_s}
               end
             end
           end
@@ -105,6 +116,12 @@ module ApplicationHelper
     end
   end
 
+private
+
+  def b
+    @markup ||= Builder::XmlMarkup.new
+  end
+
 end
 
 class NullUser

data/app/helpers/default_page_provider.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class DefaultPageProvider
 
@@ -25,4 +24,4 @@ class DefaultPageProvider
     @provider.find_by_name(name) || Page.new(:name => name)
   end
 
-end
+end

data/app/helpers/report_helper.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module ReportHelper
 

data/app/helpers/wiki_helper.rb

@@ -1,5 +1,25 @@
 module WikiHelper
 
+  def edition_link(user, page)
+    if user.nil?
+      content_tag('span', "#{'Edit'.t} #{'(requires authentication)'.t}",
+                  :class => 'disabled')
+    elsif !user.can_edit?(page)
+      'Edit'.t + ' ' + content_tag('span', '(not authorized)'.t,
+        :class => flash[:not_authorized] ? 'marked' : 'none')
+    else
+      link_to('Edit'.t, :controller => 'wiki', :action => 'edit',
+              :page_name => page.name)
+    end
+  end
+
+  def switch_view_link(page)
+    action, text = 'raw' == params[:action].to_s ? ['show','View wiki output'] :
+                                                   ['raw' ,'View raw text']
+    '| ' + link_to(text.t, :controller => :wiki, :action => action,
+                   :page_name => page.name, :revision => page.position)
+  end
+
   def page_history_link(page)
     case page.revisions.size
       when 0 then ''
@@ -10,4 +30,32 @@ module WikiHelper
     end
   end
 
+  def render_wiki_diff(old_revision, new_revision)
+    begin
+      @renderer.render_wiki_diff(old_revision.text, new_revision.text)
+    rescue
+      parsing_error_box + render_wiki_sourcediff(old_revision, new_revision)
+    end
+  end
+
+  def render_wiki_sourcediff(old_revision, new_revision)
+    render_diff_table(old_revision.diff(new_revision))
+  end
+
+  def rss_item_for_revision(rev)
+    Builder::XmlMarkup.new.item do |xml|
+      xml.title h(rev.title)
+      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,
+                              :revision => rev.position)
+    end rescue ''
+  end
+
 end

data/app/models/change.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class Change < ActiveRecord::Base
   

data/app/models/chunk.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class Chunk
   attr_reader :lines, :action

data/app/models/feed_observer.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class FeedObserver < ActiveRecord::Observer
   
@@ -24,4 +23,4 @@ class FeedObserver < ActiveRecord::Observer
     FileUtils.rm_r(Dir.glob(cache_dir+"/report/#{record.reported_by}")) rescue Errno::ENOENT
   end
   
-end
+end

data/app/models/headline.rb

@@ -2,18 +2,17 @@
 #  Copyright (C) 2006-2008  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
+#  it under the terms of the GNU Affero General Public License as published by
+#  the Free Software Foundation; either version 3 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.
+#  GNU Affero 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
+#  You should have received a copy of the GNU Affero General Public License
+#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class Headline < ActiveRecord::Base