Merge pull request #1155 from gollum/dont_wait_on_versions

Remove calls to Page#last_version. Closes #1078.

lib/gollum/app.rb

@@ -5,6 +5,7 @@ require 'gollum-lib'
 require 'mustache/sinatra'
 require 'useragent'
 require 'stringex'
+require 'json'
 
 require 'gollum'
 require 'gollum/views/layout'
@@ -131,6 +132,14 @@ module Precious
       Gollum::Wiki.new(settings.gollum_path, settings.wiki_options)
     end
 
+    get '/last-commit-info' do
+      content_type :json
+      if page = wiki_page(params[:path]).page
+        version = page.last_version
+        {:author => version.author.name, :date => version.authored_date}.to_json
+      end
+    end
+
     get '/emoji/:name' do
       begin
         [200, {'Content-Type' => 'image/png'}, emoji(params['name'])]
@@ -509,7 +518,6 @@ module Precious
 
       name = extract_name(fullpath) || wiki.index_page
       path = extract_path(fullpath) || '/'
-
       if page = wiki.paged(name, path, exact = true)
         @page          = page
         @name          = name
@@ -518,7 +526,6 @@ module Precious
 
         # Extensions and layout data
         @editable      = true
-        @page_exists   = !page.last_version.nil?
         @toc_content   = wiki.universal_toc ? @page.toc_data : nil
         @mathjax       = wiki.mathjax
         @h1_title      = wiki.h1_title

lib/gollum/public/gollum/javascript/gollum.js

@@ -306,6 +306,19 @@ $(document).ready(function() {
     $.GollumEditor();
   }
 
+  if( $("#last-edit").length ) {
+    $("#page-info-toggle").click ( function () {
+      $.ajax({
+        url: '/last-commit-info',
+        data: {path: $("#page-info-toggle").data('pagepath')},
+        success: function ( data ) {
+          $("#last-edit").html('Last edited by <b>' + data.author + '</b>, ' + data.date);
+        }
+      });
+      $("#last-edit").html('<i class="fa fa-spinner fa-spin"></i> Getting commit info...');
+    })
+  }
+
   if( $('#wiki-wrapper.create').length ){
     $("#gollum-editor-submit").click( function() { window.onbeforeunload = null; } );
     $("#gollum-editor-body").one('change', function(){

lib/gollum/templates/page.mustache

@@ -40,12 +40,10 @@ Mousetrap.bind(['e'], function( e ) {
            class="action-edit-page">Edit</a></li>
       {{/editable}}
     {{/allow_editing}}
-    {{#page_exists}}
     <li class="minibutton"><a href="{{base_url}}/history/{{escaped_url_path}}"
        class="action-page-history">History</a></li>
     <li class="minibutton"><a href="{{base_url}}/latest_changes"
        class="action-page-history">Latest Changes</a></li>
-    {{/page_exists}}
   </ul>
 </div>
 <div id="wiki-content">
@@ -85,10 +83,10 @@ Mousetrap.bind(['e'], function( e ) {
 
 </div>
 <div id="footer">
-  <p id="last-edit">Last edited by <b>{{author}}</b>, {{date}}</p>
+  <p id="last-edit"><a id="page-info-toggle" data-pagepath="{{escaped_url_path}}">When was this page last modified?</a></p>
   {{#allow_editing}}
     <p>
-      <a id="delete-link" href="{{base_url}}/{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
+      <a id="delete-link" href="{{escaped_url_path}}" data-confirm="Are you sure you want to delete this page?"><span>Delete this Page</span></a>
     </p>
   {{/allow_editing}}
 </div>

lib/gollum/views/page.rb

@@ -41,10 +41,6 @@ module Precious
         @editable
       end
 
-      def page_exists
-        @page_exists
-      end
-
       def allow_editing
         @allow_editing
       end

test/test_app.rb

@@ -90,25 +90,14 @@ context "Frontend" do
     divs.each {|div| assert_match div, last_response.body}
   end
 
-  test "retain edit information" do
+  test "provide last edit information" do
     page1 = 'page1'
     user1 = 'user1'
     @wiki.write_page(page1, :markdown, '',
                      { :name => user1, :email => user1 });
 
-    get page1
-    assert_match /Last edited by <b>user1/, last_response.body
-
-    page2 = 'page2'
-    user2 = 'user2'
-    @wiki.write_page(page2, :markdown, '',
-                     { :name => user2, :email => user2 });
-
-    get page2
-    assert_match /Last edited by <b>user2/, last_response.body
-
-    get page1
-    assert_match /Last edited by <b>user1/, last_response.body
+    get "/last-commit-info", :path => page1
+    assert_match /\"author\":\"user1\"/, last_response.body
   end
 
   test "edits page" do