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

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

master
Jacques Distler 2009-10-22 17:59:25 -05:00
parent dc26bbdd36 761f8bbb51
commit 3a4f66d484
3 changed files with 61 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/url_generator.rb
View File

@ -98,19 +98,13 @@ class UrlGenerator < AbstractUrlGenerator
end
when :publish
if known_page
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'published',
:id => name, :only_path => true
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
wikilink_for(mode, name, text, web_address)
else
%{<span class="newWikiWord">#{text}</span>}
end
when :show
if known_page
web = Web.find_by_address(web_address)
action = web.published? && web != @web ? 'published' : 'show'
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => action,
:id => name, :only_path => true
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
wikilink_for(mode, name, text, web_address)
else
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'new',
:id => name, :only_path => true
@ -118,11 +112,7 @@ class UrlGenerator < AbstractUrlGenerator
end
else
if known_page
web = Web.find_by_address(web_address)
action = web.published? ? 'published' : 'show'
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => action,
:id => name, :only_path => true
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
wikilink_for(mode, name, text, web_address)
else
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => 'new',
:id => name, :only_path => true
@ -190,5 +180,14 @@ class UrlGenerator < AbstractUrlGenerator
%{<span class="deleteWikiWord">[[#{name}:delete]]</span>}
end
end
private
def wikilink_for(mode, name, text, web_address)
web = Web.find_by_address(web_address)
action = web.published? && !(web == @web && mode != :publish) ? 'published' : 'show'
href = @controller.url_for :controller => 'wiki', :web => web_address, :action => action,
:id => name, :only_path => true
%{<a class="existingWikiWord" href="#{href}">#{text}</a>}
end
end

4
test/fixtures/revisions.yml vendored
View File

@ -88,6 +88,6 @@ liquor_first_revision:
updated_at: <%= 40.minutes.ago.to_formatted_s(:db) %>
revised_at: <%= 40.minutes.ago.to_formatted_s(:db) %>
page_id: 9
content: "[[!redirects booze]]\n Drinky-poo."
content: "[[!redirects booze]]\n Drinky-poo. [[Instiki:HomePage|go there]]"
author: Guest
ip: 127.0.0.2
ip: 127.0.0.2

46
test/functional/wiki_controller_test.rb
View File

@ -329,6 +329,52 @@ class WikiControllerTest < ActionController::TestCase
assert_response(:success)
assert_equal @home, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='\/wiki1\/show\/ThatWay'>That Way<\/a>/, r.body
r = process 'save', 'web' => 'instiki', 'id' => 'HomePage', 'content' => 'Contents of a new page',
'author' => 'AuthorOfNewPage'
assert_equal Web.find_by_address('instiki').has_page?('HomePage'), true
r = process('published', 'web' => 'wiki1', 'id' => 'liquor')
assert_response(:success)
assert_equal @liquor, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='\/instiki\/show\/HomePage'>go there<\/a>/, r.body
r = process('show', 'web' => 'wiki1', 'id' => 'liquor')
assert_response(:success)
assert_equal @liquor, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='\/instiki\/show\/HomePage'>go there<\/a>/, r.body
Web.find_by_address('instiki').update_attribute(:published, true)
r = process('published', 'web' => 'wiki1', 'id' => 'liquor')
assert_response(:success)
assert_equal @liquor, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='\/instiki\/published\/HomePage'>go there<\/a>/, r.body
r = process('show', 'web' => 'wiki1', 'id' => 'liquor')
assert_response(:success)
assert_equal @liquor, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='\/instiki\/published\/HomePage'>go there<\/a>/, r.body
set_web_property :published, false
r = process('show', 'web' => 'wiki1', 'id' => 'liquor')
assert_response(:success)
assert_equal @liquor, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='\/instiki\/published\/HomePage'>go there<\/a>/, r.body
Web.find_by_address('instiki').update_attribute(:published, false)
r = process('show', 'web' => 'wiki1', 'id' => 'liquor')
assert_response(:success)
assert_equal @liquor, r.template_objects['page']
assert_match /<a class='existingWikiWord' href='\/instiki\/show\/HomePage'>go there<\/a>/, r.body
end