pebblebed 0.0.33 → 0.0.34

data/lib/pebblebed/security/client.rb

@@ -2,7 +2,9 @@
 module Pebblebed
   module Security
     class Client
-      IDENTITY_MEMBERSHIPS_TTL = 10*60
+      # TTL is reset for every cache hit, so actual TTL might be much longer
+      # as long as the user keeps hitting that cache.
+      IDENTITY_MEMBERSHIPS_TTL = 10
 
       def initialize(connector)
         @connector = connector
@@ -22,9 +24,11 @@ module Pebblebed
       private
 
       def fetch_membership_data_for(identity)
-        result = Pebblebed.memcached.fetch("identity_membership_data:#{identity}", IDENTITY_MEMBERSHIPS_TTL) do
+        cache_key = "identity_membership_data:#{identity}"
+        result = Pebblebed.memcached.fetch(cache_key, IDENTITY_MEMBERSHIPS_TTL) do
           @connector.checkpoint.get("/identities/#{identity}/memberships").to_json
         end
+        Pebblebed.memcached.touch(cache_key, IDENTITY_MEMBERSHIPS_TTL)
         JSON.parse(result)
       end
 

data/lib/pebblebed/sinatra.rb

@@ -4,6 +4,10 @@ require 'pebblebed'
 module Sinatra
   module Pebblebed
     module Helpers
+      # Cache identity for this amount of seconds. TTL will be reset each cache hit,
+      # so real TTL might be much longer than this.
+      IDENTITY_CACHE_TTL = 10
+
       # Render the markup for a part. A partspec takes the form
       # "<kit>.<partname>", e.g. "base.post"
       def part(partspec, params = {})
@@ -39,10 +43,13 @@ module Sinatra
         if cache_current_identity?
           cache_key = "identity-for-session-#{current_session}"
           @identity = ::Pebblebed.memcached.get(cache_key)
-          return @identity if @identity
+          if @identity
+            ::Pebblebed.memcached.touch(cache_key, IDENTITY_CACHE_TTL)
+            return @identity
+          end
           @identity = pebbles.checkpoint.get("/identities/me")[:identity]
           # Cache identity only if there is a current user
-          ::Pebblebed.memcached.set(cache_key, @identity, 60) if @identity.id?
+          ::Pebblebed.memcached.set(cache_key, @identity, IDENTITY_CACHE_TTL) if @identity.id?
         else
           @identity = pebbles.checkpoint.get("/identities/me")[:identity]
         end

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.33"
+  VERSION = "0.0.34"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-23 00:00:00.000000000 Z
+date: 2012-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -328,7 +328,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -222285177429713152
+      hash: -2833651708453981054
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -222285177429713152
+      hash: -2833651708453981054
 requirements: []
 rubyforge_project: pebblebed
 rubygems_version: 1.8.24