ember_simple_auth-rails 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6114507e7e5eeef52db1098b98f10d9dc483d29
-  data.tar.gz: 97a46d0071cce71416c5c290d7b45ba939f0b294
+  metadata.gz: 719d3390d677fc68f07d4c9b56d6997a22af2730
+  data.tar.gz: a414a5634f5252c0dd3d33ced15a4d4c140db9d4
 SHA512:
-  metadata.gz: e721d44e48b6e4155d5f23afeb7cd7d3e3b51bcbb98fd88c25b62886230763af840d320ece40eb49555cd2a0a31158fe7f6b27e1e2cea9de6bb15873de99c666
-  data.tar.gz: 91e92b317511b1a7eaefabc052cbb347b1ed52e7607e2122520e48a623bdb7459d2f3f87c45b9d3cdb81bfe20d2ffb8f4e54c5d6b3a95c51945e2c013d8e9f64
+  metadata.gz: e06686f14ed887bbcd5b028d9a6c6ca74436cac09f04feda5316bf597939b779fc5f6c6a270a6c81d2521490c93af8fc267d647962b9901ce5025828f202f9a3
+  data.tar.gz: b372da27a81fbb7bf92ccacd3733cbe538a111de9e57dfa5e20b0df3a2b5e048367718a3291203fdb3f566b335096c913af955545da030de9fde8b2e838edc5a

data/lib/ember_simple_auth/rails/version.rb

@@ -1,5 +1,5 @@
 module EmberSimpleAuth
   module Rails
-    VERSION = "0.6.3"
+    VERSION = "0.6.4"
   end
 end

data/vendor/assets/javascripts/ember-simple-auth-cookie-store.js

@@ -1,5 +1,7 @@
 (function(global) {
 
+Ember.libraries.register('Ember Simple Auth Cookie Store', '0.6.4');
+
 var define, requireModule;
 
 (function() {
@@ -58,9 +60,6 @@ define("simple-auth-cookie-store/ember",
   ["./initializer"],
   function(__dependency1__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var initializer = __dependency1__["default"];
 
     Ember.onLoad('Ember.Application', function(Application) {
@@ -71,9 +70,6 @@ define("simple-auth-cookie-store/initializer",
   ["simple-auth-cookie-store/stores/cookie","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var Store = __dependency1__["default"];
 
     __exports__["default"] = {
@@ -92,20 +88,17 @@ define("simple-auth-cookie-store/stores/cookie",
     var flatObjectsAreEqual = __dependency2__["default"];
     var getGlobalConfig = __dependency3__["default"];
 
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
-      Store that saves its data in cookies.
+      Store that saves its data in a cookie.
 
       __In order to keep multiple tabs/windows of an application in sync, this
-      store has to periodically (every 500ms) check the cookies__ for changes as
+      store has to periodically (every 500ms) check the cookie__ for changes as
       there are no events that notify of changes in cookies. The recommended
       alternative is `Stores.LocalStorage` that also persistently stores data but
       instead of cookies relies on the `localStorage` API and does not need to poll
       for external changes.
 
-      By default the cookie store will use session cookies that expire and are
+      By default the cookie store will use a session cookie that expires and is
       deleted when the browser is closed. The cookie expiration period can be
       configured via setting
       [`Stores.Cooke#cookieExpirationTime`](#SimpleAuth-Stores-Cookie-cookieExpirationTime)
@@ -136,27 +129,26 @@ define("simple-auth-cookie-store/stores/cookie",
     */
     __exports__["default"] = Base.extend({
       /**
-        The prefix to use for the store's cookie names so they can be distinguished
-        from other cookies.
+        The name of the cookie the store stores its data in.
 
         This value can be configured via the global environment object:
 
         ```js
         window.ENV = window.ENV || {};
         window.ENV['simple-auth-cookie-store'] = {
-          cookieNamePrefix: 'my_app_auth_'
+          cookieName: 'my_app_auth_session'
         }
         ```
 
-        @property cookieNamePrefix
+        @property cookieName
         @type String
         @default 'ember_simple_auth:'
       */
-      cookieNamePrefix: 'ember_simple_auth:',
+      cookieName: 'ember_simple_auth:session',
 
       /**
-        The expiration time in seconds to use for the cookies. A value of `null`
-        will make the cookies session cookies that expire when the browser is
+        The expiration time in seconds to use for the cookie. A value of `null`
+        will make the cookie a session cookie that expires when the browser is
         closed.
 
         This value can be configured via the global environment object:
@@ -192,7 +184,7 @@ define("simple-auth-cookie-store/stores/cookie",
       */
       init: function() {
         var globalConfig          = getGlobalConfig('simple-auth-cookie-store');
-        this.cookieNamePrefix     = globalConfig.cookieNamePrefix || this.cookieNamePrefix;
+        this.cookieName           = globalConfig.cookieName || this.cookieName;
         this.cookieExpirationTime = globalConfig.cookieExpirationTime || this.cookieExpirationTime;
         this.syncData();
       },
@@ -204,42 +196,36 @@ define("simple-auth-cookie-store/stores/cookie",
         @param {Object} data The data to persist
       */
       persist: function(data) {
-        for (var property in data) {
-          this.write(property, data[property], !!this.cookieExpirationTime ? new Date().getTime() + this.cookieExpirationTime * 1000 : null);
-        }
+        data           = JSON.stringify(data || {});
+        var expiration = !!this.cookieExpirationTime ? new Date().getTime() + this.cookieExpirationTime * 1000 : null;
+        this.write(data, expiration);
         this._lastData = this.restore();
       },
 
       /**
-        Restores all data currently saved in the session cookies identified by the
-        `cookieNamePrefix` (see
-        [`Stores.Cookie#cookieNamePrefix`](#SimpleAuth-Stores-Cookie-cookieNamePrefix))
-        as a plain object.
+        Restores all data currently saved in the cookie as a plain object.
 
         @method restore
-        @return {Object} All data currently persisted in the session cookies
+        @return {Object} All data currently persisted in the cookie
       */
       restore: function() {
-        var _this = this;
-        var data  = {};
-        this.knownCookies().forEach(function(cookie) {
-          data[cookie] = _this.read(cookie);
-        });
-        return data;
+        var data = this.read();
+        if (Ember.isEmpty(data)) {
+          return {};
+        } else {
+          return JSON.parse(data);
+        }
       },
 
       /**
         Clears the store by deleting all session cookies prefixed with the
-        `cookieNamePrefix` (see
-        [`SimpleAuth.Stores.Cookie#cookieNamePrefix`](#SimpleAuth-Stores-Cookie-cookieNamePrefix)).
+        `cookieName` (see
+        [`SimpleAuth.Stores.Cookie#cookieName`](#SimpleAuth-Stores-Cookie-cookieName)).
 
         @method clear
       */
       clear: function() {
-        var _this = this;
-        this.knownCookies().forEach(function(cookie) {
-          _this.write(cookie, null, 0);
-        });
+        this.write(null, 0);
         this._lastData = null;
       },
 
@@ -247,8 +233,8 @@ define("simple-auth-cookie-store/stores/cookie",
         @method read
         @private
       */
-      read: function(name) {
-        var value = document.cookie.match(new RegExp(this.cookieNamePrefix + name + '=([^;]+)')) || [];
+      read: function() {
+        var value = document.cookie.match(new RegExp(this.cookieName + name + '=([^;]+)')) || [];
         return decodeURIComponent(value[1] || '');
       },
 
@@ -256,23 +242,10 @@ define("simple-auth-cookie-store/stores/cookie",
         @method write
         @private
       */
-      write: function(name, value, expiration) {
+      write: function(value, expiration) {
         var expires = Ember.isEmpty(expiration) ? '' : '; expires=' + new Date(expiration).toUTCString();
         var secure  = !!this._secureCookies ? ';secure' : '';
-        document.cookie = this.cookieNamePrefix + name + '=' + encodeURIComponent(value) + expires + secure;
-      },
-
-      /**
-        @method knownCookies
-        @private
-      */
-      knownCookies: function() {
-        var _this = this;
-        return Ember.A(document.cookie.split(/[=;\s]+/)).filter(function(element) {
-          return new RegExp('^' + _this.cookieNamePrefix).test(element);
-        }).map(function(cookie) {
-          return cookie.replace(_this.cookieNamePrefix, '');
-        });
+        document.cookie = this.cookieName + '=' + encodeURIComponent(value) + expires + secure;
       },
 
       /**

data/vendor/assets/javascripts/ember-simple-auth-devise.js

@@ -1,5 +1,7 @@
 (function(global) {
 
+Ember.libraries.register('Ember Simple Auth Devise', '0.6.4');
+
 var define, requireModule;
 
 (function() {
@@ -62,9 +64,6 @@ define("simple-auth-devise/authenticators/devise",
     var isSecureUrl = __dependency2__["default"];
     var getGlobalConfig = __dependency3__["default"];
 
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
       Authenticator that works with the Ruby gem
       [Devise](https://github.com/plataformatec/devise).
@@ -219,9 +218,6 @@ define("simple-auth-devise/authorizers/devise",
     var Base = __dependency1__["default"];
     var isSecureUrl = __dependency2__["default"];
 
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
       Authenticator that works with the Ruby gem
       [Devise](https://github.com/plataformatec/devise) by sending the `user_token`
@@ -270,9 +266,6 @@ define("simple-auth-devise/ember",
   ["./initializer"],
   function(__dependency1__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var initializer = __dependency1__["default"];
 
     Ember.onLoad('Ember.Application', function(Application) {
@@ -283,9 +276,6 @@ define("simple-auth-devise/initializer",
   ["simple-auth-devise/authenticators/devise","simple-auth-devise/authorizers/devise","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var Authenticator = __dependency1__["default"];
     var Authorizer = __dependency2__["default"];
 

data/vendor/assets/javascripts/ember-simple-auth-oauth2.js

@@ -1,5 +1,7 @@
 (function(global) {
 
+Ember.libraries.register('Ember Simple Auth OAuth 2.0', '0.6.4');
+
 var define, requireModule;
 
 (function() {
@@ -62,9 +64,6 @@ define("simple-auth-oauth2/authenticators/oauth2",
     var isSecureUrl = __dependency2__["default"];
     var getGlobalConfig = __dependency3__["default"];
 
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
       Authenticator that conforms to OAuth 2
       ([RFC 6749](http://tools.ietf.org/html/rfc6749)), specifically the _"Resource
@@ -181,22 +180,22 @@ define("simple-auth-oauth2/authenticators/oauth2",
       restore: function(data) {
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
-          if (!Ember.isEmpty(data.access_token)) {
-            var now = (new Date()).getTime();
-            if (!Ember.isEmpty(data.expires_at) && data.expires_at < now) {
-              if (_this.refreshAccessTokens) {
-                _this.refreshAccessToken(data.expires_in, data.refresh_token).then(function(data) {
-                  resolve(data);
-                }, reject);
-              } else {
-                reject();
-              }
+          var now = (new Date()).getTime();
+          if (!Ember.isEmpty(data.expires_at) && data.expires_at < now) {
+            if (_this.refreshAccessTokens) {
+              _this.refreshAccessToken(data.expires_in, data.refresh_token).then(function(data) {
+                resolve(data);
+              }, reject);
+            } else {
+              reject();
+            }
+          } else {
+            if (Ember.isEmpty(data.access_token)) {
+              reject();
             } else {
               _this.scheduleAccessTokenRefresh(data.expires_in, data.expires_at, data.refresh_token);
               resolve(data);
             }
-          } else {
-            reject();
           }
         });
       },
@@ -228,7 +227,10 @@ define("simple-auth-oauth2/authenticators/oauth2",
             Ember.run(function() {
               var expiresAt = _this.absolutizeExpirationTime(response.expires_in);
               _this.scheduleAccessTokenRefresh(response.expires_in, expiresAt, response.refresh_token);
-              resolve(Ember.$.extend(response, { expires_at: expiresAt }));
+              if (!Ember.isEmpty(expiresAt)) {
+                response = Ember.merge(response, { expires_at: expiresAt });
+              }
+              resolve(response);
             });
           }, function(xhr, status, error) {
             Ember.run(function() {
@@ -311,7 +313,7 @@ define("simple-auth-oauth2/authenticators/oauth2",
           if (Ember.isEmpty(expiresAt) && !Ember.isEmpty(expiresIn)) {
             expiresAt = new Date(now + expiresIn * 1000).getTime();
           }
-          var offset = (Math.floor(Math.random() * 15) + 5) * 1000;
+          var offset = (Math.floor(Math.random() * 5) + 5) * 1000;
           if (!Ember.isEmpty(refreshToken) && !Ember.isEmpty(expiresAt) && expiresAt > now - offset) {
             Ember.run.cancel(this._refreshTokenTimeout);
             delete this._refreshTokenTimeout;
@@ -335,7 +337,7 @@ define("simple-auth-oauth2/authenticators/oauth2",
               expiresIn     = response.expires_in || expiresIn;
               refreshToken  = response.refresh_token || refreshToken;
               var expiresAt = _this.absolutizeExpirationTime(expiresIn);
-              var data      = Ember.$.extend(response, { expires_in: expiresIn, expires_at: expiresAt, refresh_token: refreshToken });
+              var data      = Ember.merge(response, { expires_in: expiresIn, expires_at: expiresAt, refresh_token: refreshToken });
               _this.scheduleAccessTokenRefresh(expiresIn, null, refreshToken);
               _this.trigger('sessionDataUpdated', data);
               resolve(data);
@@ -353,7 +355,7 @@ define("simple-auth-oauth2/authenticators/oauth2",
       */
       absolutizeExpirationTime: function(expiresIn) {
         if (!Ember.isEmpty(expiresIn)) {
-          return new Date((new Date().getTime()) + (expiresIn - 5) * 1000).getTime();
+          return new Date((new Date().getTime()) + expiresIn * 1000).getTime();
         }
       }
     });
@@ -365,9 +367,6 @@ define("simple-auth-oauth2/authorizers/oauth2",
     var Base = __dependency1__["default"];
     var isSecureUrl = __dependency2__["default"];
 
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
       Authorizer that conforms to OAuth 2
       ([RFC 6749](http://tools.ietf.org/html/rfc6749)) by sending a bearer token
@@ -410,9 +409,6 @@ define("simple-auth-oauth2/ember",
   ["./initializer"],
   function(__dependency1__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var initializer = __dependency1__["default"];
 
     Ember.onLoad('Ember.Application', function(Application) {
@@ -423,9 +419,6 @@ define("simple-auth-oauth2/initializer",
   ["simple-auth-oauth2/authenticators/oauth2","simple-auth-oauth2/authorizers/oauth2","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var Authenticator = __dependency1__["default"];
     var Authorizer = __dependency2__["default"];
 

data/vendor/assets/javascripts/ember-simple-auth-testing.js

@@ -0,0 +1,137 @@
+(function(global) {
+
+Ember.libraries.register('Ember Simple Auth Testing', '0.6.4');
+
+var define, requireModule;
+
+(function() {
+  var registry = {}, seen = {};
+
+  define = function(name, deps, callback) {
+    registry[name] = { deps: deps, callback: callback };
+  };
+
+  requireModule = function(name) {
+    if (seen.hasOwnProperty(name)) { return seen[name]; }
+    seen[name] = {};
+
+    if (!registry[name]) {
+      throw new Error("Could not find module " + name);
+    }
+
+    var mod = registry[name],
+        deps = mod.deps,
+        callback = mod.callback,
+        reified = [],
+        exports;
+
+    for (var i=0, l=deps.length; i<l; i++) {
+      if (deps[i] === 'exports') {
+        reified.push(exports = {});
+      } else {
+        reified.push(requireModule(resolve(deps[i])));
+      }
+    }
+
+    var value = callback.apply(this, reified);
+    return seen[name] = exports || value;
+
+    function resolve(child) {
+      if (child.charAt(0) !== '.') { return child; }
+      var parts = child.split("/");
+      var parentBase = name.split("/").slice(0, -1);
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var part = parts[i];
+
+        if (part === '..') { parentBase.pop(); }
+        else if (part === '.') { continue; }
+        else { parentBase.push(part); }
+      }
+
+      return parentBase.join("/");
+    }
+  };
+
+  requireModule.registry = registry;
+})();
+
+define("simple-auth-testing/authenticators/test", 
+  ["simple-auth/authenticators/base","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Base = __dependency1__["default"];
+
+    __exports__["default"] = Base.extend({
+      restore: function(data) {
+        return new Ember.RSVP.resolve();
+      },
+
+      authenticate: function(options) {
+        return new Ember.RSVP.resolve();
+      },
+
+      invalidate: function(data) {
+        return new Ember.RSVP.resolve();
+      }
+    });
+  });
+define("simple-auth-testing/ember", 
+  ["./initializer"],
+  function(__dependency1__) {
+    "use strict";
+    var initializer = __dependency1__["default"];
+
+    Ember.onLoad('Ember.Application', function(Application) {
+      Application.initializer(initializer);
+    });
+  });
+define("simple-auth-testing/initializer", 
+  ["simple-auth-testing/authenticators/test","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var TestAuthenticator = __dependency1__["default"];
+
+    __exports__["default"] = {
+      name:       'simple-auth-testing',
+      before:     'simple-auth',
+      initialize: function(container, application) {
+        container.register('simple-auth-authenticator:test', TestAuthenticator);
+      }
+    };
+  });
+define("simple-auth-testing/test-helpers", 
+  ["simple-auth/configuration","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Configuration = __dependency1__["default"];
+
+    var testHelpers = function() {
+      Ember.Test.registerAsyncHelper('authenticateSession', function(app) {
+        var session = app.__container__.lookup(Configuration.session);
+        session.authenticate('simple-auth-authenticator:test');
+        return wait();
+      });
+
+      Ember.Test.registerAsyncHelper('invalidateSession', function(app) {
+        var session = app.__container__.lookup(Configuration.session);
+        if (session.get('isAuthenticated')) {
+          session.invalidate();
+        }
+        return wait();
+      });
+    }();
+
+    __exports__["default"] = testHelpers;
+  });
+define('simple-auth/authenticators/base',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.SimpleAuth.Authenticators.Base;
+});
+
+requireModule('simple-auth-testing/ember');
+
+if (global.Ember.testing) {
+  requireModule('simple-auth/test-helpers/authenticate-session');
+  requireModule('simple-auth/test-helpers/invalidate-session');
+}
+})((typeof global !== 'undefined') ? global : window);

data/vendor/assets/javascripts/ember-simple-auth-torii.js

@@ -1,5 +1,7 @@
 (function(global) {
 
+Ember.libraries.register('Ember Simple Auth Torii', '0.6.4');
+
 var define, requireModule;
 
 (function() {
@@ -60,9 +62,6 @@ define("simple-auth-torii/authenticators/torii",
     "use strict";
     var Base = __dependency1__["default"];
 
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
       Authenticator that wraps the
       [Torii library](https://github.com/Vestorly/torii).
@@ -165,9 +164,6 @@ define("simple-auth-torii/ember",
   ["./initializer"],
   function(__dependency1__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var initializer = __dependency1__["default"];
 
     Ember.onLoad('Ember.Application', function(Application) {

data/vendor/assets/javascripts/ember-simple-auth.js

@@ -1,5 +1,7 @@
 (function(global) {
 
+Ember.libraries.register('Ember Simple Auth', '0.6.4');
+
 var define, requireModule;
 
 (function() {
@@ -58,9 +60,6 @@ define("simple-auth/authenticators/base",
   ["exports"],
   function(__exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
       The base for all authenticators. __This serves as a starting point for
       implementing custom authenticators and must not be used directly.__
@@ -200,9 +199,10 @@ define("simple-auth/authenticators/base",
         resolving promise and thus never intercepts session invalidation.
 
         @method invalidate
+        @param {Object} data The data that the session currently holds
         @return {Ember.RSVP.Promise} A promise that when it resolves results in the session being invalidated
       */
-      invalidate: function() {
+      invalidate: function(data) {
         return new Ember.RSVP.resolve();
       }
     });
@@ -211,9 +211,6 @@ define("simple-auth/authorizers/base",
   ["exports"],
   function(__exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
       The base for all authorizers. __This serves as a starting point for
       implementing custom authorizers and must not be used directly.__
@@ -333,6 +330,19 @@ define("simple-auth/configuration",
       */
       authorizer: null,
 
+      /**
+        The session factory to use as it is registered with Ember's container,
+        see
+        [Ember's API docs](http://emberjs.com/api/classes/Ember.Application.html#method_register).
+
+        @property session
+        @readOnly
+        @static
+        @type String
+        @default 'simple-auth-session:main'
+      */
+      session: 'simple-auth-session:main',
+
       /**
         The store factory to use as it is registered with Ember's container, see
         [Ember's API docs](http://emberjs.com/api/classes/Ember.Application.html#method_register).
@@ -376,6 +386,7 @@ define("simple-auth/configuration",
         this.routeAfterAuthentication = globalConfig.routeAfterAuthentication || this.routeAfterAuthentication;
         this.sessionPropertyName      = globalConfig.sessionPropertyName || this.sessionPropertyName;
         this.authorizer               = globalConfig.authorizer || this.authorizer;
+        this.session                  = globalConfig.session || this.session;
         this.store                    = globalConfig.store || this.store;
         this.crossOriginWhitelist     = globalConfig.crossOriginWhitelist || this.crossOriginWhitelist;
         this.applicationRootUrl       = container.lookup('router:main').get('rootURL') || '/';
@@ -386,9 +397,6 @@ define("simple-auth/ember",
   ["./initializer"],
   function(__dependency1__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var initializer = __dependency1__["default"];
 
     Ember.onLoad('Ember.Application', function(Application) {
@@ -399,9 +407,6 @@ define("simple-auth/initializer",
   ["./setup","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var setup = __dependency1__["default"];
 
     __exports__["default"] = {
@@ -415,9 +420,6 @@ define("simple-auth/mixins/application-route-mixin",
   ["./../configuration","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember  = global.Ember;
-
     var Configuration = __dependency1__["default"];
 
     /**
@@ -483,20 +485,22 @@ define("simple-auth/mixins/application-route-mixin",
       */
       beforeModel: function(transition) {
         this._super(transition);
-        var _this = this;
-        Ember.A([
-          'sessionAuthenticationSucceeded',
-          'sessionAuthenticationFailed',
-          'sessionInvalidationSucceeded',
-          'sessionInvalidationFailed',
-          'authorizationFailed'
-        ]).forEach(function(event) {
-          _this.get(Configuration.sessionPropertyName).on(event, function(error) {
-            Array.prototype.unshift.call(arguments, event);
-            var target = transition.isActive ? transition : _this;
-            target.send.apply(target, arguments);
+        if (!this.get('_authEventListenersAssigned')) {
+          this.set('_authEventListenersAssigned', true);
+          var _this = this;
+          Ember.A([
+            'sessionAuthenticationSucceeded',
+            'sessionAuthenticationFailed',
+            'sessionInvalidationSucceeded',
+            'sessionInvalidationFailed',
+            'authorizationFailed'
+          ]).forEach(function(event) {
+            _this.get(Configuration.sessionPropertyName).on(event, function(error) {
+              Array.prototype.unshift.call(arguments, event);
+              transition.send.apply(transition, arguments);
+            });
           });
-        });
+        }
       },
 
       actions: {
@@ -631,9 +635,6 @@ define("simple-auth/mixins/authenticated-route-mixin",
   ["./../configuration","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var Configuration = __dependency1__["default"];
 
     /**
@@ -689,9 +690,6 @@ define("simple-auth/mixins/authentication-controller-mixin",
   ["./../configuration","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var Configuration = __dependency1__["default"];
 
     /**
@@ -740,9 +738,6 @@ define("simple-auth/mixins/login-controller-mixin",
   ["./../configuration","./authentication-controller-mixin","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var Configuration = __dependency1__["default"];
     var AuthenticationControllerMixin = __dependency2__["default"];
 
@@ -792,7 +787,7 @@ define("simple-auth/mixins/login-controller-mixin",
         authenticate: function() {
           var data = this.getProperties('identification', 'password');
           this.set('password', null);
-          this._super(data);
+          return this._super(data);
         }
       }
     });
@@ -801,9 +796,6 @@ define("simple-auth/session",
   ["exports"],
   function(__exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     /**
       __The session provides access to the current authentication state as well as
       any data the authenticator resolved with__ (see
@@ -914,6 +906,15 @@ define("simple-auth/session",
         @default null
       */
       store: null,
+      /**
+        The Ember.js container,
+
+        @property container
+        @type Container
+        @readOnly
+        @default null
+      */
+      container: null,
       /**
         Returns whether the session is currently authenticated.
 
@@ -934,14 +935,6 @@ define("simple-auth/session",
       */
       content: {},
 
-      /**
-        @method init
-        @private
-      */
-      init: function() {
-        this.bindToStoreEvents();
-      },
-
       /**
         Authenticates the session with an `authenticator` and appropriate
         `options`. __This delegates the actual authentication work to the
@@ -993,6 +986,7 @@ define("simple-auth/session",
         @return {Ember.RSVP.Promise} A promise that resolves when the session was invalidated successfully
       */
       invalidate: function() {
+        Ember.assert('Session#invalidate requires the session to be authenticated', this.get('isAuthenticated'));
         var _this = this;
         return new Ember.RSVP.Promise(function(resolve, reject) {
           var authenticator = _this.container.lookup(_this.authenticator);
@@ -1037,6 +1031,7 @@ define("simple-auth/session",
         @private
       */
       setup: function(authenticator, content, trigger) {
+        content = Ember.merge(Ember.merge({}, this.content), content);
         trigger = !!trigger && !this.get('isAuthenticated');
         this.beginPropertyChanges();
         this.setProperties({
@@ -1045,8 +1040,7 @@ define("simple-auth/session",
           content:         content
         });
         this.bindToAuthenticatorEvents();
-        var data = Ember.$.extend({ authenticator: authenticator }, this.content);
-        this.store.replace(data);
+        this.updateStore();
         this.endPropertyChanges();
         if (trigger) {
           this.trigger('sessionAuthenticationSucceeded');
@@ -1072,6 +1066,30 @@ define("simple-auth/session",
         }
       },
 
+      /**
+        @method setUnknownProperty
+        @private
+      */
+      setUnknownProperty: function(key, value) {
+        var result = this._super(key, value);
+        this.updateStore();
+        return result;
+      },
+
+      /**
+        @method updateStore
+        @private
+      */
+      updateStore: function() {
+        var data = this.content;
+        if (!Ember.isEmpty(this.authenticator)) {
+          data = Ember.merge({ authenticator: this.authenticator }, data);
+        }
+        if (!Ember.isEmpty(data)) {
+          this.store.persist(data);
+        }
+      },
+
       /**
         @method bindToAuthenticatorEvents
         @private
@@ -1108,7 +1126,7 @@ define("simple-auth/session",
             _this.clear(true);
           }
         });
-      }
+      }.observes('store')
     });
   });
 define("simple-auth/setup", 
@@ -1148,9 +1166,10 @@ define("simple-auth/setup",
       return crossOriginWhitelist.indexOf(urlOrigin) > -1;
     }
 
-    function registerStores(container) {
+    function registerFactories(container) {
       container.register('simple-auth-session-store:local-storage', LocalStorage);
       container.register('simple-auth-session-store:ephemeral', Ephemeral);
+      container.register('simple-auth-session:main', Session);
     }
 
     /**
@@ -1160,17 +1179,17 @@ define("simple-auth/setup",
     __exports__["default"] = function(container, application) {
       Configuration.load(container);
       application.deferReadiness();
-      registerStores(container);
+      registerFactories(container);
 
-      var store            = container.lookup(Configuration.store);
-      var session          = Session.create({ store: store, container: container });
-      crossOriginWhitelist = Ember.A(Configuration.crossOriginWhitelist).map(function(origin) {
-        return extractLocationOrigin(origin);
+      var store   = container.lookup(Configuration.store);
+      var session = container.lookup(Configuration.session);
+      session.setProperties({ store: store, container: container });
+      Ember.A(['controller', 'route']).forEach(function(component) {
+        container.injection(component, Configuration.sessionPropertyName, Configuration.session);
       });
 
-      container.register('simple-auth-session:main', session, { instantiate: false });
-      Ember.A(['controller', 'route']).forEach(function(component) {
-        container.injection(component, Configuration.sessionPropertyName, 'simple-auth-session:main');
+      crossOriginWhitelist = Ember.A(Configuration.crossOriginWhitelist).map(function(origin) {
+        return extractLocationOrigin(origin);
       });
 
       if (!Ember.isEmpty(Configuration.authorizer)) {
@@ -1202,9 +1221,6 @@ define("simple-auth/stores/base",
   ["../utils/flat-objects-are-equal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var flatObjectsAreEqual = __dependency1__["default"];
 
     /**
@@ -1243,7 +1259,8 @@ define("simple-auth/stores/base",
       */
 
       /**
-        Persists the `data` in the store.
+        Persists the `data` in the store. This actually replaces all currently
+        stored data.
 
         `Stores.Base`'s implementation does nothing.
 
@@ -1265,23 +1282,6 @@ define("simple-auth/stores/base",
         return {};
       },
 
-      /**
-        Replaces all data currently saved in the store with the specified `data`.
-
-        `Stores.Base`'s implementation clears the store, then persists the
-        specified `data`. If the store's current content is equal to the specified
-        `data`, nothing is done.
-
-        @method replace
-        @param {Object} data The data to replace the store's content with
-      */
-      replace: function(data) {
-        if (!flatObjectsAreEqual(data, this.restore())) {
-          this.clear();
-          this.persist(data);
-        }
-      },
-
       /**
         Clears the store.
 
@@ -1297,9 +1297,6 @@ define("simple-auth/stores/ephemeral",
   ["./base","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var Base = __dependency1__["default"];
 
     /**
@@ -1333,7 +1330,7 @@ define("simple-auth/stores/ephemeral",
         @param {Object} data The data to persist
       */
       persist: function(data) {
-        this._data = Ember.$.extend(data, this._data);
+        this._data = JSON.stringify(data || {});
       },
 
       /**
@@ -1343,7 +1340,7 @@ define("simple-auth/stores/ephemeral",
         @return {Object} All data currently persisted
       */
       restore: function() {
-        return Ember.$.extend({}, this._data);
+        return JSON.parse(this._data) || {};
       },
 
       /**
@@ -1353,7 +1350,7 @@ define("simple-auth/stores/ephemeral",
       */
       clear: function() {
         delete this._data;
-        this._data = {};
+        this._data = '{}';
       }
     });
   });
@@ -1361,9 +1358,6 @@ define("simple-auth/stores/local-storage",
   ["./base","../utils/flat-objects-are-equal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var global = (typeof window !== 'undefined') ? window : {},
-        Ember = global.Ember;
-
     var Base = __dependency1__["default"];
     var flatObjectsAreEqual = __dependency2__["default"];
 
@@ -1382,20 +1376,13 @@ define("simple-auth/stores/local-storage",
     */
     __exports__["default"] = Base.extend({
       /**
-        The prefix to use for the store's keys so they can be distinguished from
-        others.
+        The key the store stores the data in.
 
-        @property keyPrefix
+        @property key
         @type String
-        @default 'ember_simple_auth:'
+        @default 'ember_simple_auth:session'
       */
-      keyPrefix: 'ember_simple_auth:',
-
-      /**
-        @property _triggerChangeEventTimeout
-        @private
-      */
-      _triggerChangeEventTimeout: null,
+      key: 'ember_simple_auth:session',
 
       /**
         @method init
@@ -1412,10 +1399,8 @@ define("simple-auth/stores/local-storage",
         @param {Object} data The data to persist
       */
       persist: function(data) {
-        for (var property in data) {
-          var key = this.buildStorageKey(property);
-          localStorage.setItem(key, data[property]);
-        }
+        data = JSON.stringify(data || {});
+        localStorage.setItem(this.key, data);
         this._lastData = this.restore();
       },
 
@@ -1427,13 +1412,8 @@ define("simple-auth/stores/local-storage",
         @return {Object} All data currently persisted in the `localStorage`
       */
       restore: function() {
-        var _this = this;
-        var data = {};
-        this.knownKeys().forEach(function(key) {
-          var originalKey = key.replace(_this.keyPrefix, '');
-          data[originalKey] = localStorage.getItem(key);
-        });
-        return data;
+        var data = localStorage.getItem(this.key);
+        return JSON.parse(data) || {};
       },
 
       /**
@@ -1443,35 +1423,10 @@ define("simple-auth/stores/local-storage",
         @method clear
       */
       clear: function() {
-        this.knownKeys().forEach(function(key) {
-          localStorage.removeItem(key);
-        });
+        localStorage.removeItem(this.key);
         this._lastData = null;
       },
 
-      /**
-        @method buildStorageKey
-        @private
-      */
-      buildStorageKey: function(property) {
-        return this.keyPrefix + property;
-      },
-
-      /**
-        @method knownKeys
-        @private
-      */
-      knownKeys: function(callback) {
-        var keys = Ember.A([]);
-        for (var i = 0, l = localStorage.length; i < l; i++) {
-          var key = localStorage.key(i);
-          if (key.indexOf(this.keyPrefix) === 0) {
-            keys.push(key);
-          }
-        }
-        return keys;
-      },
-
       /**
         @method bindToStorageEvents
         @private
@@ -1482,10 +1437,7 @@ define("simple-auth/stores/local-storage",
           var data = _this.restore();
           if (!flatObjectsAreEqual(data, _this._lastData)) {
             _this._lastData = data;
-            Ember.run.cancel(_this._triggerChangeEventTimeout);
-            _this._triggerChangeEventTimeout = Ember.run.next(_this, function() {
-              this.trigger('sessionDataUpdated', data);
-            });
+            _this.trigger('sessionDataUpdated', data);
           }
         });
       }
@@ -1591,4 +1543,6 @@ global.SimpleAuth = {
 };
 
 requireModule('simple-auth/ember');
+
+Ember.libraries.register('Ember Simple Auth', '0.6.4');
 })((typeof global !== 'undefined') ? global : window);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ember_simple_auth-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - frederik dudzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - vendor/assets/javascripts/ember-simple-auth-cookie-store.js
 - vendor/assets/javascripts/ember-simple-auth-devise.js
 - vendor/assets/javascripts/ember-simple-auth-oauth2.js
+- vendor/assets/javascripts/ember-simple-auth-testing.js
 - vendor/assets/javascripts/ember-simple-auth-torii.js
 - vendor/assets/javascripts/ember-simple-auth.js
 homepage: https://github.com/doodzik/ember_simple_auth-rails