ember_simple_auth-rails 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a573203d0d366acbb574f5e2ffd9165ab3ee866
-  data.tar.gz: cc55804dcf7971eee623a9fb6fff2cc8734d5d6c
+  metadata.gz: 98cff789967e0d6a024fe6392feba562b75a7835
+  data.tar.gz: 088ae5371911e80a050e3f44a325713f2eabe0a4
 SHA512:
-  metadata.gz: 6ac14445cf2128de3b56e5731268d7ce02ede54c87b305681d32e1663c12c388f0008a5696b41021bf7353a599371b9d813d29e5d57c9427561cf2effbaf5278
-  data.tar.gz: ec30ebc92a9604814ff74987a66304b48a984d5f9781d10efe7fec71e67f1441becf05ad6198dbef29b20b6267b54a70fc80eef1becb0a6bced79a320a2927ff
+  metadata.gz: 9f2925db8e28803450ca3404d1b400e1bf52024d215267d281cb20409317fc37f2eb03ffdbd681d83d54dadf84c32c1a0a2fb1190fd2e808c98fa0742ab50daf
+  data.tar.gz: 51f710029060693fbe3c78d632c72b6c1d8820623589113c777cd9553b66abf6056d497ba4fd1b5a41cb185ec2bc6f7f3da032d17641b22ee5dd623d2562b29c

data/README.md

@@ -2,7 +2,7 @@
 
 ember-simple-auth for the assets pipeline
 
-# IF YOU WANT A NEW VERSION RUN 
+# IF YOU WANT A NEW VERSION RUN
 ```bash
 $ rake update
 ```
@@ -31,28 +31,28 @@ require the assets as you always do.
 require the base library:
 
 ```
-# require "ember-simple-auth"
+//= require "ember-simple-auth"
 ```
 
 plus any extension libraries you might need:
 
 ```
-# require "ember-simple-auth-cookie-store"
-# require "ember-simple-auth-devise"
-# require "ember-simple-auth-oauth2"
+//= require "ember-simple-auth-cookie-store"
+//= require "ember-simple-auth-devise"
+//= require "ember-simple-auth-oauth2"
 ```
 
 #### < 0.3.0
 
 require the library:
 
-``` 
-# require "ember-simple-auth"
+```
+//= require "ember-simple-auth"
 ```
 
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/ember_simple_auth-rails/fork )
+1. Fork it ( http://github.com/doodzik/ember_simple_auth-rails/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/ember_simple_auth/rails/version.rb

@@ -1,5 +1,5 @@
 module EmberSimpleAuth
   module Rails
-    VERSION = "0.6.6"
+    VERSION = "0.6.7"
   end
 end

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth Cookie Store', '0.6.6');
+Ember.libraries.register('Ember Simple Auth Cookie Store', '0.6.7');
 
 var define, requireModule;
 
@@ -56,6 +56,66 @@ var define, requireModule;
   requireModule.registry = registry;
 })();
 
+define("simple-auth-cookie-store/configuration", 
+  ["simple-auth/utils/load-config","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var loadConfig = __dependency1__["default"];
+
+    var defaults = {
+      cookieName:           'ember_simple_auth:session',
+      cookieExpirationTime: null
+    };
+
+    /**
+      Ember Simple Auth Cookie Store's configuration object.
+
+      To change any of these values, define a global environment object for Ember
+      Simple Auth and define the values there:
+
+      ```js
+      window.ENV = window.ENV || {};
+      window.ENV['simple-auth-cookie-store'] = {
+        cookieName: 'my_app_auth_session'
+      }
+      ```
+
+      @class CookieStore
+      @namespace SimpleAuth.Configuration
+      @module simple-auth/configuration
+    */
+    __exports__["default"] = {
+      /**
+        The name of the cookie the store stores its data in.
+
+        @property cookieName
+        @readOnly
+        @static
+        @type String
+        @default 'ember_simple_auth:'
+      */
+      cookieName: defaults.cookieName,
+
+      /**
+        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.
+
+        @property cookieExpirationTime
+        @readOnly
+        @static
+        @type Integer
+        @default null
+      */
+      cookieExpirationTime: defaults.cookieExpirationTime,
+
+      /**
+        @method load
+        @private
+      */
+      load: loadConfig(defaults)
+    };
+  });
 define("simple-auth-cookie-store/ember", 
   ["./initializer"],
   function(__dependency1__) {
@@ -67,26 +127,30 @@ define("simple-auth-cookie-store/ember",
     });
   });
 define("simple-auth-cookie-store/initializer", 
-  ["simple-auth-cookie-store/stores/cookie","exports"],
-  function(__dependency1__, __exports__) {
+  ["./configuration","simple-auth/utils/get-global-config","simple-auth-cookie-store/stores/cookie","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var Store = __dependency1__["default"];
+    var Configuration = __dependency1__["default"];
+    var getGlobalConfig = __dependency2__["default"];
+    var Store = __dependency3__["default"];
 
     __exports__["default"] = {
       name:       'simple-auth-cookie-store',
       before:     'simple-auth',
       initialize: function(container, application) {
+        var config = getGlobalConfig('simple-auth-cookie-store');
+        Configuration.load(container, config);
         container.register('simple-auth-session-store:cookie', Store);
       }
     };
   });
 define("simple-auth-cookie-store/stores/cookie", 
-  ["simple-auth/stores/base","simple-auth/utils/flat-objects-are-equal","simple-auth/utils/get-global-config","exports"],
+  ["simple-auth/stores/base","simple-auth/utils/flat-objects-are-equal","./../configuration","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Base = __dependency1__["default"];
     var flatObjectsAreEqual = __dependency2__["default"];
-    var getGlobalConfig = __dependency3__["default"];
+    var Configuration = __dependency3__["default"];
 
     /**
       Store that saves its data in a cookie.
@@ -131,18 +195,12 @@ define("simple-auth-cookie-store/stores/cookie",
       /**
         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'] = {
-          cookieName: 'my_app_auth_session'
-        }
-        ```
+        This value can be configured via
+        [`SimpleAuth.Configuration.CookieStore#cookieName`](#SimpleAuth-Configuration-CookieStore-cookieName).
 
         @property cookieName
+        @readOnly
         @type String
-        @default 'ember_simple_auth:'
       */
       cookieName: 'ember_simple_auth:session',
 
@@ -151,18 +209,12 @@ define("simple-auth-cookie-store/stores/cookie",
         will make the cookie a session cookie that expires when the browser is
         closed.
 
-        This value can be configured via the global environment object:
-
-        ```js
-        window.ENV = window.ENV || {};
-        window.ENV['simple-auth-cookie-store'] = {
-          cookieExpirationTime: 24 * 60 * 60
-        }
-        ```
+        This value can be configured via
+        [`SimpleAuth.Configuration.CookieStore#cookieExpirationTime`](#SimpleAuth-Configuration-CookieStore-cookieExpirationTime).
 
         @property cookieExpirationTime
+        @readOnly
         @type Integer
-        @default null
       */
       cookieExpirationTime: null,
 
@@ -183,9 +235,8 @@ define("simple-auth-cookie-store/stores/cookie",
         @private
       */
       init: function() {
-        var globalConfig          = getGlobalConfig('simple-auth-cookie-store');
-        this.cookieName           = globalConfig.cookieName || this.cookieName;
-        this.cookieExpirationTime = globalConfig.cookieExpirationTime || this.cookieExpirationTime;
+        this.cookieName           = Configuration.cookieName;
+        this.cookieExpirationTime = Configuration.cookieExpirationTime;
         this.syncData();
       },
 
@@ -209,6 +260,7 @@ define("simple-auth-cookie-store/stores/cookie",
         @return {Object} All data currently persisted in the cookie
       */
       restore: function() {
+
         var data = this.read();
         if (Ember.isEmpty(data)) {
           return {};
@@ -275,11 +327,16 @@ define('simple-auth/utils/flat-objects-are-equal',  ['exports'], function(__expo
 define('simple-auth/utils/get-global-config',  ['exports'], function(__exports__) {
   __exports__['default'] = global.SimpleAuth.Utils.getGlobalConfig;
 });
+define('simple-auth/utils/load-config',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.SimpleAuth.Utils.loadConfig;
+});
 
-var initializer = requireModule('simple-auth-cookie-store/initializer')['default'];
-var Cookie      = requireModule('simple-auth-cookie-store/stores/cookie')['default'];
+var initializer   = requireModule('simple-auth-cookie-store/initializer')['default'];
+var Configuration = requireModule('simple-auth-cookie-store/configuration')['default'];
+var Cookie        = requireModule('simple-auth-cookie-store/stores/cookie')['default'];
 
-global.SimpleAuth.Stores.Cookie = Cookie;
+global.SimpleAuth.Configuration.CookieStore = Configuration;
+global.SimpleAuth.Stores.Cookie             = Cookie;
 
 requireModule('simple-auth-cookie-store/ember');
 })((typeof global !== 'undefined') ? global : window);

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth Devise', '0.6.6');
+Ember.libraries.register('Ember Simple Auth Devise', '0.6.7');
 
 var define, requireModule;
 
@@ -57,12 +57,12 @@ var define, requireModule;
 })();
 
 define("simple-auth-devise/authenticators/devise", 
-  ["simple-auth/authenticators/base","simple-auth/utils/is-secure-url","simple-auth/utils/get-global-config","exports"],
+  ["simple-auth/authenticators/base","simple-auth/utils/is-secure-url","./../configuration","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Base = __dependency1__["default"];
     var isSecureUrl = __dependency2__["default"];
-    var getGlobalConfig = __dependency3__["default"];
+    var Configuration = __dependency3__["default"];
 
     /**
       Authenticator that works with the Ruby gem
@@ -86,14 +86,8 @@ define("simple-auth-devise/authenticators/devise",
         The endpoint on the server the authenticator acquires the auth token
         and email from.
 
-        This value can be configured via the global environment object:
-
-        ```js
-        window.ENV = window.ENV || {};
-        window.ENV['simple-auth-devise'] = {
-          serverTokenEndpoint: '/some/other/endpoint'
-        }
-        ```
+        This value can be configured via
+        [`SimpleAuth.Configuration.Devise#serverTokenEndpoint`](#SimpleAuth-Configuration-Devise-serverTokenEndpoint).
 
         @property serverTokenEndpoint
         @type String
@@ -104,14 +98,8 @@ define("simple-auth-devise/authenticators/devise",
       /**
         The devise resource name
 
-        This value can be configured via the global environment object:
-
-        ```js
-        window.ENV = window.ENV || {};
-        window.ENV['simple-auth-devise'] = {
-          resourceName: 'account'
-        }
-        ```
+        This value can be configured via
+        [`SimpleAuth.Configuration.Devise#resourceName`](#SimpleAuth-Configuration-Devise-resourceName).
 
         @property resourceName
         @type String
@@ -124,9 +112,8 @@ define("simple-auth-devise/authenticators/devise",
         @private
       */
       init: function() {
-        var globalConfig         = getGlobalConfig('simple-auth-devise');
-        this.serverTokenEndpoint = globalConfig.serverTokenEndpoint || this.serverTokenEndpoint;
-        this.resourceName        = globalConfig.resourceName || this.resourceName;
+        this.serverTokenEndpoint = Configuration.serverTokenEndpoint;
+        this.resourceName        = Configuration.resourceName;
       },
 
       /**
@@ -262,6 +249,65 @@ define("simple-auth-devise/authorizers/devise",
       }
     });
   });
+define("simple-auth-devise/configuration", 
+  ["simple-auth/utils/load-config","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var loadConfig = __dependency1__["default"];
+
+    var defaults = {
+      serverTokenEndpoint: '/users/sign_in',
+      resourceName:        'user'
+    };
+
+    /**
+      Ember Simple Auth Device's configuration object.
+
+      To change any of these values, define a global environment object for Ember
+      Simple Auth and define the values there:
+
+      ```js
+      window.ENV = window.ENV || {};
+      window.ENV['simple-auth-devise'] = {
+        serverTokenEndpoint: '/some/other/endpoint'
+      }
+      ```
+
+      @class Devise
+      @namespace SimpleAuth.Configuration
+      @module simple-auth/configuration
+    */
+    __exports__["default"] = {
+      /**
+        The endpoint on the server the authenticator acquires the auth token
+        and email from.
+
+        @property serverTokenEndpoint
+        @readOnly
+        @static
+        @type String
+        @default '/users/sign_in'
+      */
+      serverTokenEndpoint: defaults.serverTokenEndpoint,
+
+      /**
+        The devise resource name.
+
+        @property resourceName
+        @readOnly
+        @static
+        @type String
+        @default 'user'
+      */
+      resourceName: defaults.resourceName,
+
+      /**
+        @method load
+        @private
+      */
+      load: loadConfig(defaults)
+    };
+  });
 define("simple-auth-devise/ember", 
   ["./initializer"],
   function(__dependency1__) {
@@ -273,16 +319,20 @@ define("simple-auth-devise/ember",
     });
   });
 define("simple-auth-devise/initializer", 
-  ["simple-auth-devise/authenticators/devise","simple-auth-devise/authorizers/devise","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["./configuration","simple-auth/utils/get-global-config","simple-auth-devise/authenticators/devise","simple-auth-devise/authorizers/devise","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    var Authenticator = __dependency1__["default"];
-    var Authorizer = __dependency2__["default"];
+    var Configuration = __dependency1__["default"];
+    var getGlobalConfig = __dependency2__["default"];
+    var Authenticator = __dependency3__["default"];
+    var Authorizer = __dependency4__["default"];
 
     __exports__["default"] = {
       name:       'simple-auth-devise',
       before:     'simple-auth',
       initialize: function(container, application) {
+        var config = getGlobalConfig('simple-auth-devise');
+        Configuration.load(container, config);
         container.register('simple-auth-authorizer:devise', Authorizer);
         container.register('simple-auth-authenticator:devise', Authenticator);
       }
@@ -300,11 +350,16 @@ define('simple-auth/utils/is-secure-url',  ['exports'], function(__exports__) {
 define('simple-auth/utils/get-global-config',  ['exports'], function(__exports__) {
   __exports__['default'] = global.SimpleAuth.Utils.getGlobalConfig;
 });
+define('simple-auth/utils/load-config',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.SimpleAuth.Utils.loadConfig;
+});
 
 var initializer   = requireModule('simple-auth-devise/initializer')['default'];
+var Configuration = requireModule('simple-auth-devise/configuration')['default'];
 var Authenticator = requireModule('simple-auth-devise/authenticators/devise')['default'];
 var Authorizer    = requireModule('simple-auth-devise/authorizers/devise')['default'];
 
+global.SimpleAuth.Configuration.Devise  = Configuration;
 global.SimpleAuth.Authenticators.Devise = Authenticator;
 global.SimpleAuth.Authorizers.Devise    = Authorizer;
 

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth OAuth 2.0', '0.6.6');
+Ember.libraries.register('Ember Simple Auth OAuth 2.0', '0.6.7');
 
 var define, requireModule;
 
@@ -57,12 +57,12 @@ var define, requireModule;
 })();
 
 define("simple-auth-oauth2/authenticators/oauth2", 
-  ["simple-auth/authenticators/base","simple-auth/utils/is-secure-url","simple-auth/utils/get-global-config","exports"],
+  ["simple-auth/authenticators/base","simple-auth/utils/is-secure-url","./../configuration","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Base = __dependency1__["default"];
     var isSecureUrl = __dependency2__["default"];
-    var getGlobalConfig = __dependency3__["default"];
+    var Configuration = __dependency3__["default"];
 
     /**
       Authenticator that conforms to OAuth 2
@@ -94,14 +94,8 @@ define("simple-auth-oauth2/authenticators/oauth2",
         The endpoint on the server the authenticator acquires the access token
         from.
 
-        This value can be configured via the global environment object:
-
-        ```js
-        window.ENV = window.ENV || {};
-        window.ENV['simple-auth-oauth2'] = {
-          serverTokenEndpoint: '/some/custom/endpoint'
-        }
-        ```
+        This value can be configured via
+        [`SimpleAuth.Configuration.OAuth2#serverTokenEndpoint`](#SimpleAuth-Configuration-OAuth2-serverTokenEndpoint).
 
         @property serverTokenEndpoint
         @type String
@@ -113,14 +107,8 @@ define("simple-auth-oauth2/authenticators/oauth2",
         The endpoint on the server the authenticator uses to revoke tokens. Only
         set this if the server actually supports token revokation.
 
-        This value can be configured via the global environment object:
-
-        ```js
-        window.ENV = window.ENV || {};
-        window.ENV['simple-auth-oauth2'] = {
-          serverTokenRevocationEndpoint: '/some/custom/endpoint'
-        }
-        ```
+        This value can be configured via
+        [`SimpleAuth.Configuration.OAuth2#serverTokenRevocationEndpoint`](#SimpleAuth-Configuration-OAuth2-serverTokenRevocationEndpoint).
 
         @property serverTokenRevocationEndpoint
         @type String
@@ -131,14 +119,8 @@ define("simple-auth-oauth2/authenticators/oauth2",
       /**
         Sets whether the authenticator automatically refreshes access tokens.
 
-        This value can be configured via the global environment object:
-
-        ```js
-        window.ENV = window.ENV || {};
-        window.ENV['simple-auth-oauth2'] = {
-          refreshAccessTokens: false
-        }
-        ```
+        This value can be configured via
+        [`SimpleAuth.Configuration.OAuth2#refreshAccessTokens`](#SimpleAuth-Configuration-OAuth2-refreshAccessTokens).
 
         @property refreshAccessTokens
         @type Boolean
@@ -157,10 +139,9 @@ define("simple-auth-oauth2/authenticators/oauth2",
         @private
       */
       init: function() {
-        var globalConfig                   = getGlobalConfig('simple-auth-oauth2');
-        this.serverTokenEndpoint           = globalConfig.serverTokenEndpoint || this.serverTokenEndpoint;
-        this.serverTokenRevocationEndpoint = globalConfig.serverTokenRevocationEndpoint || this.serverTokenRevocationEndpoint;
-        this.refreshAccessTokens           = globalConfig.refreshAccessTokens || this.refreshAccessTokens;
+        this.serverTokenEndpoint           = Configuration.serverTokenEndpoint;
+        this.serverTokenRevocationEndpoint = Configuration.serverTokenRevocationEndpoint;
+        this.refreshAccessTokens           = Configuration.refreshAccessTokens;
       },
 
       /**
@@ -378,7 +359,7 @@ define("simple-auth-oauth2/authorizers/oauth2",
 
       @class OAuth2
       @namespace SimpleAuth.Authorizers
-      @module simple-auth-devise/authorizers/oauth2
+      @module simple-auth-oauth2/authorizers/oauth2
       @extends Base
     */
     __exports__["default"] = Base.extend({
@@ -405,6 +386,78 @@ define("simple-auth-oauth2/authorizers/oauth2",
       }
     });
   });
+define("simple-auth-oauth2/configuration", 
+  ["simple-auth/utils/load-config","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var loadConfig = __dependency1__["default"];
+
+    var defaults = {
+      serverTokenEndpoint:           '/token',
+      serverTokenRevocationEndpoint: null,
+      refreshAccessTokens:           true
+    };
+
+    /**
+      Ember Simple Auth OAuth2's configuration object.
+
+      To change any of these values, define a global environment object for Ember
+      Simple Auth and define the values there:
+
+      ```js
+      window.ENV = window.ENV || {};
+      window.ENV['simple-auth-oauth2'] = {
+        serverTokenEndpoint: '/some/custom/endpoint'
+      }
+      ```
+
+      @class OAuth2
+      @namespace SimpleAuth.Configuration
+      @module simple-auth/configuration
+    */
+    __exports__["default"] = {
+      /**
+        The endpoint on the server the authenticator acquires the access token
+        from.
+
+        @property serverTokenEndpoint
+        @readOnly
+        @static
+        @type String
+        @default '/token'
+      */
+      serverTokenEndpoint: defaults.serverTokenEndpoint,
+
+      /**
+        The endpoint on the server the authenticator uses to revoke tokens. Only
+        set this if the server actually supports token revokation.
+
+        @property serverTokenRevocationEndpoint
+        @readOnly
+        @static
+        @type String
+        @default null
+      */
+      serverTokenRevocationEndpoint: defaults.serverTokenRevocationEndpoint,
+
+      /**
+        Sets whether the authenticator automatically refreshes access tokens.
+
+        @property refreshAccessTokens
+        @readOnly
+        @static
+        @type Boolean
+        @default true
+      */
+      refreshAccessTokens: defaults.refreshAccessTokens,
+
+      /**
+        @method load
+        @private
+      */
+      load: loadConfig(defaults)
+    };
+  });
 define("simple-auth-oauth2/ember", 
   ["./initializer"],
   function(__dependency1__) {
@@ -416,16 +469,20 @@ define("simple-auth-oauth2/ember",
     });
   });
 define("simple-auth-oauth2/initializer", 
-  ["simple-auth-oauth2/authenticators/oauth2","simple-auth-oauth2/authorizers/oauth2","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["./configuration","simple-auth/utils/get-global-config","simple-auth-oauth2/authenticators/oauth2","simple-auth-oauth2/authorizers/oauth2","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    var Authenticator = __dependency1__["default"];
-    var Authorizer = __dependency2__["default"];
+    var Configuration = __dependency1__["default"];
+    var getGlobalConfig = __dependency2__["default"];
+    var Authenticator = __dependency3__["default"];
+    var Authorizer = __dependency4__["default"];
 
     __exports__["default"] = {
       name:       'simple-auth-oauth2',
       before:     'simple-auth',
       initialize: function(container, application) {
+        var config = getGlobalConfig('simple-auth-oauth2');
+        Configuration.load(container, config);
         container.register('simple-auth-authorizer:oauth2-bearer', Authorizer);
         container.register('simple-auth-authenticator:oauth2-password-grant', Authenticator);
       }
@@ -443,11 +500,16 @@ define('simple-auth/utils/is-secure-url',  ['exports'], function(__exports__) {
 define('simple-auth/utils/get-global-config',  ['exports'], function(__exports__) {
   __exports__['default'] = global.SimpleAuth.Utils.getGlobalConfig;
 });
+define('simple-auth/utils/load-config',  ['exports'], function(__exports__) {
+  __exports__['default'] = global.SimpleAuth.Utils.loadConfig;
+});
 
 var initializer   = requireModule('simple-auth-oauth2/initializer')['default'];
+var Configuration = requireModule('simple-auth-oauth2/configuration')['default'];
 var Authenticator = requireModule('simple-auth-oauth2/authenticators/oauth2')['default'];
 var Authorizer    = requireModule('simple-auth-oauth2/authorizers/oauth2')['default'];
 
+global.SimpleAuth.Configuration.OAuth2  = Configuration;
 global.SimpleAuth.Authenticators.OAuth2 = Authenticator;
 global.SimpleAuth.Authorizers.OAuth2    = Authorizer;
 

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth Testing', '0.6.6');
+Ember.libraries.register('Ember Simple Auth Testing', '0.6.7');
 
 var define, requireModule;
 

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth Torii', '0.6.6');
+Ember.libraries.register('Ember Simple Auth Torii', '0.6.7');
 
 var define, requireModule;
 

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

@@ -1,6 +1,6 @@
 (function(global) {
 
-Ember.libraries.register('Ember Simple Auth', '0.6.6');
+Ember.libraries.register('Ember Simple Auth', '0.6.7');
 
 var define, requireModule;
 
@@ -82,7 +82,7 @@ define("simple-auth/authenticators/base",
       __Custom authenticators have to be registered with Ember's dependency
       injection container__ so that the session can retrieve an instance, e.g.:
 
-      ```javascript
+      ```js
       import Base from 'simple-auth/authenticators/base';
 
       var CustomAuthenticator = Base.extend({
@@ -97,7 +97,7 @@ define("simple-auth/authenticators/base",
       });
       ```
 
-      ```javascript
+      ```js
       // app/controllers/login.js
       import AuthenticationControllerMixin from 'simple-auth/mixins/authentication-controller-mixin';
 
@@ -258,10 +258,22 @@ define("simple-auth/authorizers/base",
     });
   });
 define("simple-auth/configuration", 
-  ["./utils/get-global-config","exports"],
+  ["simple-auth/utils/load-config","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
-    var getGlobalConfig = __dependency1__["default"];
+    var loadConfig = __dependency1__["default"];
+
+    var defaults = {
+      authenticationRoute:         'login',
+      routeAfterAuthentication:    'index',
+      routeIfAlreadyAuthenticated: 'index',
+      sessionPropertyName:         'session',
+      authorizer:                  null,
+      session:                     'simple-auth-session:main',
+      store:                       'simple-auth-session-store:local-storage',
+      crossOriginWhitelist:        [],
+      applicationRootUrl:          null
+    };
 
     /**
       Ember Simple Auth's configuration object.
@@ -269,7 +281,7 @@ define("simple-auth/configuration",
       To change any of these values, define a global environment object for Ember
       Simple Auth and define the values there:
 
-      ```javascript
+      ```js
       window.ENV = window.ENV || {};
       window.ENV['simple-auth'] = {
         authenticationRoute: 'sign-in'
@@ -290,7 +302,7 @@ define("simple-auth/configuration",
         @type String
         @default 'login'
       */
-      authenticationRoute: 'login',
+      authenticationRoute: defaults.authenticationRoute,
 
       /**
         The route to transition to after successful authentication.
@@ -301,7 +313,7 @@ define("simple-auth/configuration",
         @type String
         @default 'index'
       */
-      routeAfterAuthentication: 'index',
+      routeAfterAuthentication: defaults.routeAfterAuthentication,
 
       /**
         The route to transition to if a route that implements
@@ -314,7 +326,7 @@ define("simple-auth/configuration",
         @type String
         @default 'index'
       */
-      routeIfAlreadyAuthenticated: 'index',
+      routeIfAlreadyAuthenticated: defaults.routeIfAlreadyAuthenticated,
 
       /**
         The name of the property that the session is injected with into routes and
@@ -326,7 +338,7 @@ define("simple-auth/configuration",
         @type String
         @default 'session'
       */
-      sessionPropertyName: 'session',
+      sessionPropertyName: defaults.sessionPropertyName,
 
       /**
         The authorizer factory to use as it is registered with Ember's container,
@@ -341,7 +353,7 @@ define("simple-auth/configuration",
         @type String
         @default null
       */
-      authorizer: null,
+      authorizer: defaults.authorizer,
 
       /**
         The session factory to use as it is registered with Ember's container,
@@ -354,7 +366,7 @@ define("simple-auth/configuration",
         @type String
         @default 'simple-auth-session:main'
       */
-      session: 'simple-auth-session:main',
+      session: defaults.session,
 
       /**
         The store factory to use as it is registered with Ember's container, see
@@ -366,7 +378,7 @@ define("simple-auth/configuration",
         @type String
         @default simple-auth-session-store:local-storage
       */
-      store: 'simple-auth-session-store:local-storage',
+      store: defaults.store,
 
       /**
         Ember Simple Auth will never authorize requests going to a different origin
@@ -381,30 +393,21 @@ define("simple-auth/configuration",
         @type Array
         @default []
       */
-      crossOriginWhitelist: [],
+      crossOriginWhitelist: defaults.crossOriginWhitelist,
 
       /**
         @property applicationRootUrl
         @private
       */
-      applicationRootUrl: null,
+      applicationRootUrl: defaults.applicationRootUrl,
 
       /**
         @method load
         @private
       */
-      load: function(container) {
-        var globalConfig              = getGlobalConfig('simple-auth');
-        this.authenticationRoute      = globalConfig.authenticationRoute || this.authenticationRoute;
-        this.routeAfterAuthentication = globalConfig.routeAfterAuthentication || this.routeAfterAuthentication;
-        this.routeIfAlreadyAuthenticated     = globalConfig.routeIfAlreadyAuthenticated || this.routeIfAlreadyAuthenticated;
-        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') || '/';
-      }
+      load: loadConfig(defaults, function(container, config) {
+        this.applicationRootUrl = container.lookup('router:main').get('rootURL') || '/';
+      })
     };
   });
 define("simple-auth/ember", 
@@ -418,14 +421,18 @@ define("simple-auth/ember",
     });
   });
 define("simple-auth/initializer", 
-  ["./setup","exports"],
-  function(__dependency1__, __exports__) {
+  ["./configuration","./utils/get-global-config","./setup","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var setup = __dependency1__["default"];
+    var Configuration = __dependency1__["default"];
+    var getGlobalConfig = __dependency2__["default"];
+    var setup = __dependency3__["default"];
 
     __exports__["default"] = {
       name:       'simple-auth',
       initialize: function(container, application) {
+        var config = getGlobalConfig('simple-auth');
+        Configuration.load(container, config);
         setup(container, application);
       }
     };
@@ -471,7 +478,7 @@ define("simple-auth/mixins/application-route-mixin",
       be automatically translated into route actions but would have to be handled
       inidivially, e.g. in an initializer:
 
-      ```javascript
+      ```js
       Ember.Application.initializer({
         name:       'authentication',
         after:      'simple-auth',
@@ -531,7 +538,7 @@ define("simple-auth/mixins/application-route-mixin",
           because it opens a new window to handle authentication there), this is
           the action to override, e.g.:__
 
-          ```javascript
+          ```js
           App.ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, {
             actions: {
               authenticateSession: function() {
@@ -576,7 +583,7 @@ define("simple-auth/mixins/application-route-mixin",
 
           It can be overridden to display error messages etc.:
 
-          ```javascript
+          ```js
           App.ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, {
             actions: {
               sessionAuthenticationFailed: function(error) {
@@ -658,7 +665,7 @@ define("simple-auth/mixins/authenticated-route-mixin",
       [`Configuration.authenticationRoute`](#SimpleAuth-Configuration-authenticationRoute)
       if it is not.
 
-      ```javascript
+      ```js
       // app/routes/protected.js
       import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
 
@@ -821,7 +828,7 @@ define("simple-auth/mixins/unauthenticated-route-mixin",
       [`Configuration.routeIfAlreadyAuthenticated`](#SimpleAuth-Configuration-routeIfAlreadyAuthenticated),
       which defaults to `'index'`.
 
-      ```javascript
+      ```js
       // app/routes/login.js
       import UnauthenticatedRouteMixin from 'simple-auth/mixins/unauthenticated-route-mixin';
 
@@ -881,7 +888,7 @@ define("simple-auth/session",
       method with the authenticator factory to use as well as any options the
       authenticator needs to authenticate the session:
 
-      ```javascript
+      ```js
       this.get('session').authenticate('authenticator:custom', { some: 'option' }).then(function() {
         // authentication was successful
       }, function() {
@@ -1242,7 +1249,6 @@ define("simple-auth/setup",
       @private
     **/
     __exports__["default"] = function(container, application) {
-      Configuration.load(container);
       application.deferReadiness();
       registerFactories(container);
 
@@ -1547,7 +1553,7 @@ define("simple-auth/utils/get-global-config",
     var global = (typeof window !== 'undefined') ? window : {};
 
     __exports__["default"] = function(scope) {
-      return(global.ENV || {})[scope] || {};
+      return Ember.get(global, 'ENV.' + scope) || {};
     }
   });
 define("simple-auth/utils/is-secure-url", 
@@ -1565,6 +1571,24 @@ define("simple-auth/utils/is-secure-url",
       return link.protocol == 'https:';
     }
   });
+define("simple-auth/utils/load-config", 
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    __exports__["default"] = function(defaults, callback) {
+      return function(container, config) {
+        var wrappedConfig = Ember.Object.create(config);
+        for (var property in this) {
+          if (this.hasOwnProperty(property) && Ember.typeOf(this[property]) !== 'function') {
+            this[property] = wrappedConfig.getWithDefault(property, defaults[property]);
+          }
+        }
+        if (callback) {
+          callback.apply(this, [container, config]);
+        }
+      };
+    }
+  });
 var initializer                   = requireModule('simple-auth/initializer')['default'];
 var Configuration                 = requireModule('simple-auth/configuration')['default'];
 var Session                       = requireModule('simple-auth/session')['default'];
@@ -1576,6 +1600,7 @@ var EphemeralStore                = requireModule('simple-auth/stores/ephemeral'
 var flatObjectsAreEqual           = requireModule('simple-auth/utils/flat-objects-are-equal')['default'];
 var isSecureUrl                   = requireModule('simple-auth/utils/is-secure-url')['default'];
 var getGlobalConfig               = requireModule('simple-auth/utils/get-global-config')['default'];
+var loadConfig                    = requireModule('simple-auth/utils/load-config')['default'];
 var ApplicationRouteMixin         = requireModule('simple-auth/mixins/application-route-mixin')['default'];
 var AuthenticatedRouteMixin       = requireModule('simple-auth/mixins/authenticated-route-mixin')['default'];
 var AuthenticationControllerMixin = requireModule('simple-auth/mixins/authentication-controller-mixin')['default'];
@@ -1604,7 +1629,8 @@ global.SimpleAuth = {
   Utils: {
     flatObjectsAreEqual: flatObjectsAreEqual,
     isSecureUrl:         isSecureUrl,
-    getGlobalConfig:     getGlobalConfig
+    getGlobalConfig:     getGlobalConfig,
+    loadConfig:          loadConfig
   },
 
   ApplicationRouteMixin:         ApplicationRouteMixin,
@@ -1616,5 +1642,5 @@ global.SimpleAuth = {
 
 requireModule('simple-auth/ember');
 
-Ember.libraries.register('Ember Simple Auth', '0.6.6');
+Ember.libraries.register('Ember Simple Auth', '0.6.7');
 })((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.6
+  version: 0.6.7
 platform: ruby
 authors:
 - frederik dudzik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-27 00:00:00.000000000 Z
+date: 2014-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler