pebblebed 0.0.32 → 0.0.33

data/lib/pebblebed/config.rb

@@ -35,6 +35,7 @@ module Pebblebed
   end
 
   def self.memcached
+    raise RuntimeError, "Please set Pebblebed.memcached = <your memcached client>" unless @memcached
     @memcached
   end
 

data/lib/pebblebed/sinatra.rb

@@ -37,12 +37,16 @@ module Sinatra
         return @identity if @identity_checked
         @identity_checked = true
         if cache_current_identity?
-          @identity = ::Pebblebed.memcached.fetch("identity-for-session-#{current_session}", :ttl => 60) do
-            pebbles.checkpoint.get("/identities/me")[:identity]
-          end
+          cache_key = "identity-for-session-#{current_session}"
+          @identity = ::Pebblebed.memcached.get(cache_key)
+          return @identity if @identity
+          @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?
         else
           @identity = pebbles.checkpoint.get("/identities/me")[:identity]
         end
+        @identity
       end
 
       def cache_current_identity?

data/lib/pebblebed/version.rb

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

data/spec/config_spec.rb

@@ -6,15 +6,20 @@ describe Pebblebed do
   it "has a nice dsl that configures stuff" do
     Pebblebed.config do
       host "example.org"
-      memcached $memcached
+      memcached "MemcachedClient"
       service :checkpoint
     end
 
     Pebblebed.host.should eq "example.org"
-    Pebblebed.memcached.should eq $memcached
+    Pebblebed.memcached.should eq "MemcachedClient"
     Pebblebed::Connector.instance_methods.should include :checkpoint
   end
 
+  it "raises an error when memcached is used but not configured" do
+    Pebblebed.memcached = nil
+    -> {Pebblebed.memcached}.should raise_error RuntimeError
+  end
+
   it "can calculate the root uri of any pebble" do
     Pebblebed.config do
       service :checkpoint

data/spec/sinatra_spec.rb

@@ -3,6 +3,7 @@ require 'pebblebed'
 require 'pebblebed/sinatra'
 require 'sinatra/base'
 require 'rack/test'
+require 'spec_helper'
 
 class TestApp < Sinatra::Base
   register Sinatra::Pebblebed
@@ -47,6 +48,7 @@ describe Sinatra::Pebblebed do
   let(:checkpoint) { stub(:get => identity, :service_url => 'http://example.com') }
 
   before :each do
+    TestApp.any_instance.stub(:current_session).and_return "validsessionyesyesyes"
     Pebblebed::Connector.any_instance.stub(:checkpoint).and_return checkpoint
   end
 
@@ -149,4 +151,16 @@ describe Sinatra::Pebblebed do
       get '/private'
     end
   end
+
+  describe "identity caching disabled when no current user" do
+    let(:identity) { {} }
+
+    it "will not cache identity when there is no current identity" do
+      identity = nil
+      app.set :cache_current_identity, true
+      checkpoint.should_receive(:get).twice
+      get '/private'
+      get '/private'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-23 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: 2532469361834301007
+      hash: -222285177429713152
 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: 2532469361834301007
+      hash: -222285177429713152
 requirements: []
 rubyforge_project: pebblebed
 rubygems_version: 1.8.24