pebblebed 0.0.37 → 0.0.39

data/lib/pebblebed/sinatra.rb

@@ -36,25 +36,33 @@ module Sinatra
         @pebbles ||= ::Pebblebed::Connector.new(checkpoint_session, :host => request.host)
       end
 
-      def current_identity
+      def current_identity_data
         return nil unless current_session
-        return @identity if @identity_checked
-        @identity_checked = true
+        return @current_identity_data if @current_identity_data_fetched
+        @current_identity_data_fetched = true
         if cache_current_identity?
-          cache_key = "identity-for-session-#{current_session}"
-          @identity = ::Pebblebed.memcached.get(cache_key)
-          if @identity
+          cache_key = "identity-data-for-session-#{current_session}"
+          @current_identity_data = ::Pebblebed.memcached.get(cache_key)
+          if @current_identity_data
             # Reinstate this line when memcached version >= 1.4.8
             # ::Pebblebed.memcached.touch(cache_key, IDENTITY_CACHE_TTL)
-            return @identity
+            return @current_identity_data
           end
-          @identity = pebbles.checkpoint.get("/identities/me")[:identity]
+          @current_identity_data = pebbles.checkpoint.get("/identities/me")
           # Cache identity only if there is a current user
-          ::Pebblebed.memcached.set(cache_key, @identity, IDENTITY_CACHE_TTL) if @identity && @identity.id?
+            ::Pebblebed.memcached.set(cache_key, @current_identity_data, IDENTITY_CACHE_TTL) if @current_identity_data['identity']
         else
-          @identity = pebbles.checkpoint.get("/identities/me")[:identity]
+          @current_identity_data = pebbles.checkpoint.get("/identities/me")
         end
-        @identity
+        @current_identity_data
+      end
+
+      def current_identity
+        current_identity_data['identity']
+      end
+
+      def current_profile
+        current_identity_data['profile']
       end
 
       def cache_current_identity?

data/lib/pebblebed/version.rb

@@ -1,3 +1,3 @@
 module Pebblebed
-  VERSION = "0.0.37"
+  VERSION = "0.0.39"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebblebed
 version: !ruby/object:Gem::Version
-  version: 0.0.37
+  version: 0.0.39
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-13 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -326,12 +326,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4403506364269353148
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4403506364269353148
 requirements: []
 rubyforge_project: pebblebed
 rubygems_version: 1.8.24
@@ -353,4 +359,3 @@ test_files:
 - spec/sinatra_spec.rb
 - spec/spec_helper.rb
 - spec/uid_spec.rb
-has_rdoc: