open_graph 0.1.3 → 0.1.4

data/facebook-stub/facebook-stub.js

@@ -9,17 +9,17 @@
     state('appId', data.appId);
   }
 
-  function login(callback){
+  function login(callback, options){
     if (calledBeforeInit('login')) return;
     if (FBWorld.state('loggedIn')){
       console.log('FB.login() called when user is already connected.');
       if (FBWorld.state('connected')){
-        callback(getStatus());
+        callback(getStatus('standard'));
       }else{
-        simulatePromptToConnect(callback);
+        simulatePromptToConnect(callback, options);
       }
     }else{
-      simulatePromptToLogin(callback);
+      simulatePromptToLogin(callback, options);
     }
   }
 
@@ -32,7 +32,7 @@
 
   function getLoginStatus(callback, perms){
     if (calledBeforeInit('getLoginStatus')) return;
-    callback(getStatus(perms));
+    callback(getStatus(perms ? 'extended' : false));
   }
 
   function getSession(){
@@ -160,7 +160,7 @@
 
   // PRIVATE FUNCTIONS
 
-  function getStatus(includePerms) {
+  function getStatus(permissions) {
     var theState = FBWorld.state();
 
     // Connected
@@ -170,7 +170,9 @@
         session: createConnectedCookie()
       };
 
-      if (includePerms) status.perms = JSON.stringify(theState.perms);
+      if(typeof(permissions) != 'undefined') {
+        status.perms = permissions == 'extended' ? JSON.stringify(theState.perms) : theState.perms.standard;
+      }
       return status;
     }
 
@@ -200,7 +202,7 @@
     return true;
   }
 
-  function simulatePromptToLogin(callback) {
+  function simulatePromptToLogin(callback, options) {
     // simulate being prompted to log in
     FBWorld.beingPromptedToLogIn = true;
     FBWorld.beingPromptedToLogInCallback = function(approved){
@@ -209,9 +211,10 @@
       if(approved){
         FBWorld.loggedIn();
         if (!FBWorld.state('connected')){
-          simulatePromptToConnect(callback);
+          simulatePromptToConnect(callback, options);
         }else{
-          callback(getStatus());
+          FBWorld.state('perms', 'standard', options.perms);
+          callback(getStatus('standard'));
         }
       }else{
         FBWorld.notLoggedIn();
@@ -221,14 +224,17 @@
     };
   };
 
-  function simulatePromptToConnect(callback) {
+  function simulatePromptToConnect(callback, options) {
     // simulate being prompted to connect
     FBWorld.beingPromptedToConnect = true;
     FBWorld.beingPromptedToConnectCallback = function(approved){
       approved ? FBWorld.connected() : FBWorld.notConnected();
       FBWorld.beingPromptedToConnect = false;
       FBWorld.beingPromptedToConnectCallback = undefined;
-      callback(getStatus());
+      if (approved){
+        FBWorld.state('perms', 'standard', options.perms);
+      }
+      callback(getStatus('standard'));
     };
   };
 

data/lib/open_graph/version.rb

@@ -1,3 +1,3 @@
 module OpenGraph
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: open_graph
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Change.org Engineering
@@ -15,11 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -07:00
+date: 2011-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,10 +30,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  name: rake
-  prerelease: false
   type: :runtime
+  version_requirements: *id001
 description: OpenGraph provides an easy to use wrapper for making facebook calls. It also provides javascript stubs allowing seemless testing against the javascript sdk.
 email: 
 - engineering@change.org