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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f79999e62cc652e4bea22f2190d6c5a6b8b92b
-  data.tar.gz: edca8ebda1f72c2beb8ac125854f9c1272724379
+  metadata.gz: b4e14899e03d2ce787afc72a12858bb8137bc1d8
+  data.tar.gz: 62e76414b4f6d6024f3fb22c73570d503bfc8999
 SHA512:
-  metadata.gz: 2b5815a20c02f767e0889846f4bf024120f215f602f24ace34827d956f889fec7c9f33bc1adbf7cd4da6d38dcd08ef2c44f75df75e6eae008b743088aecca06d
-  data.tar.gz: 41347e4946c0c1cb976f777fc55e77d32774b452572dbe4c59bfaa7e15c0302161f0e114bfb18317c2265d8b8eb5046e607183d83457a6f7493b52bc630648e3
+  metadata.gz: 66befa12de9851f18f254b4786c644aa731d347f07bb2d7fde687f3deae784e4d54a6de8a4175d33a8f4e915690701597e09013824f3ca892903fe1dcbf9b6d8
+  data.tar.gz: 0235b563e7e1d5d4d9c99c117cd959d21dc13e6f7611d1e57a860bb6997b00f8b26bec1d5ac4de2987c2e314af6725b62e386bd6f3eb94989996735d3a4e6ebe

data/dist/globals/ember-data.js

@@ -6,7 +6,7 @@
  * @copyright Copyright 2011-2016 Tilde Inc. and contributors.
  *            Portions Copyright 2011 LivingSocial Inc.
  * @license   Licensed under MIT license (see license.js)
- * @version   2.6.0-beta.1
+ * @version   2.6.0-beta.2
  */
 
 var loader, define, requireModule, require, requirejs;
@@ -63,16 +63,17 @@ var loader, define, requireModule, require, requirejs;
 
   var defaultDeps = ['require', 'exports', 'module'];
 
-  function Module(name, deps, callback) {
+  function Module(name, deps, callback, alias) {
     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;
+    this.isAlias = alias;
+    this.reified = new Array(deps.length);
   }
 
   Module.prototype.makeDefaultExport = function() {
@@ -84,14 +85,14 @@ var loader, define, requireModule, require, requirejs;
     }
   };
 
-  Module.prototype.exports = function(reifiedDeps) {
+  Module.prototype.exports = function() {
     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);
+      var result = this.callback.apply(this, this.reified);
       if (!(this.hasExportsAsDep && result === undefined)) {
         this.module.exports = result;
       }
@@ -109,11 +110,10 @@ var loader, define, requireModule, require, requirejs;
 
   Module.prototype.reify = function() {
     var deps = this.deps;
-    var length = deps.length;
-    var reified = new Array(length);
     var dep;
+    var reified = this.reified;
 
-    for (var i = 0, l = length; i < l; i++) {
+    for (var i = 0; i < deps.length; i++) {
       dep = deps[i];
       if (dep === 'exports') {
         this.hasExportsAsDep = true;
@@ -126,22 +126,25 @@ var loader, define, requireModule, require, requirejs;
         reified[i] = findModule(resolve(dep, this.name), this.name).module.exports;
       }
     }
-
-    return reified;
   };
 
   Module.prototype.makeRequire = function() {
     var name = this.name;
-
-    return this._require || (this._require = function(dep) {
+    var r = function(dep) {
       return require(resolve(dep, name));
-    });
+    };
+    r['default'] = r;
+    r.has = function(dep) {
+      return has(resolve(dep, name));
+    }
+    return r;
   };
 
   Module.prototype.build = function() {
-    if (this.state === FAILED) { return; }
+    if (this.state === FAILED || this.state === LOADED) { return; }
     this.state = FAILED;
-    this.exports(this.reify());
+    this.reify()
+    this.exports();
     this.state = LOADED;
   };
 
@@ -155,7 +158,11 @@ var loader, define, requireModule, require, requirejs;
       deps     =  [];
     }
 
-    registry[name] = new Module(name, deps, callback);
+    if (callback instanceof Alias) {
+      registry[name] = new Module(callback.name, deps, callback, true);
+    } else {
+      registry[name] = new Module(name, deps, callback, false);
+    }
   };
 
   // we don't support all of AMD
@@ -182,9 +189,8 @@ var loader, define, requireModule, require, requirejs;
   function findModule(name, referrer) {
     var mod = registry[name] || registry[name + '/index'];
 
-    while (mod && mod.callback instanceof Alias) {
-      name = mod.callback.name;
-      mod = registry[name];
+    while (mod && mod.isAlias) {
+      mod = registry[mod.name];
     }
 
     if (!mod) { missingModule(name, referrer); }
@@ -216,7 +222,12 @@ var loader, define, requireModule, require, requirejs;
     return parentBase.join('/');
   }
 
+  function has(name) {
+    return !!(registry[name] || registry[name + '/index']);
+  }
+
   requirejs.entries = requirejs._eak_seen = registry;
+  requirejs.has = has;
   requirejs.unsee = function(moduleName) {
     findModule(moduleName, '(unsee)').unsee();
   };
@@ -225,6 +236,28 @@ var loader, define, requireModule, require, requirejs;
     requirejs.entries = requirejs._eak_seen = registry = {};
     seen = {};
   };
+
+  // prime
+  define('foo',      function() {});
+  define('foo/bar',  [], function() {});
+  define('foo/asdf', ['module', 'exports', 'require'], function(module, exports, require) {
+    if (require.has('foo/bar')) {
+      require('foo/bar');
+    }
+  });
+  define('foo/baz',  [], define.alias('foo'));
+  define('foo/quz',  define.alias('foo'));
+  define('foo/bar',  ['foo', './quz', './baz', './asdf', './bar', '../foo'], function() {});
+  define('foo/main', ['foo/bar'], function() {});
+
+  require('foo/main');
+  require.unsee('foo/bar');
+
+  requirejs.clear();
+
+  if (typeof module !== 'undefined') {
+    module.exports = { require: require, define: define };
+  }
 })(this);
 
 define("ember-data/-private/adapters", ["exports", "ember-data/adapters/json-api", "ember-data/adapters/rest"], function (exports, _emberDataAdaptersJsonApi, _emberDataAdaptersRest) {
@@ -2856,26 +2889,23 @@ define("ember-data/-private/system/model/internal-model", ["exports", "ember", "
     }
   };
 
-  if ((0, _emberDataPrivateFeatures.default)('ds-references')) {
-
-    InternalModel.prototype.referenceFor = function (type, name) {
-      var reference = this.references[name];
-
-      if (!reference) {
-        var relationship = this._relationships.get(name);
+  InternalModel.prototype.referenceFor = function (type, name) {
+    var reference = this.references[name];
 
-        if (type === "belongsTo") {
-          reference = new _emberDataPrivateSystemReferences.BelongsToReference(this.store, this, relationship);
-        } else if (type === "hasMany") {
-          reference = new _emberDataPrivateSystemReferences.HasManyReference(this.store, this, relationship);
-        }
+    if (!reference) {
+      var relationship = this._relationships.get(name);
 
-        this.references[name] = reference;
+      if (type === "belongsTo") {
+        reference = new _emberDataPrivateSystemReferences.BelongsToReference(this.store, this, relationship);
+      } else if (type === "hasMany") {
+        reference = new _emberDataPrivateSystemReferences.HasManyReference(this.store, this, relationship);
       }
 
-      return reference;
-    };
-  }
+      this.references[name] = reference;
+    }
+
+    return reference;
+  };
 });
 define("ember-data/-private/system/model/model", ["exports", "ember", "ember-data/-private/debug", "ember-data/-private/system/promise-proxies", "ember-data/-private/system/model/errors", "ember-data/-private/features", "ember-data/-private/system/debug/debug-info", "ember-data/-private/system/relationships/belongs-to", "ember-data/-private/system/relationships/has-many", "ember-data/-private/system/relationships/ext", "ember-data/-private/system/model/attr"], function (exports, _ember, _emberDataPrivateDebug, _emberDataPrivateSystemPromiseProxies, _emberDataPrivateSystemModelErrors, _emberDataPrivateFeatures, _emberDataPrivateSystemDebugDebugInfo, _emberDataPrivateSystemRelationshipsBelongsTo, _emberDataPrivateSystemRelationshipsHasMany, _emberDataPrivateSystemRelationshipsExt, _emberDataPrivateSystemModelAttr) {
 
@@ -3389,18 +3419,31 @@ define("ember-data/-private/system/model/model", ["exports", "ember", "ember-dat
     /**
       Returns an object, whose keys are changed properties, and value is
       an [oldProp, newProp] array.
+       The array represents the diff of the canonical state with the local state
+      of the model. Note: if the model is created locally, the canonical state is
+      empty since the adapter hasn't acknowledged the attributes yet:
        Example
        ```app/models/mascot.js
       import DS from 'ember-data';
        export default DS.Model.extend({
-        name: attr('string')
+        name: attr('string'),
+        isAdmin: attr('boolean', {
+          defaultValue: false
+        })
       });
       ```
        ```javascript
       var mascot = store.createRecord('mascot');
-      mascot.changedAttributes(); // {}
-      mascot.set('name', 'Tomster');
-      mascot.changedAttributes(); // {name: [undefined, 'Tomster']}
+       mascot.changedAttributes(); // {}
+       mascot.set('name', 'Tomster');
+      mascot.changedAttributes(); // { name: [undefined, 'Tomster'] }
+       mascot.set('isAdmin', true);
+      mascot.changedAttributes(); // { isAdmin: [undefined, true], name: [undefined, 'Tomster'] }
+       mascot.save().then(function() {
+        mascot.changedAttributes(); // {}
+         mascot.set('isAdmin', false);
+        mascot.changedAttributes(); // { isAdmin: [true, false] }
+      });
       ```
        @method changedAttributes
       @return {Object} an object, whose keys are changed properties,
@@ -3633,108 +3676,105 @@ define("ember-data/-private/system/model/model", ["exports", "ember", "ember-dat
     });
   }
 
-  if ((0, _emberDataPrivateFeatures.default)("ds-references")) {
-
-    Model.reopen({
+  Model.reopen({
 
-      /**
-        Get the reference for the specified belongsTo relationship.
-         Example
-         ```javascript
-        // models/blog.js
-        export default DS.Model.extend({
-          user: DS.belongsTo({ async: true })
-        });
-         store.push({
-          type: 'blog',
-          id: 1,
-          relationships: {
-            user: { type: 'user', id: 1 }
-          }
-        });
-        var userRef = blog.belongsTo('user');
-         // check if the user relationship is loaded
-        var isLoaded = userRef.value() !== null;
-         // get the record of the reference (null if not yet available)
-        var user = userRef.value();
-         // get the identifier of the reference
-        if (userRef.remoteType() === "id") {
-          var id = userRef.id();
-        } else if (userRef.remoteType() === "link") {
-          var link = userRef.link();
+    /**
+      Get the reference for the specified belongsTo relationship.
+       Example
+       ```javascript
+      // models/blog.js
+      export default DS.Model.extend({
+        user: DS.belongsTo({ async: true })
+      });
+       var blog = store.push({
+        type: 'blog',
+        id: 1,
+        relationships: {
+          user: { type: 'user', id: 1 }
         }
-         // load user (via store.findRecord or store.findBelongsTo)
-        userRef.load().then(...)
-         // or trigger a reload
-        userRef.reload().then(...)
-         // provide data for reference
-        userRef.push({
-          type: 'user',
-          id: 1,
-          attributes: {
-            username: "@user"
-          }
-        }).then(function(user) {
-          userRef.value() === user;
-        });
-        ```
-         @method belongsTo
-        @param {String} name of the relationship
-        @return {BelongsToReference} reference for this relationship
-      */
-      belongsTo: function (name) {
-        return this._internalModel.referenceFor('belongsTo', name);
-      },
+      });
+      var userRef = blog.belongsTo('user');
+       // check if the user relationship is loaded
+      var isLoaded = userRef.value() !== null;
+       // get the record of the reference (null if not yet available)
+      var user = userRef.value();
+       // get the identifier of the reference
+      if (userRef.remoteType() === "id") {
+        var id = userRef.id();
+      } else if (userRef.remoteType() === "link") {
+        var link = userRef.link();
+      }
+       // load user (via store.findRecord or store.findBelongsTo)
+      userRef.load().then(...)
+       // or trigger a reload
+      userRef.reload().then(...)
+       // provide data for reference
+      userRef.push({
+        type: 'user',
+        id: 1,
+        attributes: {
+          username: "@user"
+        }
+      }).then(function(user) {
+        userRef.value() === user;
+      });
+      ```
+       @method belongsTo
+      @param {String} name of the relationship
+      @return {BelongsToReference} reference for this relationship
+    */
+    belongsTo: function (name) {
+      return this._internalModel.referenceFor('belongsTo', name);
+    },
 
-      /**
-        Get the reference for the specified hasMany relationship.
-         Example
-         ```javascript
-        // models/blog.js
-        export default DS.Model.extend({
-          comments: DS.hasMany({ async: true })
-        });
-         store.push({
-          type: 'blog',
-          id: 1,
-          relationships: {
-            comments: {
-              data: [
-                { type: 'comment', id: 1 },
-                { type: 'comment', id: 2 }
-              ]
-            }
+    /**
+      Get the reference for the specified hasMany relationship.
+       Example
+       ```javascript
+      // models/blog.js
+      export default DS.Model.extend({
+        comments: DS.hasMany({ async: true })
+      });
+       var blog = store.push({
+        type: 'blog',
+        id: 1,
+        relationships: {
+          comments: {
+            data: [
+              { type: 'comment', id: 1 },
+              { type: 'comment', id: 2 }
+            ]
           }
-        });
-        var commentsRef = blog.hasMany('comments');
-         // check if the comments are loaded already
-        var isLoaded = commentsRef.value() !== null;
-         // get the records of the reference (null if not yet available)
-        var comments = commentsRef.value();
-         // get the identifier of the reference
-        if (commentsRef.remoteType() === "ids") {
-          var ids = commentsRef.ids();
-        } else if (commentsRef.remoteType() === "link") {
-          var link = commentsRef.link();
         }
-         // load comments (via store.findMany or store.findHasMany)
-        commentsRef.load().then(...)
-         // or trigger a reload
-        commentsRef.reload().then(...)
-         // provide data for reference
-        commentsRef.push([{ type: 'comment', id: 1 }, { type: 'comment', id: 2 }]).then(function(comments) {
-          commentsRef.value() === comments;
-        });
-        ```
-         @method hasMany
-        @param {String} name of the relationship
-        @return {HasManyReference} reference for this relationship
-      */
-      hasMany: function (name) {
-        return this._internalModel.referenceFor('hasMany', name);
-      }
-    });
-  }
+      });
+      var commentsRef = blog.hasMany('comments');
+       // check if the comments are loaded already
+      var isLoaded = commentsRef.value() !== null;
+       // get the records of the reference (null if not yet available)
+      var comments = commentsRef.value();
+       // get the identifier of the reference
+      if (commentsRef.remoteType() === "ids") {
+        var ids = commentsRef.ids();
+      } else if (commentsRef.remoteType() === "link") {
+        var link = commentsRef.link();
+      }
+       // load comments (via store.findMany or store.findHasMany)
+      commentsRef.load().then(...)
+       // or trigger a reload
+      commentsRef.reload().then(...)
+       // provide data for reference
+      commentsRef.push([{ type: 'comment', id: 1 }, { type: 'comment', id: 2 }]).then(function(comments) {
+        commentsRef.value() === comments;
+      });
+      ```
+       @method hasMany
+      @param {String} name of the relationship
+      @return {HasManyReference} reference for this relationship
+    */
+    hasMany: function (name) {
+      return this._internalModel.referenceFor('hasMany', name);
+    }
+  });
 
   Model.reopenClass(_emberDataPrivateSystemRelationshipsExt.RelationshipsClassMethodsMixin);
   Model.reopenClass(_emberDataPrivateSystemModelAttr.AttrClassMethodsMixin);
@@ -5121,10 +5161,6 @@ 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);
       });
@@ -7363,9 +7399,7 @@ define('ember-data/-private/system/snapshot-record-array', ['exports', 'ember-da
     */
     this.adapterOptions = options.adapterOptions;
 
-    if ((0, _emberDataPrivateFeatures.default)('ds-finder-include')) {
-      this.include = options.include;
-    }
+    this.include = options.include;
   }
 
   /**
@@ -7428,9 +7462,7 @@ define('ember-data/-private/system/snapshot', ['exports', 'ember', 'ember-data/-
     */
     this.adapterOptions = options.adapterOptions;
 
-    if ((0, _emberDataPrivateFeatures.default)('ds-finder-include')) {
-      this.include = options.include;
-    }
+    this.include = options.include;
 
     this._changedAttributes = record.changedAttributes();
   }
@@ -8056,12 +8088,10 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
 
     /**
       This method returns a record for a given type and id combination.
-       The `findRecord` method will always return a **promise** that will be
-      resolved with the record. If the record was already in the store,
-      the promise will be resolved immediately. Otherwise, the store
-      will ask the adapter's `find` method to find the necessary data.
        The `findRecord` method will always resolve its promise with the same
       object for a given type and `id`.
+       The `findRecord` method will always return a **promise** that will be
+      resolved with the record.
        Example
        ```app/routes/post.js
       import Ember from 'ember';
@@ -8071,17 +8101,73 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
         }
       });
       ```
-       If you would like to force the record to reload, instead of
-      loading it from the cache when present you can set `reload: true`
-      in the options object for `findRecord`.
-       ```app/routes/post/edit.js
-      import Ember from 'ember';
-       export default Ember.Route.extend({
-        model: function(params) {
-          return this.store.findRecord('post', params.post_id, { reload: true });
+       If the record is not yet available, the store will ask the adapter's `find`
+      method to find the necessary data. If the record is already present in the
+      store, it depends on the reload behavior _when_ the returned promise
+      resolves.
+       The reload behavior is configured either via the passed `options` hash or
+      the result of the adapter's `shouldReloadRecord`.
+       If `{ reload: true }` is passed or `adapter.shouldReloadRecord` evaluates
+      to `true`, then the returned promise resolves once the adapter returns
+      data, regardless if the requested record is already in the store:
+       ```js
+      store.push({
+        data: {
+          id: 1,
+          type: 'post',
+          revision: 1
         }
+      });
+       // adapter#findRecord resolves with
+      // [
+      //   {
+      //     id: 1,
+      //     type: 'post',
+      //     revision: 2
+      //   }
+      // ]
+      store.findRecord('post', 1, { reload: true }).then(function(post) {
+        post.get("revision"); // 2
       });
       ```
+       If no reload is indicated via the abovementioned ways, then the promise
+      immediately resolves with the cached version in the store.
+       Optionally, if `adapter.shouldBackgroundReloadRecord` evaluates to `true`,
+      then a background reload is started, which updates the records' data, once
+      it is available:
+       ```js
+      // app/adapters/post.js
+      import ApplicationAdapter from "./application";
+       export default ApplicationAdapter.extend({
+        shouldReloadRecord(store, snapshot) {
+          return false;
+        },
+         shouldBackgroundReloadRecord(store, snapshot) {
+          return true;
+        }
+      });
+       // ...
+       store.push({
+        data: {
+          id: 1,
+          type: 'post',
+          revision: 1
+        }
+      });
+       var blogPost = store.findRecord('post', 1).then(function(post) {
+        post.get('revision'); // 1
+      });
+       // later, once adapter#findRecord resolved with
+      // [
+      //   {
+      //     id: 1,
+      //     type: 'post',
+      //     revision: 2
+      //   }
+      // ]
+       blogPost.get('revision'); // 2
+      ```
+       See [peekRecord](#method_peekRecord) to get the cached version of a record.
        @method findRecord
       @param {String} modelName
       @param {(String|Integer)} id
@@ -8563,11 +8649,10 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
     },
 
     /**
-      `findAll` ask the adapter's `findAll` method to find the records
-      for the given type, and return a promise that will be resolved
-      once the server returns the values. The promise will resolve into
-      all records of this type present in the store, even if the server
-      only returns a subset of them.
+      `findAll` ask the adapter's `findAll` method to find the records for the
+      given type, and returns a promise which will resolve with all records of
+      this type present in the store, even if the adapter only returns a subset
+      of them.
        ```app/routes/authors.js
       import Ember from 'ember';
        export default Ember.Route.extend({
@@ -8576,6 +8661,70 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
         }
       });
       ```
+       _When_ the returned promise resolves depends on the reload behavior,
+      configured via the passed `options` hash and the result of the adapter's
+      `shouldReloadAll` method.
+       If `{ reload: true }` is passed or `adapter.shouldReloadAll` evaluates to
+      `true`, then the returned promise resolves once the adapter returns data,
+      regardless if there are already records in the store:
+       ```js
+      store.push({
+        data: {
+          id: 'first',
+          type: 'author'
+        }
+      });
+       // adapter#findAll resolves with
+      // [
+      //   {
+      //     id: 'second',
+      //     type: 'author'
+      //   }
+      // ]
+      store.findAll('author', { reload: true }).then(function(authors) {
+        authors.getEach("id"); // ['first', 'second']
+      });
+      ```
+       If no reload is indicated via the abovementioned ways, then the promise
+      immediately resolves with all the records currently loaded in the store.
+      Optionally, if `adapter.shouldBackgroundReloadAll` evaluates to `true`,
+      then a background reload is started. Once this resolves, the array with
+      which the promise resolves, is updated automatically so it contains all the
+      records in the store:
+       ```js
+      // app/adapters/application.js
+      export default DS.Adapter.extend({
+        shouldReloadAll(store, snapshotsArray) {
+          return false;
+        },
+         shouldBackgroundReloadAll(store, snapshotsArray) {
+          return true;
+        }
+      });
+       // ...
+       store.push({
+        data: {
+          id: 'first',
+          type: 'author'
+        }
+      });
+       var allAuthors;
+      store.findAll('author').then(function(authors) {
+        authors.getEach('id'); // ['first']
+         allAuthors = authors;
+      });
+       // later, once adapter#findAll resolved with
+      // [
+      //   {
+      //     id: 'second',
+      //     type: 'author'
+      //   }
+      // ]
+       allAuthors.getEach('id'); // ['first', 'second']
+      ```
+       See [peekAll](#method_peekAll) to get an array of current records in the
+      store, without waiting until a reload is finished.
+       See [query](#method_query) to only get a subset of records from the server.
        @method findAll
       @param {String} modelName
       @param {Object} options
@@ -9331,15 +9480,10 @@ 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 ((0, _emberDataPrivateFeatures.default)('ds-pushpayload-return')) {
-        return this._adapterRun(function () {
-          return serializer.pushPayload(_this3, payload);
-        });
-      } else {
-        this._adapterRun(function () {
-          return serializer.pushPayload(_this3, payload);
-        });
-      }
+
+      this._adapterRun(function () {
+        return serializer.pushPayload(_this3, payload);
+      });
     },
 
     /**
@@ -9532,41 +9676,38 @@ define('ember-data/-private/system/store', ['exports', 'ember', 'ember-data/mode
 
   });
 
-  if ((0, _emberDataPrivateFeatures.default)("ds-references")) {
-
-    Store.reopen({
-      /**
-        Get the reference for the specified record.
-         Example
-         ```javascript
-        var userRef = store.getReference('user', 1);
-         // check if the user is loaded
-        var isLoaded = userRef.value() !== null;
-         // get the record of the reference (null if not yet available)
-        var user = userRef.value();
-         // get the identifier of the reference
-        if (userRef.remoteType() === "id") {
-        var id = userRef.id();
-        }
-         // load user (via store.find)
-        userRef.load().then(...)
-         // or trigger a reload
-        userRef.reload().then(...)
-         // provide data for reference
-        userRef.push({ id: 1, username: "@user" }).then(function(user) {
-          userRef.value() === user;
-        });
-      ```
-       @method getReference
-      @param {String} type
-      @param {String|Integer} id
-      @return {RecordReference}
-      */
-      getReference: function (type, id) {
-        return this._internalModelForId(type, id).recordReference;
-      }
-    });
-  }
+  Store.reopen({
+    /**
+      Get the reference for the specified record.
+       Example
+       ```javascript
+      var userRef = store.getReference('user', 1);
+       // check if the user is loaded
+      var isLoaded = userRef.value() !== null;
+       // get the record of the reference (null if not yet available)
+      var user = userRef.value();
+       // get the identifier of the reference
+      if (userRef.remoteType() === "id") {
+      var id = userRef.id();
+      }
+       // load user (via store.find)
+      userRef.load().then(...)
+       // or trigger a reload
+      userRef.reload().then(...)
+       // provide data for reference
+      userRef.push({ id: 1, username: "@user" }).then(function(user) {
+        userRef.value() === user;
+      });
+    ```
+     @method getReference
+    @param {String} type
+    @param {String|Integer} id
+    @return {RecordReference}
+    */
+    getReference: function (type, id) {
+      return this._internalModelForId(type, id).recordReference;
+    }
+  });
 
   function deserializeRecordId(store, key, relationship, id) {
     if (isNone(id)) {
@@ -10164,14 +10305,6 @@ define('ember-data/-private/transforms/boolean', ['exports', 'ember', 'ember-dat
     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") {
@@ -10184,13 +10317,6 @@ define('ember-data/-private/transforms/boolean', ['exports', 'ember', 'ember-dat
     },
 
     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);
     }
@@ -10821,9 +10947,29 @@ define('ember-data/adapter', ['exports', 'ember'], function (exports, _ember) {
       This method is used by the store to determine if the store should
       reload a record from the adapter when a record is requested by
       `store.findRecord`.
-       If this method returns true, the store will re-fetch a record from
-      the adapter. If this method returns false, the store will resolve
+       If this method returns `true`, the store will re-fetch a record from
+      the adapter. If this method returns `false`, the store will resolve
       immediately using the cached record.
+       For example, if you are building an events ticketing system, in which users
+      can only reserve tickets for 20 minutes at a time, and want to ensure that
+      in each route you have data that is no more than 20 minutes old you could
+      write:
+       ```javascript
+      shouldReloadRecord: function(store, ticketSnapshot) {
+        var timeDiff = moment().diff(ticketSnapshot.attr('lastAccessedAt')).minutes();
+        if (timeDiff > 20) {
+          return true;
+        } else {
+          return false;
+        }
+      }
+      ```
+       This method would ensure that whenever you do `store.findRecord('ticket',
+      id)` you will always get a ticket that is no more than 20 minutes old. In
+      case the cached version is more than 20 minutes old, `findRecord` will not
+      resolve until you fetched the latest version.
+       By default this hook returns `false`, as most UIs should not block user
+      interactions while waiting on data update.
        @method shouldReloadRecord
       @param {DS.Store} store
       @param {DS.Snapshot} snapshot
@@ -10837,9 +10983,33 @@ define('ember-data/adapter', ['exports', 'ember'], function (exports, _ember) {
       This method is used by the store to determine if the store should
       reload all records from the adapter when records are requested by
       `store.findAll`.
-       If this method returns true, the store will re-fetch all records from
-      the adapter. If this method returns false, the store will resolve
-      immediately using the cached record.
+       If this method returns `true`, the store will re-fetch all records from
+      the adapter. If this method returns `false`, the store will resolve
+      immediately using the cached records.
+       For example, if you are building an events ticketing system, in which users
+      can only reserve tickets for 20 minutes at a time, and want to ensure that
+      in each route you have data that is no more than 20 minutes old you could
+      write:
+       ```javascript
+      shouldReloadAll: function(store, snapshotArray) {
+        var snapshots = snapshotArray.snapshots();
+         return snapshots.any(function(ticketSnapshot) {
+          var timeDiff = moment().diff(ticketSnapshot.attr('lastAccessedAt')).minutes();
+          if (timeDiff > 20) {
+            return true;
+          } else {
+            return false;
+          }
+        });
+      }
+      ```
+       This method would ensure that whenever you do `store.findAll('ticket')` you
+      will always get a list of tickets that are no more than 20 minutes old. In
+      case a cached version is more than 20 minutes old, `findAll` will not
+      resolve until you fetched the latest versions.
+       By default this methods returns `true` if the passed `snapshotRecordArray`
+      is empty (meaning that there are no records locally available yet),
+      otherwise it returns `false`.
        @method shouldReloadAll
       @param {DS.Store} store
       @param {DS.SnapshotRecordArray} snapshotRecordArray
@@ -10855,8 +11025,23 @@ define('ember-data/adapter', ['exports', 'ember'], function (exports, _ember) {
       cached record.
        This method is *only* checked by the store when the store is
       returning a cached record.
-       If this method returns true the store will re-fetch a record from
+       If this method returns `true` the store will re-fetch a record from
       the adapter.
+       For example, if you do not want to fetch complex data over a mobile
+      connection, or if the network is down, you can implement
+      `shouldBackgroundReloadRecord` as follows:
+       ```javascript
+      shouldBackgroundReloadRecord: function(store, snapshot) {
+        var connection = window.navigator.connection;
+        if (connection === 'cellular' || connection === 'none') {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      ```
+       By default this hook returns `true` so the data for the record is updated
+      in the background.
        @method shouldBackgroundReloadRecord
       @param {DS.Store} store
       @param {DS.Snapshot} snapshot
@@ -10872,8 +11057,23 @@ define('ember-data/adapter', ['exports', 'ember'], function (exports, _ember) {
       with a cached record array.
        This method is *only* checked by the store when the store is
       returning a cached record array.
-       If this method returns true the store will re-fetch all records
+       If this method returns `true` the store will re-fetch all records
       from the adapter.
+       For example, if you do not want to fetch complex data over a mobile
+      connection, or if the network is down, you can implement
+      `shouldBackgroundReloadAll` as follows:
+       ```javascript
+      shouldBackgroundReloadAll: function(store, snapshotArray) {
+        var connection = window.navigator.connection;
+        if (connection === 'cellular' || connection === 'none') {
+          return false;
+        } else {
+          return true;
+        }
+      }
+      ```
+       By default this method returns `true`, indicating that a background reload
+      should always be triggered.
        @method shouldBackgroundReloadAll
       @param {DS.Store} store
       @param {DS.SnapshotRecordArray} snapshotRecordArray
@@ -10916,9 +11116,6 @@ define('ember-data/adapters/errors', ['exports', 'ember', 'ember-data/-private/d
   }
 
   var extendedErrorsEnabled = false;
-  if ((0, _emberDataPrivateFeatures.default)('ds-extended-errors')) {
-    extendedErrorsEnabled = true;
-  }
 
   function extendFn(ErrorClass) {
     return function () {
@@ -11206,12 +11403,8 @@ define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters
       @return {Promise} promise
     */
     findMany: function (store, type, ids, snapshots) {
-      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(',') } } });
-      }
+      var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
+      return this.ajax(url, 'GET', { data: { filter: { id: ids.join(',') } } });
     },
 
     /**
@@ -11233,81 +11426,18 @@ define('ember-data/adapters/json-api', ['exports', 'ember', 'ember-data/adapters
       @return {Promise} promise
     */
     updateRecord: function (store, type, snapshot) {
-      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
-        return this._super.apply(this, arguments);
-      } else {
-        var data = {};
-        var serializer = store.serializerFor(type.modelName);
+      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;
 });
 /**
@@ -11674,19 +11804,10 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findRecord: function (store, type, id, snapshot) {
-      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
-        var request = this._requestFor({
-          store: store, type: type, id: id, snapshot: snapshot,
-          requestType: 'findRecord'
-        });
-
-        return this._makeRequest(request);
-      } else {
-        var url = this.buildURL(type.modelName, id, snapshot, 'findRecord');
-        var query = this.buildQuery(snapshot);
+      var url = this.buildURL(type.modelName, id, snapshot, 'findRecord');
+      var query = this.buildQuery(snapshot);
 
-        return this.ajax(url, 'GET', { data: query });
-      }
+      return this.ajax(url, 'GET', { data: query });
     },
 
     /**
@@ -11704,23 +11825,13 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
     findAll: function (store, type, sinceToken, snapshotRecordArray) {
       var query = this.buildQuery(snapshotRecordArray);
 
-      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');
+      var url = this.buildURL(type.modelName, null, snapshotRecordArray, 'findAll');
 
-        if (sinceToken) {
-          query.since = sinceToken;
-        }
-
-        return this.ajax(url, 'GET', { data: query });
+      if (sinceToken) {
+        query.since = sinceToken;
       }
+
+      return this.ajax(url, 'GET', { data: query });
     },
 
     /**
@@ -11738,22 +11849,13 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     query: function (store, type, query) {
-      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
-        var request = this._requestFor({
-          store: store, type: type, query: query,
-          requestType: 'query'
-        });
-
-        return this._makeRequest(request);
-      } else {
-        var url = this.buildURL(type.modelName, null, null, 'query', query);
-
-        if (this.sortQueryParams) {
-          query = this.sortQueryParams(query);
-        }
+      var url = this.buildURL(type.modelName, null, null, 'query', query);
 
-        return this.ajax(url, 'GET', { data: query });
+      if (this.sortQueryParams) {
+        query = this.sortQueryParams(query);
       }
+
+      return this.ajax(url, 'GET', { data: query });
     },
 
     /**
@@ -11771,22 +11873,13 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     queryRecord: function (store, type, query) {
-      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
-        var request = this._requestFor({
-          store: store, type: type, query: query,
-          requestType: 'queryRecord'
-        });
-
-        return this._makeRequest(request);
-      } else {
-        var url = this.buildURL(type.modelName, null, null, 'queryRecord', query);
-
-        if (this.sortQueryParams) {
-          query = this.sortQueryParams(query);
-        }
+      var url = this.buildURL(type.modelName, null, null, 'queryRecord', query);
 
-        return this.ajax(url, 'GET', { data: query });
+      if (this.sortQueryParams) {
+        query = this.sortQueryParams(query);
       }
+
+      return this.ajax(url, 'GET', { data: query });
     },
 
     /**
@@ -11816,17 +11909,8 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findMany: function (store, type, ids, snapshots) {
-      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 } });
-      }
+      var url = this.buildURL(type.modelName, ids, snapshots, 'findMany');
+      return this.ajax(url, 'GET', { data: { ids: ids } });
     },
 
     /**
@@ -11856,21 +11940,12 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findHasMany: function (store, snapshot, url, relationship) {
-      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;
+      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');
     },
 
     /**
@@ -11900,20 +11975,11 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     findBelongsTo: function (store, snapshot, url, relationship) {
-      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;
+      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');
     },
 
     /**
@@ -11930,22 +11996,13 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     createRecord: function (store, type, snapshot) {
-      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
-        var request = this._requestFor({
-          store: store, type: type, snapshot: snapshot,
-          requestType: 'createRecord'
-        });
+      var data = {};
+      var serializer = store.serializerFor(type.modelName);
+      var url = this.buildURL(type.modelName, null, snapshot, 'createRecord');
 
-        return this._makeRequest(request);
-      } else {
-        var data = {};
-        var serializer = store.serializerFor(type.modelName);
-        var url = this.buildURL(type.modelName, null, snapshot, 'createRecord');
-
-        serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
+      serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
 
-        return this.ajax(url, "POST", { data: data });
-      }
+      return this.ajax(url, "POST", { data: data });
     },
 
     /**
@@ -11962,24 +12019,15 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     updateRecord: function (store, type, snapshot) {
-      if ((0, _emberDataPrivateFeatures.default)('ds-improved-ajax')) {
-        var request = this._requestFor({
-          store: store, type: type, snapshot: snapshot,
-          requestType: 'updateRecord'
-        });
-
-        return this._makeRequest(request);
-      } else {
-        var data = {};
-        var serializer = store.serializerFor(type.modelName);
+      var data = {};
+      var serializer = store.serializerFor(type.modelName);
 
-        serializer.serializeIntoHash(data, type, snapshot);
+      serializer.serializeIntoHash(data, type, snapshot);
 
-        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, "PUT", { data: data });
-      }
+      return this.ajax(url, "PUT", { data: data });
     },
 
     /**
@@ -11992,18 +12040,9 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       @return {Promise} promise
     */
     deleteRecord: function (store, type, snapshot) {
-      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;
+      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) {
@@ -12123,23 +12162,6 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
       var errors = this.normalizeErrorResponse(status, headers, payload);
       var detailedMessage = this.generatedDetailedMessage(status, headers, payload, requestData);
 
-      if ((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);
     },
 
@@ -12346,13 +12368,11 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
     buildQuery: function (snapshot) {
       var query = {};
 
-      if ((0, _emberDataPrivateFeatures.default)('ds-finder-include')) {
-        if (snapshot) {
-          var include = snapshot.include;
+      if (snapshot) {
+        var include = snapshot.include;
 
-          if (include) {
-            query.include = include;
-          }
+        if (include) {
+          query.include = include;
         }
       }
 
@@ -12360,266 +12380,6 @@ 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') {
@@ -12634,6 +12394,78 @@ define('ember-data/adapters/rest', ['exports', 'ember', 'ember-data/adapter', 'e
 /**
   @module ember-data
 */
+
+/**
+ * Get the data (body or query params) for a request.
+ *
+ * @public
+ * @method dataForRequest
+ * @param {Object} params
+ * @return {Object} data
+ */
+
+// type is not passed to findBelongsTo and findHasMany
+
+/**
+ * Get the HTTP method for a request.
+ *
+ * @public
+ * @method methodForRequest
+ * @param {Object} params
+ * @return {String} HTTP method
+ */
+
+/**
+ * Get the URL for a request.
+ *
+ * @public
+ * @method urlForRequest
+ * @param {Object} params
+ * @return {String} URL
+ */
+
+// type and id are not passed from updateRecord and deleteRecord, hence they
+// are defined if not set
+
+/**
+ * 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
+ */
+
+/**
+ * Get an object which contains all properties for a request which should
+ * be made.
+ *
+ * @private
+ * @method _requestFor
+ * @param {Object} params
+ * @return {Object} request object
+ */
+
+/**
+ * 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
+ */
+
+/**
+ * Make a request using `jQuery.ajax`.
+ *
+ * @private
+ * @method _makeRequest
+ * @param {Object} request
+ * @return {Promise} promise
+ */
 define('ember-data/attr', ['exports', 'ember', 'ember-data/-private/debug'], function (exports, _ember, _emberDataPrivateDebug) {
   exports.default = attr;
 
@@ -12828,14 +12660,6 @@ define("ember-data", ["exports", "ember", "ember-data/-private/debug", "ember-da
   _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 = _emberDataAdaptersErrors.errorsHashToArray;
   _emberDataPrivateCore.default.errorsArrayToHash = _emberDataAdaptersErrors.errorsArrayToHash;
 
@@ -13131,7 +12955,7 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
       ```
        Use a custom (type) serializer for the post model to configure embedded author
        ```app/serializers/post.js
-      import DS from 'ember-data;
+      import DS from 'ember-data';
        export default DS.RESTSerializer.extend(DS.EmbeddedRecordsMixin, {
         attrs: {
           author: { embedded: 'always' }
@@ -13326,10 +13150,8 @@ define('ember-data/serializers/embedded-records-mixin', ['exports', 'ember', 'em
       } 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);
-          }
+        if (this.hasSerializeIdsAndTypesOption(attr)) {
+          this._serializeHasManyAsIdsAndTypes(snapshot, json, relationship);
         }
       }
     },
@@ -13735,11 +13557,8 @@ define('ember-data/serializers/json-api', ['exports', 'ember', 'ember-data/-priv
     */
     pushPayload: function (store, payload) {
       var normalizedPayload = this._normalizeDocumentHelper(payload);
-      if ((0, _emberDataPrivateFeatures.default)('ds-pushpayload-return')) {
-        return store.push(normalizedPayload);
-      } else {
-        store.push(normalizedPayload);
-      }
+
+      store.push(normalizedPayload);
     },
 
     /**
@@ -14231,9 +14050,8 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
       var _this = this;
 
       var attributes = undefined;
-      if ((0, _emberDataPrivateFeatures.default)('ds-transform-pass-options')) {
-        attributes = get(typeClass, 'attributes');
-      }
+
+      attributes = get(typeClass, 'attributes');
 
       typeClass.eachTransformedAttribute(function (key, typeClass) {
         if (!(key in data)) {
@@ -14241,12 +14059,9 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
         }
 
         var transform = _this.transformFor(typeClass);
-        if ((0, _emberDataPrivateFeatures.default)('ds-transform-pass-options')) {
-          var transformMeta = attributes.get(key);
-          data[key] = transform.deserialize(data[key], transformMeta.options);
-        } else {
-          data[key] = transform.deserialize(data[key]);
-        }
+
+        var transformMeta = attributes.get(key);
+        data[key] = transform.deserialize(data[key], transformMeta.options);
       });
 
       return data;
@@ -15090,11 +14905,8 @@ define('ember-data/serializers/json', ['exports', 'ember', 'ember-data/-private/
         var value = snapshot.attr(key);
         if (type) {
           var transform = this.transformFor(type);
-          if ((0, _emberDataPrivateFeatures.default)('ds-transform-pass-options')) {
-            value = transform.serialize(value, attribute.options);
-          } else {
-            value = transform.serialize(value);
-          }
+
+          value = transform.serialize(value, attribute.options);
         }
 
         // if provided, use the mapping provided by `attrs` in
@@ -15828,11 +15640,7 @@ define("ember-data/serializers/rest", ["exports", "ember", "ember-data/-private/
         });
       }
 
-      if ((0, _emberDataPrivateFeatures.default)('ds-pushpayload-return')) {
-        return store.push(documentHash);
-      } else {
-        store.push(documentHash);
-      }
+      store.push(documentHash);
     },
 
     /**
@@ -16255,7 +16063,7 @@ define('ember-data/transform', ['exports', 'ember'], function (exports, _ember)
   });
 });
 define("ember-data/version", ["exports"], function (exports) {
-  exports.default = "2.6.0-beta.1";
+  exports.default = "2.6.0-beta.2";
 });
 define("ember-inflector", ["exports", "ember", "ember-inflector/lib/system", "ember-inflector/lib/ext/string"], function (exports, _ember, _emberInflectorLibSystem, _emberInflectorLibExtString) {