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

app/controllers/wiki_controller.rb

@@ -389,6 +389,7 @@ class WikiController < ApplicationController
   def load_page
     @page_name = params['id'] ? params['id'].purify : nil
     @page = @wiki.read_page(@web_name, @page_name) if @page_name
+    @page.name.as_utf8 if @page
   end
 
   private

app/models/author.rb

@@ -3,7 +3,7 @@ class Author < String
   attr_reader :name
   def initialize(name, ip = nil) 
     @ip = ip
-    super(name)
+    super(name.as_utf8)
   end
 
   def name=(value)

app/models/page.rb

@@ -82,7 +82,7 @@ class Page < ActiveRecord::Base
 
   # Returns the original wiki-word name as separate words, so "MyPage" becomes "My Page".
   def plain_name
-    web.brackets_only? ? CGI.escapeHTML(name).as_utf8 : CGI.escapeHTML(WikiWords.separate(name)).as_utf8
+    web.brackets_only? ? CGI.escapeHTML(name) : CGI.escapeHTML(WikiWords.separate(name))
   end
 
   LOCKING_PERIOD = 30.minutes

test/functional/wiki_controller_test.rb

@@ -683,7 +683,9 @@ class WikiControllerTest < ActionController::TestCase
     assert_match @eternity, r.headers["Set-Cookie"][0]
     new_page = @wiki.read_page('wiki1', 'NewPage')
     assert_equal "Double-struck A: \360\235\224\270", new_page.content
-    assert_equal "\360\235\224\270\303\274thorOfNewPage", new_page.author
+    a = ''.respond_to?(:force_encoding) ? "\u{1D538}\u00FCthorOfNewPage" :
+                                          "\360\235\224\270\303\274thorOfNewPage"
+    assert_equal a, new_page.author
     assert_equal "\360\235\224\270\303\274thorOfNewPage", r.cookies['author']
   end