cfoundry 0.3.12 → 0.3.13

data/lib/cfoundry/v1/client.rb

@@ -180,7 +180,7 @@ module CFoundry::V1
 
 
     # Retreive all of the current user's applications.
-    def apps
+    def apps(depth = 1, query = {})
       @base.apps.collect do |json|
         App.new(json[:name], self, json)
       end
@@ -201,7 +201,7 @@ module CFoundry::V1
     end
 
     # Retrieve all of the current user's services.
-    def service_instances
+    def service_instances(depth = 1, query = {})
       @base.services.collect do |json|
         ServiceInstance.new(json[:name], self, json)
       end

data/lib/cfoundry/v2/client.rb

@@ -1,3 +1,5 @@
+require "base64"
+
 require "cfoundry/v2/base"
 
 require "cfoundry/v2/app"
@@ -62,8 +64,10 @@ module CFoundry::V2
 
     # The currently authenticated user.
     def current_user
-      if user = info[:user]
-        user(user)
+      if guid = token_data[:user_id]
+        user = user(guid)
+        user.emails = [{ :value => token_data[:email] }]
+        user
       end
     end
 
@@ -185,5 +189,21 @@ module CFoundry::V2
           json)
       end
     end
+
+    private
+
+    # grab the metadata from a token that looks like:
+    #
+    # bearer (base64 ...)
+    def token_data
+      tok = Base64.decode64(@base.token.sub(/^bearer\s+/, ""))
+      tok.sub!(/\{.+?\}/, "") # clear algo
+      JSON.parse(tok[/\{.+?\}/], :symbolize_names => true)
+
+    # normally i don't catch'em all, but can't expect all tokens to be the
+    # proper format, so just silently fail as this is not critical
+    rescue
+      {}
+    end
   end
 end

data/lib/cfoundry/version.rb

@@ -1,4 +1,4 @@
 module CFoundry # :nodoc:
   # CFoundry library version number.
-  VERSION = "0.3.12"
+  VERSION = "0.3.13"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cfoundry
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 3
-  - 12
-  version: 0.3.12
+  - 13
+  version: 0.3.13
 platform: ruby
 authors: 
 - Alex Suraci
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client