ember-data-source 2.7.0.beta.1 → 2.7.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33dec8fb2ecc2b2dca716443d07526b12b9b3cdf
-  data.tar.gz: 71f8117dc0fc6993d1ee95c4c6875743b0bec930
+  metadata.gz: f47cbabddb5ffb5b67d3a0ec28dceafe4ce9b490
+  data.tar.gz: 196db0db2742755e706a6adaba6f4a96b362a46f
 SHA512:
-  metadata.gz: d6fb1b062982315f424e3a3edb20d9bd41621e22eaf547c9f618d8a274af60caf224cd8e37bc38e2d25f4205975271f913ebb33b415c8b43925fecba48fea33a
-  data.tar.gz: 161aa97282f1e6ca50c67a03caa04684d2943a477cecce815520beb5724fee64509f231e9eff2eb532ec07ed59f19a0cc7282f6120882e1ac8bda5c26f6ea5c6
+  metadata.gz: 8e5e6467cd66565c370c2893846e74b7467df30ac9c55531b4488fdf970721fc5237737c8b74735b2c12d1e116c105c1e7f7fd3187ebb01a5f7f74a7fa723537
+  data.tar.gz: dd8f243dfb73782d0955a8530907d4b48577a578b2ea888e13e948ca7e57526a7bed3b0e1b937ad05dc768e80571b733f9bcadff97755bf1fb03ffe32619f7b1

data/dist/globals/ember-data.js

@@ -6,7 +6,7 @@
  * @copyright Copyright 2011-2016 Tilde Inc. and contributors.
  *            Portions Copyright 2011 LivingSocial Inc.
  * @license   Licensed under MIT license (see license.js)
- * @version   2.7.0-beta.1
+ * @version   2.7.0-beta.2
  */
 
 var loader, define, requireModule, require, requirejs;
@@ -25,7 +25,14 @@ var loader, define, requireModule, require, requirejs;
 
   requirejs = require = requireModule = function(name) {
     stats.require++;
-    return findModule(name, '(require)').module.exports;
+    var pending = [];
+    var mod = findModule(name, '(require)', pending);
+
+    for (var i = pending.length - 1; i >= 0; i--) {
+      pending[i].exports();
+    }
+
+    return mod.module.exports;
   };
 
   function resetStats() {
@@ -33,10 +40,9 @@ var loader, define, requireModule, require, requirejs;
       define: 0,
       require: 0,
       reify: 0,
-      build: 0,
+      findDeps: 0,
       modules: 0,
       exports: 0,
-      ensureBuild: 0,
       resolve: 0,
       resolveRelative: 0,
       findModule: 0,
@@ -75,8 +81,6 @@ var loader, define, requireModule, require, requirejs;
 
   var registry = {};
   var seen = {};
-  var FAILED = false;
-  var LOADED = true;
 
   var uuid = 0;
 
@@ -94,11 +98,11 @@ var loader, define, requireModule, require, requirejs;
     this.deps      = !deps.length && callback.length ? defaultDeps : deps;
     this.module    = { exports: {} };
     this.callback  = callback;
-    this.state     = undefined;
     this.finalized = false;
     this.hasExportsAsDep = false;
     this.isAlias = alias;
     this.reified = new Array(deps.length);
+    this._foundDeps = false;
   }
 
   Module.prototype.makeDefaultExport = function() {
@@ -111,46 +115,63 @@ var loader, define, requireModule, require, requirejs;
   };
 
   Module.prototype.exports = function() {
-    stats.exports ++;
-    if (this.finalized) {
-      return this.module.exports;
-    } else {
-      if (loader.wrapModules) {
-        this.callback = loader.wrapModules(this.name, this.callback);
-      }
-      var result = this.callback.apply(this, this.reified);
-      if (!(this.hasExportsAsDep && result === undefined)) {
-        this.module.exports = result;
-      }
-      this.makeDefaultExport();
-      this.finalized = true;
-      return this.module.exports;
+    if (this.finalized) { return this.module.exports; }
+    stats.exports++;
+
+    this.finalized = true;
+
+    if (loader.wrapModules) {
+      this.callback = loader.wrapModules(this.name, this.callback);
     }
+
+    this.reify();
+
+    var result = this.callback.apply(this, this.reified);
+
+    if (!(this.hasExportsAsDep && result === undefined)) {
+      this.module.exports = result;
+    }
+    this.makeDefaultExport();
+    return this.module.exports;
   };
 
   Module.prototype.unsee = function() {
     this.finalized = false;
-    this.state = undefined;
+    this._foundDeps = false;
     this.module = { exports: {}};
   };
 
   Module.prototype.reify = function() {
     stats.reify++;
-    var deps = this.deps;
-    var dep;
     var reified = this.reified;
+    for (var i = 0; i < reified.length; i++) {
+      var mod = reified[i];
+      reified[i] = mod.exports ? mod.exports : mod.module.exports();
+    }
+  };
+
+  Module.prototype.findDeps = function(pending) {
+    if (this._foundDeps) {
+      return;
+    }
+
+    stats.findDeps++;
+    this._foundDeps = true;
+
+    var deps = this.deps;
 
     for (var i = 0; i < deps.length; i++) {
-      dep = deps[i];
+      var dep = deps[i];
+      var entry = this.reified[i] = { exports: undefined, module: undefined };
       if (dep === 'exports') {
         this.hasExportsAsDep = true;
-        reified[i] = this.module.exports;
+        entry.exports = this.module.exports;
       } else if (dep === 'require') {
-        reified[i] = this.makeRequire();
+        entry.exports = this.makeRequire();
       } else if (dep === 'module') {
-        reified[i] = this.module;
+        entry.exports = this.module;
       } else {
-        reified[i] = findModule(resolve(dep, this.name), this.name).module.exports;
+        entry.module = findModule(resolve(dep, this.name), this.name, pending);
       }
     }
   };
@@ -167,16 +188,6 @@ var loader, define, requireModule, require, requirejs;
     return r;
   };
 
-  Module.prototype.build = function() {
-    stats.ensureBuild++;
-    if (this.state === FAILED || this.state === LOADED) { return; }
-    stats.build++;
-    this.state = FAILED;
-    this.reify()
-    this.exports();
-    this.state = LOADED;
-  };
-
   define = function(name, deps, callback) {
     stats.define++;
     if (arguments.length < 2) {
@@ -212,7 +223,7 @@ var loader, define, requireModule, require, requirejs;
     throw new Error('Could not find module `' + name + '` imported from `' + referrer + '`');
   }
 
-  function findModule(name, referrer) {
+  function findModule(name, referrer, pending) {
     stats.findModule++;
     var mod = registry[name] || registry[name + '/index'];
 
@@ -222,7 +233,10 @@ var loader, define, requireModule, require, requirejs;
 
     if (!mod) { missingModule(name, referrer); }
 
-    mod.build();
+    if (pending) {
+      mod.findDeps(pending);
+      pending.push(mod);
+    }
     return mod;
   }
 
@@ -258,7 +272,7 @@ var loader, define, requireModule, require, requirejs;
   requirejs.entries = requirejs._eak_seen = registry;
   requirejs.has = has;
   requirejs.unsee = function(moduleName) {
-    findModule(moduleName, '(unsee)').unsee();
+    findModule(moduleName, '(unsee)', false).unsee();
   };
 
   requirejs.clear = function() {
@@ -5232,7 +5246,9 @@ define("ember-data/-private/system/record-arrays/adapter-populated-record-array"
         meta: (0, _emberDataPrivateSystemCloneNull.default)(payload.meta)
       });
 
-      this.set('links', (0, _emberDataPrivateSystemCloneNull.default)(payload.links));
+      if (true) {
+        this.set('links', (0, _emberDataPrivateSystemCloneNull.default)(payload.links));
+      }
 
       internalModels.forEach(function (record) {
         _this.manager.recordArraysForRecord(record).add(_this);
@@ -5556,6 +5572,12 @@ define('ember-data/-private/system/references/belongs-to', ['exports', 'ember-da
       var record;
 
       if (data instanceof _emberDataModel.default) {
+        if (false) {
+          (0, _emberDataPrivateDebug.deprecate)("BelongsToReference#push(DS.Model) is deprecated. Update relationship via `model.set('relationshipName', value)` instead.", false, {
+            id: 'ds.references.belongs-to.push-record',
+            until: '3.0'
+          });
+        }
         record = data;
       } else {
         record = _this.store.push(data);
@@ -5651,13 +5673,29 @@ define('ember-data/-private/system/references/has-many', ['exports', 'ember', 'e
     return _ember.default.RSVP.resolve(objectOrPromise).then(function (payload) {
       var array = payload;
 
+      if (false) {
+        (0, _emberDataPrivateDebug.deprecate)("HasManyReference#push(array) is deprecated. Push a JSON-API document instead.", !Array.isArray(payload), {
+          id: 'ds.references.has-many.push-array',
+          until: '3.0'
+        });
+      }
+
       var useLegacyArrayPush = true;
       if (typeof payload === "object" && payload.data) {
         array = payload.data;
         useLegacyArrayPush = array.length && array[0].data;
+
+        if (false) {
+          (0, _emberDataPrivateDebug.deprecate)("HasManyReference#push() expects a valid JSON-API document.", !useLegacyArrayPush, {
+            id: 'ds.references.has-many.push-invalid-json-api',
+            until: '3.0'
+          });
+        }
       }
 
-      useLegacyArrayPush = true;
+      if (!false) {
+        useLegacyArrayPush = true;
+      }
 
       var internalModels = undefined;
       if (useLegacyArrayPush) {
@@ -8820,7 +8858,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       });
       ```
        Note: the primary use case for `store.queryRecord` is when a single record
-      is queried and the `id` is not kown beforehand. In all other cases
+      is queried and the `id` is not known beforehand. In all other cases
       `store.query` and using the first item of the array is likely the preferred
       way:
        ```
@@ -9754,10 +9792,15 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
         (0, _emberDataPrivateDebug.assert)('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + _ember.default.inspect(modelName), typeof modelName === 'string');
         serializer = this.serializerFor(modelName);
       }
-
-      this._adapterRun(function () {
-        return serializer.pushPayload(_this3, payload);
-      });
+      if (false) {
+        return this._adapterRun(function () {
+          return serializer.pushPayload(_this3, payload);
+        });
+      } else {
+        this._adapterRun(function () {
+          return serializer.pushPayload(_this3, payload);
+        });
+      }
     },
 
     /**
@@ -10550,8 +10593,10 @@ define('ember-data/-private/transforms/boolean', ['exports', 'ember', 'ember-dat
     deserialize: function (serialized, options) {
       var type = typeof serialized;
 
-      if (isNone(serialized) && options.allowNull === true) {
-        return null;
+      if (true) {
+        if (isNone(serialized) && options.allowNull === true) {
+          return null;
+        }
       }
 
       if (type === "boolean") {
@@ -10566,8 +10611,10 @@ define('ember-data/-private/transforms/boolean', ['exports', 'ember', 'ember-dat
     },
 
     serialize: function (deserialized, options) {
-      if (isNone(deserialized) && options.allowNull === true) {
-        return null;
+      if (true) {
+        if (isNone(deserialized) && options.allowNull === true) {
+          return null;
+        }
       }
 
       return Boolean(deserialized);
@@ -11368,6 +11415,9 @@ define('ember-data/adapters/errors', ['exports', 'ember', 'ember-data/-private/d
   }
 
   var extendedErrorsEnabled = false;
+  if (false) {
+    extendedErrorsEnabled = true;
+  }
 
   function extendFn(ErrorClass) {
     return function () {
@@ -11571,7 +11621,7 @@ define('ember-data/adapters/errors', ['exports', 'ember', 'ember-data/-private/d
     return out;
   }
 });
-define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters/rest', 'ember-data/-private/features'], function (exports, _ember, _emberDataAdaptersRest, _emberDataPrivateFeatures) {
+define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters/rest', 'ember-data/-private/features', 'ember-data/-private/debug'], function (exports, _ember, _emberDataAdaptersRest, _emberDataPrivateFeatures, _emberDataPrivateDebug) {
 
   /**
     @class JSONAPIAdapter
@@ -11655,7 +11705,12 @@ define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters
       @return {Promise} promise
     */
     findMany: function (store, type, ids, snapshots) {
-      return this._super.apply(this, arguments);
+      if (true && !this._hasCustomizedAjax()) {
+        return this._super.apply(this, arguments);
+      } else {
+        var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
+        return this.ajax(url, 'GET', { data: { filter: { id: ids.join(',') } } });
+      }
     },
 
     /**
@@ -11677,65 +11732,100 @@ define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters
       @return {Promise} promise
     */
     updateRecord: function (store, type, snapshot) {
-      return this._super.apply(this, arguments);
-    }
-  });
+      if (true && !this._hasCustomizedAjax()) {
+        return this._super.apply(this, arguments);
+      } else {
+        var data = {};
+        var serializer = store.serializerFor(type.modelName);
 
-  JSONAPIAdapter.reopen({
+        serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
 
-    methodForRequest: function (params) {
-      if (params.requestType === 'updateRecord') {
-        return 'PATCH';
-      }
+        var id = snapshot.id;
+        var url = this.buildURL(type.modelName, id, snapshot, 'updateRecord');
 
-      return this._super.apply(this, arguments);
+        return this.ajax(url, 'PATCH', { data: data });
+      }
     },
 
-    dataForRequest: function (params) {
-      var requestType = params.requestType;
-      var ids = params.ids;
+    _hasCustomizedAjax: function () {
+      if (this.ajax !== JSONAPIAdapter.prototype.ajax) {
+        (0, _emberDataPrivateDebug.deprecate)('JSONAPIAdapter#ajax has been deprecated please use. `methodForRequest`, `urlForRequest`, `headersForRequest` or `dataForRequest` instead.', false, {
+          id: 'ds.json-api-adapter.ajax',
+          until: '3.0.0'
+        });
+        return true;
+      }
 
-      if (requestType === 'findMany') {
-        return {
-          filter: { id: ids.join(',') }
-        };
+      if (this.ajaxOptions !== JSONAPIAdapter.prototype.ajaxOptions) {
+        (0, _emberDataPrivateDebug.deprecate)('JSONAPIAdapterr#ajaxOptions has been deprecated please use. `methodForRequest`, `urlForRequest`, `headersForRequest` or `dataForRequest` instead.', false, {
+          id: 'ds.json-api-adapter.ajax-options',
+          until: '3.0.0'
+        });
+        return true;
       }
 
-      if (requestType === 'updateRecord') {
-        var store = params.store;
-        var type = params.type;
-        var snapshot = params.snapshot;
+      return false;
+    }
+  });
 
-        var data = {};
-        var serializer = store.serializerFor(type.modelName);
+  if (true) {
 
-        serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
+    JSONAPIAdapter.reopen({
 
-        return data;
-      }
+      methodForRequest: function (params) {
+        if (params.requestType === 'updateRecord') {
+          return 'PATCH';
+        }
 
-      return this._super.apply(this, arguments);
-    },
+        return this._super.apply(this, arguments);
+      },
 
-    headersForRequest: function () {
-      var headers = this._super.apply(this, arguments) || {};
+      dataForRequest: function (params) {
+        var requestType = params.requestType;
+        var ids = params.ids;
 
-      headers['Accept'] = 'application/vnd.api+json';
+        if (requestType === 'findMany') {
+          return {
+            filter: { id: ids.join(',') }
+          };
+        }
 
-      return headers;
-    },
+        if (requestType === 'updateRecord') {
+          var store = params.store;
+          var type = params.type;
+          var snapshot = params.snapshot;
 
-    _requestToJQueryAjaxHash: function () {
-      var hash = this._super.apply(this, arguments);
+          var data = {};
+          var serializer = store.serializerFor(type.modelName);
 
-      if (hash.contentType) {
-        hash.contentType = 'application/vnd.api+json';
-      }
+          serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
 
-      return hash;
-    }
+          return data;
+        }
 
-  });
+        return this._super.apply(this, arguments);
+      },
+
+      headersForRequest: function () {
+        var headers = this._super.apply(this, arguments) || {};
+
+        headers['Accept'] = 'application/vnd.api+json';
+
+        return headers;
+      },
+
+      _requestToJQueryAjaxHash: function () {
+        var hash = this._super.apply(this, arguments);
+
+        if (hash.contentType) {
+          hash.contentType = 'application/vnd.api+json';
+        }
+
+        return hash;
+      }
+
+    });
+  }
 
   exports.default = JSONAPIAdapter;
 });
@@ -12103,12 +12193,19 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findRecord: function (store, type, id, snapshot) {
-      var request = this._requestFor({
-        store: store, type: type, id: id, snapshot: snapshot,
-        requestType: 'findRecord'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, type: type, id: id, snapshot: snapshot,
+          requestType: 'findRecord'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var url = this.buildURL(type.modelName, id, snapshot, 'findRecord');
+        var query = this.buildQuery(snapshot);
 
-      return this._makeRequest(request);
+        return this.ajax(url, 'GET', { data: query });
+      }
     },
 
     /**
@@ -12126,13 +12223,23 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
     findAll: function (store, type, sinceToken, snapshotRecordArray) {
       var query = this.buildQuery(snapshotRecordArray);
 
-      var request = this._requestFor({
-        store: store, type: type, sinceToken: sinceToken, query: query,
-        snapshots: snapshotRecordArray,
-        requestType: 'findAll'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, type: type, sinceToken: sinceToken, query: query,
+          snapshots: snapshotRecordArray,
+          requestType: 'findAll'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var url = this.buildURL(type.modelName, null, snapshotRecordArray, 'findAll');
+
+        if (sinceToken) {
+          query.since = sinceToken;
+        }
 
-      return this._makeRequest(request);
+        return this.ajax(url, 'GET', { data: query });
+      }
     },
 
     /**
@@ -12150,12 +12257,22 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     query: function (store, type, query) {
-      var request = this._requestFor({
-        store: store, type: type, query: query,
-        requestType: 'query'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, type: type, query: query,
+          requestType: 'query'
+        });
 
-      return this._makeRequest(request);
+        return this._makeRequest(request);
+      } else {
+        var url = this.buildURL(type.modelName, null, null, 'query', query);
+
+        if (this.sortQueryParams) {
+          query = this.sortQueryParams(query);
+        }
+
+        return this.ajax(url, 'GET', { data: query });
+      }
     },
 
     /**
@@ -12173,12 +12290,22 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     queryRecord: function (store, type, query) {
-      var request = this._requestFor({
-        store: store, type: type, query: query,
-        requestType: 'queryRecord'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, type: type, query: query,
+          requestType: 'queryRecord'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var url = this.buildURL(type.modelName, null, null, 'queryRecord', query);
+
+        if (this.sortQueryParams) {
+          query = this.sortQueryParams(query);
+        }
 
-      return this._makeRequest(request);
+        return this.ajax(url, 'GET', { data: query });
+      }
     },
 
     /**
@@ -12208,12 +12335,17 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findMany: function (store, type, ids, snapshots) {
-      var request = this._requestFor({
-        store: store, type: type, ids: ids, snapshots: snapshots,
-        requestType: 'findMany'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, type: type, ids: ids, snapshots: snapshots,
+          requestType: 'findMany'
+        });
 
-      return this._makeRequest(request);
+        return this._makeRequest(request);
+      } else {
+        var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
+        return this.ajax(url, 'GET', { data: { ids: ids } });
+      }
     },
 
     /**
@@ -12243,12 +12375,21 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findHasMany: function (store, snapshot, url, relationship) {
-      var request = this._requestFor({
-        store: store, snapshot: snapshot, url: url, relationship: relationship,
-        requestType: 'findHasMany'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, snapshot: snapshot, url: url, relationship: relationship,
+          requestType: 'findHasMany'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var id = snapshot.id;
+        var type = snapshot.modelName;
+
+        url = this.urlPrefix(url, this.buildURL(type, id, snapshot, 'findHasMany'));
 
-      return this._makeRequest(request);
+        return this.ajax(url, 'GET');
+      }
     },
 
     /**
@@ -12278,12 +12419,20 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findBelongsTo: function (store, snapshot, url, relationship) {
-      var request = this._requestFor({
-        store: store, snapshot: snapshot, url: url, relationship: relationship,
-        requestType: 'findBelongsTo'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, snapshot: snapshot, url: url, relationship: relationship,
+          requestType: 'findBelongsTo'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var id = snapshot.id;
+        var type = snapshot.modelName;
 
-      return this._makeRequest(request);
+        url = this.urlPrefix(url, this.buildURL(type, id, snapshot, 'findBelongsTo'));
+        return this.ajax(url, 'GET');
+      }
     },
 
     /**
@@ -12300,12 +12449,22 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     createRecord: function (store, type, snapshot) {
-      var request = this._requestFor({
-        store: store, type: type, snapshot: snapshot,
-        requestType: 'createRecord'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, type: type, snapshot: snapshot,
+          requestType: 'createRecord'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var data = {};
+        var serializer = store.serializerFor(type.modelName);
+        var url = this.buildURL(type.modelName, null, snapshot, 'createRecord');
+
+        serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
 
-      return this._makeRequest(request);
+        return this.ajax(url, "POST", { data: data });
+      }
     },
 
     /**
@@ -12322,12 +12481,24 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     updateRecord: function (store, type, snapshot) {
-      var request = this._requestFor({
-        store: store, type: type, snapshot: snapshot,
-        requestType: 'updateRecord'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, type: type, snapshot: snapshot,
+          requestType: 'updateRecord'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var data = {};
+        var serializer = store.serializerFor(type.modelName);
+
+        serializer.serializeIntoHash(data, type, snapshot);
+
+        var id = snapshot.id;
+        var url = this.buildURL(type.modelName, id, snapshot, 'updateRecord');
 
-      return this._makeRequest(request);
+        return this.ajax(url, "PUT", { data: data });
+      }
     },
 
     /**
@@ -12340,12 +12511,18 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     deleteRecord: function (store, type, snapshot) {
-      var request = this._requestFor({
-        store: store, type: type, snapshot: snapshot,
-        requestType: 'deleteRecord'
-      });
+      if (true && !this._hasCustomizedAjax()) {
+        var request = this._requestFor({
+          store: store, type: type, snapshot: snapshot,
+          requestType: 'deleteRecord'
+        });
 
-      return this._makeRequest(request);
+        return this._makeRequest(request);
+      } else {
+        var id = snapshot.id;
+
+        return this.ajax(this.buildURL(type.modelName, id, snapshot, 'deleteRecord'), "DELETE");
+      }
     },
 
     _stripIDFromURL: function (store, snapshot) {
@@ -12469,6 +12646,23 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       var errors = this.normalizeErrorResponse(status, headers, payload);
       var detailedMessage = this.generatedDetailedMessage(status, headers, payload, requestData);
 
+      if (false) {
+        switch (status) {
+          case 401:
+            return new _emberDataAdaptersErrors.UnauthorizedError(errors, detailedMessage);
+          case 403:
+            return new _emberDataAdaptersErrors.ForbiddenError(errors, detailedMessage);
+          case 404:
+            return new _emberDataAdaptersErrors.NotFoundError(errors, detailedMessage);
+          case 409:
+            return new _emberDataAdaptersErrors.ConflictError(errors, detailedMessage);
+          default:
+            if (status >= 500) {
+              return new _emberDataAdaptersErrors.ServerError(errors, detailedMessage);
+            }
+        }
+      }
+
       return new _emberDataAdaptersErrors.AdapterError(errors, detailedMessage);
     },
 
@@ -12686,267 +12880,290 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       }
 
       return query;
-    }
-  });
-
-  RESTAdapter.reopen({
-
-    /**
-     * Get the data (body or query params) for a request.
-     *
-     * @public
-     * @method dataForRequest
-     * @param {Object} params
-     * @return {Object} data
-     */
-    dataForRequest: function (params) {
-      var store = params.store;
-      var type = params.type;
-      var snapshot = params.snapshot;
-      var requestType = params.requestType;
-      var query = params.query;
-
-      // type is not passed to findBelongsTo and findHasMany
-      type = type || snapshot && snapshot.type;
-
-      var serializer = store.serializerFor(type.modelName);
-      var data = {};
+    },
 
-      switch (requestType) {
-        case 'createRecord':
-          serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
-          break;
+    _hasCustomizedAjax: function () {
+      if (this.ajax !== RESTAdapter.prototype.ajax) {
+        (0, _emberDataPrivateDebug.deprecate)('RESTAdapter#ajax has been deprecated please use. `methodForRequest`, `urlForRequest`, `headersForRequest` or `dataForRequest` instead.', false, {
+          id: 'ds.rest-adapter.ajax',
+          until: '3.0.0'
+        });
+        return true;
+      }
 
-        case 'updateRecord':
-          serializer.serializeIntoHash(data, type, snapshot);
-          break;
+      if (this.ajaxOptions !== RESTAdapter.prototype.ajaxOptions) {
+        (0, _emberDataPrivateDebug.deprecate)('RESTAdapter#ajaxOptions has been deprecated please use. `methodForRequest`, `urlForRequest`, `headersForRequest` or `dataForRequest` instead.', false, {
+          id: 'ds.rest-adapter.ajax-options',
+          until: '3.0.0'
+        });
+        return true;
+      }
 
-        case 'findRecord':
-          data = this.buildQuery(snapshot);
-          break;
+      return false;
+    }
+  });
 
-        case 'findAll':
-          if (params.sinceToken) {
-            query = query || {};
-            query.since = params.sinceToken;
-          }
-          data = query;
-          break;
+  if (true) {
 
-        case 'query':
-        case 'queryRecord':
-          if (this.sortQueryParams) {
-            query = this.sortQueryParams(query);
-          }
-          data = query;
-          break;
+    RESTAdapter.reopen({
 
-        case 'findMany':
-          data = { ids: params.ids };
-          break;
+      /**
+       * Get the data (body or query params) for a request.
+       *
+       * @public
+       * @method dataForRequest
+       * @param {Object} params
+       * @return {Object} data
+       */
+      dataForRequest: function (params) {
+        var store = params.store;
+        var type = params.type;
+        var snapshot = params.snapshot;
+        var requestType = params.requestType;
+        var query = params.query;
 
-        default:
-          data = undefined;
-          break;
-      }
+        // type is not passed to findBelongsTo and findHasMany
+        type = type || snapshot && snapshot.type;
 
-      return data;
-    },
+        var serializer = store.serializerFor(type.modelName);
+        var data = {};
 
-    /**
-     * Get the HTTP method for a request.
-     *
-     * @public
-     * @method methodForRequest
-     * @param {Object} params
-     * @return {String} HTTP method
-     */
-    methodForRequest: function (params) {
-      var requestType = params.requestType;
+        switch (requestType) {
+          case 'createRecord':
+            serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
+            break;
 
-      switch (requestType) {
-        case 'createRecord':
-          return 'POST';
-        case 'updateRecord':
-          return 'PUT';
-        case 'deleteRecord':
-          return 'DELETE';
-      }
+          case 'updateRecord':
+            serializer.serializeIntoHash(data, type, snapshot);
+            break;
 
-      return 'GET';
-    },
+          case 'findRecord':
+            data = this.buildQuery(snapshot);
+            break;
 
-    /**
-     * Get the URL for a request.
-     *
-     * @public
-     * @method urlForRequest
-     * @param {Object} params
-     * @return {String} URL
-     */
-    urlForRequest: function (params) {
-      var type = params.type;
-      var id = params.id;
-      var ids = params.ids;
-      var snapshot = params.snapshot;
-      var snapshots = params.snapshots;
-      var requestType = params.requestType;
-      var query = params.query;
-
-      // type and id are not passed from updateRecord and deleteRecord, hence they
-      // are defined if not set
-      type = type || snapshot && snapshot.type;
-      id = id || snapshot && snapshot.id;
+          case 'findAll':
+            if (params.sinceToken) {
+              query = query || {};
+              query.since = params.sinceToken;
+            }
+            data = query;
+            break;
 
-      switch (requestType) {
-        case 'findAll':
-          return this.buildURL(type.modelName, null, snapshots, requestType);
+          case 'query':
+          case 'queryRecord':
+            if (this.sortQueryParams) {
+              query = this.sortQueryParams(query);
+            }
+            data = query;
+            break;
 
-        case 'query':
-        case 'queryRecord':
-          return this.buildURL(type.modelName, null, null, requestType, query);
+          case 'findMany':
+            data = { ids: params.ids };
+            break;
 
-        case 'findMany':
-          return this.buildURL(type.modelName, ids, snapshots, requestType);
+          default:
+            data = undefined;
+            break;
+        }
 
-        case 'findHasMany':
-        case 'findBelongsTo':
-          {
-            var url = this.buildURL(type.modelName, id, snapshot, requestType);
-            return this.urlPrefix(params.url, url);
-          }
-      }
+        return data;
+      },
 
-      return this.buildURL(type.modelName, id, snapshot, requestType, query);
-    },
+      /**
+       * Get the HTTP method for a request.
+       *
+       * @public
+       * @method methodForRequest
+       * @param {Object} params
+       * @return {String} HTTP method
+       */
+      methodForRequest: function (params) {
+        var requestType = params.requestType;
+
+        switch (requestType) {
+          case 'createRecord':
+            return 'POST';
+          case 'updateRecord':
+            return 'PUT';
+          case 'deleteRecord':
+            return 'DELETE';
+        }
 
-    /**
-     * Get the headers for a request.
-     *
-     * By default the value of the `headers` property of the adapter is
-     * returned.
-     *
-     * @public
-     * @method headersForRequest
-     * @param {Object} params
-     * @return {Object} headers
-     */
-    headersForRequest: function (params) {
-      return this.get('headers');
-    },
+        return 'GET';
+      },
 
-    /**
-     * Get an object which contains all properties for a request which should
-     * be made.
-     *
-     * @private
-     * @method _requestFor
-     * @param {Object} params
-     * @return {Object} request object
-     */
-    _requestFor: function (params) {
-      var method = this.methodForRequest(params);
-      var url = this.urlForRequest(params);
-      var headers = this.headersForRequest(params);
-      var data = this.dataForRequest(params);
+      /**
+       * Get the URL for a request.
+       *
+       * @public
+       * @method urlForRequest
+       * @param {Object} params
+       * @return {String} URL
+       */
+      urlForRequest: function (params) {
+        var type = params.type;
+        var id = params.id;
+        var ids = params.ids;
+        var snapshot = params.snapshot;
+        var snapshots = params.snapshots;
+        var requestType = params.requestType;
+        var query = params.query;
+
+        // type and id are not passed from updateRecord and deleteRecord, hence they
+        // are defined if not set
+        type = type || snapshot && snapshot.type;
+        id = id || snapshot && snapshot.id;
+
+        switch (requestType) {
+          case 'findAll':
+            return this.buildURL(type.modelName, null, snapshots, requestType);
+
+          case 'query':
+          case 'queryRecord':
+            return this.buildURL(type.modelName, null, null, requestType, query);
+
+          case 'findMany':
+            return this.buildURL(type.modelName, ids, snapshots, requestType);
+
+          case 'findHasMany':
+          case 'findBelongsTo':
+            {
+              var url = this.buildURL(type.modelName, id, snapshot, requestType);
+              return this.urlPrefix(params.url, url);
+            }
+        }
 
-      return { method: method, url: url, headers: headers, data: data };
-    },
+        return this.buildURL(type.modelName, id, snapshot, requestType, query);
+      },
 
-    /**
-     * Convert a request object into a hash which can be passed to `jQuery.ajax`.
-     *
-     * @private
-     * @method _requestToJQueryAjaxHash
-     * @param {Object} request
-     * @return {Object} jQuery ajax hash
-     */
-    _requestToJQueryAjaxHash: function (request) {
-      var hash = {};
+      /**
+       * Get the headers for a request.
+       *
+       * By default the value of the `headers` property of the adapter is
+       * returned.
+       *
+       * @public
+       * @method headersForRequest
+       * @param {Object} params
+       * @return {Object} headers
+       */
+      headersForRequest: function (params) {
+        return this.get('headers');
+      },
 
-      hash.type = request.method;
-      hash.url = request.url;
-      hash.dataType = 'json';
-      hash.context = this;
+      /**
+       * Get an object which contains all properties for a request which should
+       * be made.
+       *
+       * @private
+       * @method _requestFor
+       * @param {Object} params
+       * @return {Object} request object
+       */
+      _requestFor: function (params) {
+        var method = this.methodForRequest(params);
+        var url = this.urlForRequest(params);
+        var headers = this.headersForRequest(params);
+        var data = this.dataForRequest(params);
+
+        return { method: method, url: url, headers: headers, data: data };
+      },
 
-      if (request.data) {
-        if (request.type !== 'GET') {
-          hash.contentType = 'application/json; charset=utf-8';
-          hash.data = JSON.stringify(request.data);
-        } else {
-          hash.data = request.data;
+      /**
+       * Convert a request object into a hash which can be passed to `jQuery.ajax`.
+       *
+       * @private
+       * @method _requestToJQueryAjaxHash
+       * @param {Object} request
+       * @return {Object} jQuery ajax hash
+       */
+      _requestToJQueryAjaxHash: function (request) {
+        var hash = {};
+
+        hash.type = request.method;
+        hash.url = request.url;
+        hash.dataType = 'json';
+        hash.context = this;
+
+        if (request.data) {
+          if (request.type !== 'GET') {
+            hash.contentType = 'application/json; charset=utf-8';
+            hash.data = JSON.stringify(request.data);
+          } else {
+            hash.data = request.data;
+          }
         }
-      }
 
-      var headers = request.headers;
-      if (headers !== undefined) {
-        hash.beforeSend = function (xhr) {
-          Object.keys(headers).forEach(function (key) {
-            return xhr.setRequestHeader(key, headers[key]);
-          });
-        };
-      }
+        var headers = request.headers;
+        if (headers !== undefined) {
+          hash.beforeSend = function (xhr) {
+            Object.keys(headers).forEach(function (key) {
+              return xhr.setRequestHeader(key, headers[key]);
+            });
+          };
+        }
 
-      return hash;
-    },
+        return hash;
+      },
 
-    /**
-     * Make a request using `jQuery.ajax`.
-     *
-     * @private
-     * @method _makeRequest
-     * @param {Object} request
-     * @return {Promise} promise
-     */
-    _makeRequest: function (request) {
-      var adapter = this;
-      var hash = this._requestToJQueryAjaxHash(request);
+      /**
+       * Make a request using `jQuery.ajax`.
+       *
+       * @private
+       * @method _makeRequest
+       * @param {Object} request
+       * @return {Promise} promise
+       */
+      _makeRequest: function (request) {
+        var adapter = this;
+        var hash = this._requestToJQueryAjaxHash(request);
 
-      var method = request.method;
-      var url = request.url;
+        var method = request.method;
+        var url = request.url;
 
-      var requestData = { method: method, url: url };
+        var requestData = { method: method, url: url };
 
-      return new _ember.default.RSVP.Promise(function (resolve, reject) {
+        return new _ember.default.RSVP.Promise(function (resolve, reject) {
 
-        hash.success = function (payload, textStatus, jqXHR) {
-          var response = adapter.handleResponse(jqXHR.status, (0, _emberDataPrivateUtilsParseResponseHeaders.default)(jqXHR.getAllResponseHeaders()), payload, requestData);
+          hash.success = function (payload, textStatus, jqXHR) {
+            var response = adapter.handleResponse(jqXHR.status, (0, _emberDataPrivateUtilsParseResponseHeaders.default)(jqXHR.getAllResponseHeaders()), payload, requestData);
 
-          if (response instanceof _emberDataAdaptersErrors.AdapterError) {
-            _ember.default.run.join(null, reject, response);
-          } else {
-            _ember.default.run.join(null, resolve, response);
-          }
-        };
+            if (response instanceof _emberDataAdaptersErrors.AdapterError) {
+              _ember.default.run.join(null, reject, response);
+            } else {
+              _ember.default.run.join(null, resolve, response);
+            }
+          };
 
-        hash.error = function (jqXHR, textStatus, errorThrown) {
-          (0, _emberDataPrivateDebug.runInDebug)(function () {
-            var message = 'The server returned an empty string for ' + method + ' ' + url + ', which cannot be parsed into a valid JSON. Return either null or {}.';
-            var validJSONString = !(textStatus === "parsererror" && jqXHR.responseText === "");
-            (0, _emberDataPrivateDebug.warn)(message, validJSONString, {
-              id: 'ds.adapter.returned-empty-string-as-JSON'
+          hash.error = function (jqXHR, textStatus, errorThrown) {
+            (0, _emberDataPrivateDebug.runInDebug)(function () {
+              var message = 'The server returned an empty string for ' + method + ' ' + url + ', which cannot be parsed into a valid JSON. Return either null or {}.';
+              var validJSONString = !(textStatus === "parsererror" && jqXHR.responseText === "");
+              (0, _emberDataPrivateDebug.warn)(message, validJSONString, {
+                id: 'ds.adapter.returned-empty-string-as-JSON'
+              });
             });
-          });
 
-          var error = undefined;
+            var error = undefined;
 
-          if (errorThrown instanceof Error) {
-            error = errorThrown;
-          } else if (textStatus === 'timeout') {
-            error = new _emberDataAdaptersErrors.TimeoutError();
-          } else if (textStatus === 'abort') {
-            error = new _emberDataAdaptersErrors.AbortError();
-          } else {
-            error = adapter.handleResponse(jqXHR.status, (0, _emberDataPrivateUtilsParseResponseHeaders.default)(jqXHR.getAllResponseHeaders()), adapter.parseErrorResponse(jqXHR.responseText) || errorThrown, requestData);
-          }
+            if (errorThrown instanceof Error) {
+              error = errorThrown;
+            } else if (textStatus === 'timeout') {
+              error = new _emberDataAdaptersErrors.TimeoutError();
+            } else if (textStatus === 'abort') {
+              error = new _emberDataAdaptersErrors.AbortError();
+            } else {
+              error = adapter.handleResponse(jqXHR.status, (0, _emberDataPrivateUtilsParseResponseHeaders.default)(jqXHR.getAllResponseHeaders()), adapter.parseErrorResponse(jqXHR.responseText) || errorThrown, requestData);
+            }
 
-          _ember.default.run.join(null, reject, error);
-        };
+            _ember.default.run.join(null, reject, error);
+          };
 
-        adapter._ajaxRequest(hash);
-      }, 'DS: RESTAdapter#makeRequest: ' + method + ' ' + url);
-    }
-  });
+          adapter._ajaxRequest(hash);
+        }, 'DS: RESTAdapter#makeRequest: ' + method + ' ' + url);
+      }
+    });
+  }
 
   //From http://stackoverflow.com/questions/280634/endswith-in-javascript
   function endsWith(string, suffix) {
@@ -13160,6 +13377,14 @@ define("ember-data", ["exports", "ember", "ember-data/-private/debug", "ember-da
   _emberDataPrivateCore.default.TimeoutError = _emberDataAdaptersErrors.TimeoutError;
   _emberDataPrivateCore.default.AbortError = _emberDataAdaptersErrors.AbortError;
 
+  if (false) {
+    _emberDataPrivateCore.default.UnauthorizedError = _emberDataAdaptersErrors.UnauthorizedError;
+    _emberDataPrivateCore.default.ForbiddenError = _emberDataAdaptersErrors.ForbiddenError;
+    _emberDataPrivateCore.default.NotFoundError = _emberDataAdaptersErrors.NotFoundError;
+    _emberDataPrivateCore.default.ConflictError = _emberDataAdaptersErrors.ConflictError;
+    _emberDataPrivateCore.default.ServerError = _emberDataAdaptersErrors.ServerError;
+  }
+
   _emberDataPrivateCore.default.errorsHashToArray = _emberDataAdaptersErrors.errorsHashToArray;
   _emberDataPrivateCore.default.errorsArrayToHash = _emberDataAdaptersErrors.errorsArrayToHash;
 
@@ -13657,8 +13882,10 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
       } else if (this.hasSerializeRecordsOption(attr)) {
         this._serializeEmbeddedHasMany(snapshot, json, relationship);
       } else {
-        if (this.hasSerializeIdsAndTypesOption(attr)) {
-          this._serializeHasManyAsIdsAndTypes(snapshot, json, relationship);
+        if (true) {
+          if (this.hasSerializeIdsAndTypesOption(attr)) {
+            this._serializeHasManyAsIdsAndTypes(snapshot, json, relationship);
+          }
         }
       }
     },
@@ -14022,8 +14249,24 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
       @private
     */
     _normalizeRelationshipDataHelper: function (relationshipDataHash) {
-      var type = this.modelNameFromPayloadKey(relationshipDataHash.type);
-      relationshipDataHash.type = type;
+      if (false) {
+        var modelName = this.modelNameFromPayloadType(relationshipDataHash.type);
+        var deprecatedModelNameLookup = this.modelNameFromPayloadKey(relationshipDataHash.type);
+
+        if (modelName !== deprecatedModelNameLookup && this._hasCustomModelNameFromPayloadKey()) {
+          (0, _emberDataPrivateDebug.deprecate)("You are using modelNameFromPayloadKey to normalize the type for a relationship. This has been deprecated in favor of modelNameFromPayloadType", false, {
+            id: 'ds.json-api-serializer.deprecated-model-name-for-relationship',
+            until: '3.0.0'
+          });
+
+          modelName = deprecatedModelNameLookup;
+        }
+
+        relationshipDataHash.type = modelName;
+      } else {
+        var type = this.modelNameFromPayloadKey(relationshipDataHash.type);
+        relationshipDataHash.type = type;
+      }
 
       return relationshipDataHash;
     },
@@ -14042,8 +14285,25 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
       var modelName = undefined,
           usedLookup = undefined;
 
-      modelName = this.modelNameFromPayloadKey(resourceHash.type);
-      usedLookup = 'modelNameFromPayloadKey';
+      if (false) {
+        modelName = this.modelNameFromPayloadType(resourceHash.type);
+        var deprecatedModelNameLookup = this.modelNameFromPayloadKey(resourceHash.type);
+
+        usedLookup = 'modelNameFromPayloadType';
+
+        if (modelName !== deprecatedModelNameLookup && this._hasCustomModelNameFromPayloadKey()) {
+          (0, _emberDataPrivateDebug.deprecate)("You are using modelNameFromPayloadKey to normalize the type for a resource. This has been deprecated in favor of modelNameFromPayloadType", false, {
+            id: 'ds.json-api-serializer.deprecated-model-name-for-resource',
+            until: '3.0.0'
+          });
+
+          modelName = deprecatedModelNameLookup;
+          usedLookup = 'modelNameFromPayloadKey';
+        }
+      } else {
+        modelName = this.modelNameFromPayloadKey(resourceHash.type);
+        usedLookup = 'modelNameFromPayloadKey';
+      }
 
       if (!this.store._hasModelFor(modelName)) {
         (0, _emberDataPrivateDebug.warn)(this.warnMessageNoModelForType(modelName, resourceHash.type, usedLookup), false, {
@@ -14069,8 +14329,11 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
     */
     pushPayload: function (store, payload) {
       var normalizedPayload = this._normalizeDocumentHelper(payload);
-
-      store.push(normalizedPayload);
+      if (false) {
+        return store.push(normalizedPayload);
+      } else {
+        store.push(normalizedPayload);
+      }
     },
 
     /**
@@ -14180,7 +14443,23 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
       @private
     */
     _extractType: function (modelClass, resourceHash) {
-      return this.modelNameFromPayloadKey(resourceHash.type);
+      if (false) {
+        var modelName = this.modelNameFromPayloadType(resourceHash.type);
+        var deprecatedModelNameLookup = this.modelNameFromPayloadKey(resourceHash.type);
+
+        if (modelName !== deprecatedModelNameLookup && this._hasCustomModelNameFromPayloadKey()) {
+          (0, _emberDataPrivateDebug.deprecate)("You are using modelNameFromPayloadKey to normalize the type for a polymorphic relationship. This has been deprecated in favor of modelNameFromPayloadType", false, {
+            id: 'ds.json-api-serializer.deprecated-model-name-for-polymorphic-type',
+            until: '3.0.0'
+          });
+
+          modelName = deprecatedModelNameLookup;
+        }
+
+        return modelName;
+      } else {
+        return this.modelNameFromPayloadKey(resourceHash.type);
+      }
     },
 
     /**
@@ -14291,8 +14570,21 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
       var data = this._super.apply(this, arguments);
 
       var payloadType = undefined;
+      if (false) {
+        payloadType = this.payloadTypeFromModelName(snapshot.modelName);
+        var deprecatedPayloadTypeLookup = this.payloadKeyFromModelName(snapshot.modelName);
+
+        if (payloadType !== deprecatedPayloadTypeLookup && this._hasCustomPayloadKeyFromModelName()) {
+          (0, _emberDataPrivateDebug.deprecate)("You used payloadKeyFromModelName to customize how a type is serialized. Use payloadTypeFromModelName instead.", false, {
+            id: 'ds.json-api-serializer.deprecated-payload-type-for-model',
+            until: '3.0.0'
+          });
 
-      payloadType = this.payloadKeyFromModelName(snapshot.modelName);
+          payloadType = deprecatedPayloadTypeLookup;
+        }
+      } else {
+        payloadType = this.payloadKeyFromModelName(snapshot.modelName);
+      }
 
       data.type = payloadType;
       return { data: data };
@@ -14314,7 +14606,7 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
         var value = snapshot.attr(key);
         if (type) {
           var transform = this.transformFor(type);
-          value = transform.serialize(value);
+          value = transform.serialize(value, attribute.options);
         }
 
         var payloadKey = this._getMappedKey(key, snapshot.type);
@@ -14351,7 +14643,21 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
           if (belongsTo) {
             var payloadType = undefined;
 
-            payloadType = this.payloadKeyFromModelName(belongsTo.modelName);
+            if (false) {
+              payloadType = this.payloadTypeFromModelName(belongsTo.modelName);
+              var deprecatedPayloadTypeLookup = this.payloadKeyFromModelName(belongsTo.modelName);
+
+              if (payloadType !== deprecatedPayloadTypeLookup && this._hasCustomPayloadKeyFromModelName()) {
+                (0, _emberDataPrivateDebug.deprecate)("You used payloadKeyFromModelName to serialize type for belongs-to relationship. Use payloadTypeFromModelName instead.", false, {
+                  id: 'ds.json-api-serializer.deprecated-payload-type-for-belongs-to',
+                  until: '3.0.0'
+                });
+
+                payloadType = deprecatedPayloadTypeLookup;
+              }
+            } else {
+              payloadType = this.payloadKeyFromModelName(belongsTo.modelName);
+            }
 
             data = {
               type: payloadType,
@@ -14373,6 +14679,9 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
     serializeHasMany: function (snapshot, json, relationship) {
       var key = relationship.key;
       var shouldSerializeHasMany = '_shouldSerializeHasMany';
+      if (false) {
+        shouldSerializeHasMany = 'shouldSerializeHasMany';
+      }
 
       if (this[shouldSerializeHasMany](snapshot, key, relationship)) {
         var hasMany = snapshot.hasMany(key);
@@ -14392,7 +14701,21 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
 
             var payloadType = undefined;
 
-            payloadType = this.payloadKeyFromModelName(item.modelName);
+            if (false) {
+              payloadType = this.payloadTypeFromModelName(item.modelName);
+              var deprecatedPayloadTypeLookup = this.payloadKeyFromModelName(item.modelName);
+
+              if (payloadType !== deprecatedPayloadTypeLookup && this._hasCustomPayloadKeyFromModelName()) {
+                (0, _emberDataPrivateDebug.deprecate)("You used payloadKeyFromModelName to serialize type for belongs-to relationship. Use payloadTypeFromModelName instead.", false, {
+                  id: 'ds.json-api-serializer.deprecated-payload-type-for-has-many',
+                  until: '3.0.0'
+                });
+
+                payloadType = deprecatedPayloadTypeLookup;
+              }
+            } else {
+              payloadType = this.payloadKeyFromModelName(item.modelName);
+            }
 
             data[i] = {
               type: payloadType,
@@ -14406,6 +14729,100 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
     }
   });
 
+  if (false) {
+
+    JSONAPISerializer.reopen({
+
+      /**
+        `modelNameFromPayloadType` can be used to change the mapping for a DS model
+        name, taken from the value in the payload.
+         Say your API namespaces the type of a model and returns the following
+        payload for the `post` model:
+         ```javascript
+        // GET /api/posts/1
+        {
+          "data": {
+            "id": 1,
+            "type: "api::v1::post"
+          }
+        }
+        ```
+         By overwriting `modelNameFromPayloadType` you can specify that the
+        `posr` model should be used:
+         ```app/serializers/application.js
+        import JSONAPISerializer from "ember-data/serializers/json-api";
+         export default JSONAPISerializer.extend({
+          modelNameFromPayloadType(payloadType) {
+            return payloadType.replace('api::v1::', '');
+          }
+        });
+        ```
+         By default the modelName for a model is its singularized name in dasherized
+        form.  Usually, Ember Data can use the correct inflection to do this for
+        you. Most of the time, you won't need to override
+        `modelNameFromPayloadType` for this purpose.
+         Also take a look at
+        [payloadTypeFromModelName](#method_payloadTypeFromModelName) to customize
+        how the type of a record should be serialized.
+         @method modelNameFromPayloadType
+        @public
+        @param {String} payloadType type from payload
+        @return {String} modelName
+      */
+      modelNameFromPayloadType: function (type) {
+        return (0, _emberInflector.singularize)((0, _emberDataPrivateSystemNormalizeModelName.default)(type));
+      },
+
+      /**
+        `payloadTypeFromModelName` can be used to change the mapping for the type in
+        the payload, taken from the model name.
+         Say your API namespaces the type of a model and expects the following
+        payload when you update the `post` model:
+         ```javascript
+        // POST /api/posts/1
+        {
+          "data": {
+            "id": 1,
+            "type": "api::v1::post"
+          }
+        }
+        ```
+         By overwriting `payloadTypeFromModelName` you can specify that the
+        namespaces model name for the `post` should be used:
+         ```app/serializers/application.js
+        import JSONAPISerializer from "ember-data/serializers/json-api";
+         export default JSONAPISerializer.extend({
+          payloadTypeFromModelName(modelName) {
+            return "api::v1::" + modelName;
+          }
+        });
+        ```
+         By default the payload type is the pluralized model name. Usually, Ember
+        Data can use the correct inflection to do this for you. Most of the time,
+        you won't need to override `payloadTypeFromModelName` for this purpose.
+         Also take a look at
+        [modelNameFromPayloadType](#method_modelNameFromPayloadType) to customize
+        how the model name from should be mapped from the payload.
+         @method payloadTypeFromModelName
+        @public
+        @param {String} modelname modelName from the record
+        @return {String} payloadType
+      */
+      payloadTypeFromModelName: function (modelName) {
+        return (0, _emberInflector.pluralize)(modelName);
+      },
+
+      _hasCustomModelNameFromPayloadKey: function () {
+        return this.modelNameFromPayloadKey !== JSONAPISerializer.prototype.modelNameFromPayloadKey;
+      },
+
+      _hasCustomPayloadKeyFromModelName: function () {
+        return this.payloadKeyFromModelName !== JSONAPISerializer.prototype.payloadKeyFromModelName;
+      }
+
+    });
+  }
+
   (0, _emberDataPrivateDebug.runInDebug)(function () {
     JSONAPISerializer.reopen({
       willMergeMixin: function (props) {
@@ -14427,79 +14844,6 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
 /**
   @module ember-data
 */
-
-/**
-  `modelNameFromPayloadType` can be used to change the mapping for a DS model
-  name, taken from the value in the payload.
-   Say your API namespaces the type of a model and returns the following
-  payload for the `post` model:
-   ```javascript
-  // GET /api/posts/1
-  {
-    "data": {
-      "id": 1,
-      "type: "api::v1::post"
-    }
-  }
-  ```
-   By overwriting `modelNameFromPayloadType` you can specify that the
-  `posr` model should be used:
-   ```app/serializers/application.js
-  import JSONAPISerializer from "ember-data/serializers/json-api";
-   export default JSONAPISerializer.extend({
-    modelNameFromPayloadType(payloadType) {
-      return payloadType.replace('api::v1::', '');
-    }
-  });
-  ```
-   By default the modelName for a model is its singularized name in dasherized
-  form.  Usually, Ember Data can use the correct inflection to do this for
-  you. Most of the time, you won't need to override
-  `modelNameFromPayloadType` for this purpose.
-   Also take a look at
-  [payloadTypeFromModelName](#method_payloadTypeFromModelName) to customize
-  how the type of a record should be serialized.
-   @method modelNameFromPayloadType
-  @public
-  @param {String} payloadType type from payload
-  @return {String} modelName
-*/
-
-/**
-  `payloadTypeFromModelName` can be used to change the mapping for the type in
-  the payload, taken from the model name.
-   Say your API namespaces the type of a model and expects the following
-  payload when you update the `post` model:
-   ```javascript
-  // POST /api/posts/1
-  {
-    "data": {
-      "id": 1,
-      "type": "api::v1::post"
-    }
-  }
-  ```
-   By overwriting `payloadTypeFromModelName` you can specify that the
-  namespaces model name for the `post` should be used:
-   ```app/serializers/application.js
-  import JSONAPISerializer from "ember-data/serializers/json-api";
-   export default JSONAPISerializer.extend({
-    payloadTypeFromModelName(modelName) {
-      return "api::v1::" + modelName;
-    }
-  });
-  ```
-   By default the payload type is the pluralized model name. Usually, Ember
-  Data can use the correct inflection to do this for you. Most of the time,
-  you won't need to override `payloadTypeFromModelName` for this purpose.
-   Also take a look at
-  [modelNameFromPayloadType](#method_modelNameFromPayloadType) to customize
-  how the model name from should be mapped from the payload.
-   @method payloadTypeFromModelName
-  @public
-  @param {String} modelname modelName from the record
-  @return {String} payloadType
-*/
 define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/debug', 'ember-data/serializer', 'ember-data/-private/system/coerce-id', 'ember-data/-private/system/normalize-model-name', 'ember-data/-private/utils', 'ember-data/-private/features', 'ember-data/adapters/errors'], function (exports, _ember, _emberDataPrivateDebug, _emberDataSerializer, _emberDataPrivateSystemCoerceId, _emberDataPrivateSystemNormalizeModelName, _emberDataPrivateUtils, _emberDataPrivateFeatures, _emberDataAdaptersErrors) {
   function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; return arr2; } else { return Array.from(arr); } }
 
@@ -15067,7 +15411,24 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
 
         var modelClass = this.store.modelFor(relationshipModelName);
         if (relationshipHash.type && !(0, _emberDataPrivateUtils.modelHasAttributeOrRelationshipNamedType)(modelClass)) {
-          relationshipHash.type = this.modelNameFromPayloadKey(relationshipHash.type);
+
+          if (false) {
+            var modelName = this.modelNameFromPayloadType(relationshipHash.type);
+            var deprecatedModelNameLookup = this.modelNameFromPayloadKey(relationshipHash.type);
+
+            if (modelName !== deprecatedModelNameLookup && this._hasCustomModelNameFromPayloadKey()) {
+              (0, _emberDataPrivateDebug.deprecate)("You used modelNameFromPayloadKey to customize how a type is normalized. Use modelNameFromPayloadType instead", false, {
+                id: 'ds.json-serializer.deprecated-type-for-polymorphic-relationship',
+                until: '3.0.0'
+              });
+
+              modelName = deprecatedModelNameLookup;
+            }
+
+            relationshipHash.type = modelName;
+          } else {
+            relationshipHash.type = this.modelNameFromPayloadKey(relationshipHash.type);
+          }
         }
         return relationshipHash;
       }
@@ -15621,6 +15982,9 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
     serializeHasMany: function (snapshot, json, relationship) {
       var key = relationship.key;
       var shouldSerializeHasMany = '_shouldSerializeHasMany';
+      if (false) {
+        shouldSerializeHasMany = 'shouldSerializeHasMany';
+      }
 
       if (this[shouldSerializeHasMany](snapshot, key, relationship)) {
         var hasMany = snapshot.hasMany(key, { ids: true });
@@ -15871,15 +16235,29 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
     }
   });
 
+  if (false) {
+
+    JSONSerializer.reopen({
+
+      /**
+        @method modelNameFromPayloadType
+        @public
+        @param {String} type
+        @return {String} the model's modelName
+        */
+      modelNameFromPayloadType: function (type) {
+        return (0, _emberDataPrivateSystemNormalizeModelName.default)(type);
+      },
+
+      _hasCustomModelNameFromPayloadKey: function () {
+        return this.modelNameFromPayloadKey !== JSONSerializer.prototype.modelNameFromPayloadKey;
+      }
+
+    });
+  }
+
   exports.default = JSONSerializer;
 });
-
-/**
-  @method modelNameFromPayloadType
-  @public
-  @param {String} type
-  @return {String} the model's modelName
-  */
 define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/debug", "ember-data/serializers/json", "ember-data/-private/system/normalize-model-name", "ember-inflector", "ember-data/-private/system/coerce-id", "ember-data/-private/utils", "ember-data/-private/features"], function (exports, _ember, _emberDataPrivateDebug, _emberDataSerializersJson, _emberDataPrivateSystemNormalizeModelName, _emberInflector, _emberDataPrivateSystemCoerceId, _emberDataPrivateUtils, _emberDataPrivateFeatures) {
   function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i]; return arr2; } else { return Array.from(arr); } }
 
@@ -16068,8 +16446,21 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
       if (!primaryHasTypeAttribute && hash.type) {
         // Support polymorphic records in async relationships
         var modelName = undefined;
+        if (false) {
+          modelName = this.modelNameFromPayloadType(hash.type);
+          var deprecatedModelNameLookup = this.modelNameFromPayloadKey(hash.type);
+
+          if (modelName !== deprecatedModelNameLookup && !this._hasCustomModelNameFromPayloadType() && this._hasCustomModelNameFromPayloadKey()) {
+            (0, _emberDataPrivateDebug.deprecate)("You are using modelNameFromPayloadKey to normalize the type for a polymorphic relationship. This is has been deprecated in favor of modelNameFromPayloadType", false, {
+              id: 'ds.rest-serializer.deprecated-model-name-for-polymorphic-type',
+              until: '3.0.0'
+            });
 
-        modelName = this.modelNameFromPayloadKey(hash.type);
+            modelName = deprecatedModelNameLookup;
+          }
+        } else {
+          modelName = this.modelNameFromPayloadKey(hash.type);
+        }
 
         if (store._hasModelFor(modelName)) {
           serializer = store.serializerFor(modelName);
@@ -16292,7 +16683,11 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
         });
       }
 
-      store.push(documentHash);
+      if (false) {
+        return store.push(documentHash);
+      } else {
+        store.push(documentHash);
+      }
     },
 
     /**
@@ -16567,7 +16962,11 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
       if (_ember.default.isNone(belongsTo)) {
         json[typeKey] = null;
       } else {
-        json[typeKey] = camelize(belongsTo.modelName);
+        if (false) {
+          json[typeKey] = this.payloadTypeFromModelName(belongsTo.modelName);
+        } else {
+          json[typeKey] = camelize(belongsTo.modelName);
+        }
       }
     },
 
@@ -16607,17 +17006,144 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
 
       if (isPolymorphic && resourceHash[typeProperty] !== undefined && typeof relationshipHash !== 'object') {
 
-        var type = this.modelNameFromPayloadKey(resourceHash[typeProperty]);
-        return {
-          id: relationshipHash,
-          type: type
-        };
+        if (false) {
+
+          var payloadType = resourceHash[typeProperty];
+          var type = this.modelNameFromPayloadType(payloadType);
+          var deprecatedTypeLookup = this.modelNameFromPayloadKey(payloadType);
+
+          if (payloadType !== deprecatedTypeLookup && !this._hasCustomModelNameFromPayloadType() && this._hasCustomModelNameFromPayloadKey()) {
+            (0, _emberDataPrivateDebug.deprecate)("You are using modelNameFromPayloadKey to normalize the type for a polymorphic relationship. This has been deprecated in favor of modelNameFromPayloadType", false, {
+              id: 'ds.rest-serializer.deprecated-model-name-for-polymorphic-type',
+              until: '3.0.0'
+            });
+
+            type = deprecatedTypeLookup;
+          }
+
+          return {
+            id: relationshipHash,
+            type: type
+          };
+        } else {
+
+          var type = this.modelNameFromPayloadKey(resourceHash[typeProperty]);
+          return {
+            id: relationshipHash,
+            type: type
+          };
+        }
       }
 
       return this._super.apply(this, arguments);
     }
   });
 
+  if (false) {
+
+    RESTSerializer.reopen({
+
+      /**
+        `modelNameFromPayloadType` can be used to change the mapping for a DS model
+        name, taken from the value in the payload.
+         Say your API namespaces the type of a model and returns the following
+        payload for the `post` model, which has a polymorphic `user` relationship:
+         ```javascript
+        // GET /api/posts/1
+        {
+          "post": {
+            "id": 1,
+            "user": 1,
+            "userType: "api::v1::administrator"
+          }
+        }
+        ```
+         By overwriting `modelNameFromPayloadType` you can specify that the
+        `administrator` model should be used:
+         ```app/serializers/application.js
+        import RESTSerializer from "ember-data/serializers/rest";
+         export default RESTSerializer.extend({
+          modelNameFromPayloadType(payloadType) {
+            return payloadType.replace('api::v1::', '');
+          }
+        });
+        ```
+         By default the modelName for a model is its name in dasherized form.
+        Usually, Ember Data can use the correct inflection to do this for you. Most
+        of the time, you won't need to override `modelNameFromPayloadType` for this
+        purpose.
+         Also take a look at
+        [payloadTypeFromModelName](#method_payloadTypeFromModelName) to customize
+        how the type of a record should be serialized.
+         @method modelNameFromPayloadType
+        @public
+        @param {String} payloadType type from payload
+        @return {String} modelName
+      */
+      modelNameFromPayloadType: function (payloadType) {
+        return (0, _emberInflector.singularize)((0, _emberDataPrivateSystemNormalizeModelName.default)(payloadType));
+      },
+
+      /**
+        `payloadTypeFromModelName` can be used to change the mapping for the type in
+        the payload, taken from the model name.
+         Say your API namespaces the type of a model and expects the following
+        payload when you update the `post` model, which has a polymorphic `user`
+        relationship:
+         ```javascript
+        // POST /api/posts/1
+        {
+          "post": {
+            "id": 1,
+            "user": 1,
+            "userType": "api::v1::administrator"
+          }
+        }
+        ```
+         By overwriting `payloadTypeFromModelName` you can specify that the
+        namespaces model name for the `administrator` should be used:
+         ```app/serializers/application.js
+        import RESTSerializer from "ember-data/serializers/rest";
+         export default RESTSerializer.extend({
+          payloadTypeFromModelName(modelName) {
+            return "api::v1::" + modelName;
+          }
+        });
+        ```
+         By default the payload type is the camelized model name. Usually, Ember
+        Data can use the correct inflection to do this for you. Most of the time,
+        you won't need to override `payloadTypeFromModelName` for this purpose.
+         Also take a look at
+        [modelNameFromPayloadType](#method_modelNameFromPayloadType) to customize
+        how the model name from should be mapped from the payload.
+         @method payloadTypeFromModelName
+        @public
+        @param {String} modelname modelName from the record
+        @return {String} payloadType
+      */
+      payloadTypeFromModelName: function (modelName) {
+        return camelize(modelName);
+      },
+
+      _hasCustomModelNameFromPayloadKey: function () {
+        return this.modelNameFromPayloadKey !== RESTSerializer.prototype.modelNameFromPayloadKey;
+      },
+
+      _hasCustomModelNameFromPayloadType: function () {
+        return this.modelNameFromPayloadType !== RESTSerializer.prototype.modelNameFromPayloadType;
+      },
+
+      _hasCustomPayloadTypeFromModelName: function () {
+        return this.payloadTypeFromModelName !== RESTSerializer.prototype.payloadTypeFromModelName;
+      },
+
+      _hasCustomPayloadKeyFromModelName: function () {
+        return this.payloadKeyFromModelName !== RESTSerializer.prototype.payloadKeyFromModelName;
+      }
+
+    });
+  }
+
   (0, _emberDataPrivateDebug.runInDebug)(function () {
     RESTSerializer.reopen({
       warnMessageNoModelForKey: function (prop, typeKey) {
@@ -16631,82 +17157,6 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
 /**
   @module ember-data
 */
-
-/**
-  `modelNameFromPayloadType` can be used to change the mapping for a DS model
-  name, taken from the value in the payload.
-   Say your API namespaces the type of a model and returns the following
-  payload for the `post` model, which has a polymorphic `user` relationship:
-   ```javascript
-  // GET /api/posts/1
-  {
-    "post": {
-      "id": 1,
-      "user": 1,
-      "userType: "api::v1::administrator"
-    }
-  }
-  ```
-   By overwriting `modelNameFromPayloadType` you can specify that the
-  `administrator` model should be used:
-   ```app/serializers/application.js
-  import RESTSerializer from "ember-data/serializers/rest";
-   export default RESTSerializer.extend({
-    modelNameFromPayloadType(payloadType) {
-      return payloadType.replace('api::v1::', '');
-    }
-  });
-  ```
-   By default the modelName for a model is its name in dasherized form.
-  Usually, Ember Data can use the correct inflection to do this for you. Most
-  of the time, you won't need to override `modelNameFromPayloadType` for this
-  purpose.
-   Also take a look at
-  [payloadTypeFromModelName](#method_payloadTypeFromModelName) to customize
-  how the type of a record should be serialized.
-   @method modelNameFromPayloadType
-  @public
-  @param {String} payloadType type from payload
-  @return {String} modelName
-*/
-
-/**
-  `payloadTypeFromModelName` can be used to change the mapping for the type in
-  the payload, taken from the model name.
-   Say your API namespaces the type of a model and expects the following
-  payload when you update the `post` model, which has a polymorphic `user`
-  relationship:
-   ```javascript
-  // POST /api/posts/1
-  {
-    "post": {
-      "id": 1,
-      "user": 1,
-      "userType": "api::v1::administrator"
-    }
-  }
-  ```
-   By overwriting `payloadTypeFromModelName` you can specify that the
-  namespaces model name for the `administrator` should be used:
-   ```app/serializers/application.js
-  import RESTSerializer from "ember-data/serializers/rest";
-   export default RESTSerializer.extend({
-    payloadTypeFromModelName(modelName) {
-      return "api::v1::" + modelName;
-    }
-  });
-  ```
-   By default the payload type is the camelized model name. Usually, Ember
-  Data can use the correct inflection to do this for you. Most of the time,
-  you won't need to override `payloadTypeFromModelName` for this purpose.
-   Also take a look at
-  [modelNameFromPayloadType](#method_modelNameFromPayloadType) to customize
-  how the model name from should be mapped from the payload.
-   @method payloadTypeFromModelName
-  @public
-  @param {String} modelname modelName from the record
-  @return {String} payloadType
-*/
 define('ember-data/setup-container', ['exports', 'ember-data/-private/initializers/store', 'ember-data/-private/initializers/transforms', 'ember-data/-private/initializers/store-injections', 'ember-data/-private/initializers/data-adapter'], function (exports, _emberDataPrivateInitializersStore, _emberDataPrivateInitializersTransforms, _emberDataPrivateInitializersStoreInjections, _emberDataPrivateInitializersDataAdapter) {
   exports.default = setupContainer;
 
@@ -16794,7 +17244,7 @@ define('ember-data/transform', ['exports', 'ember'], function (exports, _ember)
   });
 });
 define("ember-data/version", ["exports"], function (exports) {
-  exports.default = "2.7.0-beta.1";
+  exports.default = "2.7.0-beta.2";
 });
 define("ember-inflector", ["exports", "ember", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (exports, _ember, _emberInflectorLibSystem, _emberInflectorLibExtString) {