Merge commit 'alex/master'

TODO

@@ -1,6 +1,5 @@
 = SOON
-  * fix duplication of routes/methods to accommodate file extensions
-  * working launchd plist
+  * repo stats/info/maintenance page
   * deleting pages 
   * pushing repo
 
@@ -15,12 +14,14 @@
   * users (email/name/ip - use for commits)
 
 = LATER/MAYBE
-  * repo stats/info/maintenance page
   * backlinks (trivial syntax, ideally)
   * outliner functionality
+  * menubar item launcher (like Instiki back in the day)
   * RubyCocoa GUI
+  * working launchd plist
 
 = DONE
+  * fix duplication of routes/methods to accommodate file extensions
   * "append selected text/link to page" bookmarklet (shamelessly cribbed 
     from Trsly/Instapaper) 
   * allow "code pages" by supporting file extensions, applying syntax 

git-wiki.rb

@@ -71,28 +71,18 @@ def touchfile
   show :history, "History of #{@page.name}"
 end
 
-get '/h/:page/:rev' do
-  @page = Page.new(page_with_ext, params[:rev])
-  show :show, "#{@page.name} / version #{params[:rev]})"
-end
-
-# FIXME this repeats the above just to accomodate pages with 
-# file extensions.  bad!
-get '/h/:page.:format/:rev' do
-  @page = Page.new(page_with_ext, params[:rev])
-  show :show, "#{@page.name} / version #{params[:rev]})"
-end
-
-get '/d/:page/:rev' do
-  @page = Page.new(page_with_ext)
-  show :delta, "Diff of #{@page.name}"
+['/h/:page/:rev', '/h/:page.:format/:rev'].each do |r|
+  get r do
+    @page = Page.new(page_with_ext, params[:rev])
+    show :show, "#{@page.name} (version #{params[:rev]})"
+  end
 end
 
-# FIXME this repeats the above just to accomodate pages with 
-# file extensions.  bad!
-get '/d/:page.:format/:rev' do
-  @page = Page.new(page_with_ext)
-  show :delta, "Diff of #{@page.name}"
+['/d/:page/:rev', '/d/:page.:format/:rev'].each do |r|
+  get r do
+    @page = Page.new(page_with_ext)
+    show :delta, "Diff of #{@page.name}"
+  end
 end
 
 get '/a/tarball' do