From ac41ed629ecdf2c3b44671f0ed1435e1471fdfb8 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Tue, 22 May 2012 22:46:15 -0600 Subject: [PATCH 1/5] Merge modified #350. --- lib/gollum/frontend/views/page.rb | 4 ++-- test/test_app.rb | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb index 953cdb10..ce8de23a 100644 --- a/lib/gollum/frontend/views/page.rb +++ b/lib/gollum/frontend/views/page.rb @@ -15,12 +15,12 @@ module Precious def author return DEFAULT_AUTHOR unless @page.version - @page.version.author.name + @page.versions.first.author.name end def date return Time.now.strftime(DATE_FORMAT) unless @page.version - @page.version.authored_date.strftime(DATE_FORMAT) + @page.versions.first.authored_date.strftime(DATE_FORMAT) end def editable diff --git a/test/test_app.rb b/test/test_app.rb index f83f9922..301c808d 100644 --- a/test/test_app.rb +++ b/test/test_app.rb @@ -15,6 +15,27 @@ context "Frontend" do FileUtils.rm_rf(@path) end + test "retain edit information" do + page1 = 'page1' + user1 = 'user1' + @wiki.write_page(page1, :markdown, '', + { :name => user1, :email => user1 }); + + get page1 + assert_match /Last edited by user1/, last_response.body + + page2 = 'page2' + user2 = 'user2' + @wiki.write_page(page2, :markdown, '', + { :name => user2, :email => user2 }); + + get page2 + assert_match /Last edited by user2/, last_response.body + + get page1 + assert_match /Last edited by user1/, last_response.body + end + test "edits page" do page_1 = @wiki.page('A') post "/edit/A", :content => 'abc', From c0e35b012644f0bab1380db3e6bea4777c777008 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Tue, 22 May 2012 23:03:23 -0600 Subject: [PATCH 2/5] Avoid nil. --- lib/gollum/frontend/views/page.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb index ce8de23a..78b19d14 100644 --- a/lib/gollum/frontend/views/page.rb +++ b/lib/gollum/frontend/views/page.rb @@ -14,13 +14,19 @@ module Precious end def author - return DEFAULT_AUTHOR unless @page.version - @page.versions.first.author.name + pagev = @page.version + return DEFAULT_AUTHOR unless pagev + first = @page.versions.first + author = first == nil ? pagev.author : first.author + author.name end def date - return Time.now.strftime(DATE_FORMAT) unless @page.version - @page.versions.first.authored_date.strftime(DATE_FORMAT) + pagev = @page.version + return Time.now.strftime(DATE_FORMAT) unless pagev + first = @page.versions.first + date = first == nil ? pagev.authored_date : first.authored_date + date.strftime(DATE_FORMAT) end def editable From e160822b0ff57e0e9af3251749e89b57016674de Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Tue, 22 May 2012 23:48:56 -0600 Subject: [PATCH 3/5] Only use versions. --- lib/gollum/frontend/views/page.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb index 78b19d14..ae789119 100644 --- a/lib/gollum/frontend/views/page.rb +++ b/lib/gollum/frontend/views/page.rb @@ -14,19 +14,15 @@ module Precious end def author - pagev = @page.version - return DEFAULT_AUTHOR unless pagev first = @page.versions.first - author = first == nil ? pagev.author : first.author - author.name + return DEFAULT_AUTHOR unless first + first.author.name end def date - pagev = @page.version - return Time.now.strftime(DATE_FORMAT) unless pagev first = @page.versions.first - date = first == nil ? pagev.authored_date : first.authored_date - date.strftime(DATE_FORMAT) + return Time.now.strftime(DATE_FORMAT) unless first + first.authored_date.strftime(DATE_FORMAT) end def editable From f765137f3f2de37e287e54b4d2445c72860d2fb8 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Wed, 23 May 2012 00:04:57 -0600 Subject: [PATCH 4/5] Avoid nil. --- lib/gollum/frontend/views/page.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gollum/frontend/views/page.rb b/lib/gollum/frontend/views/page.rb index ae789119..16576f2b 100644 --- a/lib/gollum/frontend/views/page.rb +++ b/lib/gollum/frontend/views/page.rb @@ -14,13 +14,13 @@ module Precious end def author - first = @page.versions.first + first = @page.versions ? @page.versions.first : false return DEFAULT_AUTHOR unless first first.author.name end def date - first = @page.versions.first + first = @page.versions ? @page.versions.first : false return Time.now.strftime(DATE_FORMAT) unless first first.authored_date.strftime(DATE_FORMAT) end From d7dd90f0736963d2d711c200dcb6bce7bf4f1cd4 Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Wed, 23 May 2012 11:12:29 -0600 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 415bbe54..4a3cddf2 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ utility, you can run it like so: $ gollum --help -Note that the gollum server will not run on Windows because of [an issue](https://github.com/rtomayko/posix-spawn/issues/9) with posix-spawn. +Note that the gollum server will not run on Windows because of [an issue](https://github.com/rtomayko/posix-spawn/issues/9) with posix-spawn (which is used by Grit). ## REPO STRUCTURE