Clarify use of RSVP lib, use as direct import

addon/adapters/application.js

@@ -4,10 +4,11 @@
 **/
 
 import Ember from 'ember';
+import RSVP from 'rsvp';
 import { pluralize } from 'ember-inflector';
 import FetchMixin from 'ember-jsonapi-resources/mixins/fetch';
 
-const { Evented, RSVP, getOwner } = Ember;
+const { Evented, getOwner } = Ember;
 
 /**
   Adapter for a JSON API endpoint, use as a service for your backend
@@ -321,7 +322,7 @@ export default Ember.Object.extend(FetchMixin, Evented, {
     @method fetch
     @param {String} url
     @param {Object} options may include a query object or an update flag
-    @return {Ember.RSVP.Promise}
+    @return {Promise}
   */
   fetch(url, options = {}) {
     url = this.fetchUrl(url);

addon/mixins/fetch.js

@@ -3,6 +3,7 @@
   @submodule fetch
 **/
 import Ember from 'ember';
+import RSVP from 'rsvp';
 import { ServerError, ClientError, FetchError } from 'ember-jsonapi-resources/utils/errors';
 
 /**
@@ -42,10 +43,10 @@ export default Ember.Mixin.create({
     @param {String} url
     @param {Object} options - May include a query object or an update flag
     @param {Boolean} isUpdate
-    @return {Ember.RSVP.Promise}
+    @return {Promise}
   */
   _fetch(url, options, isUpdate) {
-    return new Ember.RSVP.Promise(function(resolve, reject) {
+    return new RSVP.Promise(function(resolve, reject) {
       window.fetch(url, options).then(function(response) {
         if (response.status >= 500) {
           this.fetchServerErrorHandler(response, reject);
@@ -160,13 +161,13 @@ export default Ember.Mixin.create({
     @param {String} url
     @param {Object} options - may include a query object or an update flag
     @param {Boolean} isUpdate
-    @return {Ember.RSVP.Promise}
+    @return {Promise}
     @requires jQuery
   */
   _ajax(url, options, isUpdate) {
     options.data = options.body;
     delete options.body;
-    return new Ember.RSVP.Promise(function(resolve, reject) {
+    return new RSVP.Promise(function(resolve, reject) {
       Ember.$.ajax(url, options)
         .done(this.ajaxDoneHandler(resolve, isUpdate))
         .fail(this.ajaxFailHandler(reject));

addon/utils/related-proxy.js

@@ -5,6 +5,7 @@
 **/
 
 import Ember from 'ember';
+import RSVP from 'rsvp';
 import { pluralize } from 'ember-inflector';
 
 /**
@@ -157,7 +158,7 @@ const RelatedProxyUtil = Ember.Object.extend({
     } else {
       content = this.serviceCacheLookup(service, data);
     }
-    return (content) ? Ember.RSVP.Promise.resolve(content) : null;
+    return (content) ? RSVP.Promise.resolve(content) : null;
   },
 
   /**

tests/acceptance/polymorphic-test.js

@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import RSVP from 'rsvp';
 import { module, test } from 'qunit';
 import startApp from '../../tests/helpers/start-app';
 
@@ -94,46 +95,46 @@ function setupFetchResonses(sandbox) {
 }
 
 function picturesMockResponse() {
-  return Ember.RSVP.Promise.resolve({
+  return RSVP.Promise.resolve({
     "status": 200,
     "json": function() {
-      return Ember.RSVP.Promise.resolve(picturesMock);
+      return RSVP.Promise.resolve(picturesMock);
     }
   });
 }
 
 function pictures1MockResponse() {
-  return Ember.RSVP.Promise.resolve({
+  return RSVP.Promise.resolve({
     "status": 200,
     "json": function() {
-      return Ember.RSVP.Promise.resolve(pictures1Mock);
+      return RSVP.Promise.resolve(pictures1Mock);
     }
   });
 }
 
 function pictures1ImageableMockResponse() {
-  return Ember.RSVP.Promise.resolve({
+  return RSVP.Promise.resolve({
     "status": 200,
     "json": function() {
-      return Ember.RSVP.Promise.resolve(pictures1ImageableMock);
+      return RSVP.Promise.resolve(pictures1ImageableMock);
     }
   });
 }
 
 function pictures5MockResponse() {
-  return Ember.RSVP.Promise.resolve({
+  return RSVP.Promise.resolve({
     "status": 200,
     "json": function() {
-      return Ember.RSVP.Promise.resolve(pictures5Mock);
+      return RSVP.Promise.resolve(pictures5Mock);
     }
   });
 }
 
 function pictures5ImageableMockResponse() {
-  return Ember.RSVP.Promise.resolve({
+  return RSVP.Promise.resolve({
     "status": 200,
     "json": function() {
-      return Ember.RSVP.Promise.resolve(pictures5ImageableMock);
+      return RSVP.Promise.resolve(pictures5ImageableMock);
     }
   });
 }

tests/dummy/app/routes/post.js

@@ -1,8 +1,9 @@
 import Ember from 'ember';
+import RSVP from 'rsvp';
 
 export default Ember.Route.extend({
   model(params) {
-    return new Ember.RSVP.Promise(function (resolve, reject) {
+    return new RSVP.Promise(function (resolve, reject) {
       const found = this.store.all('posts').filter(function (post) {
         return post.get('id') === params.post_id;
       });

tests/helpers/resources.js

@@ -1,6 +1,7 @@
 import Resource from 'ember-jsonapi-resources/models/resource';
 import { attr, hasOne, hasMany } from 'ember-jsonapi-resources/models/resource';
 import Ember from 'ember';
+import RSVP from 'rsvp';
 
 export const Post = Resource.extend({
   type: 'posts',
@@ -62,7 +63,7 @@ export function mockServices() {
   let types = Ember.String.w('posts authors comments commenters people employees supervisors');
   let mockService = Ember.Service.extend({
     cacheLookup(/*id*/) { return undefined; },
-    findRelated() { return Ember.RSVP.resolve(null); }
+    findRelated() { return RSVP.resolve(null); }
   });
   for (let i = 0; i < types.length; i++) {
     this.registry.register('service:' + types[i], mockService);