Add page cache

Author: mattt

Gemfile

@@ -7,9 +7,12 @@ gem 'activesupport'
 gem 'pg'
 gem 'sequel', '~> 4.49'
 
+gem 'rack-cache', require: 'rack/cache'
 gem 'rack-headers_filter', require: 'rack/headers_filter'
 gem 'rack-ssl-enforcer', require: 'rack/ssl-enforcer'
 
+gem 'redis-rack-cache'
+
 gem 'sinatra', require: 'sinatra/base'
 gem 'sinatra-contrib', require: 'sinatra/contrib/all'
 gem 'sinatra-param', require: 'sinatra/param'

Gemfile.lock

@@ -52,6 +52,8 @@ GEM
     puma (4.0.1)
       nio4r (~> 2.0)
     rack (2.0.7)
+    rack-cache (1.9.0)
+      rack (>= 0.4)
     rack-headers_filter (0.0.1)
     rack-protection (2.0.5)
       rack
@@ -61,6 +63,12 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     redcarpet (3.5.0)
+    redis (4.1.2)
+    redis-rack-cache (2.1.0)
+      rack-cache (>= 1.6, < 2)
+      redis-store (>= 1.6, < 2)
+    redis-store (1.6.0)
+      redis (>= 2.2, < 5)
     sass (3.4.25)
     sequel (4.49.0)
     sinatra (2.0.5)
@@ -95,10 +103,12 @@ DEPENDENCIES
   haml
   pg
   puma
+  rack-cache
   rack-headers_filter
   rack-ssl-enforcer
   rake
   redcarpet
+  redis-rack-cache
   sequel (~> 4.49)
   sinatra
   sinatra-contrib

config.ru

@@ -1,21 +1,27 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler.require
 
 Sequel.extension :core_extensions, :migration
 DB = Sequel.connect(ENV['DATABASE_URL'])
 DB.extension :pg_array
 
-Rack::Mime::MIME_TYPES.merge!({
-  ".srt" => "text/plain",
-  ".vtt" => "text/vtt",
-})
-
+Rack::Mime::MIME_TYPES.merge!(
+  '.srt' => 'text/plain',
+  '.vtt' => 'text/vtt'
+)
 
 use Rack::SslEnforcer if ENV['RACK_ENV'] == 'production'
-
 use Rack::HeadersFilter
 use Rack::Deflater
-use Rack::Static, urls: ["/css", "/images", "/js", "favicon.ico"], root: "public"
+use Rack::Static, urls: ['/css', '/images', '/js', 'favicon.ico'],
+                  root: 'public'
+
+if ENV['REDIS']
+  use Rack::Cache, metastore: "#{ENV['REDIS']}/0/metastore",
+                   entitystore: "#{ENV['REDIS']}/0/entitystore"
+end
 
 require './web'
 

web.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require './lib/models/session'
 
 class Web < Sinatra::Base
@@ -10,7 +12,7 @@ class Web < Sinatra::Base
 
   helpers do
     def title(*args)
-      [*args].compact.join(" - ")
+      [*args].compact.join(' - ')
     end
 
     def url(session)
@@ -21,10 +23,8 @@ def image_url(session)
       case Integer(session.year)
       when 2010, 2011
         "/images/wwdc-#{session.year}.jpg"
-      when 2012..2018
+      when 2012..2019
         "/images/wwdc-#{session.year}.png"
-      else
-        nil
       end
     end
 
@@ -36,74 +36,76 @@ def video_url(session)
   before do
     @query = params[:q]
 
-    cache_control :public, max_age: 3600
-
-    headers "Content-Security-Policy" => %(
-                default-src 'self' *.asciiwwdc.com;
-                form-action 'self';
-                frame-ancestors 'none';
-                object-src 'none';
-                base-uri 'none';
-            ).gsub("\n", ' ').squeeze(' ').strip,
-            "Link" => %(
-                </css/screen.css>; rel=preload; as=style
-            ).gsub("\n", ' ').squeeze(' ').strip,
-            "Referrer-Policy" => "same-origin",
-            "Server" => '',
-            "Strict-Transport-Security" => "max-age=63072000; includeSubDomains; preload",
-            "X-Content-Type-Options" => "nosniff",
-            "X-Frame-Options" => "DENY",
-            "X-XSS-Protection" => "1; mode=block" unless settings.development?
+    cache_control :public, max_age: 86_400
+
+    unless settings.development?
+      headers 'Content-Security-Policy' => %(
+                  default-src 'self' *.asciiwwdc.com;
+                  form-action 'self';
+                  frame-ancestors 'none';
+                  object-src 'none';
+                  base-uri 'none';
+              ).gsub("\n", ' ').squeeze(' ').strip,
+              'Link' => %(
+                  </css/screen.css>; rel=preload; as=style
+              ).gsub("\n", ' ').squeeze(' ').strip,
+              'Referrer-Policy' => 'same-origin',
+              'Server' => '',
+              'Strict-Transport-Security' => 'max-age=63072000; includeSubDomains; preload',
+              'X-Content-Type-Options' => 'nosniff',
+              'X-Frame-Options' => 'DENY',
+              'X-XSS-Protection' => '1; mode=block'
+    end
   end
 
   error Sinatra::Param::InvalidParameterError do
-    haml :error, :locals => { :msg => env['sinatra.error'] }
+    haml :error, locals: { msg: env['sinatra.error'] }
   end
 
   error 404 do
-    haml :error, :locals => { :msg => "404 Not found"}
+    haml :error, locals: { msg: '404 Not found' }
   end
 
   not_found do
-    haml :error, :locals => { :msg => "404 Not found"}
+    haml :error, locals: { msg: '404 Not found' }
   end
 
   get '/' do
     @sessions = Session.select(:title, :year, :number, :track)
-                        .order(:year, :number)
-                        .all
-                        .group_by(&:year)
+                       .order(:year, :number)
+                       .all
+                       .group_by(&:year)
     haml :index
   end
 
   get '/contribute' do
     haml :contribute
   end
 
-  get '/:year/sessions/:number', provides: [:html, :json, :vtt, :txt] do
+  get '/:year/sessions/:number', provides: %i[html json vtt txt] do
     param :year, Integer, required: true
     param :number, Integer, required: true
 
     halt 404 unless @session = Session.first(year: params[:year], number: params[:number])
 
-    link video_url(@session), :rel => :alternate
+    link video_url(@session), rel: :alternate
 
     respond_to do |f|
-      f.html {haml :session}
-      f.json {@session.to_json}
-      f.vtt  {send_file "data/#{params[:year]}/#{params[:number]}.vtt", type: :vtt}
-      f.txt  {@session.transcript}
+      f.html { haml :session }
+      f.json { @session.to_json }
+      f.vtt  { send_file "data/#{params[:year]}/#{params[:number]}.vtt", type: :vtt }
+      f.txt  { @session.transcript }
     end
   end
 
-  get '/search', provides: [:html, :json] do
+  get '/search', provides: %i[html json] do
     param :q, String, blank: false
     param :year, Integer, in: 2010..2018
 
     @sessions = Session.search(@query, params[:year])
 
     respond_to do |f|
-      f.html {haml :search}
+      f.html { haml :search }
       f.json do
         {
           query: @query,
@@ -131,5 +133,4 @@ def video_url(session)
       pass
     end
   end
-
 end