@@ -1,34 +1,37 @@ - require 'rubygems' - require 'sinatra' - require 'sinatra/test/spec' - require 'usericons' +require 'rubygems' +require 'sinatra' +require 'sinatra/test/spec' +require 'usericons' - describe 'Usericons' do - it "should show a default page" do - get_it '/' - should.be.ok - end +describe 'Usericons' do + it "should show a default page" do + get_it '/' + should.be.ok + end - it "should redirect twitter icon url" do - get_it '/twitter/swdyh' - body.should.be.equal '' - status.should.be 302 - headers['Location'].should.match(/^http:\/\/s3.amazonaws.com/) - end + it "should redirect twitter icon url" do + get_it '/twitter/swdyh' + body.should.be.equal '' + status.should.be 302 + headers['Location'].should.match(/^http:\/\/s3.amazonaws.com/) + end - it "should redirect hatena icon url" do - get_it '/hatena/swdyh' - body.should.be.equal '' - status.should.be 302 - headers['Location'].should.match(/^http:\/\/www\.hatena\.ne\.jp\//) - end - - it "should redirect twitter icon url with url options" do - get_it '/?url=http://twitter.com/swdyh' - body.should.be.equal '' - status.should.be 302 - headers['Location'].should.match(/^http:\/\/s3.amazonaws.com/) - end - end + it "should redirect hatena icon url" do + get_it '/hatena/swdyh' + body.should.be.equal '' + status.should.be 302 + headers['Location'].should.match(/^http:\/\/www\.hatena\.ne\.jp\//) + end + it "should redirect twitter icon url with url options" do + get_it '/?url=http://twitter.com/swdyh' + body.should.be.equal '' + status.should.be 302 + headers['Location'].should.match(/^http:\/\/s3.amazonaws.com/) + end + it "shuod set http cache" do + get_it '/twitter/swdyh' + headers['Cache-Control'].should.be.equal 'private, max-age=10800' + end +end test/usericons_test.rb @@ -12,6 +12,7 @@ end URL = 'http://usericons.relucks.org/' CACHE_DIR = 'tmp' CACHE_EXPIRE = 60 * 60 * 3 +HTTP_CACHE_EXPIRE = 60 * 60 * 3 get '/' do avt = Avaticon.new @@ -47,18 +48,24 @@ get '/:service/:user_id' do path = File.join(CACHE_DIR, encode64url("#{service}_#{user_id}")) if File.exist?(path) && File.mtime(path) > (Time.now - CACHE_EXPIRE) + set_cache redirect IO.read(path).strip end begin icon_url = avt.get_icon service, user_id open(path, 'w') { |f| f.puts icon_url } + set_cache redirect icon_url rescue Exception => e throw :halt, [500, 'server error.'] end end +def set_cache + headers 'Cache-Control' => "private, max-age=#{HTTP_CACHE_EXPIRE}" +end + use_in_file_templates! __END__ usericons.rb b6b29b6d291e2337bd080263feb979bcf8983c06 swdyh youhei@gmail.com http://github.com/swdyh/usericons.relucks.org/commit/4817ab01d2ab05f8594259f9ac078b96d832f9eb 4817ab01d2ab05f8594259f9ac078b96d832f9eb 2008-12-13T10:15:32-08:00 2008-12-13T10:15:32-08:00 * added Cache-Control 2a1c167f6888cd71099392300ec9a80f557c5560 swdyh youhei@gmail.com