From d7da0420d71c19ce5327ccf5cc16b9409e7b30eb Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Thu, 2 Jan 2014 02:58:39 +0000
Subject: [PATCH] Added methods to return data from specific version

---
 app/controllers/public/content_viewer_controller.rb |  6 +++---
 app/helpers/application_helper.rb                   |  4 ++++
 app/models/article.rb                               | 26 +++++++++++++++++++-------
 app/views/content_viewer/_article_versions.rhtml    |  5 +++++
 app/views/content_viewer/versioned_article.rhtml    | 44 ++++++++++++++++++++++----------------------
 test/unit/article_test.rb                           | 32 ++++++++++++++++++++++++++++++++
 6 files changed, 85 insertions(+), 32 deletions(-)
 create mode 100644 app/views/content_viewer/_article_versions.rhtml

diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb
index 0317963..e6ea205 100644
--- a/app/controllers/public/content_viewer_controller.rb
+++ b/app/controllers/public/content_viewer_controller.rb
@@ -7,7 +7,7 @@ class ContentViewerController < ApplicationController
 
   def view_page
     path = params[:page].join('/')
-    version = params[:rev]
+    @version = params[:rev]
 
     if path.blank?
       @page = profile.home_page
@@ -44,8 +44,8 @@ class ContentViewerController < ApplicationController
       return
     end
 
-    if version
-      @versioned_article = @page.versions.find_by_version(version)
+    if @version
+      @versioned_article = @page.versions.find_by_version(@version)
       render :template => 'content_viewer/versioned_article.rhtml'
       return
     end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 998e319..0608091 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1402,4 +1402,8 @@ module ApplicationHelper
     content.nil? ? '' : content.id.to_s
   end
 
+  def display_article_versions(article, version = nil)
+    content_tag('ul', article.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:rev => v.version))})
+  end
+
 end
diff --git a/app/models/article.rb b/app/models/article.rb
index 99cc99f..908bfb1 100644
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -604,17 +604,24 @@ class Article < ActiveRecord::Base
     false
   end
 
-  def author
-    if versions.empty?
-      last_changed_by
-    else
-      author_id = versions.first.last_changed_by_id
+  def author(version_number = nil)
+    if version_number
+      version = versions.find_by_version(version_number)
+      author_id = version.last_changed_by_id
       Person.exists?(author_id) ? Person.find(author_id) : nil
+    else
+      if versions.empty?
+        last_changed_by
+      else
+        author_id = versions.first.last_changed_by_id
+        Person.exists?(author_id) ? Person.find(author_id) : nil
+      end
     end
   end
 
-  def author_name
-    author ? author.name : (setting[:author_name] || _('Unknown'))
+  def author_name(version_number = nil)
+    person = version_number ? author(version_number) : author
+    person ? person.name : (setting[:author_name] || _('Unknown'))
   end
 
   def author_url
@@ -625,6 +632,11 @@ class Article < ActiveRecord::Base
     author ? author.id : nil
   end
 
+  def version_license(version_number = nil)
+    return license if version_number.nil?
+    profile.environment.licenses.find_by_id(versions.find_by_version(version_number).license_id)
+  end
+
   alias :active_record_cache_key :cache_key
   def cache_key(params = {}, the_profile = nil, language = 'en')
     active_record_cache_key+'-'+language +
diff --git a/app/views/content_viewer/_article_versions.rhtml b/app/views/content_viewer/_article_versions.rhtml
new file mode 100644
index 0000000..d4339e4
--- /dev/null
+++ b/app/views/content_viewer/_article_versions.rhtml
@@ -0,0 +1,5 @@
+<ul class='article-versions'>
+  <% @page.versions.each do |v| %>
+    <li><%= link_to("r#{v.version}", @page.url.merge(:rev => v.version)) %></li>
+  <% end %>
+<ul>
diff --git a/app/views/content_viewer/versioned_article.rhtml b/app/views/content_viewer/versioned_article.rhtml
index 02c3370..b441848 100644
--- a/app/views/content_viewer/versioned_article.rhtml
+++ b/app/views/content_viewer/versioned_article.rhtml
@@ -1,32 +1,32 @@
 <div id="article" class="<%= @page.css_class_name %>">
 
-<div id="article-toolbar"><%= _("This is the revision %s of this content") % @versioned_article.version %></div>
-
-<% if @page.display_hits? || @page.license.present? %>
-  <div id='article-sub-header'>
-    <% if @versioned_article.license.present? %>
-      <div id="article-license">
-        <%= _('Licensed under %s') % (@versioned_article.license.url.present? ? link_to(@versioned_article.license.name, @versioned_article.license.url, :target => '_blank') : @versioned_article.license.name) %>
-      </div>
-    <% end %>
+  <div id="article-header">
+    <h1 class='title'><%= @versioned_article.name %></h1>
+    <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
   </div>
-<% end %>
 
-<% cache(@page.cache_key(params, user, language)) do %>
-  <div class="<%="article-body article-body-" + @page.css_class_name %>">
-    <% options = @page.image? ? {:gallery_view => true} : {} %>
-    <%= article_to_html(@page, options) %>
-    <br style="clear:both" />
-  </div> <!-- end class="article-body" -->
-<% end %>
+  <% if @page.version_license(@version).present? %>
+    <div id='article-sub-header'>
+      <% if @page.version_license(@version).present? %>
+        <div id="article-license">
+          <%= _('Licensed under %s') % (@page.version_license(@version).url.present? ? link_to(@page.version_license(@version).name, @page.version_license(@version).url, :target => '_blank') : @page.version_license(@version).name) %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
 
+  <% cache(@page.cache_key(params, user, language)) do %>
+    <div class="<%="article-body article-body-" + @page.css_class_name %>">
+      <%= @versioned_article.body %>
+      <br style="clear:both" />
+    </div> <!-- end class="article-body" -->
+  <% end %>
 
-<div id="article-versions">
-  <%= #TODO Review this %>
-  <%= @page.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:rev => v.version))} %>
-</div>
+  <div id="article-versions">
+    <%= render :partial => 'article_versions' %>
+  </div>
 
-<%= display_source_info(@versioned_article) %>
+  <%= display_source_info(@page) %>
 
 </div><!-- end id="article" -->
 <%= add_zoom_to_article_images %>
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index 8b91391..5a2261f 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -1693,6 +1693,16 @@ class ArticleTest < ActiveSupport::TestCase
     assert_equal license, article.license
   end
 
+  should 'return license from a specific version' do
+    cc = License.create!(:name => 'CC (by)', :environment => Environment.default)
+    gpl = License.create!(:name => 'GPLv3', :environment => Environment.default)
+    article = Article.create!(:name => 'first version', :profile => profile, :license => cc)
+    article.license = gpl
+    article.save
+    assert_equal cc, article.version_license(1)
+    assert_equal gpl, article.version_license(2)
+  end
+
   should 'update path if parent is changed' do
     f1 = Folder.create!(:name => 'Folder 1', :profile => profile)
     f2 = Folder.create!(:name => 'Folder 2', :profile => profile)
@@ -1751,6 +1761,28 @@ class ArticleTest < ActiveSupport::TestCase
     assert_nil article.author_id
   end
 
+  should "return the author of a specific version" do
+    author1 = fast_create(Person)
+    author2 = fast_create(Person)
+    article = Article.create!(:name => 'first version', :profile => profile, :last_changed_by => author1)
+    article.name = 'second version'
+    article.last_changed_by = author2
+    article.save
+    assert_equal author1, article.author(1)
+    assert_equal author2, article.author(2)
+  end
+
+  should "return the author_name of a specific version" do
+    author1 = fast_create(Person)
+    author2 = fast_create(Person)
+    article = Article.create!(:name => 'first version', :profile => profile, :last_changed_by => author1)
+    article.name = 'second version'
+    article.last_changed_by = author2
+    article.save
+    assert_equal author1.name, article.author_name(1)
+    assert_equal author2.name, article.author_name(2)
+  end
+
   should 'identify if belongs to forum' do
     p = create_user('user_forum_test').person
     forum = fast_create(Forum, :name => 'Forum test', :profile_id => p.id)
--
libgit2 0.21.2