Merge remote-tracking branch 'tjgrathwell/index-routes'

Author: alexch

app.rb

@@ -89,6 +89,49 @@ def doc_path
     end
   end
 
+  def title_for_page page_name
+    page_name.split('_').map do |w|
+      w == "osx" ? "OS X" : w.capitalize
+    end.join(' ')    
+  end
+
+  def render_page
+    begin
+      options = {
+          site_name: params[:site],
+          doc_title: title_for_page(params[:name]),
+          doc_path: doc_path,
+          back: params[:back],
+          src: src,
+      }
+
+      case ext
+        
+      when "md"
+        if doc_path =~ /\.deck\.md$/   # todo: refactor
+          # todo: render with page nav elements too
+          slides = Deck::Slide.split(src)
+          Deck::SlideDeck.new(:slides => slides).to_pretty
+        else
+          MarkdownPage.new(options).to_html
+        end
+
+      when "mw"
+        MediaWikiPage.new(options).to_html
+
+      when "step"
+        StepPage.new(options).to_html
+
+      else
+        raise "unknown file type #{doc_path}"
+      end
+
+    rescue Errno::ENOENT => e
+      p e
+      halt 404
+    end
+  end
+
   before do
     expires 3600, :public
   end
@@ -98,16 +141,7 @@ def doc_path
   end
 
   get "/" do
-    redirect "/#{default_site}"
-  end
-
-  get "/:site" do
-    site_name = params[:site]
-    if sites.include? site_name
-      redirect "/#{site_name}/#{site_name}"
-    else
-      forward  # send it on to the downstream file server
-    end
+    redirect "/#{default_site}/"
   end
 
   get "/:site/:name/src" do
@@ -141,45 +175,36 @@ def doc_path
     end
   end
 
-  get "/:site/:name" do
-    begin
-      doc_title = params[:name].split('_').map do |w|
-        w == "osx" ? "OS X" : w.capitalize
-      end.join(' ')
-
-      options = {
-          site_name: params[:site],
-          doc_title: doc_title,
-          doc_path: doc_path,
-          back: params[:back],
-          src: src,
-      }
-
-      case ext
-        
-      when "md"
-        if doc_path =~ /\.deck\.md$/   # todo: refactor
-          # todo: render with page nav elements too
-          slides = Deck::Slide.split(src)
-          Deck::SlideDeck.new(:slides => slides).to_pretty
-        else
-          MarkdownPage.new(options).to_html
-        end
+  get "/:site/:name/" do
+    # remove any extraneous slash from otherwise well-formed page URLs
+    redirect "#{params[:site]}/#{params[:name]}"
+  end
 
-      when "mw"
-        MediaWikiPage.new(options).to_html
+  get "/:site/:name" do
+    render_page
+  end
 
-      when "step"
-        StepPage.new(options).to_html
+  get "/:file.:ext" do
+    # treat root URLs with dots in them like static assets and serve them
+    #   from the downstream file server (coderay.css, jquery-1.6.1.js)
+    forward
+  end
 
-      else
-        raise "unknown file type #{doc_path}"
-      end
+  get "/:site" do
+    # add a slash to any URLs that contain only a site
+    #   (otherwise paths in that site's pages would resolve
+    #    relative to the root)
+    redirect "#{params[:site]}/"
+  end
 
-    rescue Errno::ENOENT => e
-      p e
-      halt 404
+  get "/:site/" do
+    site_name = params[:site]
+    if sites.include? site_name
+      # render the site's index page
+      params[:name] = site_name
+      render_page
+    else
+      forward  # send it on to the downstream file server
     end
   end
 end
-

spec/app_spec.rb

@@ -38,13 +38,19 @@ def get! *args
     get "/"
     assert { last_response.redirect? }
     follow_redirect! while last_response.redirect?
-    assert { last_request.path == "/installfest/installfest" }
+    assert { last_request.path == "/installfest/" }
   end
 
-  it "redirects /site to /site/site" do
+  it "redirects /site to /site/" do
     get "/installfest"
     follow_redirect! while last_response.redirect?
-    assert { last_request.path == "/installfest/installfest" }
+    assert { last_request.path == "/installfest/" }
+  end
+
+  it "redirects /site/page/ to /site/page" do
+    get "/installfest/foo/"
+    follow_redirect! while last_response.redirect?
+    assert { last_request.path == "/installfest/foo" }
   end
 
   it "has a default site" do
@@ -77,7 +83,7 @@ def get! *args
     get "/", {}, {"HTTP_HOST" => "curriculum.example.com"}
     assert { last_response.redirect? }
     follow_redirect! while last_response.redirect?
-    assert { last_request.path == "/curriculum/curriculum" }
+    assert { last_request.path == "/curriculum/" }
   end
 
   describe "an app with slides" do