ember-data-source 2.5.5 → 2.6.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4931ad5bee083305d56fa09541aff70e133984
-  data.tar.gz: 58bade410c20c861b6174949fade2879cf0e1abf
+  metadata.gz: 88f79999e62cc652e4bea22f2190d6c5a6b8b92b
+  data.tar.gz: edca8ebda1f72c2beb8ac125854f9c1272724379
 SHA512:
-  metadata.gz: 4bf473816f95e2d3a31e73d1feba3986062e61cc65d54c9149ef7835ce72a61483c50a0fb79ae216bb69b8d6e57ed34549b54b6c8e2aaaa67dfafb47f2bcb666
-  data.tar.gz: a36b73a012214876f5b5ee9bd96cac9b01e1c2b54c30a751d5079cc50c40c1a6b6aedbb3c190a276a64c17ac0cf0bc64af21039037dc2736b3de69797eca286c
+  metadata.gz: 2b5815a20c02f767e0889846f4bf024120f215f602f24ace34827d956f889fec7c9f33bc1adbf7cd4da6d38dcd08ef2c44f75df75e6eae008b743088aecca06d
+  data.tar.gz: 41347e4946c0c1cb976f777fc55e77d32774b452572dbe4c59bfaa7e15c0302161f0e114bfb18317c2265d8b8eb5046e607183d83457a6f7493b52bc630648e3

data/dist/globals/ember-data.js

@@ -6,17 +6,44 @@
  * @copyright Copyright 2011-2016 Tilde Inc. and contributors.
  *            Portions Copyright 2011 LivingSocial Inc.
  * @license   Licensed under MIT license (see license.js)
- * @version   2.5.5
+ * @version   2.6.0-beta.1
  */
 
-var define, requireModule, require, requirejs;
+var loader, define, requireModule, require, requirejs;
 
-(function() {
+(function(global) {
+  'use strict';
+
+  // Save off the original values of these globals, so we can restore them if someone asks us to
+  var oldGlobals = {
+    loader: loader,
+    define: define,
+    requireModule: requireModule,
+    require: require,
+    requirejs: requirejs
+  };
+
+  loader = {
+    noConflict: function(aliases) {
+      var oldName, newName;
+
+      for (oldName in aliases) {
+        if (aliases.hasOwnProperty(oldName)) {
+          if (oldGlobals.hasOwnProperty(oldName)) {
+            newName = aliases[oldName];
+
+            global[newName] = global[oldName];
+            global[oldName] = oldGlobals[oldName];
+          }
+        }
+      }
+    }
+  };
 
   var _isArray;
   if (!Array.isArray) {
     _isArray = function (x) {
-      return Object.prototype.toString.call(x) === "[object Array]";
+      return Object.prototype.toString.call(x) === '[object Array]';
     };
   } else {
     _isArray = Array.isArray;
@@ -25,33 +52,83 @@ var define, requireModule, require, requirejs;
   var registry = {};
   var seen = {};
   var FAILED = false;
+  var LOADED = true;
 
   var uuid = 0;
 
-  function tryFinally(tryable, finalizer) {
-    try {
-      return tryable();
-    } finally {
-      finalizer();
-    }
-  }
-
   function unsupportedModule(length) {
-    throw new Error("an unsupported module was defined, expected `define(name, deps, module)` instead got: `" + length + "` arguments to define`");
+    throw new Error('an unsupported module was defined, expected `define(name, deps, module)` instead got: `' +
+                    length + '` arguments to define`');
   }
 
   var defaultDeps = ['require', 'exports', 'module'];
 
-  function Module(name, deps, callback, exports) {
-    this.id       = uuid++;
-    this.name     = name;
-    this.deps     = !deps.length && callback.length ? defaultDeps : deps;
-    this.exports  = exports || { };
-    this.callback = callback;
-    this.state    = undefined;
+  function Module(name, deps, callback) {
+    this.id        = uuid++;
+    this.name      = name;
+    this.deps      = !deps.length && callback.length ? defaultDeps : deps;
+    this.module    = { exports: {} };
+    this.callback  = callback;
+    this.state     = undefined;
     this._require  = undefined;
+    this.finalized = false;
+    this.hasExportsAsDep = false;
   }
 
+  Module.prototype.makeDefaultExport = function() {
+    var exports = this.module.exports;
+    if (exports !== null &&
+        (typeof exports === 'object' || typeof exports === 'function') &&
+          exports['default'] === undefined) {
+      exports['default'] = exports;
+    }
+  };
+
+  Module.prototype.exports = function(reifiedDeps) {
+    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, reifiedDeps);
+      if (!(this.hasExportsAsDep && result === undefined)) {
+        this.module.exports = result;
+      }
+      this.makeDefaultExport();
+      this.finalized = true;
+      return this.module.exports;
+    }
+  };
+
+  Module.prototype.unsee = function() {
+    this.finalized = false;
+    this.state = undefined;
+    this.module = { exports: {}};
+  };
+
+  Module.prototype.reify = function() {
+    var deps = this.deps;
+    var length = deps.length;
+    var reified = new Array(length);
+    var dep;
+
+    for (var i = 0, l = length; i < l; i++) {
+      dep = deps[i];
+      if (dep === 'exports') {
+        this.hasExportsAsDep = true;
+        reified[i] = this.module.exports;
+      } else if (dep === 'require') {
+        reified[i] = this.makeRequire();
+      } else if (dep === 'module') {
+        reified[i] = this.module;
+      } else {
+        reified[i] = findModule(resolve(dep, this.name), this.name).module.exports;
+      }
+    }
+
+    return reified;
+  };
 
   Module.prototype.makeRequire = function() {
     var name = this.name;
@@ -59,7 +136,14 @@ var define, requireModule, require, requirejs;
     return this._require || (this._require = function(dep) {
       return require(resolve(dep, name));
     });
-  }
+  };
+
+  Module.prototype.build = function() {
+    if (this.state === FAILED) { return; }
+    this.state = FAILED;
+    this.exports(this.reify());
+    this.state = LOADED;
+  };
 
   define = function(name, deps, callback) {
     if (arguments.length < 2) {
@@ -87,91 +171,27 @@ var define, requireModule, require, requirejs;
     return new Alias(path);
   };
 
-  function reify(mod, name, seen) {
-    var deps = mod.deps;
-    var length = deps.length;
-    var reified = new Array(length);
-    var dep;
-    // TODO: new Module
-    // TODO: seen refactor
-    var module = { };
-
-    for (var i = 0, l = length; i < l; i++) {
-      dep = deps[i];
-      if (dep === 'exports') {
-        module.exports = reified[i] = seen;
-      } else if (dep === 'require') {
-        reified[i] = mod.makeRequire();
-      } else if (dep === 'module') {
-        mod.exports = seen;
-        module = reified[i] = mod;
-      } else {
-        reified[i] = requireFrom(resolve(dep, name), name);
-      }
-    }
-
-    return {
-      deps: reified,
-      module: module
-    };
-  }
-
-  function requireFrom(name, origin) {
-    var mod = registry[name];
-    if (!mod) {
-      throw new Error('Could not find module `' + name + '` imported from `' + origin + '`');
-    }
-    return require(name);
+  function missingModule(name, referrer) {
+    throw new Error('Could not find module `' + name + '` imported from `' + referrer + '`');
   }
 
-  function missingModule(name) {
-    throw new Error('Could not find module ' + name);
-  }
   requirejs = require = requireModule = function(name) {
-    var mod = registry[name];
-
-    if (mod && mod.callback instanceof Alias) {
-      mod = registry[mod.callback.name];
-    }
-
-    if (!mod) { missingModule(name); }
-
-    if (mod.state !== FAILED &&
-        seen.hasOwnProperty(name)) {
-      return seen[name];
-    }
-
-    var reified;
-    var module;
-    var loaded = false;
-
-    seen[name] = { }; // placeholder for run-time cycles
+    return findModule(name, '(require)').module.exports;
+  };
 
-    tryFinally(function() {
-      reified = reify(mod, name, seen[name]);
-      module = mod.callback.apply(this, reified.deps);
-      loaded = true;
-    }, function() {
-      if (!loaded) {
-        mod.state = FAILED;
-      }
-    });
+  function findModule(name, referrer) {
+    var mod = registry[name] || registry[name + '/index'];
 
-    var obj;
-    if (module === undefined && reified.module.exports) {
-      obj = reified.module.exports;
-    } else {
-      obj = seen[name] = module;
+    while (mod && mod.callback instanceof Alias) {
+      name = mod.callback.name;
+      mod = registry[name];
     }
 
-    if (obj !== null &&
-        (typeof obj === 'object' || typeof obj === 'function') &&
-          obj['default'] === undefined) {
-      obj['default'] = obj;
-    }
+    if (!mod) { missingModule(name, referrer); }
 
-    return (seen[name] = obj);
-  };
+    mod.build();
+    return mod;
+  }
 
   function resolve(child, name) {
     if (child.charAt(0) !== '.') { return child; }
@@ -198,14 +218,14 @@ var define, requireModule, require, requirejs;
 
   requirejs.entries = requirejs._eak_seen = registry;
   requirejs.unsee = function(moduleName) {
-    delete seen[moduleName];
+    findModule(moduleName, '(unsee)').unsee();
   };
 
   requirejs.clear = function() {
     requirejs.entries = requirejs._eak_seen = registry = {};
-    seen = state = {};
+    seen = {};
   };
-})();
+})(this);
 
 define("ember-data/-private/adapters", ["exports", "ember-data/adapters/json-api", "ember-data/adapters/rest"], function (exports, _emberDataAdaptersJsonApi, _emberDataAdaptersRest) {
   exports.JSONAPIAdapter = _emberDataAdaptersJsonApi.default;
@@ -389,7 +409,7 @@ define('ember-data/-private/adapters/build-url-mixin', ['exports', 'ember'], fun
     },
 
     /**
-     * @method urlForFindBelongTo
+     * @method urlForFindBelongsTo
      * @param {String} id
      * @param {String} modelName
      * @param {DS.Snapshot} snapshot
@@ -498,189 +518,6 @@ define('ember-data/-private/adapters/build-url-mixin', ['exports', 'ember'], fun
     }
   });
 });
-define('ember-data/-private/adapters/errors', ['exports', 'ember', 'ember-data/-private/debug'], function (exports, _ember, _emberDataPrivateDebug) {
-  exports.AdapterError = AdapterError;
-  exports.InvalidError = InvalidError;
-  exports.TimeoutError = TimeoutError;
-  exports.AbortError = AbortError;
-  exports.errorsHashToArray = errorsHashToArray;
-  exports.errorsArrayToHash = errorsArrayToHash;
-
-  var EmberError = _ember.default.Error;
-
-  var SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;
-  var SOURCE_POINTER_PRIMARY_REGEXP = /^\/?data/;
-  var PRIMARY_ATTRIBUTE_KEY = 'base';
-
-  /**
-    @class AdapterError
-    @namespace DS
-  */
-
-  function AdapterError(errors) {
-    var message = arguments.length <= 1 || arguments[1] === undefined ? 'Adapter operation failed' : arguments[1];
-
-    this.isAdapterError = true;
-    EmberError.call(this, message);
-
-    this.errors = errors || [{
-      title: 'Adapter Error',
-      detail: message
-    }];
-  }
-
-  AdapterError.prototype = Object.create(EmberError.prototype);
-
-  /**
-    A `DS.InvalidError` is used by an adapter to signal the external API
-    was unable to process a request because the content was not
-    semantically correct or meaningful per the API. Usually this means a
-    record failed some form of server side validation. When a promise
-    from an adapter is rejected with a `DS.InvalidError` the record will
-    transition to the `invalid` state and the errors will be set to the
-    `errors` property on the record.
-  
-    For Ember Data to correctly map errors to their corresponding
-    properties on the model, Ember Data expects each error to be
-    a valid json-api error object with a `source/pointer` that matches
-    the property name. For example if you had a Post model that
-    looked like this.
-  
-    ```app/models/post.js
-    import DS from 'ember-data';
-  
-    export default DS.Model.extend({
-      title: DS.attr('string'),
-      content: DS.attr('string')
-    });
-    ```
-  
-    To show an error from the server related to the `title` and
-    `content` properties your adapter could return a promise that
-    rejects with a `DS.InvalidError` object that looks like this:
-  
-    ```app/adapters/post.js
-    import Ember from 'ember';
-    import DS from 'ember-data';
-  
-    export default DS.RESTAdapter.extend({
-      updateRecord: function() {
-        // Fictional adapter that always rejects
-        return Ember.RSVP.reject(new DS.InvalidError([
-          {
-            detail: 'Must be unique',
-            source: { pointer: '/data/attributes/title' }
-          },
-          {
-            detail: 'Must not be blank',
-            source: { pointer: '/data/attributes/content'}
-          }
-        ]));
-      }
-    });
-    ```
-  
-    Your backend may use different property names for your records the
-    store will attempt extract and normalize the errors using the
-    serializer's `extractErrors` method before the errors get added to
-    the the model. As a result, it is safe for the `InvalidError` to
-    wrap the error payload unaltered.
-  
-    @class InvalidError
-    @namespace DS
-  */
-
-  function InvalidError(errors) {
-    (0, _emberDataPrivateDebug.assert)('`InvalidError` expects json-api formatted errors array.', _ember.default.isArray(errors || []));
-    AdapterError.call(this, errors, 'The adapter rejected the commit because it was invalid');
-  }
-
-  InvalidError.prototype = Object.create(AdapterError.prototype);
-
-  /**
-    @class TimeoutError
-    @namespace DS
-  */
-
-  function TimeoutError() {
-    AdapterError.call(this, null, 'The adapter operation timed out');
-  }
-
-  TimeoutError.prototype = Object.create(AdapterError.prototype);
-
-  /**
-    @class AbortError
-    @namespace DS
-  */
-
-  function AbortError() {
-    AdapterError.call(this, null, 'The adapter operation was aborted');
-  }
-
-  AbortError.prototype = Object.create(AdapterError.prototype);
-
-  /**
-    @method errorsHashToArray
-    @private
-  */
-
-  function errorsHashToArray(errors) {
-    var out = [];
-
-    if (_ember.default.isPresent(errors)) {
-      Object.keys(errors).forEach(function (key) {
-        var messages = _ember.default.makeArray(errors[key]);
-        for (var i = 0; i < messages.length; i++) {
-          var title = 'Invalid Attribute';
-          var pointer = '/data/attributes/' + key;
-          if (key === PRIMARY_ATTRIBUTE_KEY) {
-            title = 'Invalid Document';
-            pointer = '/data';
-          }
-          out.push({
-            title: title,
-            detail: messages[i],
-            source: {
-              pointer: pointer
-            }
-          });
-        }
-      });
-    }
-
-    return out;
-  }
-
-  /**
-    @method errorsArrayToHash
-    @private
-  */
-
-  function errorsArrayToHash(errors) {
-    var out = {};
-
-    if (_ember.default.isPresent(errors)) {
-      errors.forEach(function (error) {
-        if (error.source && error.source.pointer) {
-          var key = error.source.pointer.match(SOURCE_POINTER_REGEXP);
-
-          if (key) {
-            key = key[2];
-          } else if (error.source.pointer.search(SOURCE_POINTER_PRIMARY_REGEXP) !== -1) {
-            key = PRIMARY_ATTRIBUTE_KEY;
-          }
-
-          if (key) {
-            out[key] = out[key] || [];
-            out[key].push(error.detail || error.title);
-          }
-        }
-      });
-    }
-
-    return out;
-  }
-});
 define('ember-data/-private/core', ['exports', 'ember', 'ember-data/version'], function (exports, _ember, _emberDataVersion) {
 
   /**
@@ -1393,7 +1230,11 @@ define("ember-data/-private/system/many-array", ["exports", "ember", "ember-data
 
       //a hack for not removing new records
       //TODO remove once we have proper diffing
-      var newRecords = this.currentState.filter(function (internalModel) {
+      var newRecords = this.currentState.filter(
+      // only add new records which are not yet in the canonical state of this
+      // relationship (a new record can be in the canonical state if it has
+      // been 'acknowleged' to be in the relationship via a store.push)
+      function (internalModel) {
         return internalModel.isNew() && toSet.indexOf(internalModel) === -1;
       });
       toSet = toSet.concat(newRecords);
@@ -2765,7 +2606,7 @@ define("ember-data/-private/system/model/internal-model", ["exports", "ember", "
     },
 
     _preloadHasMany: function (key, preloadValue, type) {
-      (0, _emberDataPrivateDebug.assert)("You need to pass in an array to set a hasMany property on a record", _ember.default.isArray(preloadValue));
+      (0, _emberDataPrivateDebug.assert)("You need to pass in an array to set a hasMany property on a record", Array.isArray(preloadValue));
       var recordsToSet = new Array(preloadValue.length);
 
       for (var i = 0; i < preloadValue.length; i++) {
@@ -3015,7 +2856,7 @@ define("ember-data/-private/system/model/internal-model", ["exports", "ember", "
     }
   };
 
-  if (true) {
+  if ((0, _emberDataPrivateFeatures.default)('ds-references')) {
 
     InternalModel.prototype.referenceFor = function (type, name) {
       var reference = this.references[name];
@@ -3792,7 +3633,7 @@ define("ember-data/-private/system/model/model", ["exports", "ember", "ember-dat
     });
   }
 
-  if (true) {
+  if ((0, _emberDataPrivateFeatures.default)("ds-references")) {
 
     Model.reopen({
 
@@ -5228,7 +5069,7 @@ define("ember-data/-private/system/record-arrays", ["exports", "ember-data/-priv
 /**
   @module ember-data
 */
-define("ember-data/-private/system/record-arrays/adapter-populated-record-array", ["exports", "ember", "ember-data/-private/system/record-arrays/record-array", "ember-data/-private/system/clone-null"], function (exports, _ember, _emberDataPrivateSystemRecordArraysRecordArray, _emberDataPrivateSystemCloneNull) {
+define("ember-data/-private/system/record-arrays/adapter-populated-record-array", ["exports", "ember", "ember-data/-private/system/record-arrays/record-array", "ember-data/-private/system/clone-null", "ember-data/-private/features"], function (exports, _ember, _emberDataPrivateSystemRecordArraysRecordArray, _emberDataPrivateSystemCloneNull, _emberDataPrivateFeatures) {
 
   /**
     @module ember-data
@@ -5280,6 +5121,10 @@ define("ember-data/-private/system/record-arrays/adapter-populated-record-array"
         meta: (0, _emberDataPrivateSystemCloneNull.default)(payload.meta)
       });
 
+      if ((0, _emberDataPrivateFeatures.default)('ds-links-in-record-array')) {
+        this.set('links', (0, _emberDataPrivateSystemCloneNull.default)(payload.links));
+      }
+
       internalModels.forEach(function (record) {
         _this.manager.recordArraysForRecord(record).add(_this);
       });
@@ -6930,9 +6775,17 @@ define("ember-data/-private/system/relationships/state/create", ["exports", "emb
 
   var get = _ember.default.get;
 
+  function shouldFindInverse(relationshipMeta) {
+    var options = relationshipMeta.options;
+    return !(options && options.inverse === null);
+  }
+
   function createRelationshipFor(record, relationshipMeta, store) {
-    var inverseKey;
-    var inverse = record.type.inverseFor(relationshipMeta.key, store);
+    var inverseKey = undefined;
+    var inverse = null;
+    if (shouldFindInverse(relationshipMeta)) {
+      inverse = record.type.inverseFor(relationshipMeta.key, store);
+    }
 
     if (inverse) {
       inverseKey = inverse.name;
@@ -7510,7 +7363,7 @@ define('ember-data/-private/system/snapshot-record-array', ['exports', 'ember-da
     */
     this.adapterOptions = options.adapterOptions;
 
-    if (true) {
+    if ((0, _emberDataPrivateFeatures.default)('ds-finder-include')) {
       this.include = options.include;
     }
   }
@@ -7575,7 +7428,7 @@ define('ember-data/-private/system/snapshot', ['exports', 'ember', 'ember-data/-
     */
     this.adapterOptions = options.adapterOptions;
 
-    if (true) {
+    if ((0, _emberDataPrivateFeatures.default)('ds-finder-include')) {
       this.include = options.include;
     }
 
@@ -7861,13 +7714,12 @@ define('ember-data/-private/system/snapshot', ['exports', 'ember', 'ember-data/-
 /**
   @module ember-data
 */
-define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/model', 'ember-data/-private/debug', 'ember-data/-private/system/normalize-link', 'ember-data/-private/system/normalize-model-name', 'ember-data/-private/adapters/errors', 'ember-data/-private/system/promise-proxies', 'ember-data/-private/system/store/common', 'ember-data/-private/system/store/serializer-response', 'ember-data/-private/system/store/serializers', 'ember-data/-private/system/store/finders', 'ember-data/-private/utils', 'ember-data/-private/system/coerce-id', 'ember-data/-private/system/record-array-manager', 'ember-data/-private/system/store/container-instance-cache', 'ember-data/-private/system/model/internal-model', 'ember-data/-private/system/empty-object', 'ember-data/-private/features'], function (exports, _ember, _emberDataModel, _emberDataPrivateDebug, _emberDataPrivateSystemNormalizeLink, _emberDataPrivateSystemNormalizeModelName, _emberDataPrivateAdaptersErrors, _emberDataPrivateSystemPromiseProxies, _emberDataPrivateSystemStoreCommon, _emberDataPrivateSystemStoreSerializerResponse, _emberDataPrivateSystemStoreSerializers, _emberDataPrivateSystemStoreFinders, _emberDataPrivateUtils, _emberDataPrivateSystemCoerceId, _emberDataPrivateSystemRecordArrayManager, _emberDataPrivateSystemStoreContainerInstanceCache, _emberDataPrivateSystemModelInternalModel, _emberDataPrivateSystemEmptyObject, _emberDataPrivateFeatures) {
+define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/model', 'ember-data/-private/debug', 'ember-data/-private/system/normalize-link', 'ember-data/-private/system/normalize-model-name', 'ember-data/adapters/errors', 'ember-data/-private/system/promise-proxies', 'ember-data/-private/system/store/common', 'ember-data/-private/system/store/serializer-response', 'ember-data/-private/system/store/serializers', 'ember-data/-private/system/store/finders', 'ember-data/-private/utils', 'ember-data/-private/system/coerce-id', 'ember-data/-private/system/record-array-manager', 'ember-data/-private/system/store/container-instance-cache', 'ember-data/-private/system/model/internal-model', 'ember-data/-private/system/empty-object', 'ember-data/-private/features'], function (exports, _ember, _emberDataModel, _emberDataPrivateDebug, _emberDataPrivateSystemNormalizeLink, _emberDataPrivateSystemNormalizeModelName, _emberDataAdaptersErrors, _emberDataPrivateSystemPromiseProxies, _emberDataPrivateSystemStoreCommon, _emberDataPrivateSystemStoreSerializerResponse, _emberDataPrivateSystemStoreSerializers, _emberDataPrivateSystemStoreFinders, _emberDataPrivateUtils, _emberDataPrivateSystemCoerceId, _emberDataPrivateSystemRecordArrayManager, _emberDataPrivateSystemStoreContainerInstanceCache, _emberDataPrivateSystemModelInternalModel, _emberDataPrivateSystemEmptyObject, _emberDataPrivateFeatures) {
   var badIdFormatAssertion = '`id` has to be non-empty string or number';
 
   exports.badIdFormatAssertion = badIdFormatAssertion;
   var Backburner = _ember.default._Backburner;
   var Map = _ember.default.Map;
-  var isArray = Array.isArray || _ember.default.isArray;
 
   //Get the materialized model from the internalModel/promise that returns
   //an internal model and return it in a promiseObject. Useful for returning
@@ -8751,9 +8603,6 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
 
       (0, _emberDataPrivateDebug.assert)("You tried to load all records but you have no adapter (for " + typeClass + ")", adapter);
       (0, _emberDataPrivateDebug.assert)("You tried to load all records but your adapter does not implement `findAll`", typeof adapter.findAll === 'function');
-
-      set(array, 'isUpdating', true);
-
       if (options.reload) {
         return (0, _emberDataPrivateSystemPromiseProxies.promiseArray)((0, _emberDataPrivateSystemStoreFinders._findAll)(adapter, this, typeClass, sinceToken, options));
       }
@@ -9353,7 +9202,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
         }
       }
 
-      if (isArray(data.data)) {
+      if (Array.isArray(data.data)) {
         length = data.data.length;
         var internalModels = new Array(length);
         for (i = 0; i < length; i++) {
@@ -9384,18 +9233,30 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       (0, _emberDataPrivateDebug.assert)('You must include an \'id\' for ' + modelName + ' in an object passed to \'push\'', data.id != null && data.id !== '');
       (0, _emberDataPrivateDebug.assert)('You tried to push data with a type \'' + modelName + '\' but no model could be found with that name.', this._hasModelFor(modelName));
 
-      var type = this.modelFor(modelName);
+      (0, _emberDataPrivateDebug.runInDebug)(function () {
+        // If Ember.ENV.DS_WARN_ON_UNKNOWN_KEYS is set to true and the payload
+        // contains unknown attributes or relationships, log a warning.
 
-      // If Ember.ENV.DS_WARN_ON_UNKNOWN_KEYS is set to true and the payload
-      // contains unknown keys, log a warning.
+        if (_ember.default.ENV.DS_WARN_ON_UNKNOWN_KEYS) {
+          (function () {
+            var type = _this2.modelFor(modelName);
 
-      if (_ember.default.ENV.DS_WARN_ON_UNKNOWN_KEYS) {
-        (0, _emberDataPrivateDebug.warn)("The payload for '" + type.modelName + "' contains these unknown keys: " + _ember.default.inspect(Object.keys(data).forEach(function (key) {
-          return !(key === 'id' || key === 'links' || get(type, 'fields').has(key) || key.match(/Type$/));
-        })) + ". Make sure they've been defined in your model.", Object.keys(data).filter(function (key) {
-          return !(key === 'id' || key === 'links' || get(type, 'fields').has(key) || key.match(/Type$/));
-        }).length === 0, { id: 'ds.store.unknown-keys-in-payload' });
-      }
+            // Check unknown attributes
+            var unknownAttributes = Object.keys(data.attributes || {}).filter(function (key) {
+              return !get(type, 'fields').has(key);
+            });
+            var unknownAttributesMessage = 'The payload for \'' + type.modelName + '\' contains these unknown attributes: ' + unknownAttributes + '. Make sure they\'ve been defined in your model.';
+            (0, _emberDataPrivateDebug.warn)(unknownAttributesMessage, unknownAttributes.length === 0, { id: 'ds.store.unknown-keys-in-payload' });
+
+            // Check unknown relationships
+            var unknownRelationships = Object.keys(data.relationships || {}).filter(function (key) {
+              return !get(type, 'fields').has(key);
+            });
+            var unknownRelationshipsMessage = 'The payload for \'' + type.modelName + '\' contains these unknown relationships: ' + unknownRelationships + '. Make sure they\'ve been defined in your model.';
+            (0, _emberDataPrivateDebug.warn)(unknownRelationshipsMessage, unknownRelationships.length === 0, { id: 'ds.store.unknown-keys-in-payload' });
+          })();
+        }
+      });
 
       // Actually load the record into the store.
       var internalModel = this._load(data);
@@ -9470,7 +9331,7 @@ 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);
       }
-      if (false) {
+      if ((0, _emberDataPrivateFeatures.default)('ds-pushpayload-return')) {
         return this._adapterRun(function () {
           return serializer.pushPayload(_this3, payload);
         });
@@ -9489,7 +9350,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       socket.on('message', function(message) {
         var modelName = message.model;
         var data = message.data;
-        store.push(modelName, store.normalize(modelName, data));
+        store.push(store.normalize(modelName, data));
       });
       ```
        @method normalize
@@ -9671,7 +9532,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
 
   });
 
-  if (true) {
+  if ((0, _emberDataPrivateFeatures.default)("ds-references")) {
 
     Store.reopen({
       /**
@@ -9712,7 +9573,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       return;
     }
 
-    (0, _emberDataPrivateDebug.assert)('A ' + relationship.parentType + ' record was pushed into the store with the value of ' + key + ' being ' + _ember.default.inspect(id) + ', but ' + key + ' is a belongsTo relationship so the value must not be an array. You should probably check your data payload or serializer.', !isArray(id));
+    (0, _emberDataPrivateDebug.assert)('A ' + relationship.parentType + ' record was pushed into the store with the value of ' + key + ' being ' + _ember.default.inspect(id) + ', but ' + key + ' is a belongsTo relationship so the value must not be an array. You should probably check your data payload or serializer.', !Array.isArray(id));
 
     //TODO:Better asserts
     return store._internalModelForId(id.type, id.id);
@@ -9723,7 +9584,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
       return;
     }
 
-    (0, _emberDataPrivateDebug.assert)('A ' + relationship.parentType + ' record was pushed into the store with the value of ' + key + ' being \'' + _ember.default.inspect(ids) + '\', but ' + key + ' is a hasMany relationship so the value must be an array. You should probably check your data payload or serializer.', isArray(ids));
+    (0, _emberDataPrivateDebug.assert)('A ' + relationship.parentType + ' record was pushed into the store with the value of ' + key + ' being \'' + _ember.default.inspect(ids) + '\', but ' + key + ' is a hasMany relationship so the value must be an array. You should probably check your data payload or serializer.', Array.isArray(ids));
     var _ids = new Array(ids.length);
 
     for (var i = 0; i < ids.length; i++) {
@@ -9768,7 +9629,7 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
 
       return internalModel;
     }, function (error) {
-      if (error instanceof _emberDataPrivateAdaptersErrors.InvalidError) {
+      if (error instanceof _emberDataAdaptersErrors.InvalidError) {
         var errors = serializer.extractErrors(store, typeClass, error, snapshot.id);
         store.recordWasInvalid(internalModel, errors);
       } else {
@@ -9973,7 +9834,7 @@ define("ember-data/-private/system/store/finders", ["exports", "ember", "ember-d
   var Promise = _ember.default.RSVP.Promise;
 
   function payloadIsNotBlank(adapterPayload) {
-    if (_ember.default.isArray(adapterPayload)) {
+    if (Array.isArray(adapterPayload)) {
       return true;
     } else {
       return Object.keys(adapterPayload || {}).length;
@@ -9990,7 +9851,7 @@ define("ember-data/-private/system/store/finders", ["exports", "ember", "ember-d
     promise = (0, _emberDataPrivateSystemStoreCommon._guard)(promise, (0, _emberDataPrivateSystemStoreCommon._bind)(_emberDataPrivateSystemStoreCommon._objectIsAlive, store));
 
     return promise.then(function (adapterPayload) {
-      (0, _emberDataPrivateDebug.assert)("You made a `findRecord` request for a " + typeClass.typeClassKey + " with id " + id + ", but the adapter's response did not have any data", payloadIsNotBlank(adapterPayload));
+      (0, _emberDataPrivateDebug.assert)("You made a `findRecord` request for a " + typeClass.modelName + " with id " + id + ", but the adapter's response did not have any data", payloadIsNotBlank(adapterPayload));
       return store._adapterRun(function () {
         var payload = (0, _emberDataPrivateSystemStoreSerializerResponse.normalizeResponseHelper)(serializer, store, typeClass, adapterPayload, id, 'findRecord');
         (0, _emberDataPrivateDebug.assert)('Ember Data expected the primary data returned from a `findRecord` response to be an object but instead it found an array.', !Array.isArray(payload.data));
@@ -10022,7 +9883,7 @@ define("ember-data/-private/system/store/finders", ["exports", "ember", "ember-d
     promise = (0, _emberDataPrivateSystemStoreCommon._guard)(promise, (0, _emberDataPrivateSystemStoreCommon._bind)(_emberDataPrivateSystemStoreCommon._objectIsAlive, store));
 
     return promise.then(function (adapterPayload) {
-      (0, _emberDataPrivateDebug.assert)("You made a `findMany` request for a " + typeClass.typeClassKey + " with ids " + ids + ", but the adapter's response did not have any data", payloadIsNotBlank(adapterPayload));
+      (0, _emberDataPrivateDebug.assert)("You made a `findMany` request for " + typeClass.modelName + " records with ids " + ids + ", but the adapter's response did not have any data", payloadIsNotBlank(adapterPayload));
       return store._adapterRun(function () {
         var payload = (0, _emberDataPrivateSystemStoreSerializerResponse.normalizeResponseHelper)(serializer, store, typeClass, adapterPayload, null, 'findMany');
         //TODO Optimize, no need to materialize here
@@ -10102,7 +9963,7 @@ define("ember-data/-private/system/store/finders", ["exports", "ember", "ember-d
     promise = (0, _emberDataPrivateSystemStoreCommon._guard)(promise, (0, _emberDataPrivateSystemStoreCommon._bind)(_emberDataPrivateSystemStoreCommon._objectIsAlive, store));
 
     return promise.then(function (adapterPayload) {
-      (0, _emberDataPrivateDebug.assert)("You made a `findAll` request for " + typeClass.typeClassKey + "records, but the adapter's response did not have any data", payloadIsNotBlank(adapterPayload));
+      (0, _emberDataPrivateDebug.assert)("You made a `findAll` request for " + typeClass.modelName + " records, but the adapter's response did not have any data", payloadIsNotBlank(adapterPayload));
       store._adapterRun(function () {
         var payload = (0, _emberDataPrivateSystemStoreSerializerResponse.normalizeResponseHelper)(serializer, store, typeClass, adapterPayload, null, 'findAll');
         //TODO Optimize
@@ -10132,7 +9993,7 @@ define("ember-data/-private/system/store/finders", ["exports", "ember", "ember-d
         records = store.push(payload);
       });
 
-      (0, _emberDataPrivateDebug.assert)('The response to store.query is expected to be an array but it was a single record. Please wrap your response in an array or use `store.queryRecord` to query for a single record.', _ember.default.isArray(records));
+      (0, _emberDataPrivateDebug.assert)('The response to store.query is expected to be an array but it was a single record. Please wrap your response in an array or use `store.queryRecord` to query for a single record.', Array.isArray(records));
       recordArray.loadRecords(records, payload);
       return recordArray;
     }, null, "DS: Extract payload of query " + typeClass);
@@ -10148,7 +10009,7 @@ define("ember-data/-private/system/store/finders", ["exports", "ember", "ember-d
     promise = (0, _emberDataPrivateSystemStoreCommon._guard)(promise, (0, _emberDataPrivateSystemStoreCommon._bind)(_emberDataPrivateSystemStoreCommon._objectIsAlive, store));
 
     return promise.then(function (adapterPayload) {
-      (0, _emberDataPrivateDebug.assert)("You made a `queryRecord` request for " + typeClass.typeClassKey + "records, with query `" + query + "`, but the adapter's response did not have any data", payloadIsNotBlank(adapterPayload));
+      (0, _emberDataPrivateDebug.assert)("You made a `queryRecord` request for a " + typeClass.modelName + ", but the adapter's response did not have any data", payloadIsNotBlank(adapterPayload));
       var record;
       store._adapterRun(function () {
         var payload = (0, _emberDataPrivateSystemStoreSerializerResponse.normalizeResponseHelper)(serializer, store, typeClass, adapterPayload, null, 'queryRecord');
@@ -10188,7 +10049,7 @@ define('ember-data/-private/system/store/serializer-response', ['exports', 'embe
         }
       }
       if ('data' in doc) {
-        if (!(doc.data === null || _ember.default.isArray(doc.data) || typeof doc.data === 'object')) {
+        if (!(doc.data === null || Array.isArray(doc.data) || typeof doc.data === 'object')) {
           errors.push('data must be null, an object, or an array');
         }
       }
@@ -10198,7 +10059,7 @@ define('ember-data/-private/system/store/serializer-response', ['exports', 'embe
         }
       }
       if ('errors' in doc) {
-        if (!_ember.default.isArray(doc.errors)) {
+        if (!Array.isArray(doc.errors)) {
           errors.push('errors must be an array');
         }
       }
@@ -10274,7 +10135,8 @@ define("ember-data/-private/transforms", ["exports", "ember-data/transform", "em
   exports.StringTransform = _emberDataPrivateTransformsString.default;
   exports.BooleanTransform = _emberDataPrivateTransformsBoolean.default;
 });
-define("ember-data/-private/transforms/boolean", ["exports", "ember-data/transform"], function (exports, _emberDataTransform) {
+define('ember-data/-private/transforms/boolean', ['exports', 'ember', 'ember-data/transform', 'ember-data/-private/features'], function (exports, _ember, _emberDataTransform, _emberDataPrivateFeatures) {
+  var isNone = _ember.default.isNone;
 
   /**
     The `DS.BooleanTransform` class is used to serialize and deserialize
@@ -10299,9 +10161,17 @@ define("ember-data/-private/transforms/boolean", ["exports", "ember-data/transfo
     @namespace DS
    */
   exports.default = _emberDataTransform.default.extend({
-    deserialize: function (serialized) {
+    deserialize: function (serialized, options) {
       var type = typeof serialized;
 
+      if ((0, _emberDataPrivateFeatures.default)('ds-transform-pass-options')) {
+        if ((0, _emberDataPrivateFeatures.default)('ds-boolean-transform-allow-null')) {
+          if (isNone(serialized) && options.allowNull === true) {
+            return null;
+          }
+        }
+      }
+
       if (type === "boolean") {
         return serialized;
       } else if (type === "string") {
@@ -10313,7 +10183,15 @@ define("ember-data/-private/transforms/boolean", ["exports", "ember-data/transfo
       }
     },
 
-    serialize: function (deserialized) {
+    serialize: function (deserialized, options) {
+      if ((0, _emberDataPrivateFeatures.default)('ds-transform-pass-options')) {
+        if ((0, _emberDataPrivateFeatures.default)('ds-boolean-transform-allow-null')) {
+          if (isNone(deserialized) && options.allowNull === true) {
+            return null;
+          }
+        }
+      }
+
       return Boolean(deserialized);
     }
   });
@@ -10621,9 +10499,9 @@ define('ember-data/adapter', ['exports', 'ember'], function (exports, _ember) {
     /**
       The `findRecord()` method is invoked when the store is asked for a record that
       has not previously been loaded. In response to `findRecord()` being called, you
-      should query your persistence layer for a record with the given ID. Once
-      found, you can asynchronously call the store's `push()` method to push
-      the record into the store.
+      should query your persistence layer for a record with the given ID. The `findRecord` 
+      method should return a promise that will resolve to a JavaScript object that will be 
+      normalized by the serializer.
        Here is an example `findRecord` implementation:
        ```app/adapters/application.js
       import DS from 'ember-data';
@@ -11009,7 +10887,242 @@ define('ember-data/adapter', ['exports', 'ember'], function (exports, _ember) {
 /**
   @module ember-data
 */
-define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters/rest'], function (exports, _ember, _emberDataAdaptersRest) {
+define('ember-data/adapters/errors', ['exports', 'ember', 'ember-data/-private/debug', 'ember-data/-private/features'], function (exports, _ember, _emberDataPrivateDebug, _emberDataPrivateFeatures) {
+  exports.AdapterError = AdapterError;
+  exports.errorsHashToArray = errorsHashToArray;
+  exports.errorsArrayToHash = errorsArrayToHash;
+
+  var EmberError = _ember.default.Error;
+
+  var SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;
+  var SOURCE_POINTER_PRIMARY_REGEXP = /^\/?data/;
+  var PRIMARY_ATTRIBUTE_KEY = 'base';
+
+  /**
+    @class AdapterError
+    @namespace DS
+  */
+
+  function AdapterError(errors) {
+    var message = arguments.length <= 1 || arguments[1] === undefined ? 'Adapter operation failed' : arguments[1];
+
+    this.isAdapterError = true;
+    EmberError.call(this, message);
+
+    this.errors = errors || [{
+      title: 'Adapter Error',
+      detail: message
+    }];
+  }
+
+  var extendedErrorsEnabled = false;
+  if ((0, _emberDataPrivateFeatures.default)('ds-extended-errors')) {
+    extendedErrorsEnabled = true;
+  }
+
+  function extendFn(ErrorClass) {
+    return function () {
+      var _ref = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
+
+      var defaultMessage = _ref.message;
+
+      return extend(ErrorClass, defaultMessage);
+    };
+  }
+
+  function extend(ParentErrorClass, defaultMessage) {
+    var ErrorClass = function (errors, message) {
+      (0, _emberDataPrivateDebug.assert)('`AdapterError` expects json-api formatted errors array.', Array.isArray(errors || []));
+      ParentErrorClass.call(this, errors, message || defaultMessage);
+    };
+    ErrorClass.prototype = Object.create(ParentErrorClass.prototype);
+
+    if (extendedErrorsEnabled) {
+      ErrorClass.extend = extendFn(ErrorClass);
+    }
+
+    return ErrorClass;
+  }
+
+  AdapterError.prototype = Object.create(EmberError.prototype);
+
+  if (extendedErrorsEnabled) {
+    AdapterError.extend = extendFn(AdapterError);
+  }
+
+  /**
+    A `DS.InvalidError` is used by an adapter to signal the external API
+    was unable to process a request because the content was not
+    semantically correct or meaningful per the API. Usually this means a
+    record failed some form of server side validation. When a promise
+    from an adapter is rejected with a `DS.InvalidError` the record will
+    transition to the `invalid` state and the errors will be set to the
+    `errors` property on the record.
+  
+    For Ember Data to correctly map errors to their corresponding
+    properties on the model, Ember Data expects each error to be
+    a valid json-api error object with a `source/pointer` that matches
+    the property name. For example if you had a Post model that
+    looked like this.
+  
+    ```app/models/post.js
+    import DS from 'ember-data';
+  
+    export default DS.Model.extend({
+      title: DS.attr('string'),
+      content: DS.attr('string')
+    });
+    ```
+  
+    To show an error from the server related to the `title` and
+    `content` properties your adapter could return a promise that
+    rejects with a `DS.InvalidError` object that looks like this:
+  
+    ```app/adapters/post.js
+    import Ember from 'ember';
+    import DS from 'ember-data';
+  
+    export default DS.RESTAdapter.extend({
+      updateRecord: function() {
+        // Fictional adapter that always rejects
+        return Ember.RSVP.reject(new DS.InvalidError([
+          {
+            detail: 'Must be unique',
+            source: { pointer: '/data/attributes/title' }
+          },
+          {
+            detail: 'Must not be blank',
+            source: { pointer: '/data/attributes/content'}
+          }
+        ]));
+      }
+    });
+    ```
+  
+    Your backend may use different property names for your records the
+    store will attempt extract and normalize the errors using the
+    serializer's `extractErrors` method before the errors get added to
+    the the model. As a result, it is safe for the `InvalidError` to
+    wrap the error payload unaltered.
+  
+    @class InvalidError
+    @namespace DS
+  */
+  var InvalidError = extend(AdapterError, 'The adapter rejected the commit because it was invalid');
+
+  exports.InvalidError = InvalidError;
+  /**
+    @class TimeoutError
+    @namespace DS
+  */
+  var TimeoutError = extend(AdapterError, 'The adapter operation timed out');
+
+  exports.TimeoutError = TimeoutError;
+  /**
+    @class AbortError
+    @namespace DS
+  */
+  var AbortError = extend(AdapterError, 'The adapter operation was aborted');
+
+  exports.AbortError = AbortError;
+  /**
+    @class UnauthorizedError
+    @namespace DS
+  */
+  var UnauthorizedError = extendedErrorsEnabled ? extend(AdapterError, 'The adapter operation is unauthorized') : null;
+
+  exports.UnauthorizedError = UnauthorizedError;
+  /**
+    @class ForbiddenError
+    @namespace DS
+  */
+  var ForbiddenError = extendedErrorsEnabled ? extend(AdapterError, 'The adapter operation is forbidden') : null;
+
+  exports.ForbiddenError = ForbiddenError;
+  /**
+    @class NotFoundError
+    @namespace DS
+  */
+  var NotFoundError = extendedErrorsEnabled ? extend(AdapterError, 'The adapter could not find the resource') : null;
+
+  exports.NotFoundError = NotFoundError;
+  /**
+    @class ConflictError
+    @namespace DS
+  */
+  var ConflictError = extendedErrorsEnabled ? extend(AdapterError, 'The adapter operation failed due to a conflict') : null;
+
+  exports.ConflictError = ConflictError;
+  /**
+    @class ServerError
+    @namespace DS
+  */
+  var ServerError = extendedErrorsEnabled ? extend(AdapterError, 'The adapter operation failed due to a server error') : null;
+
+  exports.ServerError = ServerError;
+  /**
+    @method errorsHashToArray
+    @private
+  */
+
+  function errorsHashToArray(errors) {
+    var out = [];
+
+    if (_ember.default.isPresent(errors)) {
+      Object.keys(errors).forEach(function (key) {
+        var messages = _ember.default.makeArray(errors[key]);
+        for (var i = 0; i < messages.length; i++) {
+          var title = 'Invalid Attribute';
+          var pointer = '/data/attributes/' + key;
+          if (key === PRIMARY_ATTRIBUTE_KEY) {
+            title = 'Invalid Document';
+            pointer = '/data';
+          }
+          out.push({
+            title: title,
+            detail: messages[i],
+            source: {
+              pointer: pointer
+            }
+          });
+        }
+      });
+    }
+
+    return out;
+  }
+
+  /**
+    @method errorsArrayToHash
+    @private
+  */
+
+  function errorsArrayToHash(errors) {
+    var out = {};
+
+    if (_ember.default.isPresent(errors)) {
+      errors.forEach(function (error) {
+        if (error.source && error.source.pointer) {
+          var key = error.source.pointer.match(SOURCE_POINTER_REGEXP);
+
+          if (key) {
+            key = key[2];
+          } else if (error.source.pointer.search(SOURCE_POINTER_PRIMARY_REGEXP) !== -1) {
+            key = PRIMARY_ATTRIBUTE_KEY;
+          }
+
+          if (key) {
+            out[key] = out[key] || [];
+            out[key].push(error.detail || error.title);
+          }
+        }
+      });
+    }
+
+    return out;
+  }
+});
+define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters/rest', 'ember-data/-private/features'], function (exports, _ember, _emberDataAdaptersRest, _emberDataPrivateFeatures) {
 
   /**
     @class JSONAPIAdapter
@@ -11017,7 +11130,7 @@ define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters
     @namespace DS
     @extends DS.RESTAdapter
   */
-  exports.default = _emberDataAdaptersRest.default.extend({
+  var JSONAPIAdapter = _emberDataAdaptersRest.default.extend({
     defaultSerializer: '-json-api',
 
     /**
@@ -11093,8 +11206,12 @@ define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters
       @return {Promise} promise
     */
     findMany: function (store, type, ids, snapshots) {
-      var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
-      return this.ajax(url, 'GET', { data: { filter: { id: ids.join(',') } } });
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        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(',') } } });
+      }
     },
 
     /**
@@ -11116,22 +11233,87 @@ define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters
       @return {Promise} promise
     */
     updateRecord: function (store, type, snapshot) {
-      var data = {};
-      var serializer = store.serializerFor(type.modelName);
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        return this._super.apply(this, arguments);
+      } else {
+        var data = {};
+        var serializer = store.serializerFor(type.modelName);
 
-      serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
+        serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
 
-      var id = snapshot.id;
-      var url = this.buildURL(type.modelName, id, snapshot, 'updateRecord');
+        var id = snapshot.id;
+        var url = this.buildURL(type.modelName, id, snapshot, 'updateRecord');
 
-      return this.ajax(url, 'PATCH', { data: data });
+        return this.ajax(url, 'PATCH', { data: data });
+      }
     }
   });
+
+  if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+
+    JSONAPIAdapter.reopen({
+
+      methodForRequest: function (params) {
+        if (params.requestType === 'updateRecord') {
+          return 'PATCH';
+        }
+
+        return this._super.apply(this, arguments);
+      },
+
+      dataForRequest: function (params) {
+        var requestType = params.requestType;
+        var ids = params.ids;
+
+        if (requestType === 'findMany') {
+          return {
+            filter: { id: ids.join(',') }
+          };
+        }
+
+        if (requestType === 'updateRecord') {
+          var store = params.store;
+          var type = params.type;
+          var snapshot = params.snapshot;
+
+          var data = {};
+          var serializer = store.serializerFor(type.modelName);
+
+          serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
+
+          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;
 });
 /**
   @module ember-data
 */
-define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'ember-data/-private/adapters/errors', 'ember-data/-private/adapters/build-url-mixin', 'ember-data/-private/features', 'ember-data/-private/utils/parse-response-headers'], function (exports, _ember, _emberDataAdapter, _emberDataPrivateAdaptersErrors, _emberDataPrivateAdaptersBuildUrlMixin, _emberDataPrivateFeatures, _emberDataPrivateUtilsParseResponseHeaders) {
+define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'ember-data/adapters/errors', 'ember-data/-private/adapters/build-url-mixin', 'ember-data/-private/features', 'ember-data/-private/debug', 'ember-data/-private/utils/parse-response-headers'], function (exports, _ember, _emberDataAdapter, _emberDataAdaptersErrors, _emberDataPrivateAdaptersBuildUrlMixin, _emberDataPrivateFeatures, _emberDataPrivateDebug, _emberDataPrivateUtilsParseResponseHeaders) {
   var MapWithDefault = _ember.default.MapWithDefault;
   var get = _ember.default.get;
 
@@ -11345,7 +11527,7 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
     @extends DS.Adapter
     @uses DS.BuildURLMixin
   */
-  exports.default = _emberDataAdapter.default.extend(_emberDataPrivateAdaptersBuildUrlMixin.default, {
+  var RESTAdapter = _emberDataAdapter.default.extend(_emberDataPrivateAdaptersBuildUrlMixin.default, {
     defaultSerializer: '-rest',
 
     /**
@@ -11492,10 +11674,19 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findRecord: function (store, type, id, snapshot) {
-      var url = this.buildURL(type.modelName, id, snapshot, 'findRecord');
-      var query = this.buildQuery(snapshot);
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        var request = this._requestFor({
+          store: store, type: type, id: id, snapshot: snapshot,
+          requestType: 'findRecord'
+        });
 
-      return this.ajax(url, 'GET', { data: query });
+        return this._makeRequest(request);
+      } else {
+        var url = this.buildURL(type.modelName, id, snapshot, 'findRecord');
+        var query = this.buildQuery(snapshot);
+
+        return this.ajax(url, 'GET', { data: query });
+      }
     },
 
     /**
@@ -11511,10 +11702,25 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findAll: function (store, type, sinceToken, snapshotRecordArray) {
-      var url = this.buildURL(type.modelName, null, snapshotRecordArray, 'findAll');
       var query = this.buildQuery(snapshotRecordArray);
 
-      return this.ajax(url, 'GET', { data: query });
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        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.ajax(url, 'GET', { data: query });
+      }
     },
 
     /**
@@ -11532,13 +11738,22 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     query: function (store, type, query) {
-      var url = this.buildURL(type.modelName, null, null, 'query', query);
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        var request = this._requestFor({
+          store: store, type: type, query: query,
+          requestType: 'query'
+        });
 
-      if (this.sortQueryParams) {
-        query = this.sortQueryParams(query);
-      }
+        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 });
+        return this.ajax(url, 'GET', { data: query });
+      }
     },
 
     /**
@@ -11556,13 +11771,22 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     queryRecord: function (store, type, query) {
-      var url = this.buildURL(type.modelName, null, null, 'queryRecord', query);
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        var request = this._requestFor({
+          store: store, type: type, query: query,
+          requestType: 'queryRecord'
+        });
 
-      if (this.sortQueryParams) {
-        query = this.sortQueryParams(query);
-      }
+        return this._makeRequest(request);
+      } else {
+        var url = this.buildURL(type.modelName, null, null, 'queryRecord', query);
+
+        if (this.sortQueryParams) {
+          query = this.sortQueryParams(query);
+        }
 
-      return this.ajax(url, 'GET', { data: query });
+        return this.ajax(url, 'GET', { data: query });
+      }
     },
 
     /**
@@ -11592,8 +11816,17 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findMany: function (store, type, ids, snapshots) {
-      var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
-      return this.ajax(url, 'GET', { data: { ids: ids } });
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        var request = this._requestFor({
+          store: store, type: type, ids: ids, snapshots: snapshots,
+          requestType: 'findMany'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
+        return this.ajax(url, 'GET', { data: { ids: ids } });
+      }
     },
 
     /**
@@ -11623,12 +11856,21 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findHasMany: function (store, snapshot, url, relationship) {
-      var id = snapshot.id;
-      var type = snapshot.modelName;
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        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'));
+        url = this.urlPrefix(url, this.buildURL(type, id, snapshot, 'findHasMany'));
 
-      return this.ajax(url, 'GET');
+        return this.ajax(url, 'GET');
+      }
     },
 
     /**
@@ -11658,11 +11900,20 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findBelongsTo: function (store, snapshot, url, relationship) {
-      var id = snapshot.id;
-      var type = snapshot.modelName;
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        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;
 
-      url = this.urlPrefix(url, this.buildURL(type, id, snapshot, 'findBelongsTo'));
-      return this.ajax(url, 'GET');
+        url = this.urlPrefix(url, this.buildURL(type, id, snapshot, 'findBelongsTo'));
+        return this.ajax(url, 'GET');
+      }
     },
 
     /**
@@ -11679,13 +11930,22 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     createRecord: function (store, type, snapshot) {
-      var data = {};
-      var serializer = store.serializerFor(type.modelName);
-      var url = this.buildURL(type.modelName, null, snapshot, 'createRecord');
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        var request = this._requestFor({
+          store: store, type: type, snapshot: snapshot,
+          requestType: 'createRecord'
+        });
 
-      serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
+        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.ajax(url, "POST", { data: data });
+        return this.ajax(url, "POST", { data: data });
+      }
     },
 
     /**
@@ -11702,15 +11962,24 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     updateRecord: function (store, type, snapshot) {
-      var data = {};
-      var serializer = store.serializerFor(type.modelName);
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        var request = this._requestFor({
+          store: store, type: type, snapshot: snapshot,
+          requestType: 'updateRecord'
+        });
 
-      serializer.serializeIntoHash(data, type, snapshot);
+        return this._makeRequest(request);
+      } else {
+        var data = {};
+        var serializer = store.serializerFor(type.modelName);
 
-      var id = snapshot.id;
-      var url = this.buildURL(type.modelName, id, snapshot, 'updateRecord');
+        serializer.serializeIntoHash(data, type, snapshot);
 
-      return this.ajax(url, "PUT", { data: data });
+        var id = snapshot.id;
+        var url = this.buildURL(type.modelName, id, snapshot, 'updateRecord');
+
+        return this.ajax(url, "PUT", { data: data });
+      }
     },
 
     /**
@@ -11723,9 +11992,18 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     deleteRecord: function (store, type, snapshot) {
-      var id = snapshot.id;
+      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+        var request = this._requestFor({
+          store: store, type: type, snapshot: snapshot,
+          requestType: 'deleteRecord'
+        });
+
+        return this._makeRequest(request);
+      } else {
+        var id = snapshot.id;
 
-      return this.ajax(this.buildURL(type.modelName, id, snapshot, 'deleteRecord'), "DELETE");
+        return this.ajax(this.buildURL(type.modelName, id, snapshot, 'deleteRecord'), "DELETE");
+      }
     },
 
     _stripIDFromURL: function (store, snapshot) {
@@ -11839,13 +12117,30 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       if (this.isSuccess(status, headers, payload)) {
         return payload;
       } else if (this.isInvalid(status, headers, payload)) {
-        return new _emberDataPrivateAdaptersErrors.InvalidError(payload.errors);
+        return new _emberDataAdaptersErrors.InvalidError(payload.errors);
       }
 
       var errors = this.normalizeErrorResponse(status, headers, payload);
       var detailedMessage = this.generatedDetailedMessage(status, headers, payload, requestData);
 
-      return new _emberDataPrivateAdaptersErrors.AdapterError(errors, detailedMessage);
+      if ((0, _emberDataPrivateFeatures.default)('ds-extended-errors')) {
+        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);
     },
 
     /**
@@ -11917,14 +12212,22 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
         };
 
         hash.error = function (jqXHR, textStatus, errorThrown) {
+          (0, _emberDataPrivateDebug.runInDebug)(function () {
+            var message = 'The server returned an empty string for ' + type + ' ' + 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;
 
           if (errorThrown instanceof Error) {
             error = errorThrown;
           } else if (textStatus === 'timeout') {
-            error = new _emberDataPrivateAdaptersErrors.TimeoutError();
+            error = new _emberDataAdaptersErrors.TimeoutError();
           } else if (textStatus === 'abort') {
-            error = new _emberDataPrivateAdaptersErrors.AbortError();
+            error = new _emberDataAdaptersErrors.AbortError();
           } else {
             error = adapter.handleResponse(jqXHR.status, (0, _emberDataPrivateUtilsParseResponseHeaders.default)(jqXHR.getAllResponseHeaders()), adapter.parseErrorResponse(jqXHR.responseText) || errorThrown, requestData);
           }
@@ -12043,7 +12346,7 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
     buildQuery: function (snapshot) {
       var query = {};
 
-      if (true) {
+      if ((0, _emberDataPrivateFeatures.default)('ds-finder-include')) {
         if (snapshot) {
           var include = snapshot.include;
 
@@ -12057,6 +12360,266 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
     }
   });
 
+  if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
+
+    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;
+
+          case 'updateRecord':
+            serializer.serializeIntoHash(data, type, snapshot);
+            break;
+
+          case 'findRecord':
+            data = this.buildQuery(snapshot);
+            break;
+
+          case 'findAll':
+            if (params.sinceToken) {
+              query = query || {};
+              query.since = params.sinceToken;
+            }
+            data = query;
+            break;
+
+          case 'query':
+          case 'queryRecord':
+            if (this.sortQueryParams) {
+              query = this.sortQueryParams(query);
+            }
+            data = query;
+            break;
+
+          case 'findMany':
+            data = { ids: params.ids };
+            break;
+
+          default:
+            data = undefined;
+            break;
+        }
+
+        return 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':
+            return 'POST';
+          case 'updateRecord':
+            return 'PUT';
+          case 'deleteRecord':
+            return 'DELETE';
+        }
+
+        return 'GET';
+      },
+
+      /**
+       * 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 this.buildURL(type.modelName, id, snapshot, requestType, query);
+      },
+
+      /**
+       * 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');
+      },
+
+      /**
+       * 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 };
+      },
+
+      /**
+       * 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]);
+            });
+          };
+        }
+
+        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);
+
+        var method = request.method;
+        var url = request.url;
+
+        var requestData = { method: method, url: url };
+
+        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);
+
+            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'
+              });
+            });
+
+            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);
+            }
+
+            _ember.default.run.join(null, reject, error);
+          };
+
+          adapter._ajaxRequest(hash);
+        }, 'DS: RESTAdapter#makeRequest: ' + method + ' ' + url);
+      }
+    });
+  }
+
   //From http://stackoverflow.com/questions/280634/endswith-in-javascript
   function endsWith(string, suffix) {
     if (typeof String.prototype.endsWith !== 'function') {
@@ -12065,11 +12628,13 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       return string.endsWith(suffix);
     }
   }
+
+  exports.default = RESTAdapter;
 });
 /**
   @module ember-data
 */
-define("ember-data/attr", ["exports", "ember", "ember-data/-private/debug"], function (exports, _ember, _emberDataPrivateDebug) {
+define('ember-data/attr', ['exports', 'ember', 'ember-data/-private/debug'], function (exports, _ember, _emberDataPrivateDebug) {
   exports.default = attr;
 
   /**
@@ -12077,11 +12642,11 @@ define("ember-data/attr", ["exports", "ember", "ember-data/-private/debug"], fun
   */
 
   function getDefaultValue(record, options, key) {
-    if (typeof options.defaultValue === "function") {
+    if (typeof options.defaultValue === 'function') {
       return options.defaultValue.apply(null, arguments);
     } else {
       var defaultValue = options.defaultValue;
-      (0, _emberDataPrivateDebug.deprecate)("Non primitive defaultValues are deprecated because they are shared between all instances. If you would like to use a complex object as a default value please provide a function that returns the complex object.", typeof defaultValue !== 'object' || defaultValue === null, {
+      (0, _emberDataPrivateDebug.deprecate)('Non primitive defaultValues are deprecated because they are shared between all instances. If you would like to use a complex object as a default value please provide a function that returns the complex object.', typeof defaultValue !== 'object' || defaultValue === null, {
         id: 'ds.defaultValue.complex-object',
         until: '3.0.0'
       });
@@ -12231,7 +12796,7 @@ define("ember-data/attr", ["exports", "ember", "ember-data/-private/debug"], fun
   //  *
   //  */
 });
-define("ember-data", ["exports", "ember", "ember-data/-private/debug", "ember-data/-private/core", "ember-data/-private/system/normalize-model-name", "ember-data/-private/system/model/internal-model", "ember-data/-private/system/promise-proxies", "ember-data/-private/system/store", "ember-data/-private/system/model", "ember-data/model", "ember-data/-private/system/snapshot", "ember-data/adapter", "ember-data/serializer", "ember-data/-private/system/debug", "ember-data/-private/adapters/errors", "ember-data/-private/system/record-arrays", "ember-data/-private/system/many-array", "ember-data/-private/system/record-array-manager", "ember-data/-private/adapters", "ember-data/-private/adapters/build-url-mixin", "ember-data/-private/serializers", "ember-inflector", "ember-data/serializers/embedded-records-mixin", "ember-data/-private/transforms", "ember-data/relationships", "ember-data/setup-container", "ember-data/-private/instance-initializers/initialize-store-service", "ember-data/-private/system/container-proxy", "ember-data/-private/system/relationships/state/relationship"], function (exports, _ember, _emberDataPrivateDebug, _emberDataPrivateCore, _emberDataPrivateSystemNormalizeModelName, _emberDataPrivateSystemModelInternalModel, _emberDataPrivateSystemPromiseProxies, _emberDataPrivateSystemStore, _emberDataPrivateSystemModel, _emberDataModel, _emberDataPrivateSystemSnapshot, _emberDataAdapter, _emberDataSerializer, _emberDataPrivateSystemDebug, _emberDataPrivateAdaptersErrors, _emberDataPrivateSystemRecordArrays, _emberDataPrivateSystemManyArray, _emberDataPrivateSystemRecordArrayManager, _emberDataPrivateAdapters, _emberDataPrivateAdaptersBuildUrlMixin, _emberDataPrivateSerializers, _emberInflector, _emberDataSerializersEmbeddedRecordsMixin, _emberDataPrivateTransforms, _emberDataRelationships, _emberDataSetupContainer, _emberDataPrivateInstanceInitializersInitializeStoreService, _emberDataPrivateSystemContainerProxy, _emberDataPrivateSystemRelationshipsStateRelationship) {
+define("ember-data", ["exports", "ember", "ember-data/-private/debug", "ember-data/-private/features", "ember-data/-private/core", "ember-data/-private/system/normalize-model-name", "ember-data/-private/system/model/internal-model", "ember-data/-private/system/promise-proxies", "ember-data/-private/system/store", "ember-data/-private/system/model", "ember-data/model", "ember-data/-private/system/snapshot", "ember-data/adapter", "ember-data/serializer", "ember-data/-private/system/debug", "ember-data/adapters/errors", "ember-data/-private/system/record-arrays", "ember-data/-private/system/many-array", "ember-data/-private/system/record-array-manager", "ember-data/-private/adapters", "ember-data/-private/adapters/build-url-mixin", "ember-data/-private/serializers", "ember-inflector", "ember-data/serializers/embedded-records-mixin", "ember-data/-private/transforms", "ember-data/relationships", "ember-data/setup-container", "ember-data/-private/instance-initializers/initialize-store-service", "ember-data/-private/system/container-proxy", "ember-data/-private/system/relationships/state/relationship"], function (exports, _ember, _emberDataPrivateDebug, _emberDataPrivateFeatures, _emberDataPrivateCore, _emberDataPrivateSystemNormalizeModelName, _emberDataPrivateSystemModelInternalModel, _emberDataPrivateSystemPromiseProxies, _emberDataPrivateSystemStore, _emberDataPrivateSystemModel, _emberDataModel, _emberDataPrivateSystemSnapshot, _emberDataAdapter, _emberDataSerializer, _emberDataPrivateSystemDebug, _emberDataAdaptersErrors, _emberDataPrivateSystemRecordArrays, _emberDataPrivateSystemManyArray, _emberDataPrivateSystemRecordArrayManager, _emberDataPrivateAdapters, _emberDataPrivateAdaptersBuildUrlMixin, _emberDataPrivateSerializers, _emberInflector, _emberDataSerializersEmbeddedRecordsMixin, _emberDataPrivateTransforms, _emberDataRelationships, _emberDataSetupContainer, _emberDataPrivateInstanceInitializersInitializeStoreService, _emberDataPrivateSystemContainerProxy, _emberDataPrivateSystemRelationshipsStateRelationship) {
   /**
     Ember Data
     @module ember-data
@@ -12242,12 +12807,6 @@ define("ember-data", ["exports", "ember", "ember-data/-private/debug", "ember-da
     throw new _ember.default.Error("Ember Data requires at least Ember 1.13.0, but you have " + _ember.default.VERSION + ". Please upgrade your version of Ember, then upgrade Ember Data.");
   }
 
-  if (_ember.default.VERSION.match(/^1\.13\./)) {
-    (0, _emberDataPrivateDebug.warn)("Use of Ember Data 2+ with Ember 1.13 is unsupported. Please upgrade your version of Ember to 2.0 or higher.", false, {
-      id: 'ds.version.ember-1-13'
-    });
-  }
-
   _emberDataPrivateCore.default.Store = _emberDataPrivateSystemStore.Store;
   _emberDataPrivateCore.default.PromiseArray = _emberDataPrivateSystemPromiseProxies.PromiseArray;
   _emberDataPrivateCore.default.PromiseObject = _emberDataPrivateSystemPromiseProxies.PromiseObject;
@@ -12264,13 +12823,21 @@ define("ember-data", ["exports", "ember", "ember-data/-private/debug", "ember-da
 
   _emberDataPrivateCore.default.Adapter = _emberDataAdapter.default;
 
-  _emberDataPrivateCore.default.AdapterError = _emberDataPrivateAdaptersErrors.AdapterError;
-  _emberDataPrivateCore.default.InvalidError = _emberDataPrivateAdaptersErrors.InvalidError;
-  _emberDataPrivateCore.default.TimeoutError = _emberDataPrivateAdaptersErrors.TimeoutError;
-  _emberDataPrivateCore.default.AbortError = _emberDataPrivateAdaptersErrors.AbortError;
+  _emberDataPrivateCore.default.AdapterError = _emberDataAdaptersErrors.AdapterError;
+  _emberDataPrivateCore.default.InvalidError = _emberDataAdaptersErrors.InvalidError;
+  _emberDataPrivateCore.default.TimeoutError = _emberDataAdaptersErrors.TimeoutError;
+  _emberDataPrivateCore.default.AbortError = _emberDataAdaptersErrors.AbortError;
+
+  if ((0, _emberDataPrivateFeatures.default)('ds-extended-errors')) {
+    _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 = _emberDataPrivateAdaptersErrors.errorsHashToArray;
-  _emberDataPrivateCore.default.errorsArrayToHash = _emberDataPrivateAdaptersErrors.errorsArrayToHash;
+  _emberDataPrivateCore.default.errorsHashToArray = _emberDataAdaptersErrors.errorsHashToArray;
+  _emberDataPrivateCore.default.errorsArrayToHash = _emberDataAdaptersErrors.errorsArrayToHash;
 
   _emberDataPrivateCore.default.Serializer = _emberDataSerializer.default;
 
@@ -12411,7 +12978,7 @@ define('ember-data/serializer', ['exports', 'ember'], function (exports, _ember)
 /**
   @module ember-data
 */
-define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'ember-data/-private/debug'], function (exports, _ember, _emberDataPrivateDebug) {
+define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'ember-data/-private/debug', 'ember-data/-private/features'], function (exports, _ember, _emberDataPrivateDebug, _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); } }
 
   var get = _ember.default.get;
@@ -12636,7 +13203,7 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
     },
 
     /**
-      Serialize `hasMany` relationship when it is configured as embedded objects.
+      Serializes `hasMany` relationships when it is configured as embedded objects.
        This example of a post model has many comments:
        ```js
       Post = DS.Model.extend({
@@ -12677,7 +13244,7 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
       }
       ```
        The attrs options object can use more specific instruction for extracting and
-      serializing. When serializing, an option to embed `ids` or `records` can be set.
+      serializing. When serializing, an option to embed `ids`, `ids-and-types` or `records` can be set.
       When extracting the only option is `records`.
        So `{ embedded: 'always' }` is shorthand for:
       `{ serialize: 'records', deserialize: 'records' }`
@@ -12700,6 +13267,47 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
         }
       }
       ```
+       To embed the relationship as a collection of objects with `id` and `type` keys, set
+      `ids-and-types` for the related object.
+       This is particularly useful for polymorphic relationships where records don't share
+      the same table and the `id` is not enough information.
+       By example having a user that has many pets:
+       ```js
+      User = DS.Model.extend({
+        name:    DS.attr('string'),
+        pets: DS.hasMany('pet', { polymorphic: true })
+      });
+       Pet = DS.Model.extend({
+        name: DS.attr('string'),
+      });
+       Cat = Pet.extend({
+        // ...
+      });
+       Parrot = Pet.extend({
+        // ...
+      });
+      ```
+       ```app/serializers/user.js
+      import DS from 'ember-data;
+       export default DS.RESTSerializer.extend(DS.EmbeddedRecordsMixin, {
+        attrs: {
+          pets: { serialize: 'ids-and-types', deserialize: 'records' }
+        }
+      });
+      ```
+       ```js
+      {
+        "user": {
+          "id": "1"
+          "name": "Bertin Osborne",
+          "pets": [
+            { "id": "1", "type": "Cat" },
+            { "id": "1", "type": "Parrot"}
+          ]
+        }
+      }
+      ```
+       Note that the `ids-and-types` strategy is still behind the `ds-serialize-ids-and-types` feature flag.
        @method serializeHasMany
       @param {DS.Snapshot} snapshot
       @param {Object} json
@@ -12711,16 +13319,41 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
         this._super(snapshot, json, relationship);
         return;
       }
-      var includeIds = this.hasSerializeIdsOption(attr);
-      var includeRecords = this.hasSerializeRecordsOption(attr);
-      if (includeIds) {
+
+      if (this.hasSerializeIdsOption(attr)) {
         var serializedKey = this.keyForRelationship(attr, relationship.kind, 'serialize');
         json[serializedKey] = snapshot.hasMany(attr, { ids: true });
-      } else if (includeRecords) {
+      } else if (this.hasSerializeRecordsOption(attr)) {
         this._serializeEmbeddedHasMany(snapshot, json, relationship);
+      } else {
+        if ((0, _emberDataPrivateFeatures.default)("ds-serialize-ids-and-types")) {
+          if (this.hasSerializeIdsAndTypesOption(attr)) {
+            this._serializeHasManyAsIdsAndTypes(snapshot, json, relationship);
+          }
+        }
       }
     },
 
+    /**
+      Serializes a hasMany relationship as an array of objects containing only `id` and `type`
+      keys.
+      This has its use case on polymorphic hasMany relationships where the server is not storing
+      all records in the same table using STI, and therefore the `id` is not enough information
+       TODO: Make the default in Ember-data 3.0??
+    */
+    _serializeHasManyAsIdsAndTypes: function (snapshot, json, relationship) {
+      var serializedKey = this.keyForAttribute(relationship.key, 'serialize');
+      var hasMany = snapshot.hasMany(relationship.key);
+
+      json[serializedKey] = _ember.default.A(hasMany).map(function (recordSnapshot) {
+        //
+        // I'm sure I'm being utterly naive here. Propably id is a configurate property and
+        // type too, and the modelName has to be normalized somehow.
+        //
+        return { id: recordSnapshot.id, type: recordSnapshot.modelName };
+      });
+    },
+
     _serializeEmbeddedHasMany: function (snapshot, json, relationship) {
       var serializedKey = this._getMappedKey(relationship.key, snapshot.type);
       if (serializedKey === relationship.key && this.keyForRelationship) {
@@ -12798,6 +13431,12 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
       return option && (option.serialize === 'ids' || option.serialize === 'id');
     },
 
+    // checks config for attrs option to serialize records as objects containing id and types
+    hasSerializeIdsAndTypesOption: function (attr) {
+      var option = this.attrsOption(attr);
+      return option && (option.serialize === 'ids-and-types' || option.serialize === 'id-and-type');
+    },
+
     // checks config for attrs option to serialize records
     noSerializeOptionSpecified: function (attr) {
       var option = this.attrsOption(attr);
@@ -12916,7 +13555,8 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
       var serializer = store.serializerFor(modelName);
 
       return serializer.normalize(modelClass, relationshipHash, null);
-    }
+    },
+    isEmbeddedRecordsMixin: true
   });
 });
 define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-private/debug', 'ember-data/serializers/json', 'ember-data/-private/system/normalize-model-name', 'ember-inflector', 'ember-data/-private/features'], function (exports, _ember, _emberDataPrivateDebug, _emberDataSerializersJson, _emberDataPrivateSystemNormalizeModelName, _emberInflector, _emberDataPrivateFeatures) {
@@ -13095,7 +13735,7 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
     */
     pushPayload: function (store, payload) {
       var normalizedPayload = this._normalizeDocumentHelper(payload);
-      if (false) {
+      if ((0, _emberDataPrivateFeatures.default)('ds-pushpayload-return')) {
         return store.push(normalizedPayload);
       } else {
         store.push(normalizedPayload);
@@ -13410,6 +14050,11 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
 
   (0, _emberDataPrivateDebug.runInDebug)(function () {
     JSONAPISerializer.reopen({
+      willMergeMixin: function (props) {
+        (0, _emberDataPrivateDebug.warn)('The JSONAPISerializer does not work with the EmbeddedRecordsMixin because the JSON API spec does not describe how to format embedded resources.', !props.isEmbeddedRecordsMixin, {
+          id: 'ds.serializer.embedded-records-mixin-not-supported'
+        });
+      },
       warnMessageForUndefinedType: function () {
         return 'Encountered a resource object with an undefined type (resolved resource using ' + this.constructor.toString() + ')';
       },
@@ -13424,7 +14069,7 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
 /**
   @module ember-data
 */
-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/adapters/errors', 'ember-data/-private/features'], function (exports, _ember, _emberDataPrivateDebug, _emberDataSerializer, _emberDataPrivateSystemCoerceId, _emberDataPrivateSystemNormalizeModelName, _emberDataPrivateUtils, _emberDataPrivateAdaptersErrors, _emberDataPrivateFeatures) {
+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/adapters/errors', 'ember-data/-private/features'], function (exports, _ember, _emberDataPrivateDebug, _emberDataSerializer, _emberDataPrivateSystemCoerceId, _emberDataPrivateSystemNormalizeModelName, _emberDataPrivateUtils, _emberDataAdaptersErrors, _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); } }
 
   var get = _ember.default.get;
@@ -13586,17 +14231,17 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
       var _this = this;
 
       var attributes = undefined;
-      if (true) {
+      if ((0, _emberDataPrivateFeatures.default)('ds-transform-pass-options')) {
         attributes = get(typeClass, 'attributes');
       }
 
       typeClass.eachTransformedAttribute(function (key, typeClass) {
-        if (!data.hasOwnProperty(key)) {
+        if (!(key in data)) {
           return;
         }
 
         var transform = _this.transformFor(typeClass);
-        if (true) {
+        if ((0, _emberDataPrivateFeatures.default)('ds-transform-pass-options')) {
           var transformMeta = attributes.get(key);
           data[key] = transform.deserialize(data[key], transformMeta.options);
         } else {
@@ -14445,7 +15090,7 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
         var value = snapshot.attr(key);
         if (type) {
           var transform = this.transformFor(type);
-          if (true) {
+          if ((0, _emberDataPrivateFeatures.default)('ds-transform-pass-options')) {
             value = transform.serialize(value, attribute.options);
           } else {
             value = transform.serialize(value);
@@ -14686,7 +15331,7 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
       var _this7 = this;
 
       if (payload && typeof payload === 'object' && payload.errors) {
-        payload = (0, _emberDataPrivateAdaptersErrors.errorsArrayToHash)(payload.errors);
+        payload = (0, _emberDataAdaptersErrors.errorsArrayToHash)(payload.errors);
 
         this.normalizeUsingDeclaredMapping(typeClass, payload);
 
@@ -14791,8 +15436,7 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
 
   /**
     Normally, applications will use the `RESTSerializer` by implementing
-    the `normalize` method and individual normalizations under
-    `normalizeHash`.
+    the `normalize` method.
   
     This allows you to do whatever kind of munging you need, and is
     especially useful if your server is inconsistent and you need to
@@ -14805,7 +15449,7 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
     There are also a number of hooks that you might find useful to define
     across-the-board rules for your payload. These rules will be useful
     if your server is consistent, or if you're building an adapter for
-    an infrastructure service, like Parse, and want to encode service
+    an infrastructure service, like Firebase, and want to encode service
     conventions.
   
     For example, if all of your keys are underscored and all-caps, but
@@ -14889,25 +15533,25 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
       * With `App.Comment`, `"comments"` and `{ id: 1, body: "FIRST" }`
       * With `App.Comment`, `"comments"` and `{ id: 2, body: "Rails is unagi" }`
        You can use this method, for example, to normalize underscored keys to camelized
-      or other general-purpose normalizations.
-       If you want to do normalizations specific to some part of the payload, you
-      can specify those under `normalizeHash`.
+      or other general-purpose normalizations. You will only need to implement 
+      `normalize` and manipulate the payload as desired.
        For example, if the `IDs` under `"comments"` are provided as `_id` instead of
       `id`, you can specify how to normalize just the comments:
        ```app/serializers/post.js
       import DS from 'ember-data';
        export default DS.RESTSerializer.extend({
-        normalizeHash: {
-          comments: function(hash) {
+        normalize(model, hash, prop) {
+          if (prop === 'comments') {
             hash.id = hash._id;
-            delete hash._id;
-            return hash;
+            delete hash._id;   
           }
+           return this._super(...arguments);
         }
       });
       ```
-       The key under `normalizeHash` is just the original key that was in the original
-      payload.
+       On each call to the `normalize` method, the third parameter (`prop`) is always 
+      one of the keys that were in the original payload or in the result of another 
+      normalization as `normalizeResponse`.
        @method normalize
       @param {DS.Model} modelClass
       @param {Object} resourceHash
@@ -14916,9 +15560,13 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
     */
     normalize: function (modelClass, resourceHash, prop) {
       if (this.normalizeHash && this.normalizeHash[prop]) {
+        (0, _emberDataPrivateDebug.deprecate)('`RESTSerializer.normalizeHash` has been deprecated. Please use `serializer.normalize` to modify the payload of single resources.', false, {
+          id: 'ds.serializer.normalize-hash-deprecated',
+          until: '3.0.0'
+        });
         this.normalizeHash[prop](resourceHash);
       }
-      return this._super(modelClass, resourceHash, prop);
+      return this._super(modelClass, resourceHash);
     },
 
     /**
@@ -15180,7 +15828,7 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
         });
       }
 
-      if (false) {
+      if ((0, _emberDataPrivateFeatures.default)('ds-pushpayload-return')) {
         return store.push(documentHash);
       } else {
         store.push(documentHash);
@@ -15607,7 +16255,7 @@ define('ember-data/transform', ['exports', 'ember'], function (exports, _ember)
   });
 });
 define("ember-data/version", ["exports"], function (exports) {
-  exports.default = "2.5.5";
+  exports.default = "2.6.0-beta.1";
 });
 define("ember-inflector", ["exports", "ember", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (exports, _ember, _emberInflectorLibSystem, _emberInflectorLibExtString) {
 
@@ -16002,7 +16650,7 @@ define('ember-inflector/lib/system/inflector', ['exports', 'ember'], function (e
         return word;
       }
 
-      for (rule in irregular) {
+      for (rule in this.rules.irregular) {
         if (lowercase.match(rule + "$")) {
           substitution = irregular[rule];
 
@@ -16011,7 +16659,7 @@ define('ember-inflector/lib/system/inflector', ['exports', 'ember'], function (e
             rule = capitalize(rule);
           }
 
-          return word.replace(new RegExp(rule, 'i'), substitution);
+          return word.replace(rule, substitution);
         }
       }