ember-auth-source 7.1.3 → 7.2.0

data/dist/ember-auth.js

@@ -21,13 +21,13 @@ set$(Em, 'Auth', get$(Em, 'Object').extend(get$(Em, 'Evented'), {
     return get$(get$(this, '_module'), 'syncEvent').apply(get$(this, '_module'), arguments);
   },
   ensurePromise: function (callback) {
-    var cache$, deferred, ret;
+    var cache$, ret;
     if (null != (null != (cache$ = ret = callback()) ? get$(cache$, 'then') : void 0)) {
       return ret;
     } else {
-      deferred = get$(Em, 'Deferred').create();
-      deferred.resolve(deferred);
-      return deferred;
+      return new (get$(get$(Em, 'RSVP'), 'Promise'))(function (resolve) {
+        return resolve();
+      });
     }
   },
   followPromise: function (ret, callback) {
@@ -41,17 +41,16 @@ set$(Em, 'Auth', get$(Em, 'Object').extend(get$(Em, 'Evented'), {
       });
     }
   },
-  wrapDeferred: function (callback) {
-    var deferred, reject, resolve;
-    deferred = get$(Em, 'Deferred').create();
-    resolve = function () {
-      return deferred.resolve(deferred);
-    };
-    reject = function () {
-      return deferred.reject(deferred);
-    };
-    callback(resolve, reject);
-    return deferred;
+  wrapPromise: function (callback) {
+    var promise, rej, res;
+    res = null;
+    rej = null;
+    promise = new (get$(get$(Em, 'RSVP'), 'Promise'))(function (resolve, reject) {
+      res = resolve;
+      return rej = reject;
+    });
+    callback(res, rej);
+    return promise;
   },
   requestAdapter: 'jquery',
   responseAdapter: 'json',
@@ -78,13 +77,17 @@ set$(Em, 'Auth', get$(Em, 'Object').extend(get$(Em, 'Evented'), {
   rememberable: {
     tokenKey: null,
     period: 14,
-    autoRecall: true
+    autoRecall: true,
+    endPoint: null
   },
   timeoutable: {
     period: 20,
     callback: null
   },
-  urlAuthenticatable: { paramsKey: null }
+  urlAuthenticatable: {
+    paramsKey: null,
+    endPoint: null
+  }
 }));// Generated by EmberScript 0.0.7
 var get$ = Ember.get;
 var set$ = Ember.set;
@@ -105,19 +108,23 @@ set$(get$(Em, 'Auth'), 'Request', Ember.Object.extend({
     if (null != get$(get$(this, 'adapter'), 'syncEvent'))
       return get$(get$(this, 'adapter'), 'syncEvent').apply(get$(this, 'adapter'), arguments);
   },
-  signIn: function (opts) {
+  signIn: function (url, opts) {
     var this$;
+    if (typeof opts === 'undefined') {
+      opts = url;
+      url = this.resolveUrl(get$(get$(this, 'auth'), 'signInEndPoint'));
+    }
     return get$(this, 'auth').ensurePromise((this$ = this, function () {
-      var url;
-      url = this$.resolveUrl(get$(get$(this$, 'auth'), 'signInEndPoint'));
       return get$(this$, 'adapter').signIn(url, get$(get$(this$, 'auth'), '_strategy').serialize(opts));
     }));
   },
-  signOut: function (opts) {
+  signOut: function (url, opts) {
     var this$;
+    if (typeof opts === 'undefined') {
+      opts = url;
+      url = this.resolveUrl(get$(get$(this, 'auth'), 'signOutEndPoint'));
+    }
     return get$(this, 'auth').ensurePromise((this$ = this, function () {
-      var url;
-      url = this$.resolveUrl(get$(get$(this$, 'auth'), 'signOutEndPoint'));
       return get$(this$, 'adapter').signOut(url, get$(get$(this$, 'auth'), '_strategy').serialize(opts));
     }));
   },
@@ -451,9 +458,13 @@ set$(get$(Em, 'Auth'), 'Session', Ember.Object.extend({
       return get$(get$(this, 'adapter'), 'syncEvent').apply(get$(this, 'adapter'), arguments);
   },
   findUser: function () {
-    var model, modelKey;
+    var cache$, model, modelKey, this$;
     if (get$(this, 'userId') && (modelKey = get$(get$(this, 'auth'), 'userModel')) && (model = Ember.get(modelKey)))
-      return set$(this, 'user', model.find(get$(this, 'userId')));
+      if (null != (null != (cache$ = set$(this, 'user', model.find(get$(this, 'userId')))) ? get$(cache$, 'then') : void 0)) {
+        return model.find(get$(this, 'userId')).then((this$ = this, function (m) {
+          return set$(this$, 'user', m);
+        }));
+      }
   },
   start: function () {
     set$(this, 'signedIn', true);
@@ -857,6 +868,27 @@ set$(get$(get$(Em, 'Auth'), 'Module'), 'EmberModel', Ember.Object.extend({
 }));// Generated by EmberScript 0.0.7
 var get$ = Ember.get;
 var set$ = Ember.set;
+set$(get$(get$(Em, 'Auth'), 'Module'), 'Epf', Ember.Object.extend({
+  init: function () {
+    return this.patch();
+  },
+  patch: function () {
+    var self;
+    self = this;
+    if ('undefined' !== typeof Ep && null != Ep && null != get$(Ep, 'RestAdapter'))
+      return get$(Ep, 'RestAdapter').reopen({
+        ajax: function (url, type, settings) {
+          settings || (settings = {});
+          set$(settings, 'url', url);
+          set$(settings, 'type', type);
+          set$(settings, 'context', this);
+          return get$(get$(self, 'auth'), '_request').send(settings);
+        }
+      });
+  }
+}));// Generated by EmberScript 0.0.7
+var get$ = Ember.get;
+var set$ = Ember.set;
 set$(get$(get$(Em, 'Auth'), 'Module'), 'Rememberable', Ember.Object.extend({
   init: function () {
     null != get$(this, 'config') || set$(this, 'config', get$(get$(this, 'auth'), 'rememberable'));
@@ -877,17 +909,25 @@ set$(get$(get$(Em, 'Auth'), 'Module'), 'Rememberable', Ember.Object.extend({
     var this$;
     if (null == opts)
       opts = {};
-    return get$(this, 'auth').wrapDeferred((this$ = this, function (resolve, reject) {
+    return get$(this, 'auth').wrapPromise((this$ = this, function (resolve, reject) {
       var token;
       if (!get$(get$(this$, 'auth'), 'signedIn') && (token = this$.retrieveToken())) {
         set$(this$, 'fromRecall', true);
         opts.data || (opts.data = {});
         get$(opts, 'data')[get$(get$(this$, 'config'), 'tokenKey')] = token;
-        return get$(this$, 'auth').signIn(opts).then(function () {
-          return resolve();
-        }, function () {
-          return resolve();
-        });
+        if (null != get$(get$(this$, 'config'), 'endPoint')) {
+          return get$(this$, 'auth').signIn(get$(get$(this$, 'config'), 'endPoint'), opts).then(function () {
+            return resolve();
+          }, function () {
+            return resolve();
+          });
+        } else {
+          return get$(this$, 'auth').signIn(opts).then(function () {
+            return resolve();
+          }, function () {
+            return resolve();
+          });
+        }
       } else {
         return resolve();
       }
@@ -1258,18 +1298,26 @@ void function () {
       var this$;
       if (null == opts)
         opts = {};
-      return get$(this, 'auth').wrapDeferred((this$ = this, function (resolve, reject) {
+      return get$(this, 'auth').wrapPromise((this$ = this, function (resolve, reject) {
         if (get$(get$(this$, 'auth'), 'signedIn'))
           return resolve();
         this$.canonicalizeParams();
         if ($.isEmptyObject(get$(this$, 'params')))
           return resolve();
         set$(opts, 'data', $.extend(true, get$(this$, 'params'), get$(opts, 'data') || {}));
-        return get$(this$, 'auth').signIn(opts).then(function () {
-          return resolve();
-        }, function () {
-          return resolve();
-        });
+        if (null != get$(get$(this$, 'config'), 'endPoint')) {
+          return get$(this$, 'auth').signIn(get$(get$(this$, 'config'), 'endPoint'), opts).then(function () {
+            return resolve();
+          }, function () {
+            return resolve();
+          });
+        } else {
+          return get$(this$, 'auth').signIn(opts).then(function () {
+            return resolve();
+          }, function () {
+            return resolve();
+          });
+        }
       }));
     },
     retrieveParams: function () {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-auth-source
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-source
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -85182207
+      hash: 802230493
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: