added cache expiration

micheljansen · Dec 29, 2009 · d214497 · d214497
1 parent 646e937
commit d214497
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/afcal.rb b/afcal.rb
@@ -38,7 +38,7 @@
   alarm = params[:alarm].to_i if params[:alarm]
 
   #fetch events
-  @all_events = Sinatra::Cache.cache("#{params[:postalcode]}/#{params[:housenumber]}/#{time}") do
+  @all_events = Sinatra::Cache.cache("#{params[:postalcode]}/#{params[:housenumber]}/#{time}", :expire => 60*60*24) do
     TwenteMilieuData.new(params[:postalcode], params[:housenumber], time).all_events
   end
 

diff --git a/lib/cache.rb b/lib/cache.rb
@@ -1,20 +1,21 @@
-# source: http://railsillustrated.com/blazing-fast-sinatra-with-memcached.html
+# based on: http://railsillustrated.com/blazing-fast-sinatra-with-memcached.html
 require 'memcache'
 require 'digest/md5'
 
 module Sinatra
   class Cache
-    def self.cache(key, &block)
+    def self.cache(key, options={}, &block)
       unless CONFIG['memcached']
         raise "Configure CONFIG['memcached'] to be a string like 'localhost:11211' "
       end
       begin
+        options[:expire] ||= 0
         key = Digest::MD5.hexdigest(key)
         @@connection ||= MemCache.new(CONFIG['memcached'], :namespace => 'Sinatra/')
         result = @@connection.get(key)
         return result if result
         result = yield
-        @@connection.set(key, result)
+        @@connection.set(key, result, options[:expire])
         result
       rescue
         yield