added caching and content type stuff

assets/config.ru

@@ -3,5 +3,14 @@ require 'evil'
 
 Evil.app_root = File.expand_path(File.dirname(__FILE__))
 
+unless Evil.heroku?
+  require 'rack/cache'
+
+  use Rack::Cache,
+    :verbose     => true,
+    :metastore   => "file:#{Evil.app_root}/cache/meta",
+    :entitystore => "file:#{Evil.app_root}/cache/entity"
+end
+
 use Rack::Session::Cookie, :secret => '__SECRET__', :key => '_evil'
 run Evil::Application

lib/evil.rb

@@ -19,6 +19,10 @@ module Setup
 
   class << self
     attr_accessor :gem_root, :app_root
+
+    def heroku?
+      Object.const_defined?(:Heroku)
+    end
   end
 end
 

lib/evil/application.rb

@@ -12,14 +12,14 @@ class Application < Sinatra::Base
     require_whitelisted_openid(/^\/admin/)
     load_template_routes
 
-    get '/openid/login' do
+    get '/admin/openid/login' do
       attempt_openid_authentication do |identity_url|
         session[:identity_url] = identity_url
         redirect session[:destination_url]
       end
     end
 
-    post '/openid/logout' do
+    post '/admin/openid/logout' do
       session[:identity_url] = nil
       redirect '/admin'
     end

lib/evil/extensions.rb

@@ -25,8 +25,13 @@ def reload!
     end
 
     def connect_to_database
-      ActiveRecord::Base.establish_connection :adapter => 'sqlite3', 
-                                              :database => File.join(Evil.app_root, 'evil.db')
+      if Evil.heroku?
+        dbconfig = YAML.load(File.read(File.join(Evil.app_root, 'config/database.yml')))
+        ActiveRecord::Base.establish_connection dbconfig['production']
+      else
+        ActiveRecord::Base.establish_connection :adapter => 'sqlite3', 
+                                                :database => File.join(Evil.app_root, 'evil.db')
+      end
     end
 
     def load_template_routes
@@ -47,7 +52,7 @@ def load_all_plugins
 
     def require_whitelisted_openid(pattern)
       before do
-        if request.path_info =~ pattern
+        if request.path_info =~ pattern && !params[:openid_url]
           unless whitelisted_openid?
             session[:destination_url] = request.url
             not_authorized

lib/evil/helpers.rb

@@ -5,10 +5,15 @@ module Helpers
     def serve(template)
       initialize_plugins
 
-      template = Liquid::Template.parse(template.reload.source)
+      liquid_template = Liquid::Template.parse(template.reload.source)
 
-      content_type 'text/html', :charset => 'utf-8'
-      template.render 'params' => params
+      content_type(template.content_type || 'text/html', :charset => template.encoding || 'utf-8')
+
+      if template.ttl
+        headers 'Cache-Control' => "public, max-age=#{template.ttl}"
+      end
+
+      liquid_template.render 'params' => params
     end
 
     def partial(template, options={})

lib/evil/setup/migration.rb

@@ -8,7 +8,7 @@ module Migration
       def create_evil_tables
         create_table :evil_templates do |t|
           t.integer :ttl, :position
-          t.string  :title, :route
+          t.string  :title, :route, :content_type, :encoding
           t.text    :source
           t.timestamps
         end unless Evil::Models::Template.table_exists? 

test/example/config.ru

@@ -5,4 +5,14 @@ require 'evil'
 Evil.app_root = File.expand_path(File.dirname(__FILE__))
 
 use Rack::Session::Cookie, :secret => '4424427c834b0c67f38f40a977315480b75ce94b', :key => '_evil'
+
+unless Evil.heroku?
+  require 'rack/cache'
+
+  use Rack::Cache,
+    :verbose     => true,
+    :metastore   => "file:#{Evil.app_root}/cache/meta",
+    :entitystore => "file:#{Evil.app_root}/cache/entity"
+end
+
 run Evil::Application

test/example/public/stylesheets/evil.css

@@ -193,12 +193,16 @@ form p {
   margin: 1em 0;
 }
 
-form input.text, form textarea {
+form input.text, form textarea, form input.short {
   width: 100%;
   font-family: Verdana, Helvetica, Arial, sans-serif;
   font-size: 1em;
 }
 
+form input.short {
+  width: 30%;
+}
+
 form div.errors {
   border: 1px solid red;
   font-size: 0.8em;

views/_banner.haml

@@ -2,7 +2,7 @@
   #banner
     %a{ :href => '/admin' }
       %img#logo{ :src => '/images/logo.png', :alt => 'Evil' } 
-    %form{ :method => 'post', :action => '/openid/logout', :id => 'logout' }
+    %form{ :method => 'post', :action => '/admin/openid/logout', :id => 'logout' }
       Logged in as 
       %em= session[:identity_url]
       %input.submit{ :type => 'submit', :value => 'Log out' }

views/index.haml

@@ -13,7 +13,7 @@
         %tr{ :class => ('alt' if i % 2 == 1) }
           %td= template.title
           %td= template.route
-          %td= template.ttl
+          %td= template.route.empty? ? 'N/A' : template.ttl
           %td.tools
             %a{ :href => "/admin/templates/#{template.id}"} Edit
     %tfoot

views/login.haml

@@ -1,4 +1,4 @@
-%form{ :action => '/openid/login', :id => 'login' }
+%form{ :action => '/admin/openid/login', :id => 'login' }
   %p
     %img{ :src => '/images/logo.png', :alt => 'Evil' }
     %input#openid_url{ :name => 'openid_url' }

views/templates/_fields.haml

@@ -10,5 +10,14 @@
   %label{ :for => 'template_source' }
     Source *
   %textarea#template_source{ :name => 'template[source]' }= @template.source
+%p
+  %label{ :for => 'template_ttl' }
+    Expires every (seconds)
+  %input#template_ttl.text{ :name => 'template[ttl]', :value => @template.ttl || 600 }
+%p
+  %label{ :for => 'template_content_type' }
+    Content Type
+  %input#template_content_type.short{ :name => 'template[content_type]', :value => @template.content_type || 'text/html' }
+  %input#template_encoding.short{ :name => 'template[encoding]', :value => @template.encoding || 'utf-8' }
 %p
   %input.submit{ :value => 'Save', :type => 'submit' }