From 06959ab278e67e68c1a0e98155aef36ec243fa2a Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Sun, 14 Aug 2005 23:35:10 +0000
Subject: [PATCH] Moved pretty date formatting from revision to the main view
 helper, where this presentation logic obviously belongs

---
 app/helpers/application_helper.rb     | 6 ++++++
 app/models/revision.rb                | 8 --------
 app/views/wiki/page.rhtml             | 2 +-
 app/views/wiki/print.rhtml            | 2 +-
 app/views/wiki/recently_revised.rhtml | 2 +-
 app/views/wiki/revision.rhtml         | 2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 134df0bf..6e100fb9 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -72,4 +72,10 @@ module ApplicationHelper
     h(text).gsub(/\n/, '<br/>')
   end
 
+  def format_date(date)
+    # Must use DateTime because Time doesn't support %e on at least some platforms
+    DateTime.new(date.year, date.mon, date.day, date.hour, date.min, 
+        date.sec).strftime("%B %e, %Y %H:%M:%S")
+  end
+
 end
diff --git a/app/models/revision.rb b/app/models/revision.rb
index f9924eb9..9aab6370 100644
--- a/app/models/revision.rb
+++ b/app/models/revision.rb
@@ -3,14 +3,6 @@ class Revision < ActiveRecord::Base
   belongs_to :page
   composed_of :author, :mapping => [ %w(author name), %w(ip ip) ]
 
-  # TODO this method belongs in the view helpers (only views use it)
-  def pretty_created_on
-    # Must use DateTime because Time doesn't support %e on at least some platforms
-    DateTime.new(
-      revised_at.year, revised_at.mon, revised_at.day, revised_at.hour, revised_at.min, revised_at.sec
-    ).strftime "%B %e, %Y %H:%M:%S"  
-  end
-
   # Returns an array of all the WikiIncludes present in the content of this revision.
   def wiki_includes
     unless @wiki_includes_cache 
diff --git a/app/views/wiki/page.rhtml b/app/views/wiki/page.rhtml
index 7dec70a6..904382ce 100644
--- a/app/views/wiki/page.rhtml
+++ b/app/views/wiki/page.rhtml
@@ -22,7 +22,7 @@
 <% end %>
 
 <div class="byline">
-  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_on %> 
+  <%= @page.revisions? ? "Revised" : "Created" %> on <%= format_date(@page.revised_at) %> 
   by <%= @page.author_link %>
   <%= "(#{@page.author.ip})" if @page.author.respond_to?(:ip) %>
   <% if @web.count_pages? %>
diff --git a/app/views/wiki/print.rhtml b/app/views/wiki/print.rhtml
index 3507db1c..25bf0f30 100644
--- a/app/views/wiki/print.rhtml
+++ b/app/views/wiki/print.rhtml
@@ -8,7 +8,7 @@
 <%= @page.display_content_for_export %>
 
 <div class="byline">
-  <%= @page.revisions? ? "Revised" : "Created" %> on <%= @page.pretty_created_on %> 
+  <%= @page.revisions? ? "Revised" : "Created" %> on <%= format_date(@page.revised_at) %> 
   by
   <%= @page.author_link({ :mode => (@link_mode || :show) }) %>
 </div>
diff --git a/app/views/wiki/recently_revised.rhtml b/app/views/wiki/recently_revised.rhtml
index 4e45475f..0460c7b7 100644
--- a/app/views/wiki/recently_revised.rhtml
+++ b/app/views/wiki/recently_revised.rhtml
@@ -17,7 +17,7 @@
       <%= link_to_existing_page page %>
       <div class="byline" style="margin-bottom: 0px">
         by <%= link_to_page(page.author) %>
-        at <%= page.current_revision.pretty_created_on %>
+        at <%= format_date(page.revised_at) %>
         <%= "from #{page.author.ip}" if page.author.respond_to?(:ip) %>
       </div>
     </li>
diff --git a/app/views/wiki/revision.rhtml b/app/views/wiki/revision.rhtml
index ee53b9c1..89e2a685 100644
--- a/app/views/wiki/revision.rhtml
+++ b/app/views/wiki/revision.rhtml
@@ -17,7 +17,7 @@
 
 
 <div class="byline">
-  <%= "Revision from #{@revision.pretty_created_on} by" %>
+  <%= "Revision from #{format_date(@revision.revised_at)} by" %>
   <%= link_to_page @revision.author %>
 </div>