Simple log view, with previous revisions

Author: decklin

git-wiki.rb

@@ -26,10 +26,11 @@ def self.find_all
     GitWiki.all_page_blobs.map {|blob| new(blob) }
   end
 
-  def self.find_or_create(name)
+  def self.find_or_create(name, rev=nil)
     path = name + GitWiki.extension
-    blob = GitWiki.repository.tree/path
-    new(blob || Grit::Blob.create(GitWiki.repository, :name => path))
+    tree = rev ? GitWiki.repository.commit(rev).tree : GitWiki.repository.tree
+    blob = tree/path || Grit::Blob.create(GitWiki.repository, :name => path)
+    new(blob)
   end
 
   def self.wikify(content)
@@ -57,6 +58,10 @@ def edit_url
     "/pages/#{to_s}/edit"
   end
 
+  def log_url
+    "/pages/#{to_s}/revisions/"
+  end
+
   def css_class
     @blob.id ? 'existing' : 'new'
   end
@@ -69,6 +74,10 @@ def to_html
     Page.wikify(RDiscount.new(content).to_html)
   end
 
+  def log
+    GitWiki.repository.log('master', @blob.name).map {|commit| commit.to_hash }
+  end
+
   def save!(data, msg)
     msg = "web commit: #{self}" if msg.empty?
     Dir.chdir(GitWiki.repository.working_dir) do
@@ -96,6 +105,16 @@ def save!(data, msg)
   haml :show
 end
 
+get '/pages/:page/revisions/' do
+  @page = Page.find_or_create(params[:page])
+  haml :log
+end
+
+get '/pages/:page/revisions/:rev' do
+  @page = Page.find_or_create(params[:page], params[:rev])
+  haml :show
+end
+
 get '/pages/:page/edit' do
   @page = Page.find_or_create(params[:page])
   haml :edit

views/layout.haml

@@ -13,6 +13,8 @@
       - if @page
         %li
           %a.edit{:href => @page.edit_url}> edit
+        %li
+          %a.log{:href => @page.log_url}> log
       %li
-        %a.list{:href => '/pages/'}> list
+        %a.list{:href => '/pages/'}> all
     #content= yield

views/log.haml

@@ -0,0 +1,5 @@
+%dl
+  - @page.log.each do |commit|
+    %dt= commit['committed_date']
+    %dd
+      %a{:href => commit['id']}= commit['message']