facebook-stub 0.0.1.21 → 0.0.1.22

data/bin/facebook-stub.js

@@ -381,7 +381,7 @@
   }
 
   function setSecret(newSecret) {
-    return state('secret', newSecret);
+    return FBWorld.state('secret', newSecret);
   }
 
   function loggedIn(perms) {
@@ -648,10 +648,10 @@
   // cookie looks like this: (with the quotes): "access_token=theToken&base_domain=local-change.org&expires=0&secret=theSecret&session_key=theSessionKeysig=theSig-Hashed&uid=theUID"
   function createConnectedCookie() {
     var theState = {
-      user_id: state('uid'),
-      code: 'theAccessToken|hashData',
-      // We need to verify the timezone for this value. Traditionally FB uses PST8PDT, but it may be UTC.
-      issued_at: Math.floor(new Date().getTime() / 1000)
+      userID: state('uid'),
+      authToken: 'theAccessToken|hashData',
+      signedRequest: 'ABC123',
+      expiresIn: 2*60*60
     };
 
     if (uid() !== null) {
@@ -745,55 +745,76 @@ setTimeout(function() { if (typeof fbAsyncInit === 'function') fbAsyncInit(); },
  */
 
 // Modified to make it not use jquery
-FBWorld.Helpers.makeMeACookie = function(name, value, options) {
-    if (typeof value != 'undefined') { // name and value given, set cookie
-        options = options || {};
-        if (value === null) {
-          value = '';
-          options.expires = -1;
-        } else {
-          options.expires = 100; // 100 days from now
-        }
-        var expires = '';
-        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
-            var date;
-            if (typeof options.expires == 'number') {
-                date = new Date();
-                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
-            } else {
-                date = options.expires;
-            }
-            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
-        }
-        // CAUTION: Needed to parenthesize options.path and options.domain
-        // in the following expressions, otherwise they evaluate to undefined
-        // in the packed version for some reason...
-        var path = '; path=/';
-        var domain = options.domain ? '; domain=' + (options.domain) : '';
-        var secure = options.secure ? '; secure' : '';
-        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+FBWorld.Helpers = {
+  makeMeACookie: function(name, value, options) {
+    if (typeof value !== 'undefined') {
+      // name and value given, set cookie
+      this.setCookieWithValue(name, value, options);
     } else { // only name given, get cookie
-        var cookieValue = null;
-        if (document.cookie && document.cookie != '') {
-            var cookies = document.cookie.split(';');
-            for (var i = 0; i < cookies.length; i++) {
-                var cookie = FBWorld.Helpers.trim(cookies[i]);
-                // Does this cookie string begin with the name we want?
-                if (cookie.substring(0, name.length + 1) == (name + '=')) {
-                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                    break;
-                }
-            }
-        }
-        return cookieValue;
+      return this.getCookieBasedOnName(name);
     }
-};
+  },
 
-//Taken from jQuery
-FBWorld.Helpers.trim = function( text ) {
-  return text == null ?
-    "" :
-    text.toString().replace( /^\s+/, "" ).replace( /\s+$/, "" );
+  setCookieWithValue: function(name, value, options) {
+    options = options || {};
+    if (value === null) {
+      value = '';
+      options.expires = -1;
+    } else {
+      options.expires = 100; // 100 days from now
+    }
+
+    this.setCookieBasedOnName(name, value, options);
+  },
+
+  //Taken from jQuery
+  trim: function( text ) {
+    return text === null ?
+      "" :
+      text.toString().replace( /^\s+/, "" ).replace( /\s+$/, "" );
+  },
+
+  expirationForCookie: function(expires) {
+    var expireString = '';
+    if (expires && (typeof expires == 'number' || expires.toUTCString)) {
+      var date;
+      if (typeof expires == 'number') {
+        date = new Date();
+        var millisecondsPer24Hours = 24 * 60 * 60 * 1000;
+        date.setTime(date.getTime() + (expires * millisecondsPer24Hours));
+      } else {
+        date = expires;
+      }
+      expireString = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+    }
+    return expireString;
+  },
+
+  setCookieBasedOnName: function(name, value, options) {
+    var domain = options.domain ? '; domain=' + (options.domain) : '';
+    var secure = options.secure ? '; secure' : '';
+    var cookieString = [encodeURIComponent(value), this.expirationForCookie(options.expires),
+      '; path=/', domain, secure].join('');
+
+    document.cookie = [name, '=', cookieString].join('');
+  },
+
+  getCookieBasedOnName: function(name) {
+    var cookieValue = null;
+    var cookieString = document.cookie;
+    if (cookieString && cookieString !== '') {
+      var cookies = cookieString.split(';');
+      for (var i = 0; i < cookies.length; i++) {
+        var cookie = this.trim(cookies[i]);
+        // Does this cookie string begin with the name we want?
+        if (cookie.substring(0, name.length + 1) == (name + '=')) {
+          cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+          break;
+        }
+      }
+    }
+    return cookieValue;
+  }
 };
 /* A JavaScript implementation of the SHA family of hashes, as defined in FIPS
  * PUB 180-2 as well as the corresponding HMAC implementation as defined in

data/lib/facebook_stub/cookie.js

@@ -55,53 +55,74 @@
  */
 
 // Modified to make it not use jquery
-FBWorld.Helpers.makeMeACookie = function(name, value, options) {
-    if (typeof value != 'undefined') { // name and value given, set cookie
-        options = options || {};
-        if (value === null) {
-          value = '';
-          options.expires = -1;
-        } else {
-          options.expires = 100; // 100 days from now
-        }
-        var expires = '';
-        if (options.expires && (typeof options.expires == 'number' || options.expires.toUTCString)) {
-            var date;
-            if (typeof options.expires == 'number') {
-                date = new Date();
-                date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
-            } else {
-                date = options.expires;
-            }
-            expires = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
-        }
-        // CAUTION: Needed to parenthesize options.path and options.domain
-        // in the following expressions, otherwise they evaluate to undefined
-        // in the packed version for some reason...
-        var path = '; path=/';
-        var domain = options.domain ? '; domain=' + (options.domain) : '';
-        var secure = options.secure ? '; secure' : '';
-        document.cookie = [name, '=', encodeURIComponent(value), expires, path, domain, secure].join('');
+FBWorld.Helpers = {
+  makeMeACookie: function(name, value, options) {
+    if (typeof value !== 'undefined') {
+      // name and value given, set cookie
+      this.setCookieWithValue(name, value, options);
     } else { // only name given, get cookie
-        var cookieValue = null;
-        if (document.cookie && document.cookie != '') {
-            var cookies = document.cookie.split(';');
-            for (var i = 0; i < cookies.length; i++) {
-                var cookie = FBWorld.Helpers.trim(cookies[i]);
-                // Does this cookie string begin with the name we want?
-                if (cookie.substring(0, name.length + 1) == (name + '=')) {
-                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
-                    break;
-                }
-            }
-        }
-        return cookieValue;
+      return this.getCookieBasedOnName(name);
     }
-};
+  },
+
+  setCookieWithValue: function(name, value, options) {
+    options = options || {};
+    if (value === null) {
+      value = '';
+      options.expires = -1;
+    } else {
+      options.expires = 100; // 100 days from now
+    }
+
+    this.setCookieBasedOnName(name, value, options);
+  },
 
-//Taken from jQuery
-FBWorld.Helpers.trim = function( text ) {
-  return text == null ?
-    "" :
-    text.toString().replace( /^\s+/, "" ).replace( /\s+$/, "" );
+  //Taken from jQuery
+  trim: function( text ) {
+    return text === null ?
+      "" :
+      text.toString().replace( /^\s+/, "" ).replace( /\s+$/, "" );
+  },
+
+  expirationForCookie: function(expires) {
+    var expireString = '';
+    if (expires && (typeof expires == 'number' || expires.toUTCString)) {
+      var date;
+      if (typeof expires == 'number') {
+        date = new Date();
+        var millisecondsPer24Hours = 24 * 60 * 60 * 1000;
+        date.setTime(date.getTime() + (expires * millisecondsPer24Hours));
+      } else {
+        date = expires;
+      }
+      expireString = '; expires=' + date.toUTCString(); // use expires attribute, max-age is not supported by IE
+    }
+    return expireString;
+  },
+
+  setCookieBasedOnName: function(name, value, options) {
+    var domain = options.domain ? '; domain=' + (options.domain) : '';
+    var secure = options.secure ? '; secure' : '';
+    var cookieString = [encodeURIComponent(value), this.expirationForCookie(options.expires),
+      '; path=/', domain, secure].join('');
+
+    document.cookie = [name, '=', cookieString].join('');
+  },
+
+  getCookieBasedOnName: function(name) {
+    var cookieValue = null;
+    var cookieString = document.cookie;
+    if (cookieString && cookieString !== '') {
+      var cookies = cookieString.split(';');
+      for (var i = 0; i < cookies.length; i++) {
+        var cookie = this.trim(cookies[i]);
+        // Does this cookie string begin with the name we want?
+        if (cookie.substring(0, name.length + 1) == (name + '=')) {
+          cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+          break;
+        }
+      }
+    }
+    return cookieValue;
+  }
 };

data/lib/facebook_stub/core.js

@@ -381,7 +381,7 @@
   }
 
   function setSecret(newSecret) {
-    return state('secret', newSecret);
+    return FBWorld.state('secret', newSecret);
   }
 
   function loggedIn(perms) {
@@ -648,10 +648,10 @@
   // cookie looks like this: (with the quotes): "access_token=theToken&base_domain=local-change.org&expires=0&secret=theSecret&session_key=theSessionKeysig=theSig-Hashed&uid=theUID"
   function createConnectedCookie() {
     var theState = {
-      user_id: state('uid'),
-      code: 'theAccessToken|hashData',
-      // We need to verify the timezone for this value. Traditionally FB uses PST8PDT, but it may be UTC.
-      issued_at: Math.floor(new Date().getTime() / 1000)
+      userID: state('uid'),
+      authToken: 'theAccessToken|hashData',
+      signedRequest: 'ABC123',
+      expiresIn: 2*60*60
     };
 
     if (uid() !== null) {

data/lib/facebook_stub/version.rb

@@ -1,3 +1,3 @@
 module FacebookStub
-  VERSION = "0.0.1.21"
+  VERSION = "0.0.1.22"
 end

data/spec/javascripts/FBApiSpec.js

@@ -1,19 +1,17 @@
 describe("FB.api", function() {
-  beforeEach(function() {
-    setup();
-  });
-
-  afterEach(function() {
-    FBWorld.reset();
-  });
 
   describe("when loggedIn, connected, and granted permissions", function() {
 
     beforeEach(function() {
+      setup();
       FBWorld.loggedIn('publish_actions');
       FBWorld.connected();
     });
 
+    afterEach(function() {
+      FBWorld.reset();
+    });
+
     describe("when I call FB.api('/me/friends', callback)", function() {
       it("should callback with FBWorld.friendList", function() {
         FB.api('/me/friends', function (r) {
@@ -160,6 +158,14 @@ describe("FB.api", function() {
   });
 
   describe("when not connected", function () {
+    beforeEach(function() {
+      setup();
+    });
+
+    afterEach(function() {
+      FBWorld.reset();
+    });
+
     it("should callback with the unconnected error object", function() {
       FB.api('/me/friends', function (r) {
         expect(r).toEqual(apiUnconnectedMessage());

data/spec/javascripts/helpers/SpecHelper.js

@@ -1,4 +1,14 @@
 function setup() {
+  FBWorld.Helpers.setCookieBasedOnName = function(name, value, options) {
+    this.fakeCookie = this.fakeCookie || {};
+    this.fakeCookie[name] = value;
+  };
+
+  FBWorld.Helpers.getCookieBasedOnName = function(name) {
+    this.fakeCookie = this.fakeCookie || {};
+    return this.fakeCookie[name];
+  };
+
   FBWorld.setSecret('00000000000000000000000000000000');
 
   FB.init({
@@ -9,7 +19,6 @@ function setup() {
     channelUrl : '/facebook/channel.html',
     oauth      : true
   });
-
 }
 
 function apiUnconnectedMessage() {

data/spec/javascripts/support/jasmine.yml

@@ -11,7 +11,7 @@
 #   - dist/**/*.js
 #
 src_files:
-    - bin/*.js
+  - bin/*.js
 
 # stylesheets
 #
@@ -37,6 +37,7 @@ stylesheets:
 #   - helpers/**/*.js
 #
 helpers:
+  - helpers/*.js
 
 # spec_files
 #
@@ -49,6 +50,7 @@ helpers:
 #   - **/*[sS]pec.js
 #
 spec_files:
+  - /*Spec.js
 
 # src_dir
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook-stub
 version: !ruby/object:Gem::Version
-  version: 0.0.1.21
+  version: 0.0.1.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger
-  requirement: &2190503640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190503640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2190503220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190503220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2190502800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190502800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2190502380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190502380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &2190501960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190501960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2190501540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190501540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2190501120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190501120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2190500700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190500700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &2190500280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2190500280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: facebook-stub is a gem for stubbing out the Facebook JavaScript API in
   acceptance and integration tests.
 email:
@@ -160,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1661798866571045948
+      hash: -3884959683233776032
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,10 +214,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1661798866571045948
+      hash: -3884959683233776032
 requirements: []
 rubyforge_project: facebook-stub
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Stub out the FB JS API