Redo routes, / for index, give pages url and edit_url

Author: decklin

git-wiki.rb

@@ -7,11 +7,11 @@
 
 module GitWiki
   class << self
-    attr_accessor :homepage, :extension, :repository, :link_pattern
+    attr_accessor :root_page, :extension, :repository, :link_pattern
   end
   @repository = Grit::Repo.new(ARGV[0] || File.expand_path('~/wiki'))
   @extension = ARGV[1] || '.markdown'
-  @homepage = ARGV[2] || 'Home'
+  @root_page = ARGV[2] || 'index'
   @link_pattern = /\[\[(.*?)\]\]/
 end
 
@@ -47,6 +47,14 @@ def to_s
     name
   end
 
+  def url
+    to_s == GitWiki.root_page ? '/' : "/pages/#{to_s}"
+  end
+
+  def edit_url
+    "/pages/#{to_s}/edit"
+  end
+
   def css_class
     @blob.id ? 'existing' : 'new'
   end
@@ -70,27 +78,28 @@ def save!(data)
 
 set :haml, :format => :html5, :attr_wrapper => '"'
 
-get "/" do
-  redirect "/" + GitWiki.homepage
+get '/' do
+  @page = Page.find_or_create(GitWiki.root_page)
+  haml :show
 end
 
-get "/pages" do
+get '/pages/' do
   @pages = Page.find_all
   haml :list
 end
 
-get "/:page/edit" do
+get '/pages/:page/?' do
   @page = Page.find_or_create(params[:page])
-  haml :edit
+  haml :show
 end
 
-get "/:page" do
+get '/pages/:page/edit' do
   @page = Page.find_or_create(params[:page])
-  haml :show
+  haml :edit
 end
 
-post "/:page" do
+post '/pages/:page/edit' do
   @page = Page.find_or_create(params[:page])
   @page.save!(params[:body])
-  redirect "/#{@page}"
+  redirect @page.url
 end

views/edit.haml

@@ -1,9 +1,9 @@
 - title "Editing #{@page.name}"
 %h1= title
-%form{:method => 'POST', :action => "/#{@page}"}
+%form{:method => 'POST', :action => @page.edit_url}
   %p
     %textarea{:name => 'body', :rows => 30, :style => "width: 100%"}= @page.content
   %p
     %input.submit{:type => :submit, :value => "Save as the newest version"}
     or
-    %a.cancel{:href=>"/#{@page}"} cancel
+    %a.cancel{:href=>@page.url} cancel

views/layout.haml

@@ -5,7 +5,7 @@
   %body
     %ul
       %li
-        %a{ :href => "/#{GitWiki.homepage}" } Home
+        %a{ :href => "/" } Home
       %li
-        %a{ :href => "/pages" } All pages
+        %a{ :href => "/pages/" } All pages
     #content= yield

views/show.haml

@@ -1,6 +1,6 @@
 - title @page.name
 #edit
-  %a{:href => "/#{@page}/edit"} Edit this page
+  %a{:href => @page.edit_url} Edit this page
 %h1= title
 #content
   ~"#{@page.to_html}"