introduce locale (as sites subdir and optional param), and...

* use Sinatra 1.3.6
* add short stack trace to error log
* various refactorings
* put Deck file server ahead of Sinatra in middleware chain (using Rack::Cascade)

Author: alexch

Gemfile.lock

@@ -42,7 +42,7 @@ GEM
     rack-codehighlighter (0.5.0)
       nokogiri (>= 1.4.1)
       rack (>= 1.0.0)
-    rack-protection (1.5.1)
+    rack-protection (1.5.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -70,7 +70,7 @@ GEM
       sexp_processor (~> 4.1)
     sass (3.2.12)
     sexp_processor (4.4.1)
-    sinatra (1.3.4)
+    sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)

app.rb

@@ -17,22 +17,29 @@
 require "deck"
 require "deck/rack_app"
 require "titleizer"
+require "site"
 
-class InstallFest < Sinatra::Application
+class InstallFest < Sinatra::Application   # todo: use Sinatra::Base instead, with more explicit config
   include Erector::Mixin
 
   def initialize
     super
     @here = File.expand_path(File.dirname(__FILE__))
     @default_site = "docs"
-    set_downstream_app # todo: test
+    @default_locale = "en"   # nil for English   # todo: make a cleaner way to switch default locales
   end
 
   attr_reader :here
-  attr_writer :default_site
+  attr_writer :default_site, :default_locale
+
+  # todo: test
+  # returns the most-specific hostname component, e.g. "foo" for "foo.example.com"
+  def subdomain
+    host.split(".").first
+  end
 
   def default_site
-    if host && sites.include?(site = host.split(".").first)
+    if host && sites.include?(site = subdomain)
       site
     else
       @default_site
@@ -47,16 +54,8 @@ def site_dir
     "#{sites_dir}/#{params[:site]}"
   end
 
-  def sites_dir= dir
-    @sites_dir = dir.tap { set_downstream_app }
-  end
-
-  def set_downstream_app
-    @app = ::Deck::RackApp.public_file_server
-  end
-
   def sites_dir
-    @sites_dir || "#{@here}/sites"
+    Site.sites_dir(locale)
   end
 
   def sites
@@ -68,6 +67,12 @@ def redirect_sites
       'curriculum' => 'intro-to-rails'
     }
   end
+  
+  def locale
+    (params && params[:locale]) or
+      (host && subdomain =~ /^..$/ && subdomain) or   # note: only allows 2-char locales for now -- should check against a list of locales
+      @default_locale
+  end
 
   def src
     File.read(doc_path)
@@ -88,12 +93,6 @@ 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 = {
@@ -126,12 +125,23 @@ def render_page
 
     rescue Errno::ENOENT => e
       p e
+      e.backtrace.each do |line|
+        break if line =~ /sinatra\/base.rb/
+        puts "\t"+line
+      end
       halt 404
     end
   end
 
   before do
     expires 3600, :public
+
+    if request.path =~ /^\/es(.*)/
+      params[:locale] = "es"
+      request.env["PATH_INFO"] = $1
+      # p request.env["PATH_INFO"]
+      # p request.params[:locale]
+    end
   end
 
   get '/favicon.ico' do
@@ -141,7 +151,7 @@ def render_page
   get "/" do
     redirect "/#{default_site}/"
   end
-
+  
   get "/:site/:name/src" do
     begin
       RawPage.new(
@@ -160,25 +170,21 @@ def render_page
   get "/:site/:name.:ext" do
     if sites.include?(params[:site])
       send_file "#{site_dir}/#{params[:name]}.#{params[:ext]}"
-    else
-      forward # send it on to the downstream file server
     end
   end
 
   # todo: make this work in a general way, without hardcoded 'img'
   get "/:site/img/:name.:ext" do
     if sites.include?(params[:site])
       send_file "#{site_dir}/img/#{params[:name]}.#{params[:ext]}"
-    else
-      forward # send it on to the downstream file server
     end
   end
 
   get "/:site/:name/" do
     # remove any extraneous slash from otherwise well-formed page URLs
     redirect request.fullpath.chomp('/')
   end
-
+  
   get "/:site/:name" do
     site_name = params[:site]
     if redirect_sites[site_name]
@@ -188,10 +194,13 @@ def render_page
     end
   end
 
-  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.7.2.js)
-    forward
+  get "/:site/:name/:section/" do
+    # remove any extraneous slash from otherwise well-formed page URLs
+    redirect "#{params[:site]}/#{params[:name]}/#{params[:section]}"
+  end
+
+  get "/:site/:name/:section" do
+    render_page
   end
 
   get "/:site" do
@@ -208,8 +217,6 @@ def render_page
       # 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

config.ru

@@ -14,4 +14,7 @@ use Rack::Codehighlighter, :coderay,
 # Thin::Logging.debug = true
 
 require './app'
-run InstallFest
+run Rack::Cascade.new([
+  Deck::RackApp.public_file_server,
+  InstallFest
+  ])

lib/site.rb

@@ -1,10 +1,14 @@
 class Site
   @@here = File.expand_path(File.dirname(__FILE__))
   @@project_root = File.dirname(@@here)
-  @@sites_dir = File.expand_path("sites", @@project_root)
+  
+  def self.sites_dir locale = "en"
+    sites_dir = File.join(["sites", locale].compact)
+    File.expand_path(sites_dir, @@project_root)
+  end
 
-  def self.all
-    Dir["#{@@sites_dir}/*"].map{|dir| Site.new(dir)}
+  def self.all locale = "en"
+    Dir["#{sites_dir(locale)}/*"].map{|dir| Site.new(dir)}
   end
 
   def self.named name

lib/site_index.rb

@@ -1,8 +1,4 @@
 class SiteIndex < Erector::Widget
-  @@here = File.expand_path(File.dirname(__FILE__))
-  @@project_root = File.dirname(@@here)
-  @@sites_dir = File.expand_path("sites", @@project_root)
-
   needs :site_name
   attr_accessor :site_name
 
@@ -12,7 +8,7 @@ def initialize(options)
 
   def sites
     return @sites if @sites
-    @sites = Dir.glob("#{@@sites_dir}/**").map { |filename| File.basename(filename) }.sort
+    @sites = Dir.glob("#{Site.sites_dir}/**").map { |filename| File.basename(filename) }.sort
   end
 
   def site_link site