From 5b075ca338b7d75453b98390509763a1ec0e6b32 Mon Sep 17 00:00:00 2001 From: Alexey Verkhovsky Date: Sun, 14 Aug 2005 23:27:55 +0000 Subject: [PATCH] Renamed revised_on to revised_at everywhere (for consistency) --- app/controllers/wiki_controller.rb | 12 ++++++------ app/models/page.rb | 2 +- app/models/page_set.rb | 4 ++-- app/models/revision.rb | 4 ---- app/models/web.rb | 2 +- app/models/wiki.rb | 4 ++-- app/views/wiki/recently_revised.rhtml | 6 +++--- app/views/wiki/rss_feed.rhtml | 2 +- test/unit/page_test.rb | 2 +- 9 files changed, 17 insertions(+), 21 deletions(-) diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index 3e43eaf6..81624733 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -57,7 +57,7 @@ class WikiController < ApplicationController end def export_pdf - file_name = "#{@web.address}-tex-#{@web.revised_on.strftime('%Y-%m-%d-%H-%M-%S')}" + file_name = "#{@web.address}-tex-#{@web.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}" file_path = File.join(@wiki.storage_path, file_name) export_web_to_tex "#{file_path}.tex" unless FileTest.exists? "#{file_path}.tex" @@ -66,7 +66,7 @@ class WikiController < ApplicationController end def export_tex - file_name = "#{@web.address}-tex-#{@web.revised_on.strftime('%Y-%m-%d-%H-%M-%S')}.tex" + file_name = "#{@web.address}-tex-#{@web.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}.tex" file_path = File.join(@wiki.storage_path, file_name) export_web_to_tex(file_path) unless FileTest.exists?(file_path) send_file file_path @@ -140,7 +140,7 @@ class WikiController < ApplicationController def pdf page = wiki.read_page(@web_name, @page_name) safe_page_name = @page.name.gsub(/\W/, '') - file_name = "#{safe_page_name}-#{@web.address}-#{@page.revised_on.strftime('%Y-%m-%d-%H-%M-%S')}" + file_name = "#{safe_page_name}-#{@web.address}-#{@page.revised_at.strftime('%Y-%m-%d-%H-%M-%S')}" file_path = File.join(@wiki.storage_path, file_name) export_page_to_tex("#{file_path}.tex") unless FileTest.exists?("#{file_path}.tex") @@ -247,7 +247,7 @@ class WikiController < ApplicationController def export_pages_as_zip(file_type, &block) file_prefix = "#{@web.address}-#{file_type}-" - timestamp = @web.revised_on.strftime('%Y-%m-%d-%H-%M-%S') + timestamp = @web.revised_at.strftime('%Y-%m-%d-%H-%M-%S') file_path = File.join(@wiki.storage_path, file_prefix + timestamp + '.zip') tmp_path = "#{file_path}.tmp" @@ -313,8 +313,8 @@ class WikiController < ApplicationController @pages_by_revision = @web.select.by_revision.first(limit) else @pages_by_revision = @web.select.by_revision - @pages_by_revision.reject! { |page| page.revised_on < start_date } if start_date - @pages_by_revision.reject! { |page| page.revised_on > end_date } if end_date + @pages_by_revision.reject! { |page| page.revised_at < start_date } if start_date + @pages_by_revision.reject! { |page| page.revised_at > end_date } if end_date end @hide_description = hide_description diff --git a/app/models/page.rb b/app/models/page.rb index ca9c8644..8f2ef436 100644 --- a/app/models/page.rb +++ b/app/models/page.rb @@ -121,7 +121,7 @@ class Page < ActiveRecord::Base private def continous_revision?(time, author) - (current_revision.author == author) && (revised_on + 30.minutes > time) + (current_revision.author == author) && (revised_at + 30.minutes > time) end # Forward method calls to the current revision, so the page responds to all revision calls diff --git a/app/models/page_set.rb b/app/models/page_set.rb index 47e1d4e9..38671eda 100644 --- a/app/models/page_set.rb +++ b/app/models/page_set.rb @@ -17,7 +17,7 @@ class PageSet < Array end def most_recent_revision - self.map { |page| page.revised_on }.max || Time.at(0) + self.map { |page| page.revised_at }.max || Time.at(0) end def by_name @@ -27,7 +27,7 @@ class PageSet < Array alias :sort :by_name def by_revision - PageSet.new(@web, sort_by { |page| page.revised_on }).reverse + PageSet.new(@web, sort_by { |page| page.revised_at }).reverse end def pages_that_reference(page_name) diff --git a/app/models/revision.rb b/app/models/revision.rb index d02a50ca..f9924eb9 100644 --- a/app/models/revision.rb +++ b/app/models/revision.rb @@ -3,10 +3,6 @@ class Revision < ActiveRecord::Base belongs_to :page composed_of :author, :mapping => [ %w(author name), %w(ip ip) ] - def revised_on - revised_at - end - # 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 diff --git a/app/models/web.rb b/app/models/web.rb index a568e6a1..be520aba 100644 --- a/app/models/web.rb +++ b/app/models/web.rb @@ -134,7 +134,7 @@ class Web < ActiveRecord::Base pages_to_be_removed.each { |p| p.destroy } end - def revised_on + def revised_at select.most_recent_revision end diff --git a/app/models/wiki.rb b/app/models/wiki.rb index e1390e31..5880e3c5 100644 --- a/app/models/wiki.rb +++ b/app/models/wiki.rb @@ -59,9 +59,9 @@ class Wiki web.remove_pages(web.select.orphaned_pages) end - def revise_page(web_address, page_name, content, revised_on, author) + def revise_page(web_address, page_name, content, revised_at, author) page = read_page(web_address, page_name) - page.revise(content, revised_on, author) + page.revise(content, revised_at, author) end def rollback_page(web_address, page_name, revision_number, time, author_id = nil) diff --git a/app/views/wiki/recently_revised.rhtml b/app/views/wiki/recently_revised.rhtml index cf61554e..4e45475f 100644 --- a/app/views/wiki/recently_revised.rhtml +++ b/app/views/wiki/recently_revised.rhtml @@ -3,12 +3,12 @@ <%= categories_menu %> <% unless @pages_by_revision.empty? %> - <% revision_date = @pages_by_revision.first.revised_on %> + <% revision_date = @pages_by_revision.first.revised_at %>

<%= revision_date.strftime('%B %e, %Y') %>

<%= revision_date.strftime('%B %e, %Y') %>