deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2011-04-25 10:58:42 -05:00
parent 823f8b79c9 7290e90631
commit c2dfe7e621
8 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/cache_sweeping_helper.rb
View file

@ -26,7 +26,7 @@ module CacheSweepingHelper
end end
def expire_cached_revisions(page) def expire_cached_revisions(page)
page.revisions.count.times do |i| page.rev_ids.count.times do |i|
revno = i+1 revno = i+1
expire_action :controller => 'wiki', :web => page.web.address, expire_action :controller => 'wiki', :web => page.web.address,
:action => 'revision', :id => page.name, :rev => revno :action => 'revision', :id => page.name, :rev => revno

16
app/controllers/wiki_controller.rb
View file

@ -69,7 +69,7 @@ class WikiController < ApplicationController
def export_html def export_html
export_pages_as_zip(html_ext) do |page| export_pages_as_zip(html_ext) do |page|
renderer = PageRenderer.new(page.revisions.last) renderer = PageRenderer.new(page.current_revision)
rendered_page = <<-EOL rendered_page = <<-EOL
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd" > <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN" "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg-flat.dtd" >
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
@ -262,7 +262,7 @@ EOL
redirect_home redirect_home
end end
@link_mode ||= :show @link_mode ||= :show
@renderer = PageRenderer.new(@page.revisions.last) @renderer = PageRenderer.new(@page.current_revision)
# to template # to template
end end
@ -276,7 +276,7 @@ EOL
@page ||= wiki.read_page(@web_name, @page_name) @page ||= wiki.read_page(@web_name, @page_name)
@link_mode ||= :publish @link_mode ||= :publish
if @page if @page
@renderer = PageRenderer.new(@page.revisions.last) @renderer = PageRenderer.new(@page.current_revision)
else else
real_page = WikiReference.page_that_redirects_for(@web, @page_name) real_page = WikiReference.page_that_redirects_for(@web, @page_name)
if real_page if real_page
@ -348,7 +348,7 @@ EOL
def show def show
if @page if @page
begin begin
@renderer = PageRenderer.new(@page.revisions.last) @renderer = PageRenderer.new(@page.current_revision)
@show_diff = (params[:mode] == 'diff') @show_diff = (params[:mode] == 'diff')
render :action => 'page' render :action => 'page'
# TODO this rescue should differentiate between errors due to rendering and errors in # TODO this rescue should differentiate between errors due to rendering and errors in
@ -383,8 +383,8 @@ EOL
if @page if @page
@revisions_by_day = Hash.new { |h, day| h[day] = [] } @revisions_by_day = Hash.new { |h, day| h[day] = [] }
@revision_numbers = Hash.new { |h, id| h[id] = [] } @revision_numbers = Hash.new { |h, id| h[id] = [] }
revision_number = @page.revisions.size revision_number = @page.rev_ids.size
@page.revisions.reverse.each do |rev| @page.rev_ids.reverse.each do |rev|
day = Date.new(rev.revised_at.year, rev.revised_at.month, rev.revised_at.day) day = Date.new(rev.revised_at.year, rev.revised_at.month, rev.revised_at.day)
@revisions_by_day[day] << rev @revisions_by_day[day] << rev
@revision_numbers[rev.id] = revision_number @revision_numbers[rev.id] = revision_number
@ -415,7 +415,7 @@ EOL
def s5 def s5
if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup) if [:markdownMML, :markdownPNG, :markdown].include?(@web.markup)
my_rendered = PageRenderer.new(@page.revisions.last) my_rendered = PageRenderer.new(@page.current_revision)
@s5_content = my_rendered.display_s5 @s5_content = my_rendered.display_s5
@s5_theme = my_rendered.s5_theme @s5_theme = my_rendered.s5_theme
else else
@ -506,7 +506,7 @@ EOL
if params['rev'] if params['rev']
@revision_number = params['rev'].to_i @revision_number = params['rev'].to_i
else else
@revision_number = @page.revisions.size @revision_number = @page.rev_ids.size
end end
@revision = @page.revisions[@revision_number - 1] @revision = @page.revisions[@revision_number - 1]
end end

4
app/helpers/application_helper.rb
View file

@ -55,7 +55,7 @@ require 'instiki_stringsupport'
# Create a hyperlink to a particular revision of a Wiki page # Create a hyperlink to a particular revision of a Wiki page
def link_to_revision(page, revision_number, text = nil, mode = nil, html_options = {}) def link_to_revision(page, revision_number, text = nil, mode = nil, html_options = {})
revision_number == page.revisions.size ? revision_number == page.rev_ids.size ?
link_to( link_to(
text || page.plain_name, text || page.plain_name,
{:web => @web.address, :action => 'show', :id => page.name, {:web => @web.address, :action => 'show', :id => page.name,
@ -109,7 +109,7 @@ require 'instiki_stringsupport'
end end
def rendered_content(page) def rendered_content(page)
PageRenderer.new(page.revisions.last).display_content PageRenderer.new(page.current_revision).display_content
end end
def truncate(text, *args) def truncate(text, *args)

14
app/helpers/wiki_helper.rb
View file

@ -6,7 +6,7 @@ module WikiHelper
menu << back_for_revision if @revision_number > 1 menu << back_for_revision if @revision_number > 1
menu << current_revision menu << current_revision
menu << see_or_hide_changes_for_revision if @revision_number > 1 menu << see_or_hide_changes_for_revision if @revision_number > 1
menu << history if @page.revisions.size > 1 menu << history if @page.rev_ids.size > 1
menu << rollback menu << rollback
menu menu
end end
@ -15,11 +15,11 @@ module WikiHelper
menu = [] menu = []
menu << edit_page menu << edit_page
menu << edit_web if @page.name == "HomePage" menu << edit_web if @page.name == "HomePage"
if @page.revisions.size > 1 if @page.rev_ids.size > 1
menu << back_for_page menu << back_for_page
menu << see_or_hide_changes_for_page menu << see_or_hide_changes_for_page
end end
menu << history if @page.revisions.size > 1 menu << history if @page.rev_ids.size > 1
menu menu
end end
@ -40,11 +40,11 @@ module WikiHelper
end end
def forward def forward
if @revision_number < @page.revisions.size - 1 if @revision_number < @page.rev_ids.size - 1
link_to('Forward in time', link_to('Forward in time',
{:web => @web.address, :action => 'revision', :id => @page.name, :rev => @revision_number + 1}, {:web => @web.address, :action => 'revision', :id => @page.name, :rev => @revision_number + 1},
{:class => 'navlink', :accesskey => 'F', :id => 'to_next_revision', :rel => 'nofollow'}) + {:class => 'navlink', :accesskey => 'F', :id => 'to_next_revision', :rel => 'nofollow'}) +
" <span class='revisions'>(#{@revision.page.revisions.size - @revision_number} more)</span> ".html_safe " <span class='revisions'>(#{@revision.page.rev_ids.size - @revision_number} more)</span> ".html_safe
else else
link_to('Forward in time', {:web => @web.address, :action => 'show', :id => @page.name}, link_to('Forward in time', {:web => @web.address, :action => 'show', :id => @page.name},
{:class => 'navlink', :accesskey => 'F', :id => 'to_next_revision', :rel => 'nofollow'}) + {:class => 'navlink', :accesskey => 'F', :id => 'to_next_revision', :rel => 'nofollow'}) +
@ -62,9 +62,9 @@ module WikiHelper
def back_for_page def back_for_page
link_to('Back in time', link_to('Back in time',
{:web => @web.address, :action => 'revision', :id => @page.name, {:web => @web.address, :action => 'revision', :id => @page.name,
:rev => @page.revisions.size - 1}, :rev => @page.rev_ids.size - 1},
{:class => 'navlink', :accesskey => 'B', :id => 'to_previous_revision', :rel => 'nofollow'}) + {:class => 'navlink', :accesskey => 'B', :id => 'to_previous_revision', :rel => 'nofollow'}) +
" <span class='revisions'>(#{@page.revisions.size - 1} #{@page.revisions.size - 1 == 1 ? 'revision' : 'revisions'})</span>".html_safe " <span class='revisions'>(#{@page.rev_ids.size - 1} #{@page.rev_ids.size - 1 == 1 ? 'revision' : 'revisions'})</span>".html_safe
end end
def current_revision def current_revision

8
app/models/page.rb
View file

@ -1,6 +1,8 @@
class Page < ActiveRecord::Base class Page < ActiveRecord::Base
belongs_to :web belongs_to :web
has_many :revisions, :order => 'id', :dependent => :destroy has_many :revisions, :order => 'id', :dependent => :destroy
#In many cases, we don't need to instantiate the full revisions (with all that textual data)
has_many :rev_ids, :order => 'id', :class_name => 'Revision', :select => 'id, revised_at, page_id, author, ip'
has_many :wiki_references, :order => 'referenced_name' has_many :wiki_references, :order => 'referenced_name'
has_one :current_revision, :class_name => 'Revision', :order => 'id DESC' has_one :current_revision, :class_name => 'Revision', :order => 'id DESC'
@ -9,7 +11,7 @@ class Page < ActiveRecord::Base
end end
def revise(content, name, time, author, renderer) def revise(content, name, time, author, renderer)
revisions_size = new_record? ? 0 : revisions.size revisions_size = new_record? ? 0 : rev_ids.size
if (revisions_size > 0) and content == current_revision.content and name == self.name if (revisions_size > 0) and content == current_revision.content and name == self.name
raise Instiki::ValidationError.new( raise Instiki::ValidationError.new(
"You have tried to save page '#{name}' without changing its content") "You have tried to save page '#{name}' without changing its content")
@ -46,11 +48,11 @@ class Page < ActiveRecord::Base
end end
def revisions? def revisions?
revisions.size > 1 rev_ids.size > 1
end end
def previous_revision(revision) def previous_revision(revision)
revision_index = revisions.each_with_index do |rev, index| revision_index = rev_ids.each_with_index do |rev, index|
if rev.id == revision.id if rev.id == revision.id
break index break index
else else

2
app/views/wiki/history.html.erb
View file

@ -7,7 +7,7 @@
<%- for rev in @revisions_by_day[day] -%> <%- for rev in @revisions_by_day[day] -%>
<li> <li>
<%= link_to_revision(rev.page, @revision_numbers[rev.id], <%= link_to_revision(rev.page, @revision_numbers[rev.id],
text= (rev.page.revisions.size == @revision_numbers[rev.id] ? text= (rev.page.rev_ids.size == @revision_numbers[rev.id] ?
"Current" : "Current" :
"Revision #{@revision_numbers[rev.id]}" ) "Revision #{@revision_numbers[rev.id]}" )
) %> ) %>

2
app/views/wiki/page.rhtml
View file

@ -7,7 +7,7 @@
<div id="revision"> <div id="revision">
<%- if @show_diff -%> <%- if @show_diff -%>
<p class="show_diff"> <p class="show_diff">
Showing changes from revision #<%= @page.revisions.size - 1 %> to #<%= @page.revisions.size %>: Showing changes from revision #<%= @page.rev_ids.size - 1 %> to #<%= @page.rev_ids.size %>:
<ins class="diffins">Added</ins> | <del class="diffdel">Removed</del> | <del class="diffmod">Chan</del><ins class="diffmod">ged</ins> <ins class="diffins">Added</ins> | <del class="diffdel">Removed</del> | <del class="diffmod">Chan</del><ins class="diffmod">ged</ins>
</p> </p>
<%= @renderer.display_diff %> <%= @renderer.display_diff %>

4
app/views/wiki/recently_revised.rhtml
View file

@ -8,9 +8,9 @@
<%- for page in @pages_by_day[day] -%> <%- for page in @pages_by_day[day] -%>
<li> <li>
<%= link_to_existing_page page %> <%= link_to_existing_page page %>
<%- if page.revisions.size > 1 %> <%- if page.rev_ids.size > 1 %>
<span class="views"> <span class="views">
( <%= link_to_revision(page, page.revisions.size, text='diff', ( <%= link_to_revision(page, page.rev_ids.size, text='diff',
mode='diff') %> | <%= link_to_history(page, text='history') %> ) mode='diff') %> | <%= link_to_history(page, text='history') %> )
</span> </span>
<%- end -%> <%- end -%>