ember-data-source 1.13.6 → 1.13.7

data/dist/ember-data.js

@@ -4,13 +4,12 @@
     var ember$data$lib$system$object$polyfills$$keysFunc = Object.keys || Ember.keys;
     var ember$data$lib$system$object$polyfills$$create = Object.create || Ember.create;
 
-    /**
+    var ember$data$lib$adapters$errors$$EmberError = Ember.Error;
+    var ember$data$lib$adapters$errors$$forEach = Ember.ArrayPolyfills.forEach;
+    var ember$data$lib$adapters$errors$$SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;/**
       @class AdapterError
       @namespace DS
-    */var ember$data$lib$adapters$errors$$EmberError = Ember.Error;
-
-    var ember$data$lib$adapters$errors$$forEach = Ember.ArrayPolyfills.forEach;
-    var ember$data$lib$adapters$errors$$SOURCE_POINTER_REGEXP = /data\/(attributes|relationships)\/(.*)/;
+    */
     function ember$data$lib$adapters$errors$$AdapterError(errors, message) {
       message = message || "Adapter operation failed";
 
@@ -84,7 +83,7 @@
     */
     function ember$data$lib$adapters$errors$$InvalidError(errors) {
       if (!Ember.isArray(errors)) {
-        Ember.deprecate("`InvalidError` expects json-api formatted errors.");
+        Ember.deprecate("`InvalidError` expects json-api formatted errors.", false, { id: "ds.errors.invalid-error-expects-json-api-format", until: "2.0.0" });
         errors = ember$data$lib$adapters$errors$$errorsHashToArray(errors);
       }
       ember$data$lib$adapters$errors$$AdapterError.call(this, errors, "The adapter rejected the commit because it was invalid");
@@ -123,10 +122,10 @@
           var messages = Ember.makeArray(errors[key]);
           for (var i = 0; i < messages.length; i++) {
             out.push({
-              title: 'Invalid Attribute',
+              title: "Invalid Attribute",
               detail: messages[i],
               source: {
-                pointer: "data/attributes/" + key
+                pointer: "/data/attributes/" + key
               }
             });
           }
@@ -577,7 +576,7 @@
       */
       shouldReloadAll: function (store, snapshotRecordArray) {
         var modelName = snapshotRecordArray.type.modelName;
-        Ember.deprecate('The default behavior of shouldReloadAll will change in Ember Data 2.0 to always return false when there is at least one "' + modelName + '" record in the store. If you would like to preserve the current behavior please override shouldReloadAll in your adapter:application and return true.');
+        Ember.deprecate('The default behavior of shouldReloadAll will change in Ember Data 2.0 to always return false when there is at least one "' + modelName + '" record in the store. If you would like to preserve the current behavior please override shouldReloadAll in your adapter:application and return true.', false, { id: 'ds.adapter.should-reload-all-default-behavior', until: '2.0.0' });
         return true;
       },
 
@@ -595,7 +594,7 @@
         @return {Boolean}
       */
       shouldBackgroundReloadRecord: function (store, snapshot) {
-        Ember.deprecate('The default behavior of `shouldBackgroundReloadRecord` will change in Ember Data 2.0 to always return true. If you would like to preserve the current behavior please override `shouldBackgroundReloadRecord` in your adapter:application and return false.');
+        Ember.deprecate('The default behavior of `shouldBackgroundReloadRecord` will change in Ember Data 2.0 to always return true. If you would like to preserve the current behavior please override `shouldBackgroundReloadRecord` in your adapter:application and return false.', false, { id: 'ds.adapter.should-background-reload-record-default-behavior', until: '2.0.0' });
         return false;
       },
 
@@ -754,7 +753,10 @@
        */
       urlForFindRecord: function (id, modelName, snapshot) {
         if (this.urlForFind !== ember$data$lib$adapters$build$url$mixin$$urlForFind) {
-          Ember.deprecate('BuildURLMixin#urlForFind has been deprecated and renamed to `urlForFindRecord`.');
+          Ember.deprecate('BuildURLMixin#urlForFind has been deprecated and renamed to `urlForFindRecord`.', false, {
+            id: 'ds.adapter.url-for-find-deprecated',
+            until: '2.0.0'
+          });
           return this.urlForFind(id, modelName, snapshot);
         }
         return this._buildURL(modelName, id);
@@ -786,7 +788,10 @@
        */
       urlForQuery: function (query, modelName) {
         if (this.urlForFindQuery !== ember$data$lib$adapters$build$url$mixin$$urlForFindQuery) {
-          Ember.deprecate('BuildURLMixin#urlForFindQuery has been deprecated and renamed to `urlForQuery`.');
+          Ember.deprecate('BuildURLMixin#urlForFindQuery has been deprecated and renamed to `urlForQuery`.', false, {
+            id: 'ds.adapter.url-for-find-query-deprecated',
+            until: '2.0.0'
+          });
           return this.urlForFindQuery(query, modelName);
         }
         return this._buildURL(modelName);
@@ -870,21 +875,16 @@
         if (path) {
           // Protocol relative url
           //jscs:disable disallowEmptyBlocks
-          if (/^\/\//.test(path)) {
-            // Do nothing, the full host is already included. This branch
-            // avoids the absolute path logic and the relative path logic.
-
-            // Absolute path
-          } else if (path.charAt(0) === '/') {
-              //jscs:enable disallowEmptyBlocks
-              if (host) {
-                path = path.slice(1);
-                url.push(host);
-              }
-              // Relative path
-            } else if (!/^http(s)?:\/\//.test(path)) {
-                url.push(parentURL);
-              }
+          if (/^\/\//.test(path)) {} else if (path.charAt(0) === '/') {
+            //jscs:enable disallowEmptyBlocks
+            if (host) {
+              path = path.slice(1);
+              url.push(host);
+            }
+            // Relative path
+          } else if (!/^http(s)?:\/\//.test(path)) {
+            url.push(parentURL);
+          }
         } else {
           if (host) {
             url.push(host);
@@ -928,36 +928,45 @@
     });
 
     function ember$data$lib$adapters$build$url$mixin$$urlForFind(id, modelName, snapshot) {
-      Ember.deprecate('BuildURLMixin#urlForFind has been deprecated and renamed to `urlForFindRecord`.');
+      Ember.deprecate('BuildURLMixin#urlForFind has been deprecated and renamed to `urlForFindRecord`.', false, {
+        id: 'ds.adapter.url-for-find-deprecated',
+        until: '2.0.0'
+      });
+
       return this._buildURL(modelName, id);
     }
 
     function ember$data$lib$adapters$build$url$mixin$$urlForFindQuery(query, modelName) {
-      Ember.deprecate('BuildURLMixin#urlForFindQuery has been deprecated and renamed to `urlForQuery`.');
+      Ember.deprecate('BuildURLMixin#urlForFindQuery has been deprecated and renamed to `urlForQuery`.', false, {
+        id: 'ds.adapter.url-for-find-query-deprecated',
+        until: '2.0.0'
+      });
       return this._buildURL(modelName);
     }
 
     var ember$data$lib$adapters$build$url$mixin$$default = ember$data$lib$adapters$build$url$mixin$$BuildURLMixin;
 
-    /**
+    var ember$data$lib$adapters$rest$adapter$$get = Ember.get;
+    var ember$data$lib$adapters$rest$adapter$$set = Ember.set;
+    var ember$data$lib$adapters$rest$adapter$$forEach = Ember.ArrayPolyfills.forEach;/**
       The REST adapter allows your store to communicate with an HTTP server by
       transmitting JSON via XHR. Most Ember.js apps that consume a JSON API
       should use the REST adapter.
-
+    
       This adapter is designed around the idea that the JSON exchanged with
       the server should be conventional.
-
+    
       ## JSON Structure
-
+    
       The REST adapter expects the JSON returned from your server to follow
       these conventions.
-
+    
       ### Object Root
-
+    
       The JSON payload should be an object that contains the record inside a
       root property. For example, in response to a `GET` request for
       `/posts/1`, the JSON should look like this:
-
+    
       ```js
       {
         "post": {
@@ -967,10 +976,10 @@
         }
       }
       ```
-
+    
       Similarly, in response to a `GET` request for `/posts`, the JSON should
       look like this:
-
+    
       ```js
       {
         "posts": [
@@ -987,26 +996,26 @@
         ]
       }
       ```
-
+    
       ### Conventional Names
-
+    
       Attribute names in your JSON payload should be the camelCased versions of
       the attributes in your Ember.js models.
-
+    
       For example, if you have a `Person` model:
-
+    
       ```app/models/person.js
       import DS from 'ember-data';
-
+    
       export default DS.Model.extend({
         firstName: DS.attr('string'),
         lastName: DS.attr('string'),
         occupation: DS.attr('string')
       });
       ```
-
+    
       The JSON returned should look like this:
-
+    
       ```js
       {
         "person": {
@@ -1017,45 +1026,45 @@
         }
       }
       ```
-
+    
       ## Customization
-
+    
       ### Endpoint path customization
-
+    
       Endpoint paths can be prefixed with a `namespace` by setting the namespace
       property on the adapter:
-
+    
       ```app/adapters/application.js
       import DS from 'ember-data';
-
+    
       export default DS.RESTAdapter.extend({
         namespace: 'api/1'
       });
       ```
       Requests for `App.Person` would now target `/api/1/people/1`.
-
+    
       ### Host customization
-
+    
       An adapter can target other hosts by setting the `host` property.
-
+    
       ```app/adapters/application.js
       import DS from 'ember-data';
-
+    
       export default DS.RESTAdapter.extend({
         host: 'https://api.example.com'
       });
       ```
-
+    
       ### Headers customization
-
+    
       Some APIs require HTTP headers, e.g. to provide an API key. Arbitrary
       headers can be set as key/value pairs on the `RESTAdapter`'s `headers`
       object and Ember Data will send them along with each ajax request.
-
-
+    
+    
       ```app/adapters/application.js
       import DS from 'ember-data';
-
+    
       export default DS.RESTAdapter.extend({
         headers: {
           "API_KEY": "secret key",
@@ -1063,14 +1072,14 @@
         }
       });
       ```
-
+    
       `headers` can also be used as a computed property to support dynamic
       headers. In the example below, the `session` object has been
       injected into an adapter by Ember's container.
-
+    
       ```app/adapters/application.js
       import DS from 'ember-data';
-
+    
       export default DS.RESTAdapter.extend({
         headers: function() {
           return {
@@ -1080,17 +1089,17 @@
         }.property("session.authToken")
       });
       ```
-
+    
       In some cases, your dynamic headers may require data from some
       object outside of Ember's observer system (for example
       `document.cookie`). You can use the
       [volatile](/api/classes/Ember.ComputedProperty.html#method_volatile)
       function to set the property into a non-cached mode causing the headers to
       be recomputed with every request.
-
+    
       ```app/adapters/application.js
       import DS from 'ember-data';
-
+    
       export default DS.RESTAdapter.extend({
         headers: function() {
           return {
@@ -1100,17 +1109,15 @@
         }.property().volatile()
       });
       ```
-
+    
       @class RESTAdapter
       @constructor
       @namespace DS
       @extends DS.Adapter
       @uses DS.BuildURLMixin
     */
-    var ember$data$lib$adapters$rest$adapter$$get = Ember.get;
-    var ember$data$lib$adapters$rest$adapter$$set = Ember.set;
-    var ember$data$lib$adapters$rest$adapter$$forEach = Ember.ArrayPolyfills.forEach;var ember$data$lib$adapters$rest$adapter$$RestAdapter = ember$data$lib$system$adapter$$default.extend(ember$data$lib$adapters$build$url$mixin$$default, {
-      defaultSerializer: '-rest',
+    var ember$data$lib$adapters$rest$adapter$$RestAdapter = ember$data$lib$system$adapter$$default.extend(ember$data$lib$adapters$build$url$mixin$$default, {
+      defaultSerializer: "-rest",
 
       /**
         By default, the RESTAdapter will send the query params sorted alphabetically to the
@@ -1252,8 +1259,11 @@
         @deprecated Use [findRecord](#method_findRecord) instead
       */
       find: function (store, type, id, snapshot) {
-        Ember.deprecate('RestAdapter#find has been deprecated and renamed to `findRecord`.');
-        return this.ajax(this.buildURL(type.modelName, id, snapshot, 'find'), 'GET');
+        Ember.deprecate("RestAdapter#find has been deprecated and renamed to `findRecord`.", false, {
+          id: "ds.adapter.find-renamed-to-find-record",
+          until: "2.0.0"
+        });
+        return this.ajax(this.buildURL(type.modelName, id, snapshot, "find"), "GET");
       },
 
       /**
@@ -1272,10 +1282,13 @@
       findRecord: function (store, type, id, snapshot) {
         var find = ember$data$lib$adapters$rest$adapter$$RestAdapter.prototype.find;
         if (find !== this.find) {
-          Ember.deprecate('RestAdapter#find has been deprecated and renamed to `findRecord`.');
+          Ember.deprecate("RestAdapter#find has been deprecated and renamed to `findRecord`.", false, {
+            id: "ds.adapter.find-renamed-to-find-record",
+            until: "2.0.0"
+          });
           return this.find(store, type, id, snapshot);
         }
-        return this.ajax(this.buildURL(type.modelName, id, snapshot, 'findRecord'), 'GET');
+        return this.ajax(this.buildURL(type.modelName, id, snapshot, "findRecord"), "GET");
       },
 
       /**
@@ -1297,9 +1310,9 @@
           query = { since: sinceToken };
         }
 
-        url = this.buildURL(type.modelName, null, null, 'findAll');
+        url = this.buildURL(type.modelName, null, null, "findAll");
 
-        return this.ajax(url, 'GET', { data: query });
+        return this.ajax(url, "GET", { data: query });
       },
 
       /**
@@ -1318,14 +1331,17 @@
         @deprecated Use [query](#method_query) instead
       */
       findQuery: function (store, type, query) {
-        Ember.deprecate('RestAdapter#findQuery has been deprecated and renamed to `query`.');
-        var url = this.buildURL(type.modelName, null, null, 'findQuery', query);
+        Ember.deprecate("RestAdapter#findQuery has been deprecated and renamed to `query`.", false, {
+          id: "ds.adapter.find-query-renamed-to-query",
+          until: "2.0.0"
+        });
+        var url = this.buildURL(type.modelName, null, null, "findQuery", query);
 
         if (this.sortQueryParams) {
           query = this.sortQueryParams(query);
         }
 
-        return this.ajax(url, 'GET', { data: query });
+        return this.ajax(url, "GET", { data: query });
       },
 
       /**
@@ -1345,17 +1361,45 @@
       query: function (store, type, query) {
         var findQuery = ember$data$lib$adapters$rest$adapter$$RestAdapter.prototype.findQuery;
         if (findQuery !== this.findQuery) {
-          Ember.deprecate('RestAdapter#findQuery has been deprecated and renamed to `query`.');
+          Ember.deprecate("RestAdapter#findQuery has been deprecated and renamed to `query`.", false, {
+            id: "ds.adapter.find-query-renamed-to-query",
+            until: "2.0.0"
+          });
           return this.findQuery(store, type, query);
         }
 
-        var url = this.buildURL(type.modelName, null, null, 'query', query);
+        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 });
+      },
+
+      /**
+        Called by the store in order to fetch a JSON object for
+        the record that matches a particular query.
+         The `queryRecord` method makes an Ajax (HTTP GET) request to a URL
+        computed by `buildURL`, and returns a promise for the resulting
+        payload.
+         The `query` argument is a simple JavaScript object that will be passed directly
+        to the server as parameters.
+         @private
+        @method queryRecord
+        @param {DS.Store} store
+        @param {DS.Model} type
+        @param {Object} query
+        @return {Promise} promise
+      */
+      queryRecord: function (store, type, query) {
+        var url = this.buildURL(type.modelName, null, null, "queryRecord", query);
+
+        if (this.sortQueryParams) {
+          query = this.sortQueryParams(query);
+        }
+
+        return this.ajax(url, "GET", { data: query });
       },
 
       /**
@@ -1385,8 +1429,8 @@
         @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 } });
+        var url = this.buildURL(type.modelName, ids, snapshots, "findMany");
+        return this.ajax(url, "GET", { data: { ids: ids } });
       },
 
       /**
@@ -1415,9 +1459,9 @@
         var id = snapshot.id;
         var type = snapshot.modelName;
 
-        url = this.urlPrefix(url, this.buildURL(type, id, null, 'findHasMany'));
+        url = this.urlPrefix(url, this.buildURL(type, id, null, "findHasMany"));
 
-        return this.ajax(url, 'GET');
+        return this.ajax(url, "GET");
       },
 
       /**
@@ -1446,8 +1490,8 @@
         var id = snapshot.id;
         var type = snapshot.modelName;
 
-        url = this.urlPrefix(url, this.buildURL(type, id, null, 'findBelongsTo'));
-        return this.ajax(url, 'GET');
+        url = this.urlPrefix(url, this.buildURL(type, id, null, "findBelongsTo"));
+        return this.ajax(url, "GET");
       },
 
       /**
@@ -1466,7 +1510,7 @@
       createRecord: function (store, type, snapshot) {
         var data = {};
         var serializer = store.serializerFor(type.modelName);
-        var url = this.buildURL(type.modelName, null, snapshot, 'createRecord');
+        var url = this.buildURL(type.modelName, null, snapshot, "createRecord");
 
         serializer.serializeIntoHash(data, type, snapshot, { includeId: true });
 
@@ -1493,7 +1537,7 @@
         serializer.serializeIntoHash(data, type, snapshot);
 
         var id = snapshot.id;
-        var url = this.buildURL(type.modelName, id, snapshot, 'updateRecord');
+        var url = this.buildURL(type.modelName, id, snapshot, "updateRecord");
 
         return this.ajax(url, "PUT", { data: data });
       },
@@ -1510,24 +1554,24 @@
       deleteRecord: function (store, type, snapshot) {
         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) {
         var url = this.buildURL(snapshot.modelName, snapshot.id, snapshot);
 
-        var expandedURL = url.split('/');
+        var expandedURL = url.split("/");
         //Case when the url is of the format ...something/:id
         var lastSegment = expandedURL[expandedURL.length - 1];
         var id = snapshot.id;
         if (lastSegment === id) {
           expandedURL[expandedURL.length - 1] = "";
-        } else if (ember$data$lib$adapters$rest$adapter$$endsWith(lastSegment, '?id=' + id)) {
+        } else if (ember$data$lib$adapters$rest$adapter$$endsWith(lastSegment, "?id=" + id)) {
           //Case when the url is of the format ...something?id=:id
           expandedURL[expandedURL.length - 1] = lastSegment.substring(0, lastSegment.length - id.length - 1);
         }
 
-        return expandedURL.join('/');
+        return expandedURL.join("/");
       },
 
       // http://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers
@@ -1586,7 +1630,7 @@
 
         var groupsArray = [];
         groups.forEach(function (group, key) {
-          var paramNameLength = '&ids%5B%5D='.length;
+          var paramNameLength = "&ids%5B%5D=".length;
           var splitGroups = splitGroupToFitInUrl(group, maxURLLength, paramNameLength);
 
           ember$data$lib$adapters$rest$adapter$$forEach.call(splitGroups, function (splitGroup) {
@@ -1706,7 +1750,10 @@
             var response = undefined;
 
             if (adapter.ajaxSuccess) {
-              Ember.deprecate("`ajaxSuccess` has been deprecated. Use `isSuccess`, `isInvalid` or `handleResponse` instead.");
+              Ember.deprecate("`ajaxSuccess` has been deprecated. Use `isSuccess`, `isInvalid` or `handleResponse` instead.", false, {
+                id: "ds.adapter.ajax-success-deprecated",
+                until: "2.0.0"
+              });
               response = adapter.ajaxSuccess(jqXHR, payload);
             }
 
@@ -1725,16 +1772,19 @@
             var error = undefined;
 
             if (adapter.ajaxError) {
-              Ember.deprecate("`ajaxError` has been deprecated. Use `isSuccess`, `isInvalid` or `handleResponse` instead.");
+              Ember.deprecate("`ajaxError` has been deprecated. Use `isSuccess`, `isInvalid` or `handleResponse` instead.", false, {
+                id: "ds.adapter.ajax-error-deprecated",
+                until: "2.0.0"
+              });
               error = adapter.ajaxError(jqXHR, textStatus, errorThrown);
             }
 
             if (!(error instanceof Error)) {
               if (errorThrown instanceof Error) {
                 error = errorThrown;
-              } else if (textStatus === 'timeout') {
+              } else if (textStatus === "timeout") {
                 error = new ember$data$lib$adapters$errors$$TimeoutError();
-              } else if (textStatus === 'abort') {
+              } else if (textStatus === "abort") {
                 error = new ember$data$lib$adapters$errors$$AbortError();
               } else {
                 error = adapter.handleResponse(jqXHR.status, ember$data$lib$adapters$rest$adapter$$parseResponseHeaders(jqXHR.getAllResponseHeaders()), adapter.parseErrorResponse(jqXHR.responseText) || errorThrown);
@@ -1745,7 +1795,7 @@
           };
 
           Ember.$.ajax(hash);
-        }, 'DS: RESTAdapter#ajax ' + type + ' to ' + url);
+        }, "DS: RESTAdapter#ajax " + type + " to " + url);
       },
 
       /**
@@ -1760,15 +1810,15 @@
         var hash = options || {};
         hash.url = url;
         hash.type = type;
-        hash.dataType = 'json';
+        hash.dataType = "json";
         hash.context = this;
 
-        if (hash.data && type !== 'GET') {
-          hash.contentType = 'application/json; charset=utf-8';
+        if (hash.data && type !== "GET") {
+          hash.contentType = "application/json; charset=utf-8";
           hash.data = JSON.stringify(hash.data);
         }
 
-        var headers = ember$data$lib$adapters$rest$adapter$$get(this, 'headers');
+        var headers = ember$data$lib$adapters$rest$adapter$$get(this, "headers");
         if (headers !== undefined) {
           hash.beforeSend = function (xhr) {
             ember$data$lib$adapters$rest$adapter$$forEach.call(ember$data$lib$system$object$polyfills$$keysFunc(headers), function (key) {
@@ -1805,7 +1855,7 @@
         @return {Object} errors payload
       */
       normalizeErrorResponse: function (status, headers, payload) {
-        if (payload && typeof payload === 'object' && payload.errors) {
+        if (payload && typeof payload === "object" && payload.errors) {
           return payload.errors;
         } else {
           return [{
@@ -1823,12 +1873,12 @@
         return headers;
       }
 
-      var headerPairs = headerStr.split('\u000d\u000a');
+      var headerPairs = headerStr.split("\r\n");
       for (var i = 0; i < headerPairs.length; i++) {
         var headerPair = headerPairs[i];
         // Can't use split() here because it does the wrong thing
         // if the header value has the string ": " in it.
-        var index = headerPair.indexOf('\u003a\u0020');
+        var index = headerPair.indexOf(": ");
         if (index > 0) {
           var key = headerPair.substring(0, index);
           var val = headerPair.substring(index + 2);
@@ -1841,7 +1891,7 @@
 
     //From http://stackoverflow.com/questions/280634/endswith-in-javascript
     function ember$data$lib$adapters$rest$adapter$$endsWith(string, suffix) {
-      if (typeof String.prototype.endsWith !== 'function') {
+      if (typeof String.prototype.endsWith !== "function") {
         return string.indexOf(suffix, string.length - suffix.length) !== -1;
       } else {
         return string.endsWith(suffix);
@@ -1849,16 +1899,22 @@
     }
 
     if (Ember.platform.hasPropertyAccessors) {
-      Ember.defineProperty(ember$data$lib$adapters$rest$adapter$$RestAdapter.prototype, 'maxUrlLength', {
+      Ember.defineProperty(ember$data$lib$adapters$rest$adapter$$RestAdapter.prototype, "maxUrlLength", {
         enumerable: false,
         get: function () {
-          Ember.deprecate('maxUrlLength has been deprecated (wrong casing). You should use maxURLLength instead.');
+          Ember.deprecate("maxUrlLength has been deprecated (wrong casing). You should use maxURLLength instead.", false, {
+            id: "ds.adapter.max-url-length-deprecated-case",
+            until: "2.0.0"
+          });
           return this.maxURLLength;
         },
 
         set: function (value) {
-          Ember.deprecate('maxUrlLength has been deprecated (wrong casing). You should use maxURLLength instead.');
-          ember$data$lib$adapters$rest$adapter$$set(this, 'maxURLLength', value);
+          Ember.deprecate("maxUrlLength has been deprecated (wrong casing). You should use maxURLLength instead.", false, {
+            id: "ds.adapter.max-url-length-deprecated-case",
+            until: "2.0.0"
+          });
+          ember$data$lib$adapters$rest$adapter$$set(this, "maxURLLength", value);
         }
       });
     }
@@ -1972,7 +2028,7 @@
     }
 
     if (!Object.create && !Object.create(null).hasOwnProperty) {
-      throw new Error("This browser does not support Object.create(null), please polyfil with es5-sham: http://git.io/yBU2rg");
+      throw new Error('This browser does not support Object.create(null), please polyfil with es5-sham: http://git.io/yBU2rg');
     }
 
     function ember$inflector$lib$lib$system$inflector$$makeDictionary() {
@@ -2108,12 +2164,12 @@
         @param {Object} irregular
       */
       inflect: function (word, typeRules, irregular) {
-        var inflection, substitution, result, lowercase, wordSplit, firstPhrase, lastWord, isBlank, isCamelized, rule;
+        var inflection, substitution, result, lowercase, wordSplit, firstPhrase, lastWord, isBlank, isCamelized, isUncountable, isIrregular, rule;
 
         isBlank = !word || ember$inflector$lib$lib$system$inflector$$BLANK_REGEX.test(word);
 
         isCamelized = ember$inflector$lib$lib$system$inflector$$CAMELIZED_REGEX.test(word);
-        firstPhrase = "";
+        firstPhrase = '';
 
         if (isBlank) {
           return word;
@@ -2121,28 +2177,25 @@
 
         lowercase = word.toLowerCase();
         wordSplit = ember$inflector$lib$lib$system$inflector$$LAST_WORD_DASHED_REGEX.exec(word) || ember$inflector$lib$lib$system$inflector$$LAST_WORD_CAMELIZED_REGEX.exec(word);
-
         if (wordSplit) {
           firstPhrase = wordSplit[1];
           lastWord = wordSplit[2].toLowerCase();
         }
 
-        for (rule in this.rules.uncountable) {
-          if (lowercase.match(rule + "$")) {
-            return word;
-          }
-        }
+        isUncountable = this.rules.uncountable[lowercase] || this.rules.uncountable[lastWord];
 
-        for (rule in this.rules.irregular) {
-          if (lowercase.match(rule + "$")) {
-            substitution = irregular[rule];
+        if (isUncountable) {
+          return word;
+        }
 
-            if (isCamelized && irregular[lastWord]) {
-              substitution = ember$inflector$lib$lib$system$inflector$$capitalize(substitution);
-              rule = ember$inflector$lib$lib$system$inflector$$capitalize(rule);
-            }
+        isIrregular = irregular && (irregular[lowercase] || irregular[lastWord]);
 
-            return word.replace(rule, substitution);
+        if (isIrregular) {
+          if (irregular[lowercase]) {
+            return isIrregular;
+          } else {
+            isIrregular = isCamelized ? ember$inflector$lib$lib$system$inflector$$capitalize(isIrregular) : isIrregular;
+            return firstPhrase + isIrregular;
           }
         }
 
@@ -2271,7 +2324,7 @@
         if (count !== 1) {
           word = ember$inflector$lib$lib$system$string$$pluralize(word);
         }
-        return count + " " + word;
+        return count + ' ' + word;
       }
     });
 
@@ -2302,16 +2355,18 @@
     ember$lib$main$$default.String.singularize = ember$inflector$lib$lib$system$string$$singularize;
     var ember$inflector$lib$main$$default = ember$inflector$lib$lib$system$inflector$$default;
 
-    if (typeof define !== 'undefined' && define.amd) {
-      define('ember-inflector', ['exports'], function (__exports__) {
-        __exports__['default'] = ember$inflector$lib$lib$system$inflector$$default;
+    if (typeof define !== "undefined" && define.amd) {
+      define("ember-inflector", ["exports"], function (__exports__) {
+        __exports__["default"] = ember$inflector$lib$lib$system$inflector$$default;
         return ember$inflector$lib$lib$system$inflector$$default;
       });
-    } else if (typeof module !== 'undefined' && module['exports']) {
-      module['exports'] = ember$inflector$lib$lib$system$inflector$$default;
+    } else if (typeof module !== "undefined" && module["exports"]) {
+      module["exports"] = ember$inflector$lib$lib$system$inflector$$default;
     }
 
     var activemodel$adapter$lib$system$active$model$adapter$$_Ember$String = ember$lib$main$$default.String;
+    var activemodel$adapter$lib$system$active$model$adapter$$decamelize = activemodel$adapter$lib$system$active$model$adapter$$_Ember$String.decamelize;
+    var activemodel$adapter$lib$system$active$model$adapter$$underscore = activemodel$adapter$lib$system$active$model$adapter$$_Ember$String.underscore;
 
     /**
       @module ember-data
@@ -2408,8 +2463,6 @@
       @extends DS.RESTAdapter
     **/
 
-    var activemodel$adapter$lib$system$active$model$adapter$$decamelize = activemodel$adapter$lib$system$active$model$adapter$$_Ember$String.decamelize;
-    var activemodel$adapter$lib$system$active$model$adapter$$underscore = activemodel$adapter$lib$system$active$model$adapter$$_Ember$String.underscore;
     var activemodel$adapter$lib$system$active$model$adapter$$ActiveModelAdapter = ember$data$lib$adapters$rest$adapter$$default.extend({
       defaultSerializer: '-active-model',
       /**
@@ -2654,7 +2707,7 @@
         @type {String}
         @default 'id'
       */
-      primaryKey: 'id',
+      primaryKey: "id",
 
       /**
         The `attrs` object can be used to declare a simple mapping between
@@ -2705,7 +2758,7 @@
          @property attrs
         @type {Object}
       */
-      mergedProperties: ['attrs'],
+      mergedProperties: ["attrs"],
 
       /**
        Given a subclass of `DS.Model` and a JSON object this method will
@@ -2761,25 +2814,25 @@
       */
       normalizeResponse: function (store, primaryModelClass, payload, id, requestType) {
         switch (requestType) {
-          case 'findRecord':
+          case "findRecord":
             return this.normalizeFindRecordResponse.apply(this, arguments);
-          case 'queryRecord':
+          case "queryRecord":
             return this.normalizeQueryRecordResponse.apply(this, arguments);
-          case 'findAll':
+          case "findAll":
             return this.normalizeFindAllResponse.apply(this, arguments);
-          case 'findBelongsTo':
+          case "findBelongsTo":
             return this.normalizeFindBelongsToResponse.apply(this, arguments);
-          case 'findHasMany':
+          case "findHasMany":
             return this.normalizeFindHasManyResponse.apply(this, arguments);
-          case 'findMany':
+          case "findMany":
             return this.normalizeFindManyResponse.apply(this, arguments);
-          case 'query':
+          case "query":
             return this.normalizeQueryResponse.apply(this, arguments);
-          case 'createRecord':
+          case "createRecord":
             return this.normalizeCreateRecordResponse.apply(this, arguments);
-          case 'deleteRecord':
+          case "deleteRecord":
             return this.normalizeDeleteRecordResponse.apply(this, arguments);
-          case 'updateRecord':
+          case "updateRecord":
             return this.normalizeUpdateRecordResponse.apply(this, arguments);
         }
       },
@@ -2974,7 +3027,7 @@
 
         var meta = this.extractMeta(store, primaryModelClass, payload);
         if (meta) {
-          Ember.assert('The `meta` returned from `extractMeta` has to be an object, not "' + Ember.typeOf(meta) + '".', Ember.typeOf(meta) === 'object');
+          Ember.assert("The `meta` returned from `extractMeta` has to be an object, not \"" + Ember.typeOf(meta) + "\".", Ember.typeOf(meta) === "object");
           documentHash.meta = meta;
         }
 
@@ -3038,7 +3091,7 @@
         @return {Object}
       */
       normalize: function (typeClass, hash) {
-        if (this.get('isNewSerializerAPI')) {
+        if (this.get("isNewSerializerAPI")) {
           return ember$data$lib$serializers$json$serializer$$_newNormalize.apply(this, arguments);
         }
 
@@ -3063,7 +3116,7 @@
         @return {String}
       */
       extractId: function (modelClass, resourceHash) {
-        var primaryKey = ember$data$lib$serializers$json$serializer$$get(this, 'primaryKey');
+        var primaryKey = ember$data$lib$serializers$json$serializer$$get(this, "primaryKey");
         var id = resourceHash[primaryKey];
         return ember$data$lib$system$coerce$id$$default(id);
       },
@@ -3081,7 +3134,7 @@
         var attributes = {};
 
         modelClass.eachAttribute(function (key) {
-          attributeKey = this.keyForAttribute(key, 'deserialize');
+          attributeKey = this.keyForAttribute(key, "deserialize");
           if (resourceHash.hasOwnProperty(attributeKey)) {
             attributes[key] = resourceHash[attributeKey];
           }
@@ -3107,7 +3160,7 @@
           is polymorphic. It could however also be embedded resources that the
           EmbeddedRecordsMixin has be able to process.
         */
-        if (Ember.typeOf(relationshipHash) === 'object') {
+        if (Ember.typeOf(relationshipHash) === "object") {
           if (relationshipHash.id) {
             relationshipHash.id = ember$data$lib$system$coerce$id$$default(relationshipHash.id);
           }
@@ -3132,13 +3185,13 @@
 
         modelClass.eachRelationship(function (key, relationshipMeta) {
           var relationship = null;
-          var relationshipKey = this.keyForRelationship(key, relationshipMeta.kind, 'deserialize');
+          var relationshipKey = this.keyForRelationship(key, relationshipMeta.kind, "deserialize");
           if (resourceHash.hasOwnProperty(relationshipKey)) {
             var data = null;
             var relationshipHash = resourceHash[relationshipKey];
-            if (relationshipMeta.kind === 'belongsTo') {
+            if (relationshipMeta.kind === "belongsTo") {
               data = this.extractRelationship(relationshipMeta.type, relationshipHash);
-            } else if (relationshipMeta.kind === 'hasMany') {
+            } else if (relationshipMeta.kind === "hasMany") {
               data = Ember.A(relationshipHash).map(function (item) {
                 return this.extractRelationship(relationshipMeta.type, item);
               }, this);
@@ -3202,7 +3255,7 @@
 
         if (this.keyForAttribute) {
           typeClass.eachAttribute(function (key) {
-            payloadKey = this.keyForAttribute(key, 'deserialize');
+            payloadKey = this.keyForAttribute(key, "deserialize");
             if (key === payloadKey) {
               return;
             }
@@ -3225,7 +3278,7 @@
 
         if (this.keyForRelationship) {
           typeClass.eachRelationship(function (key, relationship) {
-            payloadKey = this.keyForRelationship(key, relationship.kind, 'deserialize');
+            payloadKey = this.keyForRelationship(key, relationship.kind, "deserialize");
             if (key === payloadKey) {
               return;
             }
@@ -3244,7 +3297,7 @@
         @private
       */
       normalizeUsingDeclaredMapping: function (typeClass, hash) {
-        var attrs = ember$data$lib$serializers$json$serializer$$get(this, 'attrs');
+        var attrs = ember$data$lib$serializers$json$serializer$$get(this, "attrs");
         var payloadKey, key;
 
         if (attrs) {
@@ -3267,9 +3320,9 @@
         @private
       */
       normalizeId: function (hash) {
-        var primaryKey = ember$data$lib$serializers$json$serializer$$get(this, 'primaryKey');
+        var primaryKey = ember$data$lib$serializers$json$serializer$$get(this, "primaryKey");
 
-        if (primaryKey === 'id') {
+        if (primaryKey === "id") {
           return;
         }
 
@@ -3297,7 +3350,7 @@
         @return {String} key
       */
       _getMappedKey: function (key) {
-        var attrs = ember$data$lib$serializers$json$serializer$$get(this, 'attrs');
+        var attrs = ember$data$lib$serializers$json$serializer$$get(this, "attrs");
         var mappedKey;
         if (attrs && attrs[key]) {
           mappedKey = attrs[key];
@@ -3306,7 +3359,7 @@
           if (mappedKey.key) {
             mappedKey = mappedKey.key;
           }
-          if (typeof mappedKey === 'string') {
+          if (typeof mappedKey === "string") {
             key = mappedKey;
           }
         }
@@ -3323,7 +3376,7 @@
         @return {boolean} true if the key can be serialized
       */
       _canSerialize: function (key) {
-        var attrs = ember$data$lib$serializers$json$serializer$$get(this, 'attrs');
+        var attrs = ember$data$lib$serializers$json$serializer$$get(this, "attrs");
 
         return !attrs || !attrs[key] || attrs[key].serialize !== false;
       },
@@ -3338,7 +3391,7 @@
         @return {boolean} true if the key must be serialized
       */
       _mustSerialize: function (key) {
-        var attrs = ember$data$lib$serializers$json$serializer$$get(this, 'attrs');
+        var attrs = ember$data$lib$serializers$json$serializer$$get(this, "attrs");
 
         return attrs && attrs[key] && attrs[key].serialize === true;
       },
@@ -3357,7 +3410,7 @@
         if (this._mustSerialize(key)) {
           return true;
         }
-        return this._canSerialize(key) && (relationshipType === 'manyToNone' || relationshipType === 'manyToMany');
+        return this._canSerialize(key) && (relationshipType === "manyToNone" || relationshipType === "manyToMany");
       },
 
       // SERIALIZE
@@ -3481,7 +3534,7 @@
           var id = snapshot.id;
 
           if (id) {
-            json[ember$data$lib$serializers$json$serializer$$get(this, 'primaryKey')] = id;
+            json[ember$data$lib$serializers$json$serializer$$get(this, "primaryKey")] = id;
           }
         }
 
@@ -3490,9 +3543,9 @@
         }, this);
 
         snapshot.eachRelationship(function (key, relationship) {
-          if (relationship.kind === 'belongsTo') {
+          if (relationship.kind === "belongsTo") {
             this.serializeBelongsTo(snapshot, json, relationship);
-          } else if (relationship.kind === 'hasMany') {
+          } else if (relationship.kind === "hasMany") {
             this.serializeHasMany(snapshot, json, relationship);
           }
         }, this);
@@ -3562,7 +3615,7 @@
           var payloadKey = this._getMappedKey(key);
 
           if (payloadKey === key && this.keyForAttribute) {
-            payloadKey = this.keyForAttribute(key, 'serialize');
+            payloadKey = this.keyForAttribute(key, "serialize");
           }
 
           json[payloadKey] = value;
@@ -3913,9 +3966,12 @@
         @return {Object} json The deserialized payload
       */
       extractSingle: function (store, typeClass, payload, id, requestType) {
-        if (!this.get('didDeprecateNormalizePayload')) {
-          this.set('didDeprecateNormalizePayload', true);
-          Ember.deprecate('`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.', this.normalizePayload === ember$data$lib$serializers$json$serializer$$JSONSerializer.prototype.normalizePayload);
+        if (!this.get("didDeprecateNormalizePayload")) {
+          this.set("didDeprecateNormalizePayload", true);
+          Ember.deprecate("`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.", this.normalizePayload === ember$data$lib$serializers$json$serializer$$JSONSerializer.prototype.normalizePayload, {
+            id: "ds.serializer.normalize-payload-deprecated",
+            until: "2.0.0"
+          });
         }
         var normalizedPayload = this.normalizePayload(payload);
         return this.normalize(typeClass, normalizedPayload);
@@ -3944,9 +4000,12 @@
         @return {Array} array An array of deserialized objects
       */
       extractArray: function (store, typeClass, arrayPayload, id, requestType) {
-        if (!this.get('didDeprecateNormalizePayload')) {
-          this.set('didDeprecateNormalizePayload', true);
-          Ember.deprecate('`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.', this.normalizePayload === ember$data$lib$serializers$json$serializer$$JSONSerializer.prototype.normalizePayload);
+        if (!this.get("didDeprecateNormalizePayload")) {
+          this.set("didDeprecateNormalizePayload", true);
+          Ember.deprecate("`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.", this.normalizePayload === ember$data$lib$serializers$json$serializer$$JSONSerializer.prototype.normalizePayload, {
+            id: "ds.serializer.normalize-payload-deprecated",
+            until: "2.0.0"
+          });
         }
         var normalizedPayload = this.normalizePayload(arrayPayload);
         var serializer = this;
@@ -3978,7 +4037,7 @@
         @param {Object} payload
       */
       extractMeta: function (store, typeClass, payload) {
-        if (this.get('isNewSerializerAPI')) {
+        if (this.get("isNewSerializerAPI")) {
           return ember$data$lib$serializers$json$serializer$$_newExtractMeta.apply(this, arguments);
         }
 
@@ -4014,7 +4073,7 @@
         @return {Object} json The deserialized errors
       */
       extractErrors: function (store, typeClass, payload, id) {
-        if (payload && typeof payload === 'object' && payload.errors) {
+        if (payload && typeof payload === "object" && payload.errors) {
           payload = ember$data$lib$adapters$errors$$errorsArrayToHash(payload.errors);
           this.normalizeErrors(typeClass, payload);
         }
@@ -4088,7 +4147,7 @@
        @return {DS.Transform} transform
       */
       transformFor: function (attributeType, skipAssertion) {
-        var transform = this.container.lookup('transform:' + attributeType);
+        var transform = this.container.lookup("transform:" + attributeType);
         Ember.assert("Unable to find transform for '" + attributeType + "'", skipAssertion || !!transform);
         return transform;
       }
@@ -4129,7 +4188,7 @@
       @private
     */
     function ember$data$lib$serializers$json$serializer$$_newExtractMeta(store, modelClass, payload) {
-      if (payload && payload.hasOwnProperty('meta')) {
+      if (payload && payload.hasOwnProperty("meta")) {
         var meta = payload.meta;
         delete payload.meta;
         return meta;
@@ -4267,97 +4326,13 @@
       });
     };
 
-    /**
-    @module ember-data
-    */
-
-    /**
-      Holds validation errors for a given record organized by attribute names.
-
-      Every DS.Model has an `errors` property that is an instance of
-      `DS.Errors`. This can be used to display validation error
-      messages returned from the server when a `record.save()` rejects.
-      This works automatically with `DS.ActiveModelAdapter`, but you
-      can implement [ajaxError](/api/data/classes/DS.RESTAdapter.html#method_ajaxError)
-      in other adapters as well.
-
-      For Example, if you had an `User` model that looked like this:
-
-      ```app/models/user.js
-      import DS from 'ember-data';
-
-      export default DS.Model.extend({
-        username: attr('string'),
-        email: attr('string')
-      });
-      ```
-      And you attempted to save a record that did not validate on the backend.
-
-      ```javascript
-      var user = store.createRecord('user', {
-        username: 'tomster',
-        email: 'invalidEmail'
-      });
-      user.save();
-      ```
-
-      Your backend data store might return a response that looks like
-      this. This response will be used to populate the error object.
-
-      ```javascript
-      {
-        "errors": {
-          "username": ["This username is already taken!"],
-          "email": ["Doesn't look like a valid email."]
-        }
-      }
-      ```
-
-      Errors can be displayed to the user by accessing their property name
-      to get an array of all the error objects for that property. Each
-      error object is a JavaScript object with two keys:
-
-      - `message` A string containing the error message from the backend
-      - `attribute` The name of the property associated with this error message
-
-      ```handlebars
-      <label>Username: {{input value=username}} </label>
-      {{#each model.errors.username as |error|}}
-        <div class="error">
-          {{error.message}}
-        </div>
-      {{/each}}
-
-      <label>Email: {{input value=email}} </label>
-      {{#each model.errors.email as |error|}}
-        <div class="error">
-          {{error.message}}
-        </div>
-      {{/each}}
-      ```
-
-      You can also access the special `messages` property on the error
-      object to get an array of all the error strings.
-
-      ```handlebars
-      {{#each model.errors.messages as |message|}}
-        <div class="error">
-          {{message}}
-        </div>
-      {{/each}}
-      ```
-
-      @class Errors
-      @namespace DS
-      @extends Ember.Object
-      @uses Ember.Enumerable
-      @uses Ember.Evented
-     */
     var ember$data$lib$system$model$errors$$get = Ember.get;
+    var ember$data$lib$system$model$errors$$set = Ember.set;
     var ember$data$lib$system$model$errors$$isEmpty = Ember.isEmpty;
     var ember$data$lib$system$model$errors$$map = Ember.ArrayPolyfills.map;
+    var ember$data$lib$system$model$errors$$makeArray = Ember.makeArray;
 
-    var ember$data$lib$system$model$errors$$default = Ember.Object.extend(Ember.Enumerable, Ember.Evented, {
+    var ember$data$lib$system$model$errors$$default = Ember.ArrayProxy.extend(Ember.Evented, {
       /**
         Register with target handler
          @method registerHandlers
@@ -4439,21 +4414,12 @@
         return errors;
       },
 
-      /**
-        @method nextObject
-        @private
-      */
-      nextObject: function (index, previousObject, context) {
-        return ember$data$lib$system$model$errors$$get(this, 'content').objectAt(index);
-      },
-
       /**
         Total number of errors.
          @property length
         @type {Number}
         @readOnly
       */
-      length: Ember.computed.oneWay('content.length').readOnly(),
 
       /**
         @property isEmpty
@@ -4479,11 +4445,10 @@
         var wasEmpty = ember$data$lib$system$model$errors$$get(this, 'isEmpty');
 
         messages = this._findOrCreateMessages(attribute, messages);
-        ember$data$lib$system$model$errors$$get(this, 'content').addObjects(messages);
+        this.addObjects(messages);
         ember$data$lib$system$model$errors$$get(this, 'errorsByAttributeName').get(attribute).addObjects(messages);
 
         this.notifyPropertyChange(attribute);
-        this.enumerableContentDidChange();
 
         if (wasEmpty && !ember$data$lib$system$model$errors$$get(this, 'isEmpty')) {
           this.trigger('becameInvalid');
@@ -4497,7 +4462,7 @@
       _findOrCreateMessages: function (attribute, messages) {
         var errors = this.errorsFor(attribute);
 
-        return ember$data$lib$system$model$errors$$map.call(Ember.makeArray(messages), function (message) {
+        return ember$data$lib$system$model$errors$$map.call(ember$data$lib$system$model$errors$$makeArray(messages), function (message) {
           return errors.findBy('message', message) || {
             attribute: attribute,
             message: message
@@ -4538,12 +4503,11 @@
           return;
         }
 
-        var content = ember$data$lib$system$model$errors$$get(this, 'content').rejectBy('attribute', attribute);
-        ember$data$lib$system$model$errors$$get(this, 'content').setObjects(content);
+        var content = this.rejectBy('attribute', attribute);
+        ember$data$lib$system$model$errors$$set(this, 'content', content);
         ember$data$lib$system$model$errors$$get(this, 'errorsByAttributeName')["delete"](attribute);
 
         this.notifyPropertyChange(attribute);
-        this.enumerableContentDidChange();
 
         if (ember$data$lib$system$model$errors$$get(this, 'isEmpty')) {
           this.trigger('becameValid');
@@ -4572,9 +4536,19 @@
           return;
         }
 
-        ember$data$lib$system$model$errors$$get(this, 'content').clear();
-        ember$data$lib$system$model$errors$$get(this, 'errorsByAttributeName').clear();
-        this.enumerableContentDidChange();
+        var errorsByAttributeName = ember$data$lib$system$model$errors$$get(this, 'errorsByAttributeName');
+        var attributes = Ember.A();
+
+        errorsByAttributeName.forEach(function (_, attribute) {
+          attributes.push(attribute);
+        });
+
+        errorsByAttributeName.clear();
+        attributes.forEach(function (attribute) {
+          this.notifyPropertyChange(attribute);
+        }, this);
+
+        this._super();
 
         this.trigger('becameValid');
       },
@@ -4603,6 +4577,63 @@
       }
     });
 
+    var ember$new$computed$lib$utils$can$use$new$syntax$$supportsSetterGetter;
+
+    try {
+      ember$lib$main$$default.computed({
+        set: function () {},
+        get: function () {}
+      });
+      ember$new$computed$lib$utils$can$use$new$syntax$$supportsSetterGetter = true;
+    } catch (e) {
+      ember$new$computed$lib$utils$can$use$new$syntax$$supportsSetterGetter = false;
+    }
+
+    var ember$new$computed$lib$utils$can$use$new$syntax$$default = ember$new$computed$lib$utils$can$use$new$syntax$$supportsSetterGetter;
+    var ember$new$computed$lib$main$$default = ember$new$computed$lib$main$$newComputed;
+
+    var ember$new$computed$lib$main$$computed = ember$lib$main$$default.computed;
+
+    function ember$new$computed$lib$main$$newComputed() {
+      var polyfillArguments = [];
+      var config = arguments[arguments.length - 1];
+
+      if (typeof config === 'function' || ember$new$computed$lib$utils$can$use$new$syntax$$default) {
+        return ember$new$computed$lib$main$$computed.apply(undefined, arguments);
+      }
+
+      for (var i = 0, l = arguments.length - 1; i < l; i++) {
+        polyfillArguments.push(arguments[i]);
+      }
+
+      var func;
+      if (config.set) {
+        func = function (key, value) {
+          if (arguments.length > 1) {
+            return config.set.call(this, key, value);
+          } else {
+            return config.get.call(this, key);
+          }
+        };
+      } else {
+        func = function (key) {
+          return config.get.call(this, key);
+        };
+      }
+
+      polyfillArguments.push(func);
+
+      return ember$new$computed$lib$main$$computed.apply(undefined, polyfillArguments);
+    }
+
+    var ember$new$computed$lib$main$$getKeys = Object.keys || ember$lib$main$$default.keys;
+    var ember$new$computed$lib$main$$computedKeys = ember$new$computed$lib$main$$getKeys(ember$new$computed$lib$main$$computed);
+
+    for (var ember$new$computed$lib$main$$i = 0, ember$new$computed$lib$main$$l = ember$new$computed$lib$main$$computedKeys.length; ember$new$computed$lib$main$$i < ember$new$computed$lib$main$$l; ember$new$computed$lib$main$$i++) {
+      ember$new$computed$lib$main$$newComputed[ember$new$computed$lib$main$$computedKeys[ember$new$computed$lib$main$$i]] = ember$new$computed$lib$main$$computed[ember$new$computed$lib$main$$computedKeys[ember$new$computed$lib$main$$i]];
+    }
+    var ember$data$lib$system$model$model$$errorDeprecationShown = false;
+
     /**
       @module ember-data
     */
@@ -4610,6 +4641,8 @@
     var ember$data$lib$system$model$model$$get = Ember.get;
     var ember$data$lib$system$model$model$$forEach = Ember.ArrayPolyfills.forEach;
     var ember$data$lib$system$model$model$$indexOf = Ember.ArrayPolyfills.indexOf;
+    var ember$data$lib$system$model$model$$merge = Ember.merge;
+    var ember$data$lib$system$model$model$$copy = Ember.copy;
 
     function ember$data$lib$system$model$model$$intersection(array1, array2) {
       var result = [];
@@ -4622,9 +4655,9 @@
       return result;
     }
 
-    var ember$data$lib$system$model$model$$RESERVED_MODEL_PROPS = ['currentState', 'data', 'store'];
+    var ember$data$lib$system$model$model$$RESERVED_MODEL_PROPS = ["currentState", "data", "store"];
 
-    var ember$data$lib$system$model$model$$retrieveFromCurrentState = Ember.computed('currentState', function (key) {
+    var ember$data$lib$system$model$model$$retrieveFromCurrentState = Ember.computed("currentState", function (key) {
       return ember$data$lib$system$model$model$$get(this._internalModel.currentState, key);
     }).readOnly();
 
@@ -4709,10 +4742,29 @@
         @readOnly
         @deprecated
       */
-      isDirty: Ember.computed('currentState.isDirty', function () {
-        Ember.deprecate('DS.Model#isDirty has been deprecated please use hasDirtyAttributes instead');
-        return this.get('currentState.isDirty');
+      isDirty: Ember.computed("currentState.isDirty", function () {
+        Ember.deprecate("DS.Model#isDirty has been deprecated please use hasDirtyAttributes instead", false, {
+          id: "ds.model.is-dirty-deprecated",
+          until: "2.0.0"
+        });
+        return this.get("currentState.isDirty");
+      }),
+
+      /**
+        @property error
+        @type {Boolean}
+        @deprecated
+      */
+      error: ember$new$computed$lib$main$$default("adapterError", {
+        get: function () {
+          if (!ember$data$lib$system$model$model$$errorDeprecationShown) {
+            Ember.deprecate("DS.Model#error has been deprecated please use adapterError instead");
+            ember$data$lib$system$model$model$$errorDeprecationShown = true;
+          }
+          return Ember.get(this, "adapterError");
+        }
       }),
+
       /**
         If this property is `true` the record is in the `dirty` state. The
         record has local changes that have not yet been saved by the
@@ -4732,8 +4784,8 @@
         @type {Boolean}
         @readOnly
       */
-      hasDirtyAttributes: Ember.computed('currentState.isDirty', function () {
-        return this.get('currentState.isDirty');
+      hasDirtyAttributes: Ember.computed("currentState.isDirty", function () {
+        return this.get("currentState.isDirty");
       }),
       /**
         If this property is `true` the record is in the `saving` state. A
@@ -4935,9 +4987,9 @@
         var errors = ember$data$lib$system$model$errors$$default.create();
 
         errors.registerHandlers(this._internalModel, function () {
-          this.send('becameInvalid');
+          this.send("becameInvalid");
         }, function () {
-          this.send('becameValid');
+          this.send("becameValid");
         });
 
         return errors;
@@ -4979,7 +5031,7 @@
       */
       toJSON: function (options) {
         // container is for lazy transform lookups
-        var serializer = this.store.serializerFor('-default');
+        var serializer = this.store.serializerFor("-default");
         var snapshot = this._internalModel.createSnapshot();
 
         return serializer.serialize(snapshot, options);
@@ -5039,7 +5091,7 @@
         @private
         @type {Object}
       */
-      data: Ember.computed.readOnly('_internalModel._data'),
+      data: Ember.computed.readOnly("_internalModel._data"),
 
       //TODO Do we want to deprecate these?
       /**
@@ -5161,8 +5213,10 @@
           and value is an [oldProp, newProp] array.
       */
       changedAttributes: function () {
-        var oldData = ember$data$lib$system$model$model$$get(this._internalModel, '_data');
-        var newData = ember$data$lib$system$model$model$$get(this._internalModel, '_attributes');
+        var oldData = ember$data$lib$system$model$model$$get(this._internalModel, "_data");
+        var currentData = ember$data$lib$system$model$model$$get(this._internalModel, "_attributes");
+        var inFlightData = ember$data$lib$system$model$model$$get(this._internalModel, "_inFlightAttributes");
+        var newData = ember$data$lib$system$model$model$$merge(ember$data$lib$system$model$model$$copy(inFlightData), currentData);
         var diffData = ember$data$lib$system$object$polyfills$$create(null);
 
         var newDataKeys = ember$data$lib$system$object$polyfills$$keysFunc(newData);
@@ -5207,7 +5261,10 @@
         @deprecated Use `rollbackAttributes()` instead
       */
       rollback: function () {
-        Ember.deprecate('Using model.rollback() has been deprecated. Use model.rollbackAttributes() to discard any unsaved changes to a model.');
+        Ember.deprecate("Using model.rollback() has been deprecated. Use model.rollbackAttributes() to discard any unsaved changes to a model.", false, {
+          id: "ds.model.rollback-deprecated",
+          until: "2.0.0"
+        });
         this.rollbackAttributes();
       },
 
@@ -5237,7 +5294,7 @@
       },
 
       toStringExtension: function () {
-        return ember$data$lib$system$model$model$$get(this, 'id');
+        return ember$data$lib$system$model$model$$get(this, "id");
       },
 
       /**
@@ -5329,7 +5386,7 @@
       // rely on the data property.
       willMergeMixin: function (props) {
         var constructor = this.constructor;
-        Ember.assert('`' + ember$data$lib$system$model$model$$intersection(ember$data$lib$system$object$polyfills$$keysFunc(props), ember$data$lib$system$model$model$$RESERVED_MODEL_PROPS)[0] + '` is a reserved property name on DS.Model objects. Please choose a different property name for ' + constructor.toString(), !ember$data$lib$system$model$model$$intersection(ember$data$lib$system$object$polyfills$$keysFunc(props), ember$data$lib$system$model$model$$RESERVED_MODEL_PROPS)[0]);
+        Ember.assert("`" + ember$data$lib$system$model$model$$intersection(ember$data$lib$system$object$polyfills$$keysFunc(props), ember$data$lib$system$model$model$$RESERVED_MODEL_PROPS)[0] + "` is a reserved property name on DS.Model objects. Please choose a different property name for " + constructor.toString(), !ember$data$lib$system$model$model$$intersection(ember$data$lib$system$object$polyfills$$keysFunc(props), ember$data$lib$system$model$model$$RESERVED_MODEL_PROPS)[0]);
       },
 
       attr: function () {
@@ -5428,7 +5485,10 @@
         }
         return normalizedResponse;
       } else {
-        Ember.deprecate('Your custom serializer uses the old version of the Serializer API, with `extract` hooks. Please upgrade your serializers to the new Serializer API using `normalizeResponse` hooks instead.');
+        Ember.deprecate('Your custom serializer uses the old version of the Serializer API, with `extract` hooks. Please upgrade your serializers to the new Serializer API using `normalizeResponse` hooks instead.', false, {
+          id: 'ds.serializer.extract-hooks-deprecated',
+          until: '2.0.0'
+        });
         var serializerPayload = serializer.extract(store, modelClass, payload, id, requestType);
         return ember$data$lib$system$store$serializer$response$$_normalizeSerializerPayload(modelClass, serializerPayload);
       }
@@ -5508,7 +5568,7 @@
                 return value;
               }
 
-              Ember.assert("A " + relationshipMeta.parentType + " record was pushed into the store with the value of " + key + " being " + Ember.inspect(value) + ", but " + key + " is a belongsTo relationship so the value must not be an array. You should probably check your data payload or serializer.", !Ember.isArray(value));
+              Ember.assert('A ' + relationshipMeta.parentType + ' record was pushed into the store with the value of ' + key + ' being ' + Ember.inspect(value) + ', but ' + key + ' is a belongsTo relationship so the value must not be an array. You should probably check your data payload or serializer.', !Ember.isArray(value));
               return { id: '' + value, type: relationshipMeta.type };
             };
 
@@ -5520,7 +5580,7 @@
               }
             } else if (relationshipMeta.kind === 'hasMany') {
               //|| [] because the hasMany could be === null
-              Ember.assert("A " + relationshipMeta.parentType + " record was pushed into the store with the value of " + key + " being '" + Ember.inspect(value) + "', but " + key + " is a hasMany relationship so the value must be an array. You should probably check your data payload or serializer.", Ember.isArray(value) || value === null);
+              Ember.assert('A ' + relationshipMeta.parentType + ' record was pushed into the store with the value of ' + key + ' being \'' + Ember.inspect(value) + '\', but ' + key + ' is a hasMany relationship so the value must be an array. You should probably check your data payload or serializer.', Ember.isArray(value) || value === null);
 
               relationshipData = Ember.A(value || []);
 
@@ -5814,7 +5874,7 @@
         @return {Object}
       */
       normalize: function (typeClass, hash, prop) {
-        if (this.get('isNewSerializerAPI')) {
+        if (this.get("isNewSerializerAPI")) {
           ember$data$lib$serializers$rest$serializer$$_newNormalize.apply(this, arguments);
           return this._super.apply(this, arguments);
         }
@@ -5826,7 +5886,10 @@
         this.normalizeUsingDeclaredMapping(typeClass, hash);
 
         if (this.normalizeHash && this.normalizeHash[prop]) {
-          Ember.deprecate('`RESTSerializer.normalizeHash` has been deprecated. Please use `serializer.normalize` to modify the payload of single resources.');
+          Ember.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: "2.0.0"
+          });
           this.normalizeHash[prop](hash);
         }
 
@@ -5853,7 +5916,7 @@
         var modelClass = store.modelFor(modelName);
         var serializer = store.serializerFor(modelName);
 
-        Ember.assert(this.toString() + " has opted into the new serializer API and expects the " + serializer.toString() + " it collaborates with to also support the new serializer API by setting its `isNewSerializerAPI` property to true.", ember$data$lib$serializers$rest$serializer$$get(serializer, 'isNewSerializerAPI'));
+        Ember.assert(this.toString() + " has opted into the new serializer API and expects the " + serializer.toString() + " it collaborates with to also support the new serializer API by setting its `isNewSerializerAPI` property to true.", ember$data$lib$serializers$rest$serializer$$get(serializer, "isNewSerializerAPI"));
 
         /*jshint loopfunc:true*/
         ember$data$lib$serializers$rest$serializer$$forEach.call(arrayHash, function (hash) {
@@ -5892,7 +5955,7 @@
 
         var meta = this.extractMeta(store, primaryModelClass, payload);
         if (meta) {
-          Ember.assert('The `meta` returned from `extractMeta` has to be an object, not "' + Ember.typeOf(meta) + '".', Ember.typeOf(meta) === 'object');
+          Ember.assert("The `meta` returned from `extractMeta` has to be an object, not \"" + Ember.typeOf(meta) + "\".", Ember.typeOf(meta) === "object");
           documentHash.meta = meta;
         }
 
@@ -5920,14 +5983,16 @@
             ```
              This forces `_users` to be added to `included` instead of `data`.
            */
-          if (prop.charAt(0) === '_') {
+          if (prop.charAt(0) === "_") {
             forcedSecondary = true;
             modelName = prop.substr(1);
           }
 
           var typeName = this.modelNameFromPayloadKey(modelName);
           if (!store.modelFactoryFor(typeName)) {
-            Ember.warn(this.warnMessageNoModelForKey(modelName, typeName), false);
+            Ember.warn(this.warnMessageNoModelForKey(modelName, typeName), false, {
+              id: "ds.serializer.model-for-key-missing"
+            });
             continue;
           }
 
@@ -5947,7 +6012,7 @@
             }
             ```
            */
-          if (isPrimary && Ember.typeOf(value) !== 'array') {
+          if (isPrimary && Ember.typeOf(value) !== "array") {
             var _normalize = this.normalize(primaryModelClass, value, prop);
 
             var _data = _normalize.data;
@@ -6074,7 +6139,10 @@
         @return {Object} the primary response to the original request
       */
       extractSingle: function (store, primaryTypeClass, rawPayload, recordId) {
-        Ember.deprecate('`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.', this.normalizePayload === ember$data$lib$serializers$json$serializer$$default.prototype.normalizePayload);
+        Ember.deprecate("`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.", this.normalizePayload === ember$data$lib$serializers$json$serializer$$default.prototype.normalizePayload, {
+          id: "ds.serializer.normalize-payload-deprecated",
+          until: "2.0.0"
+        });
         var payload = this.normalizePayload(rawPayload);
         var primaryRecord;
 
@@ -6082,7 +6150,9 @@
           var modelName = this.modelNameFromPayloadKey(prop);
 
           if (!store.modelFactoryFor(modelName)) {
-            Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false);
+            Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false, {
+              id: "ds.serializer.model-for-key-missing"
+            });
             continue;
           }
           var isPrimary = this.isPrimaryType(store, modelName, primaryTypeClass);
@@ -6104,7 +6174,7 @@
             var type = store.modelFor(typeName);
             var typeSerializer = store.serializerFor(type.modelName);
 
-            Ember.assert(this.toString() + " is using the " + (ember$data$lib$serializers$rest$serializer$$get(this, 'isNewSerializerAPI') ? 'new' : 'old') + " serializer API and expects " + typeSerializer.toString() + " it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.", ember$data$lib$serializers$rest$serializer$$get(this, 'isNewSerializerAPI') === ember$data$lib$serializers$rest$serializer$$get(typeSerializer, 'isNewSerializerAPI'));
+            Ember.assert(this.toString() + " is using the " + (ember$data$lib$serializers$rest$serializer$$get(this, "isNewSerializerAPI") ? "new" : "old") + " serializer API and expects " + typeSerializer.toString() + " it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.", ember$data$lib$serializers$rest$serializer$$get(this, "isNewSerializerAPI") === ember$data$lib$serializers$rest$serializer$$get(typeSerializer, "isNewSerializerAPI"));
 
             hash = typeSerializer.normalize(type, hash, prop);
 
@@ -6214,7 +6284,10 @@
           to the original query.
       */
       extractArray: function (store, primaryTypeClass, rawPayload) {
-        Ember.deprecate('`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.', this.normalizePayload === ember$data$lib$serializers$json$serializer$$default.prototype.normalizePayload);
+        Ember.deprecate("`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.", this.normalizePayload === ember$data$lib$serializers$json$serializer$$default.prototype.normalizePayload, {
+          id: "ds.serializer.normalize-payload-deprecated",
+          until: "2.0.0"
+        });
         var payload = this.normalizePayload(rawPayload);
         var primaryArray;
 
@@ -6222,20 +6295,22 @@
           var modelName = prop;
           var forcedSecondary = false;
 
-          if (prop.charAt(0) === '_') {
+          if (prop.charAt(0) === "_") {
             forcedSecondary = true;
             modelName = prop.substr(1);
           }
 
           var typeName = this.modelNameFromPayloadKey(modelName);
           if (!store.modelFactoryFor(typeName)) {
-            Ember.warn(this.warnMessageNoModelForKey(prop, typeName), false);
+            Ember.warn(this.warnMessageNoModelForKey(prop, typeName), false, {
+              id: "ds.serializer.model-for-key-missing"
+            });
             continue;
           }
           var type = store.modelFor(typeName);
           var typeSerializer = store.serializerFor(type.modelName);
 
-          Ember.assert(this.toString() + " is using the " + (ember$data$lib$serializers$rest$serializer$$get(this, 'isNewSerializerAPI') ? 'new' : 'old') + " serializer API and expects " + typeSerializer.toString() + " it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.", ember$data$lib$serializers$rest$serializer$$get(this, 'isNewSerializerAPI') === ember$data$lib$serializers$rest$serializer$$get(typeSerializer, 'isNewSerializerAPI'));
+          Ember.assert(this.toString() + " is using the " + (ember$data$lib$serializers$rest$serializer$$get(this, "isNewSerializerAPI") ? "new" : "old") + " serializer API and expects " + typeSerializer.toString() + " it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.", ember$data$lib$serializers$rest$serializer$$get(this, "isNewSerializerAPI") === ember$data$lib$serializers$rest$serializer$$get(typeSerializer, "isNewSerializerAPI"));
 
           var isPrimary = !forcedSecondary && this.isPrimaryType(store, typeName, primaryTypeClass);
 
@@ -6288,24 +6363,29 @@
         @param {Object} rawPayload
       */
       pushPayload: function (store, rawPayload) {
-        if (this.get('isNewSerializerAPI')) {
+        if (this.get("isNewSerializerAPI")) {
           ember$data$lib$serializers$rest$serializer$$_newPushPayload.apply(this, arguments);
           return;
         }
 
-        Ember.deprecate('`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.', this.normalizePayload === ember$data$lib$serializers$json$serializer$$default.prototype.normalizePayload);
+        Ember.deprecate("`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.", this.normalizePayload === ember$data$lib$serializers$json$serializer$$default.prototype.normalizePayload, {
+          id: "ds.serializer.normalize-payload-deprecated",
+          until: "2.0.0"
+        });
         var payload = this.normalizePayload(rawPayload);
 
         for (var prop in payload) {
           var modelName = this.modelNameFromPayloadKey(prop);
           if (!store.modelFactoryFor(modelName)) {
-            Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false);
+            Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false, {
+              id: "ds.serializer.model-for-key-missing"
+            });
             continue;
           }
           var typeClass = store.modelFor(modelName);
           var typeSerializer = store.serializerFor(modelName);
 
-          Ember.assert(this.toString() + " is using the " + (ember$data$lib$serializers$rest$serializer$$get(this, 'isNewSerializerAPI') ? 'new' : 'old') + " serializer API and expects " + typeSerializer.toString() + " it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.", ember$data$lib$serializers$rest$serializer$$get(this, 'isNewSerializerAPI') === ember$data$lib$serializers$rest$serializer$$get(typeSerializer, 'isNewSerializerAPI'));
+          Ember.assert(this.toString() + " is using the " + (ember$data$lib$serializers$rest$serializer$$get(this, "isNewSerializerAPI") ? "new" : "old") + " serializer API and expects " + typeSerializer.toString() + " it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.", ember$data$lib$serializers$rest$serializer$$get(this, "isNewSerializerAPI") === ember$data$lib$serializers$rest$serializer$$get(typeSerializer, "isNewSerializerAPI"));
 
           /*jshint loopfunc:true*/
           var normalizedArray = ember$data$lib$serializers$rest$serializer$$map.call(Ember.makeArray(payload[prop]), function (hash) {
@@ -6560,7 +6640,10 @@
         @deprecated
       */
       typeForRoot: function (modelName) {
-        Ember.deprecate("typeForRoot is deprecated. Use modelNameFromPayloadKey instead.");
+        Ember.deprecate("typeForRoot is deprecated. Use modelNameFromPayloadKey instead.", false, {
+          id: "ds.serializer.type-for-root-deprecated",
+          until: "2.0.0"
+        });
         return this.modelNameFromPayloadKey(modelName);
       },
 
@@ -6588,7 +6671,7 @@
     Ember.runInDebug(function () {
       ember$data$lib$serializers$rest$serializer$$RESTSerializer.reopen({
         warnMessageNoModelForKey: function (prop, typeKey) {
-          return 'Encountered "' + prop + '" in payload, but no model was found for model name "' + typeKey + '" (resolved model name using ' + this.constructor.toString() + '.modelNameFromPayloadKey("' + prop + '"))';
+          return "Encountered \"" + prop + "\" in payload, but no model was found for model name \"" + typeKey + "\" (resolved model name using " + this.constructor.toString() + ".modelNameFromPayloadKey(\"" + prop + "\"))";
         }
       });
     });
@@ -6605,7 +6688,10 @@
     */
     function ember$data$lib$serializers$rest$serializer$$_newNormalize(modelClass, resourceHash, prop) {
       if (this.normalizeHash && this.normalizeHash[prop]) {
-        Ember.deprecate('`RESTSerializer.normalizeHash` has been deprecated. Please use `serializer.normalize` to modify the payload of single resources.');
+        Ember.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: "2.0.0"
+        });
         this.normalizeHash[prop](resourceHash);
       }
     }
@@ -6621,19 +6707,24 @@
         included: []
       };
 
-      Ember.deprecate('`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.', this.normalizePayload === ember$data$lib$serializers$json$serializer$$default.prototype.normalizePayload);
+      Ember.deprecate("`serializer.normalizePayload` has been deprecated. Please use `serializer.normalizeResponse` with the new Serializer API to modify the payload.", this.normalizePayload === ember$data$lib$serializers$json$serializer$$default.prototype.normalizePayload, {
+        id: "ds.serializer.normalize-payload-deprecated",
+        until: "2.0.0"
+      });
       var payload = this.normalizePayload(rawPayload);
 
       for (var prop in payload) {
         var modelName = this.modelNameFromPayloadKey(prop);
         if (!store.modelFactoryFor(modelName)) {
-          Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false);
+          Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false, {
+            id: "ds.serializer.model-for-key-missing"
+          });
           continue;
         }
         var type = store.modelFor(modelName);
         var typeSerializer = store.serializerFor(type.modelName);
 
-        Ember.assert(this.toString() + " is using the " + (ember$data$lib$serializers$rest$serializer$$get(this, 'isNewSerializerAPI') ? 'new' : 'old') + " serializer API and expects " + typeSerializer.toString() + " it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.", ember$data$lib$serializers$rest$serializer$$get(this, 'isNewSerializerAPI') === ember$data$lib$serializers$rest$serializer$$get(typeSerializer, 'isNewSerializerAPI'));
+        Ember.assert(this.toString() + " is using the " + (ember$data$lib$serializers$rest$serializer$$get(this, "isNewSerializerAPI") ? "new" : "old") + " serializer API and expects " + typeSerializer.toString() + " it collaborates with to do the same. Make sure to set `isNewSerializerAPI: true` in your custom serializers if you want to use the new Serializer API.", ember$data$lib$serializers$rest$serializer$$get(this, "isNewSerializerAPI") === ember$data$lib$serializers$rest$serializer$$get(typeSerializer, "isNewSerializerAPI"));
 
         /*jshint loopfunc:true*/
         ember$data$lib$serializers$rest$serializer$$forEach.call(Ember.makeArray(payload[prop]), function (hash) {
@@ -6659,6 +6750,11 @@
      */
 
     var activemodel$adapter$lib$system$active$model$serializer$$_Ember$String = ember$lib$main$$default.String;
+    var activemodel$adapter$lib$system$active$model$serializer$$singularize = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.singularize;
+    var activemodel$adapter$lib$system$active$model$serializer$$classify = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.classify;
+    var activemodel$adapter$lib$system$active$model$serializer$$decamelize = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.decamelize;
+    var activemodel$adapter$lib$system$active$model$serializer$$camelize = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.camelize;
+    var activemodel$adapter$lib$system$active$model$serializer$$underscore = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.underscore;
 
     /**
       The ActiveModelSerializer is a subclass of the RESTSerializer designed to integrate
@@ -6747,11 +6843,6 @@
       @namespace DS
       @extends DS.RESTSerializer
     */
-    var activemodel$adapter$lib$system$active$model$serializer$$singularize = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.singularize;
-    var activemodel$adapter$lib$system$active$model$serializer$$classify = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.classify;
-    var activemodel$adapter$lib$system$active$model$serializer$$decamelize = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.decamelize;
-    var activemodel$adapter$lib$system$active$model$serializer$$camelize = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.camelize;
-    var activemodel$adapter$lib$system$active$model$serializer$$underscore = activemodel$adapter$lib$system$active$model$serializer$$_Ember$String.underscore;
     var activemodel$adapter$lib$system$active$model$serializer$$ActiveModelSerializer = ember$data$lib$serializers$rest$serializer$$default.extend({
       // SERIALIZE
 
@@ -6775,10 +6866,10 @@
       */
       keyForRelationship: function (relationshipModelName, kind) {
         var key = activemodel$adapter$lib$system$active$model$serializer$$decamelize(relationshipModelName);
-        if (kind === "belongsTo") {
-          return key + "_id";
-        } else if (kind === "hasMany") {
-          return activemodel$adapter$lib$system$active$model$serializer$$singularize(key) + "_ids";
+        if (kind === 'belongsTo') {
+          return key + '_id';
+        } else if (kind === 'hasMany') {
+          return activemodel$adapter$lib$system$active$model$serializer$$singularize(key) + '_ids';
         } else {
           return key;
         }
@@ -6821,7 +6912,7 @@
       serializePolymorphicType: function (snapshot, json, relationship) {
         var key = relationship.key;
         var belongsTo = snapshot.belongsTo(key);
-        var jsonKey = activemodel$adapter$lib$system$active$model$serializer$$underscore(key + "_type");
+        var jsonKey = activemodel$adapter$lib$system$active$model$serializer$$underscore(key + '_type');
 
         if (ember$lib$main$$default.isNone(belongsTo)) {
           json[jsonKey] = null;
@@ -6912,18 +7003,18 @@
           typeClass.eachRelationship(function (key, relationship) {
             var payloadKey, payload;
             if (relationship.options.polymorphic) {
-              payloadKey = this.keyForAttribute(key, "deserialize");
+              payloadKey = this.keyForAttribute(key, 'deserialize');
               payload = hash[payloadKey];
               if (payload && payload.type) {
                 payload.type = this.modelNameFromPayloadKey(payload.type);
-              } else if (payload && relationship.kind === "hasMany") {
+              } else if (payload && relationship.kind === 'hasMany') {
                 for (var i = 0, len = payload.length; i < len; i++) {
                   var single = payload[i];
                   single.type = this.modelNameFromPayloadKey(single.type);
                 }
               }
             } else {
-              payloadKey = this.keyForRelationship(key, relationship.kind, "deserialize");
+              payloadKey = this.keyForRelationship(key, relationship.kind, 'deserialize');
               if (!hash.hasOwnProperty(payloadKey)) {
                 return;
               }
@@ -6941,7 +7032,7 @@
 
       extractRelationships: function (modelClass, resourceHash) {
         modelClass.eachRelationship(function (key, relationshipMeta) {
-          var relationshipKey = this.keyForRelationship(key, relationshipMeta.kind, "deserialize");
+          var relationshipKey = this.keyForRelationship(key, relationshipMeta.kind, 'deserialize');
 
           // prefer the format the AMS gem expects, e.g.:
           // relationship: {id: id, type: type}
@@ -6980,23 +7071,23 @@
           resourceHash[relationshipKey] = { id: id, type: type };
           // otherwise hasMany
         } else {
-            var hashes = resourceHash[polymorphicKey];
+          var hashes = resourceHash[polymorphicKey];
 
-            if (!hashes) {
-              return;
-            }
+          if (!hashes) {
+            return;
+          }
 
-            // TODO: replace this with map when ActiveModelAdapter branches for Ember Data 2.0
-            var array = [];
-            for (var i = 0, _length = hashes.length; i < _length; i++) {
-              var hash = hashes[i];
-              var id = hash.id;
-              var type = hash.type;
+          // TODO: replace this with map when ActiveModelAdapter branches for Ember Data 2.0
+          var array = [];
+          for (var i = 0, _length = hashes.length; i < _length; i++) {
+            var hash = hashes[i];
+            var id = hash.id;
+            var type = hash.type;
 
-              array.push({ id: id, type: type });
-            }
-            resourceHash[relationshipKey] = array;
+            array.push({ id: id, type: type });
           }
+          resourceHash[relationshipKey] = array;
+        }
       }
     }
 
@@ -7027,7 +7118,10 @@
 
     ember$data$lib$system$container$proxy$$ContainerProxy.prototype.registerDeprecation = function (deprecated, valid) {
       var preLookupCallback = function () {
-        Ember.deprecate("You tried to look up '" + deprecated + "', " + "but this has been deprecated in favor of '" + valid + "'.", false);
+        Ember.deprecate('You tried to look up \'' + deprecated + '\', but this has been deprecated in favor of \'' + valid + '\'.', false, {
+          id: 'ds.store.deprecated-lookup',
+          until: '2.0.0'
+        });
       };
 
       return this.registerAlias(deprecated, valid, preLookupCallback);
@@ -7049,29 +7143,12 @@
     var activemodel$adapter$lib$setup$container$$default = activemodel$adapter$lib$setup$container$$setupActiveModelAdapter;
     function activemodel$adapter$lib$setup$container$$setupActiveModelAdapter(registry, application) {
       var proxy = new ember$data$lib$system$container$proxy$$default(registry);
-      proxy.registerDeprecations([{ deprecated: 'serializer:_ams', valid: 'serializer:-active-model' }, { deprecated: 'adapter:_ams', valid: 'adapter:-active-model' }]);
+      proxy.registerDeprecations([{ deprecated: "serializer:_ams", valid: "serializer:-active-model" }, { deprecated: "adapter:_ams", valid: "adapter:-active-model" }]);
 
-      registry.register('serializer:-active-model', activemodel$adapter$lib$system$active$model$serializer$$default.extend({ isNewSerializerAPI: true }));
-      registry.register('adapter:-active-model', activemodel$adapter$lib$system$active$model$adapter$$default);
+      registry.register("serializer:-active-model", activemodel$adapter$lib$system$active$model$serializer$$default.extend({ isNewSerializerAPI: true }));
+      registry.register("adapter:-active-model", activemodel$adapter$lib$system$active$model$adapter$$default);
     }
 
-    /**
-      `DS.FixtureAdapter` is an adapter that loads records from memory.
-      It's primarily used for development and testing. You can also use
-      `DS.FixtureAdapter` while working on the API but is not ready to
-      integrate yet. It is a fully functioning adapter. All CRUD methods
-      are implemented. You can also implement query logic that a remote
-      system would do. It's possible to develop your entire application
-      with `DS.FixtureAdapter`.
-
-      For information on how to use the `FixtureAdapter` in your
-      application please see the [FixtureAdapter
-      guide](/guides/models/the-fixture-adapter/).
-
-      @class FixtureAdapter
-      @namespace DS
-      @extends DS.Adapter
-    */
     /**
       @module ember-data
     */
@@ -7121,9 +7198,9 @@
           return fixtures.map(function (fixture) {
             var fixtureIdType = typeof fixture.id;
             if (fixtureIdType !== "number" && fixtureIdType !== "string") {
-              throw new Error(ember$data$lib$adapters$fixture$adapter$$fmt('the id property must be defined as a number or string for fixture %@', [fixture]));
+              throw new Error(ember$data$lib$adapters$fixture$adapter$$fmt("the id property must be defined as a number or string for fixture %@", [fixture]));
             }
-            fixture.id = fixture.id + '';
+            fixture.id = fixture.id + "";
             return fixture;
           });
         }
@@ -7139,7 +7216,7 @@
         @return {(Promise|Array)}
       */
       queryFixtures: function (fixtures, query, typeClass) {
-        Ember.assert('Not implemented: You must override the DS.FixtureAdapter::queryFixtures method to support querying the fixture store.');
+        Ember.assert("Not implemented: You must override the DS.FixtureAdapter::queryFixtures method to support querying the fixture store.");
       },
 
       /**
@@ -7194,7 +7271,7 @@
         Ember.assert("Unable to find fixtures for model type " + typeClass.toString() + ". If you're defining your fixtures using `Model.FIXTURES = ...`, please change it to `Model.reopenClass({ FIXTURES: ... })`.", fixtures);
 
         if (fixtures) {
-          fixture = Ember.A(fixtures).findBy('id', id);
+          fixture = Ember.A(fixtures).findBy("id", id);
         }
 
         if (fixture) {
@@ -7357,7 +7434,7 @@
       */
       findFixtureById: function (fixtures, id) {
         return Ember.A(fixtures).find(function (r) {
-          if ('' + ember$data$lib$adapters$fixture$adapter$$get(r, 'id') === '' + id) {
+          if ("" + ember$data$lib$adapters$fixture$adapter$$get(r, "id") === "" + id) {
             return true;
           } else {
             return false;
@@ -7376,14 +7453,14 @@
 
         return new Ember.RSVP.Promise(function (resolve) {
           var value = Ember.copy(callback.call(context), true);
-          if (ember$data$lib$adapters$fixture$adapter$$get(adapter, 'simulateRemoteResponse')) {
+          if (ember$data$lib$adapters$fixture$adapter$$get(adapter, "simulateRemoteResponse")) {
             // Schedule with setTimeout
             Ember.run.later(function () {
               resolve(value);
-            }, ember$data$lib$adapters$fixture$adapter$$get(adapter, 'latency'));
+            }, ember$data$lib$adapters$fixture$adapter$$get(adapter, "latency"));
           } else {
             // Asynchronous, but at the of the runloop with zero latency
-            Ember.run.schedule('actions', null, function () {
+            Ember.run.schedule("actions", null, function () {
               resolve(value);
             });
           }
@@ -7465,7 +7542,7 @@
     });
 
     var ember$data$lib$core$$DS = Ember.Namespace.create({
-      VERSION: '1.13.6'
+      VERSION: '1.13.7'
     });
 
     if (Ember.libraries) {
@@ -7488,7 +7565,7 @@
     }
 
     function ember$data$lib$system$store$common$$_guard(promise, test) {
-      var guarded = promise['finally'](function () {
+      var guarded = promise["finally"](function () {
         if (!test()) {
           guarded._subscribers.length = 0;
         }
@@ -7509,7 +7586,10 @@
       }
 
       if (serializer === null || serializer === undefined) {
-        Ember.deprecate('Ember Data 2.0 will no longer support adapters with a null serializer property. Please define `defaultSerializer: "-default"` your adapter and make sure the `serializer` property is not null.');
+        Ember.deprecate('Ember Data 2.0 will no longer support adapters with a null serializer property. Please define `defaultSerializer: "-default"` your adapter and make sure the `serializer` property is not null.', false, {
+          id: 'ds.adapter.null-serializer-property',
+          until: '2.0.0'
+        });
         serializer = {
           extract: function (store, type, payload) {
             return payload;
@@ -7527,7 +7607,10 @@
       var snapshot = internalModel.createSnapshot(options);
       var promise;
       if (!adapter.findRecord) {
-        Ember.deprecate('Adapter#find has been deprecated and renamed to `findRecord`.');
+        Ember.deprecate("Adapter#find has been deprecated and renamed to `findRecord`.", false, {
+          id: "ds.adapter.find-renamed-to-find-record",
+          until: "2.0.0"
+        });
         promise = adapter.find(store, typeClass, id, snapshot);
       } else {
         promise = adapter.findRecord(store, typeClass, id, snapshot);
@@ -7541,7 +7624,7 @@
       return promise.then(function (adapterPayload) {
         Ember.assert("You made a request for a " + typeClass.typeClassKey + " with id " + id + ", but the adapter's response did not have any data", adapterPayload);
         return store._adapterRun(function () {
-          var requestType = ember$data$lib$system$store$finders$$get(serializer, 'isNewSerializerAPI') ? 'findRecord' : 'find';
+          var requestType = ember$data$lib$system$store$finders$$get(serializer, "isNewSerializerAPI") ? "findRecord" : "find";
           var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, id, requestType);
           //TODO Optimize
           var record = ember$data$lib$system$store$serializer$response$$pushPayload(store, payload);
@@ -7558,13 +7641,13 @@
     }
 
     function ember$data$lib$system$store$finders$$_findMany(adapter, store, typeClass, ids, internalModels) {
-      var snapshots = Ember.A(internalModels).invoke('createSnapshot');
+      var snapshots = Ember.A(internalModels).invoke("createSnapshot");
       var promise = adapter.findMany(store, typeClass, ids, snapshots);
       var serializer = ember$data$lib$system$store$serializers$$serializerForAdapter(store, adapter, typeClass.modelName);
       var label = "DS: Handle Adapter#findMany of " + typeClass;
 
       if (promise === undefined) {
-        throw new Error('adapter.findMany returned undefined, this was very likely a mistake');
+        throw new Error("adapter.findMany returned undefined, this was very likely a mistake");
       }
 
       promise = ember$data$lib$system$store$finders$$Promise.cast(promise, label);
@@ -7572,7 +7655,7 @@
 
       return promise.then(function (adapterPayload) {
         return store._adapterRun(function () {
-          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, 'findMany');
+          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, "findMany");
           //TODO Optimize, no need to materialize here
           var records = ember$data$lib$system$store$serializer$response$$pushPayload(store, payload);
           return ember$data$lib$system$store$finders$$map.call(records, function (record) {
@@ -7595,13 +7678,13 @@
 
       return promise.then(function (adapterPayload) {
         return store._adapterRun(function () {
-          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, 'findHasMany');
+          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, "findHasMany");
           //TODO Use a non record creating push
           var records = ember$data$lib$system$store$serializer$response$$pushPayload(store, payload);
           var recordArray = ember$data$lib$system$store$finders$$map.call(records, function (record) {
             return record._internalModel;
           });
-          if (ember$data$lib$system$store$finders$$get(serializer, 'isNewSerializerAPI')) {
+          if (ember$data$lib$system$store$finders$$get(serializer, "isNewSerializerAPI")) {
             recordArray.meta = payload.meta;
           }
           return recordArray;
@@ -7622,7 +7705,7 @@
 
       return promise.then(function (adapterPayload) {
         return store._adapterRun(function () {
-          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, 'findBelongsTo');
+          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, "findBelongsTo");
 
           if (!payload.data) {
             return null;
@@ -7648,7 +7731,7 @@
 
       return promise.then(function (adapterPayload) {
         store._adapterRun(function () {
-          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, 'findAll');
+          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, "findAll");
           //TODO Optimize
           ember$data$lib$system$store$serializer$response$$pushPayload(store, payload);
         });
@@ -7663,7 +7746,10 @@
       var promise;
 
       if (!adapter.query) {
-        Ember.deprecate('Adapter#findQuery has been deprecated and renamed to `query`.');
+        Ember.deprecate("Adapter#findQuery has been deprecated and renamed to `query`.", false, {
+          id: "ds.adapter.find-query-renamed-to-query",
+          until: "2.0.0"
+        });
         promise = adapter.findQuery(store, typeClass, query, recordArray);
       } else {
         promise = adapter.query(store, typeClass, query, recordArray);
@@ -7678,7 +7764,7 @@
       return promise.then(function (adapterPayload) {
         var records;
         store._adapterRun(function () {
-          var requestType = ember$data$lib$system$store$finders$$get(serializer, 'isNewSerializerAPI') ? 'query' : 'findQuery';
+          var requestType = ember$data$lib$system$store$finders$$get(serializer, "isNewSerializerAPI") ? "query" : "findQuery";
           var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, requestType);
           //TODO Optimize
           records = ember$data$lib$system$store$serializer$response$$pushPayload(store, payload);
@@ -7701,7 +7787,7 @@
       return promise.then(function (adapterPayload) {
         var record;
         store._adapterRun(function () {
-          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, 'queryRecord');
+          var payload = ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, typeClass, adapterPayload, null, "queryRecord");
           //TODO Optimize
           record = ember$data$lib$system$store$serializer$response$$pushPayload(store, payload);
         });
@@ -7710,14 +7796,51 @@
       }, null, "DS: Extract payload of queryRecord " + typeClass);
     }
     function ember$data$lib$system$snapshot$record$array$$SnapshotRecordArray(recordArray, meta, adapterOptions) {
+      /**
+        An array of snapshots
+        @private
+        @property _snapshots
+        @type {Array}
+      */
       this._snapshots = null;
+      /**
+        An array of records
+        @private
+        @property _recordArray
+        @type {Array}
+      */
       this._recordArray = recordArray;
+      /**
+        Number of records in the array
+        @property length
+        @type {Number}
+      */
       this.length = recordArray.get('length');
+      /**
+        The type of the underlying records for the snapshots in the array, as a DS.Model
+        @property type
+        @type {DS.Model}
+      */
       this.type = recordArray.get('type');
+      /**
+        Meta object
+        @property meta
+        @type {Object}
+      */
       this.meta = meta;
+      /**
+        A hash of adapter options
+        @property adapterOptions
+        @type {Object}
+      */
       this.adapterOptions = adapterOptions;
     }
 
+    /**
+      Get snapshots of the underlying record array
+      @method snapshots
+      @return {Array} Array of snapshots
+    */
     ember$data$lib$system$snapshot$record$array$$SnapshotRecordArray.prototype.snapshots = function () {
       if (this._snapshots) {
         return this._snapshots;
@@ -7793,7 +7916,7 @@
         @return {DS.Model} record
       */
       objectAtContent: function (index) {
-        var content = ember$data$lib$system$record$arrays$record$array$$get(this, 'content');
+        var content = ember$data$lib$system$record$arrays$record$array$$get(this, "content");
         var internalModel = content.objectAt(index);
         return internalModel && internalModel.getRecord();
       },
@@ -7811,12 +7934,12 @@
          @method update
       */
       update: function () {
-        if (ember$data$lib$system$record$arrays$record$array$$get(this, 'isUpdating')) {
+        if (ember$data$lib$system$record$arrays$record$array$$get(this, "isUpdating")) {
           return;
         }
 
-        var store = ember$data$lib$system$record$arrays$record$array$$get(this, 'store');
-        var modelName = ember$data$lib$system$record$arrays$record$array$$get(this, 'type.modelName');
+        var store = ember$data$lib$system$record$arrays$record$array$$get(this, "store");
+        var modelName = ember$data$lib$system$record$arrays$record$array$$get(this, "type.modelName");
 
         return store.findAll(modelName, { reload: true });
       },
@@ -7829,7 +7952,7 @@
         @param {number} an optional index to insert at
       */
       addInternalModel: function (internalModel, idx) {
-        var content = ember$data$lib$system$record$arrays$record$array$$get(this, 'content');
+        var content = ember$data$lib$system$record$arrays$record$array$$get(this, "content");
         if (idx === undefined) {
           content.addObject(internalModel);
         } else if (!content.contains(internalModel)) {
@@ -7844,7 +7967,7 @@
         @param {InternalModel} internalModel
       */
       removeInternalModel: function (internalModel) {
-        ember$data$lib$system$record$arrays$record$array$$get(this, 'content').removeObject(internalModel);
+        ember$data$lib$system$record$arrays$record$array$$get(this, "content").removeObject(internalModel);
       },
 
       /**
@@ -7862,7 +7985,7 @@
       */
       save: function () {
         var recordArray = this;
-        var promiseLabel = "DS: RecordArray#save " + ember$data$lib$system$record$arrays$record$array$$get(this, 'type');
+        var promiseLabel = "DS: RecordArray#save " + ember$data$lib$system$record$arrays$record$array$$get(this, "type");
         var promise = Ember.RSVP.all(this.invoke("save"), promiseLabel).then(function (array) {
           return recordArray;
         }, null, "DS: RecordArray#save return RecordArray");
@@ -7873,7 +7996,7 @@
       _dissociateFromOwnRecords: function () {
         var array = this;
 
-        this.get('content').forEach(function (record) {
+        this.get("content").forEach(function (record) {
           var recordArrays = record._recordArrays;
 
           if (recordArrays) {
@@ -7887,20 +8010,20 @@
         @private
       */
       _unregisterFromManager: function () {
-        var manager = ember$data$lib$system$record$arrays$record$array$$get(this, 'manager');
+        var manager = ember$data$lib$system$record$arrays$record$array$$get(this, "manager");
         manager.unregisterRecordArray(this);
       },
 
       willDestroy: function () {
         this._unregisterFromManager();
         this._dissociateFromOwnRecords();
-        ember$data$lib$system$record$arrays$record$array$$set(this, 'content', undefined);
+        ember$data$lib$system$record$arrays$record$array$$set(this, "content", undefined);
         this._super.apply(this, arguments);
       },
 
       createSnapshot: function (options) {
         var adapterOptions = options && options.adapterOptions;
-        var meta = this.get('meta');
+        var meta = this.get("meta");
         return new ember$data$lib$system$snapshot$record$array$$default(this, meta, adapterOptions);
       }
     });
@@ -7937,7 +8060,7 @@
       isLoaded: true,
 
       replace: function () {
-        var type = ember$data$lib$system$record$arrays$filtered$record$array$$get(this, 'type').toString();
+        var type = ember$data$lib$system$record$arrays$filtered$record$array$$get(this, "type").toString();
         throw new Error("The result of a client-side filter (on " + type + ") is immutable.");
       },
 
@@ -7946,13 +8069,13 @@
         @private
       */
       _updateFilter: function () {
-        var manager = ember$data$lib$system$record$arrays$filtered$record$array$$get(this, 'manager');
-        manager.updateFilter(this, ember$data$lib$system$record$arrays$filtered$record$array$$get(this, 'type'), ember$data$lib$system$record$arrays$filtered$record$array$$get(this, 'filterFunction'));
+        var manager = ember$data$lib$system$record$arrays$filtered$record$array$$get(this, "manager");
+        manager.updateFilter(this, ember$data$lib$system$record$arrays$filtered$record$array$$get(this, "type"), ember$data$lib$system$record$arrays$filtered$record$array$$get(this, "filterFunction"));
       },
 
-      updateFilter: Ember.observer(function () {
+      updateFilter: Ember.observer("filterFunction", function () {
         Ember.run.once(this, this._updateFilter);
-      }, 'filterFunction')
+      })
     });
 
     var ember$data$lib$system$clone$null$$default = ember$data$lib$system$clone$null$$cloneNull;
@@ -7974,7 +8097,7 @@
       query: null,
 
       replace: function () {
-        var type = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, 'type').toString();
+        var type = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, "type").toString();
         throw new Error("The result of a server query (on " + type + ") is immutable.");
       },
 
@@ -7984,8 +8107,8 @@
         @param {Array} data
       */
       load: function (data) {
-        var store = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, 'store');
-        var type = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, 'type');
+        var store = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, "store");
+        var type = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, "type");
         var modelName = type.modelName;
         var records = store.pushMany(modelName, data);
 
@@ -7998,13 +8121,13 @@
         @private
       */
       loadRecords: function (records) {
-        var store = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, 'store');
-        var type = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, 'type');
+        var store = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, "store");
+        var type = ember$data$lib$system$record$arrays$adapter$populated$record$array$$get(this, "type");
         var modelName = type.modelName;
         var meta = store._metadataFor(modelName);
 
         //TODO Optimize
-        var internalModels = Ember.A(records).mapBy('_internalModel');
+        var internalModels = Ember.A(records).mapBy("_internalModel");
         this.setProperties({
           content: Ember.A(internalModels),
           isLoaded: true,
@@ -8016,7 +8139,7 @@
         }, this);
 
         // TODO: should triggering didLoad event be the last action of the runLoop?
-        Ember.run.once(this, 'trigger', 'didLoad');
+        Ember.run.once(this, "trigger", "didLoad");
       }
     });
 
@@ -8088,7 +8211,7 @@
           return;
         }
 
-        Ember.run.schedule('actions', this, this.updateRecordArrays);
+        Ember.run.schedule("actions", this, this.updateRecordArrays);
       },
 
       recordArraysForRecord: function (record) {
@@ -8134,7 +8257,7 @@
         var recordArrays = this.filteredRecordArrays.get(typeClass);
         var filter;
         ember$data$lib$system$record$array$manager$$forEach.call(recordArrays, function (array) {
-          filter = ember$data$lib$system$record$array$manager$$get(array, 'filterFunction');
+          filter = ember$data$lib$system$record$array$manager$$get(array, "filterFunction");
           this.updateFilterRecordArray(array, filter, typeClass, record);
         }, this);
       },
@@ -8146,7 +8269,7 @@
         var filter;
 
         ember$data$lib$system$record$array$manager$$forEach.call(recordArrays, function (array) {
-          filter = ember$data$lib$system$record$array$manager$$get(array, 'filterFunction');
+          filter = ember$data$lib$system$record$array$manager$$get(array, "filterFunction");
           this.updateFilterRecordArray(array, filter, typeClass, record);
         }, this);
 
@@ -8327,11 +8450,11 @@
 
           // unregister live record array
         } else if (this.liveRecordArrays.has(typeClass)) {
-            var liveRecordArrayForType = this.liveRecordArrayFor(typeClass);
-            if (array === liveRecordArrayForType) {
-              this.liveRecordArrays["delete"](typeClass);
-            }
+          var liveRecordArrayForType = this.liveRecordArrayFor(typeClass);
+          if (array === liveRecordArrayForType) {
+            this.liveRecordArrays["delete"](typeClass);
           }
+        }
       },
 
       willDestroy: function () {
@@ -8413,7 +8536,10 @@
 
       instanceFor: function (key) {
         if (key === 'adapter:-rest') {
-          ember$lib$main$$default.deprecate('You are currently using the default DS.RESTAdapter adapter. For Ember 2.0 the default adapter will be DS.JSONAPIAdapter. If you would like to continue using DS.RESTAdapter please create an application adapter that extends DS.RESTAdapter.');
+          ember$lib$main$$default.deprecate('You are currently using the default DS.RESTAdapter adapter. For Ember 2.0 the default adapter will be DS.JSONAPIAdapter. If you would like to continue using DS.RESTAdapter please create an application adapter that extends DS.RESTAdapter.', false, {
+            id: 'ds.adapter.default-adapter-changing-to-json-api',
+            until: '2.0.0'
+          });
         }
 
         var cache = this._cache;
@@ -8813,6 +8939,7 @@
 
         rolledBack: function (internalModel) {
           internalModel.clearErrorMessages();
+          internalModel.transitionTo('loaded.saved');
           internalModel.triggerLater('ready');
         },
 
@@ -8899,7 +9026,7 @@
     ember$data$lib$system$model$states$$createdState.uncommitted.propertyWasReset = Ember.K;
 
     function ember$data$lib$system$model$states$$assertAgainstUnloadRecord(internalModel) {
-      Ember.assert("You can only unload a record which is not inFlight. `" + internalModel + "`", false);
+      Ember.assert('You can only unload a record which is not inFlight. `' + internalModel + '`', false);
     }
 
     ember$data$lib$system$model$states$$updatedState.inFlight.unloadRecord = ember$data$lib$system$model$states$$assertAgainstUnloadRecord;
@@ -9218,14 +9345,14 @@
           continue;
         }
         if (typeof object[prop] === 'object') {
-          object[prop] = ember$data$lib$system$model$states$$wireState(object[prop], object, name + "." + prop);
+          object[prop] = ember$data$lib$system$model$states$$wireState(object[prop], object, name + '.' + prop);
         }
       }
 
       return object;
     }
 
-    ember$data$lib$system$model$states$$RootState = ember$data$lib$system$model$states$$wireState(ember$data$lib$system$model$states$$RootState, null, "root");
+    ember$data$lib$system$model$states$$RootState = ember$data$lib$system$model$states$$wireState(ember$data$lib$system$model$states$$RootState, null, 'root');
 
     var ember$data$lib$system$model$states$$default = ember$data$lib$system$model$states$$RootState;
 
@@ -9438,8 +9565,10 @@
       },
 
       updateLink: function (link) {
-        Ember.warn("You have pushed a record of type '" + this.record.type.modelName + "' with '" + this.key + "' as a link, but the association is not an async relationship.", this.isAsync);
-        Ember.assert("You have pushed a record of type '" + this.record.type.modelName + "' with '" + this.key + "' as a link, but the value of that link is not a string.", typeof link === 'string' || link === null);
+        Ember.warn('You have pushed a record of type \'' + this.record.type.modelName + '\' with \'' + this.key + '\' as a link, but the association is not an async relationship.', this.isAsync, {
+          id: 'ds.store.push-link-for-sync-relationship'
+        });
+        Ember.assert('You have pushed a record of type \'' + this.record.type.modelName + '\' with \'' + this.key + '\' as a link, but the value of that link is not a string.', typeof link === 'string' || link === null);
         if (link !== this.link) {
           this.link = link;
           this.linkPromise = null;
@@ -9674,10 +9803,10 @@
       */
       save: function () {
         var manyArray = this;
-        var promiseLabel = "DS: ManyArray#save " + ember$data$lib$system$many$array$$get(this, 'type');
-        var promise = Ember.RSVP.all(this.invoke("save"), promiseLabel).then(function (array) {
+        var promiseLabel = 'DS: ManyArray#save ' + ember$data$lib$system$many$array$$get(this, 'type');
+        var promise = Ember.RSVP.all(this.invoke('save'), promiseLabel).then(function (array) {
           return manyArray;
-        }, null, "DS: ManyArray#save return ManyArray");
+        }, null, 'DS: ManyArray#save return ManyArray');
 
         return ember$data$lib$system$promise$proxies$$PromiseArray.create({ promise: promise });
       },
@@ -9694,7 +9823,7 @@
         var type = ember$data$lib$system$many$array$$get(this, 'type');
         var record;
 
-        Ember.assert("You cannot add '" + type.modelName + "' records to this polymorphic relationship.", !ember$data$lib$system$many$array$$get(this, 'isPolymorphic'));
+        Ember.assert('You cannot add \'' + type.modelName + '\' records to this polymorphic relationship.', !ember$data$lib$system$many$array$$get(this, 'isPolymorphic'));
 
         record = store.createRecord(type.modelName, hash);
         this.pushObject(record);
@@ -9708,7 +9837,10 @@
         @deprecated Use `addObject()` instead
       */
       addRecord: function (record) {
-        Ember.deprecate('Using manyArray.addRecord() has been deprecated. You should use manyArray.addObject() instead.');
+        Ember.deprecate('Using manyArray.addRecord() has been deprecated. You should use manyArray.addObject() instead.', false, {
+          id: 'ds.many-array.add-record-deprecated',
+          until: '2.0.0'
+        });
         this.addObject(record);
       },
 
@@ -9718,7 +9850,10 @@
         @deprecated Use `removeObject()` instead
       */
       removeRecord: function (record) {
-        Ember.deprecate('Using manyArray.removeRecord() has been deprecated. You should use manyArray.removeObject() instead.');
+        Ember.deprecate('Using manyArray.removeRecord() has been deprecated. You should use manyArray.removeObject() instead.', false, {
+          id: 'ds.many-array.remove-record-deprecated',
+          until: '2.0.0'
+        });
         this.removeObject(record);
       }
     });
@@ -9793,7 +9928,7 @@
     ember$data$lib$system$relationships$state$has$many$$ManyRelationship.prototype._super$updateMeta = ember$data$lib$system$relationships$state$relationship$$default.prototype.updateMeta;
     ember$data$lib$system$relationships$state$has$many$$ManyRelationship.prototype.updateMeta = function (meta) {
       this._super$updateMeta(meta);
-      this.manyArray.set('meta', meta);
+      this.manyArray.set("meta", meta);
     };
 
     ember$data$lib$system$relationships$state$has$many$$ManyRelationship.prototype._super$addCanonicalRecord = ember$data$lib$system$relationships$state$relationship$$default.prototype.addCanonicalRecord;
@@ -9866,7 +10001,7 @@
       } else {
         return this.store.scheduleFetchMany(this.manyArray.toArray()).then(function () {
           //Goes away after the manyArray refactor
-          self.manyArray.set('isLoaded', true);
+          self.manyArray.set("isLoaded", true);
           return self.manyArray;
         });
       }
@@ -9908,7 +10043,7 @@
       var _this = this;
 
       return this.store.findHasMany(this.record, this.link, this.relationshipMeta).then(function (records) {
-        if (records.hasOwnProperty('meta')) {
+        if (records.hasOwnProperty("meta")) {
           _this.updateMeta(records.meta);
         }
         _this.store._backburner.join(function () {
@@ -9925,7 +10060,7 @@
         return rec._internalModel;
       })).then(function () {
         //Goes away after the manyArray refactor
-        manyArray.set('isLoaded', true);
+        manyArray.set("isLoaded", true);
         return manyArray;
       });
     };
@@ -9950,11 +10085,11 @@
           promise: promise
         });
       } else {
-        Ember.assert("You looked up the '" + this.key + "' relationship on a '" + this.record.type.modelName + "' with id " + this.record.id + " but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (`DS.hasMany({ async: true })`)", this.manyArray.isEvery('isEmpty', false));
+        Ember.assert("You looked up the '" + this.key + "' relationship on a '" + this.record.type.modelName + "' with id " + this.record.id + " but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (`DS.hasMany({ async: true })`)", this.manyArray.isEvery("isEmpty", false));
 
         //TODO(Igor) WTF DO I DO HERE?
-        if (!this.manyArray.get('isDestroyed')) {
-          this.manyArray.set('isLoaded', true);
+        if (!this.manyArray.get("isDestroyed")) {
+          this.manyArray.set("isLoaded", true);
         }
         return this.manyArray;
       }
@@ -10048,7 +10183,7 @@
     };
 
     ember$data$lib$system$relationships$state$belongs$to$$BelongsToRelationship.prototype.setRecordPromise = function (newPromise) {
-      var content = newPromise.get && newPromise.get('content');
+      var content = newPromise.get && newPromise.get("content");
       Ember.assert("You passed in a promise that did not originate from an EmberData relationship. You can only pass promises that come from a belongsTo or hasMany relationship to the get call.", content !== undefined);
       this.setRecord(content ? content._internalModel : content);
     };
@@ -10112,7 +10247,7 @@
           return null;
         }
         var toReturn = this.inverseRecord.getRecord();
-        Ember.assert("You looked up the '" + this.key + "' relationship on a '" + this.record.type.modelName + "' with id " + this.record.id + " but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (`DS.belongsTo({ async: true })`)", toReturn === null || !toReturn.get('isEmpty'));
+        Ember.assert("You looked up the '" + this.key + "' relationship on a '" + this.record.type.modelName + "' with id " + this.record.id + " but some of the associated records were not loaded. Either make sure they are all loaded together with the parent record, or specify that the relationship is async (`DS.belongsTo({ async: true })`)", toReturn === null || !toReturn.get("isEmpty"));
         return toReturn;
       }
     };
@@ -10129,7 +10264,7 @@
         inverseKey = inverse.name;
       }
 
-      if (relationshipMeta.kind === 'hasMany') {
+      if (relationshipMeta.kind === "hasMany") {
         return new ember$data$lib$system$relationships$state$has$many$$default(store, record, inverseKey, relationshipMeta);
       } else {
         return new ember$data$lib$system$relationships$state$belongs$to$$default(store, record, inverseKey, relationshipMeta);
@@ -10147,7 +10282,7 @@
 
     ember$data$lib$system$relationships$state$create$$Relationships.prototype.get = function (key) {
       var relationships = this.initializedRelationships;
-      var relationshipsByName = ember$data$lib$system$relationships$state$create$$get(this.record.type, 'relationshipsByName');
+      var relationshipsByName = ember$data$lib$system$relationships$state$create$$get(this.record.type, "relationshipsByName");
       if (!relationships[key] && relationshipsByName.get(key)) {
         relationships[key] = ember$data$lib$system$relationships$state$create$$createRelationshipFor(this.record, relationshipsByName.get(key), this.record.store);
       }
@@ -10157,17 +10292,17 @@
     var ember$data$lib$system$relationships$state$create$$default = ember$data$lib$system$relationships$state$create$$Relationships;
 
     /**
+      @module ember-data
+    */
+
+    var ember$data$lib$system$snapshot$$get = Ember.get;/**
       @class Snapshot
       @namespace DS
       @private
       @constructor
       @param {DS.Model} internalModel The model to create a snapshot from
     */
-    /**
-      @module ember-data
-    */
-
-    var ember$data$lib$system$snapshot$$get = Ember.get;function ember$data$lib$system$snapshot$$Snapshot(internalModel) {
+    function ember$data$lib$system$snapshot$$Snapshot(internalModel) {
       this._attributes = ember$data$lib$system$object$polyfills$$create(null);
       this._belongsToRelationships = ember$data$lib$system$object$polyfills$$create(null);
       this._belongsToIds = ember$data$lib$system$object$polyfills$$create(null);
@@ -10204,7 +10339,10 @@
             // again.
             if (callDeprecate) {
               callDeprecate = false;
-              Ember.deprecate('Usage of `snapshot.constructor` is deprecated, use `snapshot.type` instead.');
+              Ember.deprecate('Usage of `snapshot.constructor` is deprecated, use `snapshot.type` instead.', false, {
+                id: 'ds.snapshot.constructor-deprecator',
+                until: '2.0.0'
+              });
               callDeprecate = true;
             }
 
@@ -10274,7 +10412,7 @@
         if (keyName in this._attributes) {
           return this._attributes[keyName];
         }
-        throw new Ember.Error("Model '" + Ember.inspect(this.record) + "' has no attribute named '" + keyName + "' defined.");
+        throw new Ember.Error('Model \'' + Ember.inspect(this.record) + '\' has no attribute named \'' + keyName + '\' defined.');
       },
 
       /**
@@ -10356,7 +10494,7 @@
 
         relationship = this._internalModel._relationships.get(keyName);
         if (!(relationship && relationship.relationshipMeta.kind === 'belongsTo')) {
-          throw new Ember.Error("Model '" + Ember.inspect(this.record) + "' has no belongsTo relationship named '" + keyName + "' defined.");
+          throw new Ember.Error('Model \'' + Ember.inspect(this.record) + '\' has no belongsTo relationship named \'' + keyName + '\' defined.');
         }
 
         hasData = ember$data$lib$system$snapshot$$get(relationship, 'hasData');
@@ -10420,7 +10558,7 @@
 
         relationship = this._internalModel._relationships.get(keyName);
         if (!(relationship && relationship.relationshipMeta.kind === 'hasMany')) {
-          throw new Ember.Error("Model '" + Ember.inspect(this.record) + "' has no hasMany relationship named '" + keyName + "' defined.");
+          throw new Ember.Error('Model \'' + Ember.inspect(this.record) + '\' has no hasMany relationship named \'' + keyName + '\' defined.');
         }
 
         hasData = ember$data$lib$system$snapshot$$get(relationship, 'hasData');
@@ -10489,7 +10627,10 @@
         @deprecated Use [attr](#method_attr), [belongsTo](#method_belongsTo) or [hasMany](#method_hasMany) instead
       */
       get: function (keyName) {
-        Ember.deprecate('Using DS.Snapshot.get() is deprecated. Use .attr(), .belongsTo() or .hasMany() instead.');
+        Ember.deprecate('Using DS.Snapshot.get() is deprecated. Use .attr(), .belongsTo() or .hasMany() instead.', false, {
+          id: 'ds.snapshot.get-deprecated',
+          until: '2.0.0'
+        });
 
         if (keyName === 'id') {
           return this.id;
@@ -10535,7 +10676,10 @@
         @private
       */
       _createSnapshot: function () {
-        Ember.deprecate("You called _createSnapshot on what's already a DS.Snapshot. You shouldn't manually create snapshots in your adapter since the store passes snapshots to adapters by default.");
+        Ember.deprecate('You called _createSnapshot on what\'s already a DS.Snapshot. You shouldn\'t manually create snapshots in your adapter since the store passes snapshots to adapters by default.', false, {
+          id: 'ds.snapshot.create-snapshot-on-snapshot',
+          until: '2.0.0'
+        });
         return this;
       }
     };
@@ -10543,7 +10687,10 @@
     Ember.defineProperty(ember$data$lib$system$snapshot$$Snapshot.prototype, 'typeKey', {
       enumerable: false,
       get: function () {
-        Ember.deprecate('Snapshot.typeKey is deprecated. Use snapshot.modelName instead.');
+        Ember.deprecate('Snapshot.typeKey is deprecated. Use snapshot.modelName instead.', false, {
+          id: 'ds.snapshot.type-key-deprecated',
+          until: '2.0.0'
+        });
         return this.modelName;
       },
       set: function () {
@@ -10563,7 +10710,7 @@
     var ember$data$lib$system$model$internal$model$$_splitOnDotCache = ember$data$lib$system$object$polyfills$$create(null);
 
     function ember$data$lib$system$model$internal$model$$splitOnDot(name) {
-      return ember$data$lib$system$model$internal$model$$_splitOnDotCache[name] || (ember$data$lib$system$model$internal$model$$_splitOnDotCache[name] = name.split('.'));
+      return ember$data$lib$system$model$internal$model$$_splitOnDotCache[name] || (ember$data$lib$system$model$internal$model$$_splitOnDotCache[name] = name.split("."));
     }
 
     function ember$data$lib$system$model$internal$model$$extractPivotName(name) {
@@ -10634,15 +10781,15 @@
     };
 
     ember$data$lib$system$model$internal$model$$InternalModel.prototype = {
-      isEmpty: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('isEmpty'),
-      isLoading: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('isLoading'),
-      isLoaded: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('isLoaded'),
-      hasDirtyAttributes: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('hasDirtyAttributes'),
-      isSaving: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('isSaving'),
-      isDeleted: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('isDeleted'),
-      isNew: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('isNew'),
-      isValid: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('isValid'),
-      dirtyType: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState('dirtyType'),
+      isEmpty: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("isEmpty"),
+      isLoading: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("isLoading"),
+      isLoaded: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("isLoaded"),
+      hasDirtyAttributes: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("hasDirtyAttributes"),
+      isSaving: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("isSaving"),
+      isDeleted: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("isDeleted"),
+      isNew: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("isNew"),
+      isValid: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("isValid"),
+      dirtyType: ember$data$lib$system$model$internal$model$$retrieveFromCurrentState("dirtyType"),
 
       constructor: ember$data$lib$system$model$internal$model$$InternalModel,
       materializeRecord: function () {
@@ -10654,7 +10801,7 @@
           store: this.store,
           container: this.container,
           _internalModel: this,
-          currentState: ember$data$lib$system$model$internal$model$$get(this, 'currentState'),
+          currentState: ember$data$lib$system$model$internal$model$$get(this, "currentState"),
           isError: this.isError,
           adapterError: this.error
         });
@@ -10666,7 +10813,7 @@
       },
 
       deleteRecord: function () {
-        this.send('deleteRecord');
+        this.send("deleteRecord");
       },
 
       save: function (options) {
@@ -10680,14 +10827,14 @@
       startedReloading: function () {
         this.isReloading = true;
         if (this.record) {
-          ember$data$lib$system$model$internal$model$$set(this.record, 'isReloading', true);
+          ember$data$lib$system$model$internal$model$$set(this.record, "isReloading", true);
         }
       },
 
       finishedReloading: function () {
         this.isReloading = false;
         if (this.record) {
-          ember$data$lib$system$model$internal$model$$set(this.record, 'isReloading', false);
+          ember$data$lib$system$model$internal$model$$set(this.record, "isReloading", false);
         }
       },
 
@@ -10696,7 +10843,7 @@
         var record = this;
         var promiseLabel = "DS: Model#reload of " + this;
         return new ember$data$lib$system$model$internal$model$$Promise(function (resolve) {
-          record.send('reloadRecord', resolve);
+          record.send("reloadRecord", resolve);
         }, promiseLabel).then(function () {
           record.didCleanError();
           return record;
@@ -10717,7 +10864,7 @@
       },
 
       unloadRecord: function () {
-        this.send('unloadRecord');
+        this.send("unloadRecord");
       },
 
       eachRelationship: function (callback, binding) {
@@ -10743,7 +10890,7 @@
       },
 
       becameReady: function () {
-        Ember.run.schedule('actions', this.store.recordArrayManager, this.store.recordArrayManager.recordWasLoaded, this);
+        Ember.run.schedule("actions", this.store.recordArrayManager, this.store.recordArrayManager.recordWasLoaded, this);
       },
 
       didInitalizeData: function () {
@@ -10776,7 +10923,7 @@
         @param {Promise} promise
       */
       loadingData: function (promise) {
-        this.send('loadingData', promise);
+        this.send("loadingData", promise);
       },
 
       /**
@@ -10784,7 +10931,7 @@
         @private
       */
       loadedData: function () {
-        this.send('loadedData');
+        this.send("loadedData");
         this.didInitalizeData();
       },
 
@@ -10793,7 +10940,7 @@
         @private
       */
       notFound: function () {
-        this.send('notFound');
+        this.send("notFound");
       },
 
       /**
@@ -10801,7 +10948,7 @@
         @private
       */
       pushedData: function () {
-        this.send('pushedData');
+        this.send("pushedData");
       },
 
       flushChangedAttributes: function () {
@@ -10814,7 +10961,7 @@
         @private
       */
       adapterWillCommit: function () {
-        this.send('willCommit');
+        this.send("willCommit");
       },
 
       /**
@@ -10822,7 +10969,7 @@
         @private
       */
       adapterDidDirty: function () {
-        this.send('becomeDirty');
+        this.send("becomeDirty");
         this.updateRecordArraysLater();
       },
 
@@ -10833,7 +10980,7 @@
         @param {Object} context
       */
       send: function (name, context) {
-        var currentState = ember$data$lib$system$model$internal$model$$get(this, 'currentState');
+        var currentState = ember$data$lib$system$model$internal$model$$get(this, "currentState");
 
         if (!currentState[name]) {
           this._unhandledEvent(currentState, name, context);
@@ -10871,7 +11018,7 @@
 
         this._attributes = ember$data$lib$system$object$polyfills$$create(null);
 
-        if (ember$data$lib$system$model$internal$model$$get(this, 'isError')) {
+        if (ember$data$lib$system$model$internal$model$$get(this, "isError")) {
           this._inFlightAttributes = ember$data$lib$system$object$polyfills$$create(null);
           this.didCleanError();
         }
@@ -10893,7 +11040,7 @@
           this._inFlightAttributes = ember$data$lib$system$object$polyfills$$create(null);
         }
 
-        this.send('rolledBack');
+        this.send("rolledBack");
 
         this.record._notifyProperties(dirtyKeys);
       },
@@ -10907,7 +11054,7 @@
         // always having direct reference to state objects
 
         var pivotName = ember$data$lib$system$model$internal$model$$extractPivotName(name);
-        var currentState = ember$data$lib$system$model$internal$model$$get(this, 'currentState');
+        var currentState = ember$data$lib$system$model$internal$model$$get(this, "currentState");
         var state = currentState;
 
         do {
@@ -10937,10 +11084,10 @@
           enters[i].enter(this);
         }
 
-        ember$data$lib$system$model$internal$model$$set(this, 'currentState', state);
+        ember$data$lib$system$model$internal$model$$set(this, "currentState", state);
         //TODO Consider whether this is the best approach for keeping these two in sync
         if (this.record) {
-          ember$data$lib$system$model$internal$model$$set(this.record, 'currentState', state);
+          ember$data$lib$system$model$internal$model$$set(this.record, "currentState", state);
         }
 
         for (i = 0, l = setups.length; i < l; i++) {
@@ -10973,7 +11120,7 @@
         if (this._deferredTriggers.push(args) !== 1) {
           return;
         }
-        Ember.run.scheduleOnce('actions', this, '_triggerDeferredTriggers');
+        Ember.run.scheduleOnce("actions", this, "_triggerDeferredTriggers");
       },
 
       _triggerDeferredTriggers: function () {
@@ -11059,7 +11206,7 @@
       _preloadRelationship: function (key, preloadValue) {
         var relationshipMeta = this.type.metaForProperty(key);
         var type = relationshipMeta.type;
-        if (relationshipMeta.kind === 'hasMany') {
+        if (relationshipMeta.kind === "hasMany") {
           this._preloadHasMany(key, preloadValue, type);
         } else {
           this._preloadBelongsTo(key, preloadValue, type);
@@ -11087,7 +11234,7 @@
       },
 
       _convertStringOrNumberIntoInternalModel: function (value, type) {
-        if (typeof value === 'string' || typeof value === 'number') {
+        if (typeof value === "string" || typeof value === "number") {
           return this.store._internalModelForId(type, value);
         }
         if (value._internalModel) {
@@ -11108,7 +11255,7 @@
       setId: function (id) {
         this.id = id;
         //TODO figure out whether maybe we should proxy
-        ember$data$lib$system$model$internal$model$$set(this.record, 'id', id);
+        ember$data$lib$system$model$internal$model$$set(this.record, "id", id);
       },
 
       didError: function (error) {
@@ -11155,7 +11302,7 @@
 
         this._inFlightAttributes = ember$data$lib$system$object$polyfills$$create(null);
 
-        this.send('didCommit');
+        this.send("didCommit");
         this.updateRecordArraysLater();
 
         if (!data) {
@@ -11175,22 +11322,22 @@
           return;
         }
         this._updatingRecordArraysLater = true;
-        Ember.run.schedule('actions', this, this.updateRecordArrays);
+        Ember.run.schedule("actions", this, this.updateRecordArrays);
       },
 
       addErrorMessageToAttribute: function (attribute, message) {
         var record = this.getRecord();
-        ember$data$lib$system$model$internal$model$$get(record, 'errors').add(attribute, message);
+        ember$data$lib$system$model$internal$model$$get(record, "errors").add(attribute, message);
       },
 
       removeErrorMessageFromAttribute: function (attribute) {
         var record = this.getRecord();
-        ember$data$lib$system$model$internal$model$$get(record, 'errors').remove(attribute);
+        ember$data$lib$system$model$internal$model$$get(record, "errors").remove(attribute);
       },
 
       clearErrorMessages: function () {
         var record = this.getRecord();
-        ember$data$lib$system$model$internal$model$$get(record, 'errors').clear();
+        ember$data$lib$system$model$internal$model$$get(record, "errors").clear();
       },
 
       // FOR USE DURING COMMIT PROCESS
@@ -11216,7 +11363,7 @@
         @private
       */
       adapterDidError: function (error) {
-        this.send('becameError');
+        this.send("becameError");
         this.didError(error);
         this._saveWasRejected();
       },
@@ -11306,15 +11453,15 @@
 
     var ember$data$lib$system$model$internal$model$$default = ember$data$lib$system$model$internal$model$$InternalModel;
 
-    var ember$data$lib$system$store$$Backburner = Ember._Backburner || Ember.Backburner || Ember.__loader.require('backburner')['default'] || Ember.__loader.require('backburner')['Backburner'];
+    var ember$data$lib$system$store$$Backburner = Ember._Backburner || Ember.Backburner || Ember.__loader.require("backburner")["default"] || Ember.__loader.require("backburner")["Backburner"];
 
     //Shim Backburner.join
     if (!ember$data$lib$system$store$$Backburner.prototype.join) {
       var ember$data$lib$system$store$$isString = function (suspect) {
-        return typeof suspect === 'string';
+        return typeof suspect === "string";
       };
 
-      ember$data$lib$system$store$$Backburner.prototype.join = function () /*target, method, args */{
+      ember$data$lib$system$store$$Backburner.prototype.join = function () {
         var method, target;
 
         if (this.currentInstance) {
@@ -11469,7 +11616,7 @@
         @private
       */
       init: function () {
-        this._backburner = new ember$data$lib$system$store$$Backburner(['normalizeRelationships', 'syncRelationships', 'finished']);
+        this._backburner = new ember$data$lib$system$store$$Backburner(["normalizeRelationships", "syncRelationships", "finished"]);
         // internal bookkeeping; not observable
         this.typeMaps = {};
         this.recordArrayManager = ember$data$lib$system$record$array$manager$$default.create({
@@ -11492,7 +11639,7 @@
         @default DS.RESTAdapter
         @type {(DS.Adapter|String)}
       */
-      adapter: '-rest',
+      adapter: "-rest",
 
       /**
         Returns a JSON representation of the record using a custom
@@ -11522,12 +11669,12 @@
         @private
         @return DS.Adapter
       */
-      defaultAdapter: Ember.computed('adapter', function () {
-        var adapter = ember$data$lib$system$store$$get(this, 'adapter');
+      defaultAdapter: Ember.computed("adapter", function () {
+        var adapter = ember$data$lib$system$store$$get(this, "adapter");
 
-        Ember.assert('You tried to set `adapter` property to an instance of `DS.Adapter`, where it should be a name', typeof adapter === 'string');
+        Ember.assert("You tried to set `adapter` property to an instance of `DS.Adapter`, where it should be a name", typeof adapter === "string");
 
-        adapter = this.retrieveManagedInstance('adapter', adapter);
+        adapter = this.retrieveManagedInstance("adapter", adapter);
 
         return adapter;
       }),
@@ -11560,7 +11707,7 @@
         @return {DS.Model} record
       */
       createRecord: function (modelName, inputProperties) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var typeClass = this.modelFor(modelName);
         var properties = ember$data$lib$system$store$$copy(inputProperties) || ember$data$lib$system$object$polyfills$$create(null);
 
@@ -11702,19 +11849,25 @@
       find: function (modelName, id, preload) {
         Ember.assert("You need to pass a type to the store's find method", arguments.length >= 1);
         Ember.assert("You may not pass `" + id + "` as id to the store's find method", arguments.length === 1 || !Ember.isNone(id));
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
 
         if (arguments.length === 1) {
-          Ember.deprecate('Using store.find(type) has been deprecated. Use store.findAll(type) to retrieve all records for a given type.');
+          Ember.deprecate("Using store.find(type) has been deprecated. Use store.findAll(type) to retrieve all records for a given type.", false, {
+            id: "ds.store.find-with-type-deprecated",
+            until: "2.0.0"
+          });
           return this.findAll(modelName);
         }
 
         // We are passed a query instead of an id.
-        if (Ember.typeOf(id) === 'object') {
-          Ember.deprecate('Calling store.find() with a query object is deprecated. Use store.query() instead.');
+        if (Ember.typeOf(id) === "object") {
+          Ember.deprecate("Calling store.find() with a query object is deprecated. Use store.query() instead.", false, {
+            id: "ds.store.find-with-type-deprecated",
+            until: "2.0.0"
+          });
           return this.query(modelName, id);
         }
-        var options = ember$data$lib$system$store$$deprecatePreload(preload, this.modelFor(modelName), 'find');
+        var options = ember$data$lib$system$store$$deprecatePreload(preload, this.modelFor(modelName), "find");
         return this.findRecord(modelName, ember$data$lib$system$coerce$id$$default(id), options);
       },
 
@@ -11728,9 +11881,12 @@
         @return {Promise} promise
       */
       fetchById: function (modelName, id, preload) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
-        var options = ember$data$lib$system$store$$deprecatePreload(preload, this.modelFor(modelName), 'fetchById');
-        Ember.deprecate('Using store.fetchById(type, id) has been deprecated. Use store.findRecord(type, id, { reload: true }) to reload a record for a given type.');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
+        var options = ember$data$lib$system$store$$deprecatePreload(preload, this.modelFor(modelName), "fetchById");
+        Ember.deprecate("Using store.fetchById(type, id) has been deprecated. Use store.findRecord(type, id, { reload: true }) to reload a record for a given type.", false, {
+          id: "ds.store.fetch-by-id-deprecated",
+          until: "2.0.0"
+        });
         if (this.hasRecordForId(modelName, id)) {
           return this.peekRecord(modelName, id).reload();
         } else {
@@ -11747,7 +11903,10 @@
         @return {Promise} promise
       */
       fetchAll: function (modelName) {
-        Ember.deprecate('Using store.fetchAll(type) has been deprecated. Use store.findAll(type, { reload: true }) to retrieve all records for a given type.');
+        Ember.deprecate("Using store.fetchAll(type) has been deprecated. Use store.findAll(type, { reload: true }) to retrieve all records for a given type.", false, {
+          id: "ds.store.fetch-all-deprecated",
+          until: "2.0.0"
+        });
         return this.findAll(modelName, { reload: true });
       },
 
@@ -11760,8 +11919,11 @@
         @deprecated Use [findRecord](#method_findRecord) instead
       */
       fetch: function (modelName, id, preload) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
-        Ember.deprecate('Using store.fetch() has been deprecated. Use store.findRecord for fetching individual records or store.findAll for collections');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
+        Ember.deprecate("Using store.fetch() has been deprecated. Use store.findRecord for fetching individual records or store.findAll for collections", false, {
+          id: "ds.store.fetch-deprecated",
+          until: "2.0.0"
+        });
         return this.findRecord(modelName, id, { reload: true, preload: preload });
       },
 
@@ -11775,8 +11937,11 @@
         @return {Promise} promise
       */
       findById: function (modelName, id, preload) {
-        Ember.deprecate('Using store.findById() has been deprecated. Use store.findRecord() to return a record for a given type and id combination.');
-        var options = ember$data$lib$system$store$$deprecatePreload(preload, this.modelFor(modelName), 'findById');
+        Ember.deprecate("Using store.findById() has been deprecated. Use store.findRecord() to return a record for a given type and id combination.", false, {
+          id: "ds.store.find-by-id-deprecated",
+          until: "2.0.0"
+        });
+        var options = ember$data$lib$system$store$$deprecatePreload(preload, this.modelFor(modelName), "findById");
         return this.findRecord(modelName, id, options);
       },
 
@@ -11815,7 +11980,7 @@
         @return {Promise} promise
       */
       findRecord: function (modelName, id, options) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var internalModel = this._internalModelForId(modelName, id);
         options = options || {};
 
@@ -11825,7 +11990,7 @@
 
         var fetchedInternalModel = this._findRecord(internalModel, options);
 
-        return ember$data$lib$system$store$$promiseRecord(fetchedInternalModel, "DS: Store#findRecord " + internalModel.typeKey + " with id: " + ember$data$lib$system$store$$get(internalModel, 'id'));
+        return ember$data$lib$system$store$$promiseRecord(fetchedInternalModel, "DS: Store#findRecord " + internalModel.typeKey + " with id: " + ember$data$lib$system$store$$get(internalModel, "id"));
       },
 
       _findRecord: function (internalModel, options) {
@@ -11861,7 +12026,7 @@
 
         var fetchedInternalModel = this._findEmptyInternalModel(internalModel, options);
 
-        return ember$data$lib$system$store$$promiseRecord(fetchedInternalModel, "DS: Store#findRecord " + internalModel.typeKey + " with id: " + ember$data$lib$system$store$$get(internalModel, 'id'));
+        return ember$data$lib$system$store$$promiseRecord(fetchedInternalModel, "DS: Store#findRecord " + internalModel.typeKey + " with id: " + ember$data$lib$system$store$$get(internalModel, "id"));
       },
 
       _findEmptyInternalModel: function (internalModel, options) {
@@ -11887,7 +12052,7 @@
         @return {Promise} promise
       */
       findByIds: function (modelName, ids) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var store = this;
 
         return ember$data$lib$system$promise$proxies$$promiseArray(Ember.RSVP.all(ember$data$lib$system$store$$map.call(ids, function (id) {
@@ -11911,7 +12076,7 @@
         var adapter = this.adapterFor(typeClass.modelName);
 
         Ember.assert("You tried to find a record but you have no adapter (for " + typeClass + ")", adapter);
-        Ember.assert("You tried to find a record but your adapter (for " + typeClass + ") does not implement 'findRecord'", typeof adapter.findRecord === 'function' || typeof adapter.find === 'function');
+        Ember.assert("You tried to find a record but your adapter (for " + typeClass + ") does not implement 'findRecord'", typeof adapter.findRecord === "function" || typeof adapter.find === "function");
 
         var promise = ember$data$lib$system$store$finders$$_find(adapter, this, typeClass, id, internalModel, options);
         return promise;
@@ -11931,7 +12096,7 @@
           return internalModel._loadingPromise;
         }
 
-        var resolver = Ember.RSVP.defer('Fetching ' + typeClass + 'with id: ' + internalModel.id);
+        var resolver = Ember.RSVP.defer("Fetching " + typeClass + "with id: " + internalModel.id);
         var pendingFetchItem = {
           record: internalModel,
           resolver: resolver,
@@ -11946,7 +12111,7 @@
         } else {
           this._pendingFetch.get(typeClass).push(pendingFetchItem);
         }
-        Ember.run.scheduleOnce('afterRender', this, this.flushAllPendingFetches);
+        Ember.run.scheduleOnce("afterRender", this, this.flushAllPendingFetches);
 
         return promise;
       },
@@ -11964,7 +12129,7 @@
         var store = this;
         var adapter = store.adapterFor(typeClass.modelName);
         var shouldCoalesce = !!adapter.findMany && adapter.coalesceFindRequests;
-        var records = Ember.A(pendingFetchItems).mapBy('record');
+        var records = Ember.A(pendingFetchItems).mapBy("record");
 
         function _fetchRecord(recordResolverPair) {
           recordResolverPair.resolver.resolve(store.fetchRecord(recordResolverPair.record, recordResolverPair.options)); // TODO adapter options
@@ -11972,7 +12137,7 @@
 
         function resolveFoundRecords(records) {
           ember$data$lib$system$store$$forEach.call(records, function (record) {
-            var pair = Ember.A(pendingFetchItems).findBy('record', record);
+            var pair = Ember.A(pendingFetchItems).findBy("record", record);
             if (pair) {
               var resolver = pair.resolver;
               resolver.resolve(record);
@@ -11988,7 +12153,9 @@
               return resolvedRecords.contains(record);
             });
             if (missingRecords.length) {
-              Ember.warn('Ember Data expected to find records with the following ids in the adapter response but they were missing: ' + Ember.inspect(Ember.A(missingRecords).mapBy('id')), false);
+              Ember.warn("Ember Data expected to find records with the following ids in the adapter response but they were missing: " + Ember.inspect(Ember.A(missingRecords).mapBy("id")), false, {
+                id: "ds.store.missing-records-from-adapter"
+              });
             }
             rejectRecords(missingRecords);
           };
@@ -12002,7 +12169,7 @@
 
         function rejectRecords(records, error) {
           ember$data$lib$system$store$$forEach.call(records, function (record) {
-            var pair = Ember.A(pendingFetchItems).findBy('record', record);
+            var pair = Ember.A(pendingFetchItems).findBy("record", record);
             if (pair) {
               var resolver = pair.resolver;
               resolver.reject(error);
@@ -12025,16 +12192,16 @@
           // records from the grouped snapshots even though the _findMany() finder
           // will once again convert the records to snapshots for adapter.findMany()
 
-          var snapshots = Ember.A(records).invoke('createSnapshot');
+          var snapshots = Ember.A(records).invoke("createSnapshot");
           var groups = adapter.groupRecordsForFindMany(this, snapshots);
           ember$data$lib$system$store$$forEach.call(groups, function (groupOfSnapshots) {
-            var groupOfRecords = Ember.A(groupOfSnapshots).mapBy('_internalModel');
+            var groupOfRecords = Ember.A(groupOfSnapshots).mapBy("_internalModel");
             var requestedRecords = Ember.A(groupOfRecords);
-            var ids = requestedRecords.mapBy('id');
+            var ids = requestedRecords.mapBy("id");
             if (ids.length > 1) {
               ember$data$lib$system$store$finders$$_findMany(adapter, store, typeClass, ids, requestedRecords).then(resolveFoundRecords).then(makeMissingRecordsRejector(requestedRecords)).then(null, makeRecordsRejector(requestedRecords));
             } else if (ids.length === 1) {
-              var pair = Ember.A(pendingFetchItems).findBy('record', groupOfRecords[0]);
+              var pair = Ember.A(pendingFetchItems).findBy("record", groupOfRecords[0]);
               _fetchRecord(pair);
             } else {
               Ember.assert("You cannot return an empty array from adapter's method groupRecordsForFindMany", false);
@@ -12061,7 +12228,10 @@
         @return {DS.Model|null} record
       */
       getById: function (modelName, id) {
-        Ember.deprecate('Using store.getById() has been deprecated. Use store.peekRecord to get a record by a given type and ID without triggering a fetch.');
+        Ember.deprecate("Using store.getById() has been deprecated. Use store.peekRecord to get a record by a given type and ID without triggering a fetch.", false, {
+          id: "ds.store.get-by-id-deprecated",
+          until: "2.0.0"
+        });
         return this.peekRecord(modelName, id);
       },
 
@@ -12081,7 +12251,7 @@
         @return {DS.Model|null} record
       */
       peekRecord: function (modelName, id) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         if (this.hasRecordForId(modelName, id)) {
           return this._internalModelForId(modelName, id).getRecord();
         } else {
@@ -12106,7 +12276,7 @@
 
         Ember.assert("You cannot reload a record without an ID", id);
         Ember.assert("You tried to reload a record but you have no adapter (for " + modelName + ")", adapter);
-        Ember.assert("You tried to reload a record but your adapter does not implement `findRecord`", typeof adapter.findRecord === 'function' || typeof adapter.find === 'function');
+        Ember.assert("You tried to reload a record but your adapter does not implement `findRecord`", typeof adapter.findRecord === "function" || typeof adapter.find === "function");
 
         return this.scheduleFetch(internalModel);
       },
@@ -12119,7 +12289,7 @@
         @return {Boolean}
       */
       hasRecordForId: function (modelName, inputId) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var typeClass = this.modelFor(modelName);
         var id = ember$data$lib$system$coerce$id$$default(inputId);
         var internalModel = this.typeMapFor(typeClass).idToRecord[id];
@@ -12136,7 +12306,7 @@
         @return {DS.Model} record
       */
       recordForId: function (modelName, id) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         return this._internalModelForId(modelName, id).getRecord();
       },
 
@@ -12185,7 +12355,7 @@
         var adapter = this.adapterFor(owner.type.modelName);
 
         Ember.assert("You tried to load a hasMany relationship but you have no adapter (for " + owner.type + ")", adapter);
-        Ember.assert("You tried to load a hasMany relationship from a specified `link` in the original payload but your adapter does not implement `findHasMany`", typeof adapter.findHasMany === 'function');
+        Ember.assert("You tried to load a hasMany relationship from a specified `link` in the original payload but your adapter does not implement `findHasMany`", typeof adapter.findHasMany === "function");
 
         return ember$data$lib$system$store$finders$$_findHasMany(adapter, this, owner, link, relationship);
       },
@@ -12202,7 +12372,7 @@
         var adapter = this.adapterFor(owner.type.modelName);
 
         Ember.assert("You tried to load a belongsTo relationship but you have no adapter (for " + owner.type + ")", adapter);
-        Ember.assert("You tried to load a belongsTo relationship from a specified `link` in the original payload but your adapter does not implement `findBelongsTo`", typeof adapter.findBelongsTo === 'function');
+        Ember.assert("You tried to load a belongsTo relationship from a specified `link` in the original payload but your adapter does not implement `findBelongsTo`", typeof adapter.findBelongsTo === "function");
 
         return ember$data$lib$system$store$finders$$_findBelongsTo(adapter, this, owner, link, relationship);
       },
@@ -12243,14 +12413,14 @@
         @return {Promise} promise
       */
       query: function (modelName, query) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var typeClass = this.modelFor(modelName);
         var array = this.recordArrayManager.createAdapterPopulatedRecordArray(typeClass, query);
 
         var adapter = this.adapterFor(modelName);
 
         Ember.assert("You tried to load a query but you have no adapter (for " + typeClass + ")", adapter);
-        Ember.assert("You tried to load a query but your adapter does not implement `query`", typeof adapter.query === 'function' || typeof adapter.findQuery === 'function');
+        Ember.assert("You tried to load a query but your adapter does not implement `query`", typeof adapter.query === "function" || typeof adapter.findQuery === "function");
 
         return ember$data$lib$system$promise$proxies$$promiseArray(ember$data$lib$system$store$finders$$_query(adapter, this, typeClass, query, array));
       },
@@ -12271,13 +12441,13 @@
       queryRecord: function (modelName, query) {
         Ember.assert("You need to pass a type to the store's queryRecord method", modelName);
         Ember.assert("You need to pass a query hash to the store's queryRecord method", query);
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
 
         var typeClass = this.modelFor(modelName);
         var adapter = this.adapterFor(modelName);
 
         Ember.assert("You tried to make a query but you have no adapter (for " + typeClass + ")", adapter);
-        Ember.assert("You tried to make a query but your adapter does not implement `queryRecord`", typeof adapter.queryRecord === 'function');
+        Ember.assert("You tried to make a query but your adapter does not implement `queryRecord`", typeof adapter.queryRecord === "function");
 
         return ember$data$lib$system$promise$proxies$$promiseObject(ember$data$lib$system$store$finders$$_queryRecord(adapter, this, typeClass, query));
       },
@@ -12297,7 +12467,10 @@
         @deprecated Use `store.query instead`
       */
       findQuery: function (modelName, query) {
-        Ember.deprecate('store#findQuery is deprecated. You should use store#query instead.');
+        Ember.deprecate("store#findQuery is deprecated. You should use store#query instead.", false, {
+          id: "ds.store.find-query-deprecated",
+          until: "2.0.0"
+        });
         return this.query(modelName, query);
       },
 
@@ -12321,7 +12494,7 @@
         @return {DS.AdapterPopulatedRecordArray}
       */
       findAll: function (modelName, options) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var typeClass = this.modelFor(modelName);
 
         return this._fetchAll(typeClass, this.peekAll(modelName), options);
@@ -12339,10 +12512,10 @@
         var adapter = this.adapterFor(typeClass.modelName);
         var sinceToken = this.typeMapFor(typeClass).metadata.since;
 
-        ember$data$lib$system$store$$set(array, 'isUpdating', true);
+        ember$data$lib$system$store$$set(array, "isUpdating", true);
 
         Ember.assert("You tried to load all records but you have no adapter (for " + typeClass + ")", adapter);
-        Ember.assert("You tried to load all records but your adapter does not implement `findAll`", typeof adapter.findAll === 'function');
+        Ember.assert("You tried to load all records but your adapter does not implement `findAll`", typeof adapter.findAll === "function");
         if (options.reload) {
           return ember$data$lib$system$promise$proxies$$promiseArray(ember$data$lib$system$store$finders$$_findAll(adapter, this, typeClass, sinceToken, options));
         }
@@ -12363,7 +12536,7 @@
       */
       didUpdateAll: function (typeClass) {
         var liveRecordArray = this.recordArrayManager.liveRecordArrayFor(typeClass);
-        ember$data$lib$system$store$$set(liveRecordArray, 'isUpdating', false);
+        ember$data$lib$system$store$$set(liveRecordArray, "isUpdating", false);
       },
 
       /**
@@ -12385,7 +12558,10 @@
         @return {DS.RecordArray}
       */
       all: function (modelName) {
-        Ember.deprecate('Using store.all() has been deprecated. Use store.peekAll() to get all records by a given type without triggering a fetch.');
+        Ember.deprecate("Using store.all() has been deprecated. Use store.peekAll() to get all records by a given type without triggering a fetch.", false, {
+          id: "ds.store.all-renamed-deprecated",
+          until: "2.0.0"
+        });
         return this.peekAll(modelName);
       },
 
@@ -12408,7 +12584,7 @@
         @return {DS.RecordArray}
       */
       peekAll: function (modelName) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var typeClass = this.modelFor(modelName);
 
         var liveRecordArray = this.recordArrayManager.liveRecordArrayFor(typeClass);
@@ -12428,7 +12604,7 @@
        @param {String=} modelName
       */
       unloadAll: function (modelName) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), !modelName || typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), !modelName || typeof modelName === "string");
         if (arguments.length === 0) {
           var typeMaps = this.typeMaps;
           var keys = ember$data$lib$system$object$polyfills$$keysFunc(typeMaps);
@@ -12452,7 +12628,7 @@
         }
 
         function byType(entry) {
-          return typeMaps[entry]['type'].modelName;
+          return typeMaps[entry]["type"].modelName;
         }
       },
 
@@ -12499,11 +12675,13 @@
         @return {DS.PromiseArray}
       */
       filter: function (modelName, query, filter) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
 
         if (!Ember.ENV.ENABLE_DS_FILTER) {
-          Ember.deprecate('The filter API will be moved into a plugin soon. To enable store.filter using an environment flag, or to use an alternative, you can visit the ember-data-filter addon page', false, {
-            url: 'https://github.com/ember-data/ember-data-filter'
+          Ember.deprecate("The filter API will be moved into a plugin soon. To enable store.filter using an environment flag, or to use an alternative, you can visit the ember-data-filter addon page", false, {
+            url: "https://github.com/ember-data/ember-data-filter",
+            id: "ds.store.filter-deprecated",
+            until: "2.0.0"
           });
         }
 
@@ -12551,7 +12729,7 @@
         @return {boolean}
       */
       recordIsLoaded: function (modelName, id) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         return this.hasRecordForId(modelName, id);
       },
 
@@ -12563,7 +12741,10 @@
         @deprecated
       */
       metadataFor: function (modelName) {
-        Ember.deprecate("`store.metadataFor()` has been deprecated. You can use `.get('meta')` on relationships and arrays returned from `store.query()`.");
+        Ember.deprecate("`store.metadataFor()` has been deprecated. You can use `.get('meta')` on relationships and arrays returned from `store.query()`.", false, {
+          id: "ds.store.metadata-for-deprecated",
+          until: "2.0.0"
+        });
         return this._metadataFor(modelName);
       },
 
@@ -12574,7 +12755,7 @@
         @private
       */
       _metadataFor: function (modelName) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var typeClass = this.modelFor(modelName);
         return this.typeMapFor(typeClass).metadata;
       },
@@ -12588,7 +12769,10 @@
         @deprecated
       */
       setMetadataFor: function (modelName, metadata) {
-        Ember.deprecate("`store.setMetadataFor()` has been deprecated. Please return meta from your serializer's `extractMeta` hook.");
+        Ember.deprecate("`store.setMetadataFor()` has been deprecated. Please return meta from your serializer's `extractMeta` hook.", false, {
+          id: "ds.store.set-metadata-for-deprecated",
+          until: "2.0.0"
+        });
         this._setMetadataFor(modelName, metadata);
       },
 
@@ -12599,7 +12783,7 @@
         @private
       */
       _setMetadataFor: function (modelName, metadata) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var typeClass = this.modelFor(modelName);
         Ember.merge(this.typeMapFor(typeClass).metadata, metadata);
       },
@@ -12644,7 +12828,7 @@
           snapshot: snapshot,
           resolver: resolver
         });
-        ember$data$lib$system$store$$once(this, 'flushPendingSave');
+        ember$data$lib$system$store$$once(this, "flushPendingSave");
       },
 
       /**
@@ -12664,14 +12848,14 @@
           var adapter = this.adapterFor(record.type.modelName);
           var operation;
 
-          if (ember$data$lib$system$store$$get(record, 'currentState.stateName') === 'root.deleted.saved') {
+          if (ember$data$lib$system$store$$get(record, "currentState.stateName") === "root.deleted.saved") {
             return resolver.resolve();
           } else if (record.isNew()) {
-            operation = 'createRecord';
+            operation = "createRecord";
           } else if (record.isDeleted()) {
-            operation = 'deleteRecord';
+            operation = "deleteRecord";
           } else {
-            operation = 'updateRecord';
+            operation = "updateRecord";
           }
 
           resolver.resolve(ember$data$lib$system$store$$_commit(adapter, this, operation, snapshot));
@@ -12696,7 +12880,7 @@
         }
         if (data) {
           // normalize relationship IDs into records
-          this._backburner.schedule('normalizeRelationships', this, '_setupRelationships', internalModel, internalModel.type, data);
+          this._backburner.schedule("normalizeRelationships", this, "_setupRelationships", internalModel, internalModel.type, data);
           this.updateId(internalModel, data);
         }
 
@@ -12759,7 +12943,7 @@
         @return {Object} typeMap
       */
       typeMapFor: function (typeClass) {
-        var typeMaps = ember$data$lib$system$store$$get(this, 'typeMaps');
+        var typeMaps = ember$data$lib$system$store$$get(this, "typeMaps");
         var guid = Ember.guidFor(typeClass);
         var typeMap = typeMaps[guid];
 
@@ -12820,10 +13004,10 @@
       _modelForMixin: function (modelName) {
         var normalizedModelName = ember$data$lib$system$normalize$model$name$$default(modelName);
         var registry = this.container._registry ? this.container._registry : this.container;
-        var mixin = registry.resolve('mixin:' + normalizedModelName);
+        var mixin = registry.resolve("mixin:" + normalizedModelName);
         if (mixin) {
           //Cache the class as a model
-          registry.register('model:' + normalizedModelName, DS.Model.extend(mixin));
+          registry.register("model:" + normalizedModelName, DS.Model.extend(mixin));
         }
         var factory = this.modelFactoryFor(normalizedModelName);
         if (factory) {
@@ -12843,7 +13027,7 @@
         @return {DS.Model}
       */
       modelFor: function (modelName) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
 
         var factory = this.modelFactoryFor(modelName);
         if (!factory) {
@@ -12856,12 +13040,15 @@
         factory.modelName = factory.modelName || ember$data$lib$system$normalize$model$name$$default(modelName);
 
         // deprecate typeKey
-        if (!('typeKey' in factory)) {
-          Ember.defineProperty(factory, 'typeKey', {
+        if (!("typeKey" in factory)) {
+          Ember.defineProperty(factory, "typeKey", {
             enumerable: true,
             configurable: false,
             get: function () {
-              Ember.deprecate('Usage of `typeKey` has been deprecated and will be removed in Ember Data 1.0. It has been replaced by `modelName` on the model class.');
+              Ember.deprecate("Usage of `typeKey` has been deprecated and will be removed in Ember Data 2.0. It has been replaced by `modelName` on the model class.", false, {
+                id: "ds.model.type-key-replace-by-model-name",
+                until: "2.0.0"
+              });
               var typeKey = this.modelName;
               if (typeKey) {
                 typeKey = Ember.String.camelize(this.modelName);
@@ -12869,7 +13056,7 @@
               return typeKey;
             },
             set: function () {
-              Ember.assert('Setting typeKey is not supported. In addition, typeKey has also been deprecated in favor of modelName. Setting modelName is also not supported.');
+              Ember.assert("Setting typeKey is not supported. In addition, typeKey has also been deprecated in favor of modelName. Setting modelName is also not supported.");
             }
           });
         }
@@ -12878,9 +13065,9 @@
       },
 
       modelFactoryFor: function (modelName) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var normalizedKey = ember$data$lib$system$normalize$model$name$$default(modelName);
-        return this.container.lookupFactory('model:' + normalizedKey);
+        return this.container.lookupFactory("model:" + normalizedKey);
       },
 
       /**
@@ -12943,15 +13130,18 @@
 
         var data, modelName;
 
-        if (Ember.typeOf(modelNameArg) === 'object' && Ember.typeOf(dataArg) === 'undefined') {
+        if (Ember.typeOf(modelNameArg) === "object" && Ember.typeOf(dataArg) === "undefined") {
           data = modelNameArg;
         } else {
-          Ember.deprecate('store.push(type, data) has been deprecated. Please provide a JSON-API document object as the first and only argument to store.push.');
-          Ember.assert("Expected an object as `data` in a call to `push` for " + modelNameArg + " , but was " + Ember.typeOf(dataArg), Ember.typeOf(dataArg) === 'object');
-          Ember.assert("You must include an `id` for " + modelNameArg + " in an object passed to `push`", dataArg.id != null && dataArg.id !== '');
+          Ember.deprecate("store.push(type, data) has been deprecated. Please provide a JSON-API document object as the first and only argument to store.push.", false, {
+            id: "ds.store.push-with-type-and-data-deprecated",
+            until: "2.0.0"
+          });
+          Ember.assert("Expected an object as `data` in a call to `push` for " + modelNameArg + " , but was " + Ember.typeOf(dataArg), Ember.typeOf(dataArg) === "object");
+          Ember.assert("You must include an `id` for " + modelNameArg + " in an object passed to `push`", dataArg.id != null && dataArg.id !== "");
           data = ember$data$lib$system$store$serializer$response$$_normalizeSerializerPayload(this.modelFor(modelNameArg), dataArg);
           modelName = modelNameArg;
-          Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string' || typeof data === 'undefined');
+          Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string" || typeof data === "undefined");
         }
 
         if (data.included) {
@@ -12960,7 +13150,7 @@
           });
         }
 
-        if (Ember.typeOf(data.data) === 'array') {
+        if (Ember.typeOf(data.data) === "array") {
           var internalModels = ember$data$lib$system$store$$map.call(data.data, function (recordData) {
             return _this._pushInternalModel(recordData);
           });
@@ -12980,8 +13170,8 @@
 
       _pushInternalModel: function (data) {
         var modelName = data.type;
-        Ember.assert("Expected an object as 'data' in a call to 'push' for " + modelName + ", but was " + Ember.typeOf(data), Ember.typeOf(data) === 'object');
-        Ember.assert("You must include an 'id' for " + modelName + " in an object passed to 'push'", data.id != null && data.id !== '');
+        Ember.assert("Expected an object as 'data' in a call to 'push' for " + modelName + ", but was " + Ember.typeOf(data), Ember.typeOf(data) === "object");
+        Ember.assert("You must include an 'id' for " + modelName + " in an object passed to 'push'", data.id != null && data.id !== "");
         Ember.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);
@@ -12992,10 +13182,10 @@
 
         if (Ember.ENV.DS_WARN_ON_UNKNOWN_KEYS) {
           Ember.warn("The payload for '" + type.modelName + "' contains these unknown keys: " + Ember.inspect(filter.call(ember$data$lib$system$object$polyfills$$keysFunc(data), function (key) {
-            return !(key === 'id' || key === 'links' || ember$data$lib$system$store$$get(type, 'fields').has(key) || key.match(/Type$/));
+            return !(key === "id" || key === "links" || ember$data$lib$system$store$$get(type, "fields").has(key) || key.match(/Type$/));
           })) + ". Make sure they've been defined in your model.", filter.call(ember$data$lib$system$object$polyfills$$keysFunc(data), function (key) {
-            return !(key === 'id' || key === 'links' || ember$data$lib$system$store$$get(type, 'fields').has(key) || key.match(/Type$/));
-          }).length === 0);
+            return !(key === "id" || key === "links" || ember$data$lib$system$store$$get(type, "fields").has(key) || key.match(/Type$/));
+          }).length === 0, { id: "ds.store.unknown-keys-in-payload" });
         }
 
         // Actually load the record into the store.
@@ -13004,7 +13194,7 @@
         var store = this;
 
         this._backburner.join(function () {
-          store._backburner.schedule('normalizeRelationships', store, '_setupRelationships', internalModel, type, data);
+          store._backburner.schedule("normalizeRelationships", store, "_setupRelationships", internalModel, type, data);
         });
 
         return internalModel;
@@ -13075,10 +13265,10 @@
         if (!inputPayload) {
           payload = modelName;
           serializer = ember$data$lib$system$store$$defaultSerializer(this);
-          Ember.assert("You cannot use `store#pushPayload` without a modelName unless your default serializer defines `pushPayload`", typeof serializer.pushPayload === 'function');
+          Ember.assert("You cannot use `store#pushPayload` without a modelName unless your default serializer defines `pushPayload`", typeof serializer.pushPayload === "function");
         } else {
           payload = inputPayload;
-          Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+          Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
           serializer = this.serializerFor(modelName);
         }
         var store = this;
@@ -13104,7 +13294,7 @@
         @return {Object} The normalized payload
       */
       normalize: function (modelName, payload) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
         var serializer = this.serializerFor(modelName);
         var model = this.modelFor(modelName);
         return serializer.normalize(model, payload);
@@ -13118,8 +13308,11 @@
         @deprecated Use [push](#method_push) instead
       */
       update: function (modelName, data) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
-        Ember.deprecate('Using store.update() has been deprecated since store.push() now handles partial updates. You should use store.push() instead.');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
+        Ember.deprecate("Using store.update() has been deprecated since store.push() now handles partial updates. You should use store.push() instead.", false, {
+          id: "ds.store.update-deprecated",
+          until: "2.0.0"
+        });
         return this.push(modelName, data);
       },
 
@@ -13133,8 +13326,11 @@
         @return {Array}
       */
       pushMany: function (modelName, datas) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
-        Ember.deprecate('Using store.pushMany() has been deprecated since store.push() now handles multiple items. You should use store.push() instead.');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
+        Ember.deprecate("Using store.pushMany() has been deprecated since store.push() now handles multiple items. You should use store.push() instead.", false, {
+          id: "ds.store.push-many-deprecated",
+          until: "2.0.0"
+        });
         var length = datas.length;
         var result = new Array(length);
 
@@ -13152,8 +13348,11 @@
         @deprecated Use [setMetadataFor](#method_setMetadataFor) instead
       */
       metaForType: function (modelName, metadata) {
-        Ember.assert('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelName === 'string');
-        Ember.deprecate('Using store.metaForType() has been deprecated. Use store.setMetadataFor() to set metadata for a specific type.');
+        Ember.assert("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), typeof modelName === "string");
+        Ember.deprecate("Using store.metaForType() has been deprecated. Use store.setMetadataFor() to set metadata for a specific type.", false, {
+          id: "ds.store.meta-for-type-deprecated",
+          until: "2.0.0"
+        });
         this.setMetadataFor(modelName, metadata);
       },
 
@@ -13171,8 +13370,8 @@
         var typeMap = this.typeMapFor(type);
         var idToRecord = typeMap.idToRecord;
 
-        Ember.assert('The id ' + id + ' has already been used with another record of type ' + type.toString() + '.', !id || !idToRecord[id]);
-        Ember.assert("`" + Ember.inspect(type) + "` does not appear to be an ember-data model", typeof type._create === 'function');
+        Ember.assert("The id " + id + " has already been used with another record of type " + type.toString() + ".", !id || !idToRecord[id]);
+        Ember.assert("`" + Ember.inspect(type) + "` does not appear to be an ember-data model", typeof type._create === "function");
 
         // lookupFactory should really return an object that creates
         // instances with the injections applied
@@ -13205,7 +13404,10 @@
         @deprecated Use [unloadRecord](#method_unloadRecord) instead
       */
       dematerializeRecord: function (record) {
-        Ember.deprecate('Using store.dematerializeRecord() has been deprecated since it was intended for private use only. You should use store.unloadRecord() instead.');
+        Ember.deprecate("Using store.dematerializeRecord() has been deprecated since it was intended for private use only. You should use store.unloadRecord() instead.", false, {
+          id: "ds.store.dematerialize-record-deprecated",
+          until: "2.0.0"
+        });
         this._dematerializeRecord(record);
       },
 
@@ -13252,12 +13454,11 @@
       adapterFor: function (modelOrClass) {
         var modelName;
 
-        Ember.deprecate('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelName), typeof modelOrClass === 'string');
-
-        if (typeof modelOrClass !== 'string') {
-          modelName = modelOrClass.modelName;
-        } else {
+        if (typeof modelOrClass === "string") {
           modelName = modelOrClass;
+        } else {
+          Ember.deprecate("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), false, { id: "ds.store.passing-classes-deprecated", until: "2.0.0" });
+          modelName = modelOrClass.modelName;
         }
 
         return this.lookupAdapter(modelName);
@@ -13291,14 +13492,14 @@
       serializerFor: function (modelOrClass) {
         var modelName;
 
-        Ember.deprecate('Passing classes to store methods has been removed. Please pass a dasherized string instead of ' + Ember.inspect(modelOrClass), typeof modelOrClass === 'string');
-        if (typeof modelOrClass !== 'string') {
-          modelName = modelOrClass.modelName;
-        } else {
+        if (typeof modelOrClass === "string") {
           modelName = modelOrClass;
+        } else {
+          Ember.deprecate("Passing classes to store methods has been removed. Please pass a dasherized string instead of " + Ember.inspect(modelName), false, { id: "ds.store.passing-classes-deprecated", until: "2.0.0" });
+          modelName = modelOrClass.modelName;
         }
 
-        var fallbacks = ['application', this.adapterFor(modelName).get('defaultSerializer'), '-default'];
+        var fallbacks = ["application", this.adapterFor(modelName).get("defaultSerializer"), "-default"];
 
         var serializer = this.lookupSerializer(modelName, fallbacks);
         return serializer;
@@ -13321,21 +13522,21 @@
         var normalizedModelName = ember$data$lib$system$normalize$model$name$$default(modelName);
 
         var instance = this._instanceCache.get(type, normalizedModelName, fallbacks);
-        ember$data$lib$system$store$$set(instance, 'store', this);
+        ember$data$lib$system$store$$set(instance, "store", this);
         return instance;
       },
 
       lookupAdapter: function (name) {
-        return this.retrieveManagedInstance('adapter', name, this.get('_adapterFallbacks'));
+        return this.retrieveManagedInstance("adapter", name, this.get("_adapterFallbacks"));
       },
 
-      _adapterFallbacks: Ember.computed('adapter', function () {
-        var adapter = this.get('adapter');
-        return ['application', adapter, '-rest'];
+      _adapterFallbacks: Ember.computed("adapter", function () {
+        var adapter = this.get("adapter");
+        return ["application", adapter, "-rest"];
       }),
 
       lookupSerializer: function (name, fallbacks) {
-        return this.retrieveManagedInstance('serializer', name, fallbacks);
+        return this.retrieveManagedInstance("serializer", name, fallbacks);
       },
 
       willDestroy: function () {
@@ -13360,9 +13561,9 @@
         var value;
         if (data.relationships[key] && data.relationships[key].data) {
           value = data.relationships[key].data;
-          if (kind === 'belongsTo') {
+          if (kind === "belongsTo") {
             data.relationships[key].data = ember$data$lib$system$store$$deserializeRecordId(store, key, relationship, value);
-          } else if (kind === 'hasMany') {
+          } else if (kind === "hasMany") {
             data.relationships[key].data = ember$data$lib$system$store$$deserializeRecordIds(store, key, relationship, value);
           }
         }
@@ -13396,7 +13597,7 @@
     // Delegation to the adapter and promise management
 
     function ember$data$lib$system$store$$defaultSerializer(store) {
-      return store.serializerFor('application');
+      return store.serializerFor("application");
     }
 
     function ember$data$lib$system$store$$_commit(adapter, store, operation, snapshot) {
@@ -13465,10 +13666,10 @@
         var value = data.relationships[key].data;
 
         if (value !== undefined) {
-          if (kind === 'belongsTo') {
+          if (kind === "belongsTo") {
             relationship = record._relationships.get(key);
             relationship.setCanonicalRecord(value);
-          } else if (kind === 'hasMany') {
+          } else if (kind === "hasMany") {
             relationship = record._relationships.get(key);
             relationship.updateRecordsFromAdapter(value);
           }
@@ -13479,7 +13680,7 @@
     function ember$data$lib$system$store$$deprecatePreload(preloadOrOptions, type, methodName) {
       if (preloadOrOptions) {
         var modelProperties = [];
-        var fields = Ember.get(type, 'fields');
+        var fields = Ember.get(type, "fields");
         fields.forEach(function (fieldType, key) {
           modelProperties.push(key);
         });
@@ -13487,14 +13688,17 @@
         var preloadDetected = false;
         for (var i = 0, _length = modelProperties.length; i < _length; i++) {
           var key = modelProperties[i];
-          if (typeof preloadOrOptions[key] !== 'undefined') {
+          if (typeof preloadOrOptions[key] !== "undefined") {
             preloadDetected = true;
             break;
           }
         }
 
         if (preloadDetected) {
-          Ember.deprecate("Passing a preload argument to `store." + methodName + "` is deprecated. Please move it to the preload key on the " + methodName + " `options` argument.");
+          Ember.deprecate("Passing a preload argument to `store." + methodName + "` is deprecated. Please move it to the preload key on the " + methodName + " `options` argument.", false, {
+            id: "ds.store.preload-outside-options",
+            until: "2.0.0"
+          });
           var preload = preloadOrOptions;
           return {
             preload: preload
@@ -13717,7 +13921,22 @@
       },
 
       /**
-       @method keyForAttribute
+       `keyForAttribute` can be used to define rules for how to convert an
+       attribute name in your model to a key in your JSON.
+       By default `JSONAPISerializer` follows the format used on the examples of
+       http://jsonapi.org/format and uses dashes as the word separator in the JSON
+       attribute keys.
+        This behaviour can be easily customized by extending this method.
+        Example
+        ```app/serializers/application.js
+       import DS from 'ember-data';
+        export default DS.JSONAPISerializer.extend({
+         keyForAttribute: function(attr, method) {
+           return Ember.String.dasherize(attr).toUpperCase();
+         }
+       });
+       ```
+        @method keyForAttribute
        @param {String} key
        @param {String} method
        @return {String} normalized key
@@ -13727,6 +13946,21 @@
       },
 
       /**
+       `keyForRelationship` can be used to define a custom key when
+       serializing and deserializing relationship properties.
+       By default `JSONAPISerializer` follows the format used on the examples of
+       http://jsonapi.org/format and uses dashes as word separators in
+       relationship properties.
+        This behaviour can be easily customized by extending this method.
+        Example
+         ```app/serializers/post.js
+        import DS from 'ember-data';
+         export default DS.JSONAPISerializer.extend({
+          keyForRelationship: function(key, relationship, method) {
+            return Ember.String.underscore(key);
+          }
+        });
+        ```
        @method keyForRelationship
        @param {String} key
        @param {String} typeClass
@@ -13856,44 +14090,50 @@
       @param {Object} [application] an application namespace
     */
     function ember$data$lib$initializers$store$$initializeStore(registry, application) {
-      Ember.deprecate('Specifying a custom Store for Ember Data on your global namespace as `App.Store` ' + 'has been deprecated. Please use `App.ApplicationStore` instead.', !(application && application.Store));
+      Ember.deprecate("Specifying a custom Store for Ember Data on your global namespace as `App.Store` " + "has been deprecated. Please use `App.ApplicationStore` instead.", !(application && application.Store), { id: "ds.initializer.specifying-custom-store-on-global-namespace-deprecated", until: "2.0.0" });
 
-      registry.optionsForType('serializer', { singleton: false });
-      registry.optionsForType('adapter', { singleton: false });
+      registry.optionsForType("serializer", { singleton: false });
+      registry.optionsForType("adapter", { singleton: false });
 
       // allow older names to be looked up
       var proxy = new ember$data$lib$system$container$proxy$$default(registry);
-      proxy.registerDeprecations([{ deprecated: 'serializer:_default', valid: 'serializer:-default' }, { deprecated: 'serializer:_rest', valid: 'serializer:-rest' }, { deprecated: 'adapter:_rest', valid: 'adapter:-rest' }]);
+      proxy.registerDeprecations([{ deprecated: "serializer:_default", valid: "serializer:-default" }, { deprecated: "serializer:_rest", valid: "serializer:-rest" }, { deprecated: "adapter:_rest", valid: "adapter:-rest" }]);
 
       // new go forward paths
-      registry.register('serializer:-default', ember$data$lib$serializers$json$serializer$$default.extend({ isNewSerializerAPI: true }));
-      registry.register('serializer:-rest', ember$data$lib$serializers$rest$serializer$$default.extend({ isNewSerializerAPI: true }));
-      registry.register('adapter:-rest', ember$data$lib$adapters$rest$adapter$$default);
+      registry.register("serializer:-default", ember$data$lib$serializers$json$serializer$$default.extend({ isNewSerializerAPI: true }));
+      registry.register("serializer:-rest", ember$data$lib$serializers$rest$serializer$$default.extend({ isNewSerializerAPI: true }));
+      registry.register("adapter:-rest", ember$data$lib$adapters$rest$adapter$$default);
 
-      registry.register('adapter:-json-api', ember$data$lib$adapters$json$api$adapter$$default);
-      registry.register('serializer:-json-api', ember$data$lib$serializers$json$api$serializer$$default);
+      registry.register("adapter:-json-api", ember$data$lib$adapters$json$api$adapter$$default);
+      registry.register("serializer:-json-api", ember$data$lib$serializers$json$api$serializer$$default);
 
       var store;
-      if (registry.has('store:main')) {
-        Ember.deprecate('Registering a custom store as `store:main` or defining a store in app/store.js has been deprecated. Please move you store to `service:store` or define your custom store in `app/services/store.js`');
-        store = registry.lookup('store:main');
+      if (registry.has("store:main")) {
+        Ember.deprecate("Registering a custom store as `store:main` or defining a store in app/store.js has been deprecated. Please move you store to `service:store` or define your custom store in `app/services/store.js`", false, {
+          id: "ds.initializer.custom-store-as-store-main-deprecated",
+          until: "2.0.0"
+        });
+        store = registry.lookup("store:main");
       } else {
         var storeMainProxy = new ember$data$lib$system$container$proxy$$default(registry);
-        storeMainProxy.registerDeprecations([{ deprecated: 'store:main', valid: 'service:store' }]);
+        storeMainProxy.registerDeprecations([{ deprecated: "store:main", valid: "service:store" }]);
       }
 
-      if (registry.has('store:application')) {
-        Ember.deprecate('Registering a custom store as `store:application` or defining a store in app/stores/application.js has been deprecated. Please move you store to `service:store` or define your custom store in `app/services/store.js`');
-        store = registry.lookup('store:application');
+      if (registry.has("store:application")) {
+        Ember.deprecate("Registering a custom store as `store:main` or defining a store in app/store.js has been deprecated. Please move you store to `service:store` or define your custom store in `app/services/store.js`", false, {
+          id: "ds.initializer.custom-store-as-store-main-deprecated",
+          until: "2.0.0"
+        });
+        store = registry.lookup("store:application");
       } else {
         var storeApplicationProxy = new ember$data$lib$system$container$proxy$$default(registry);
-        storeApplicationProxy.registerDeprecations([{ deprecated: 'store:application', valid: 'service:store' }]);
+        storeApplicationProxy.registerDeprecations([{ deprecated: "store:application", valid: "service:store" }]);
       }
 
       if (store) {
-        registry.register('service:store', store, { instantiate: false });
-      } else if (!registry.has('service:store')) {
-        registry.register('service:store', application && application.Store || ember$data$lib$system$store$$default);
+        registry.register("service:store", store, { instantiate: false });
+      } else if (!registry.has("service:store")) {
+        registry.register("service:store", application && application.Store || ember$data$lib$system$store$$default);
       }
     }
 
@@ -13984,9 +14224,9 @@
       deserialize: function (serialized) {
         var type = typeof serialized;
 
-        if (type === "string") {
+        if (type === 'string') {
           return new Date(Ember.Date.parse(serialized));
-        } else if (type === "number") {
+        } else if (type === 'number') {
           return new Date(serialized);
         } else if (serialized === null || serialized === undefined) {
           // if the value is null return null
@@ -14065,61 +14305,6 @@
       registry.injection('route', 'store', 'service:store');
       registry.injection('data-adapter', 'store', 'service:store');
     }
-    var ember$new$computed$lib$utils$can$use$new$syntax$$supportsSetterGetter;
-
-    try {
-      ember$lib$main$$default.computed({
-        set: function () {},
-        get: function () {}
-      });
-      ember$new$computed$lib$utils$can$use$new$syntax$$supportsSetterGetter = true;
-    } catch (e) {
-      ember$new$computed$lib$utils$can$use$new$syntax$$supportsSetterGetter = false;
-    }
-
-    var ember$new$computed$lib$utils$can$use$new$syntax$$default = ember$new$computed$lib$utils$can$use$new$syntax$$supportsSetterGetter;
-    var ember$new$computed$lib$main$$default = ember$new$computed$lib$main$$newComputed;
-
-    var ember$new$computed$lib$main$$computed = ember$lib$main$$default.computed;
-
-    function ember$new$computed$lib$main$$newComputed() {
-      var polyfillArguments = [];
-      var config = arguments[arguments.length - 1];
-
-      if (typeof config === 'function' || ember$new$computed$lib$utils$can$use$new$syntax$$default) {
-        return ember$new$computed$lib$main$$computed.apply(undefined, arguments);
-      }
-
-      for (var i = 0, l = arguments.length - 1; i < l; i++) {
-        polyfillArguments.push(arguments[i]);
-      }
-
-      var func;
-      if (config.set) {
-        func = function (key, value) {
-          if (arguments.length > 1) {
-            return config.set.call(this, key, value);
-          } else {
-            return config.get.call(this, key);
-          }
-        };
-      } else {
-        func = function (key) {
-          return config.get.call(this, key);
-        };
-      }
-
-      polyfillArguments.push(func);
-
-      return ember$new$computed$lib$main$$computed.apply(undefined, polyfillArguments);
-    }
-
-    var ember$new$computed$lib$main$$getKeys = Object.keys || ember$lib$main$$default.keys;
-    var ember$new$computed$lib$main$$computedKeys = ember$new$computed$lib$main$$getKeys(ember$new$computed$lib$main$$computed);
-
-    for (var ember$new$computed$lib$main$$i = 0, ember$new$computed$lib$main$$l = ember$new$computed$lib$main$$computedKeys.length; ember$new$computed$lib$main$$i < ember$new$computed$lib$main$$l; ember$new$computed$lib$main$$i++) {
-      ember$new$computed$lib$main$$newComputed[ember$new$computed$lib$main$$computedKeys[ember$new$computed$lib$main$$i]] = ember$new$computed$lib$main$$computed[ember$new$computed$lib$main$$computedKeys[ember$new$computed$lib$main$$i]];
-    }
     var ember$data$lib$system$model$attributes$$default = ember$data$lib$system$model$attributes$$attr;
 
     /**
@@ -14168,7 +14353,7 @@
 
         this.eachComputedProperty(function (name, meta) {
           if (meta.isAttribute) {
-            Ember.assert("You may not set `id` as an attribute on your model. Please remove any lines that look like: `id: DS.attr('<type>')` from " + this.toString(), name !== 'id');
+            Ember.assert("You may not set `id` as an attribute on your model. Please remove any lines that look like: `id: DS.attr('<type>')` from " + this.toString(), name !== "id");
 
             meta.name = name;
             map.set(name, meta);
@@ -14254,7 +14439,7 @@
         @static
       */
       eachAttribute: function (callback, binding) {
-        ember$data$lib$system$model$attributes$$get(this, 'attributes').forEach(function (meta, name) {
+        ember$data$lib$system$model$attributes$$get(this, "attributes").forEach(function (meta, name) {
           callback.call(binding, name, meta);
         }, binding);
       },
@@ -14294,7 +14479,7 @@
         @static
       */
       eachTransformedAttribute: function (callback, binding) {
-        ember$data$lib$system$model$attributes$$get(this, 'transformedAttributes').forEach(function (type, name) {
+        ember$data$lib$system$model$attributes$$get(this, "transformedAttributes").forEach(function (type, name) {
           callback.call(binding, name, type);
         });
       }
@@ -14379,7 +14564,7 @@
       @return {Attribute}
     */
     function ember$data$lib$system$model$attributes$$attr(type, options) {
-      if (typeof type === 'object') {
+      if (typeof type === "object") {
         options = type;
         type = undefined;
       } else {
@@ -14402,7 +14587,7 @@
           }
         },
         set: function (key, value) {
-          Ember.assert("You may not set `id` as an attribute on your model. Please remove any lines that look like: `id: DS.attr('<type>')` from " + this.constructor.toString(), key !== 'id');
+          Ember.assert("You may not set `id` as an attribute on your model. Please remove any lines that look like: `id: DS.attr('<type>')` from " + this.constructor.toString(), key !== "id");
           var internalModel = this._internalModel;
           var oldValue = ember$data$lib$system$model$attributes$$getValue(internalModel, key);
 
@@ -14411,7 +14596,7 @@
             // the 'didSetProperty' handler if it is no different from the original value
             internalModel._attributes[key] = value;
 
-            this._internalModel.send('didSetProperty', {
+            this._internalModel.send("didSetProperty", {
               name: key,
               oldValue: oldValue,
               originalValue: internalModel._data[key],
@@ -14428,15 +14613,6 @@
     var ember$data$lib$system$debug$debug$adapter$$capitalize = Ember.String.capitalize;
     var ember$data$lib$system$debug$debug$adapter$$underscore = Ember.String.underscore;
     var ember$data$lib$system$debug$debug$adapter$$_Ember = Ember;
-
-    /**
-      Extend `Ember.DataAdapter` with ED specific code.
-
-      @class DebugAdapter
-      @namespace DS
-      @extends Ember.DataAdapter
-      @private
-    */
     var ember$data$lib$system$debug$debug$adapter$$assert = ember$data$lib$system$debug$debug$adapter$$_Ember.assert;
 
     var ember$data$lib$system$debug$debug$adapter$$default = Ember.DataAdapter.extend({
@@ -14476,7 +14652,7 @@
             }
           }
         }
-        ember$data$lib$system$debug$debug$adapter$$assert("Cannot find model name. Please upgrade to Ember.js >= 1.13 for Ember Inspector support", !!modelName);
+        ember$data$lib$system$debug$debug$adapter$$assert('Cannot find model name. Please upgrade to Ember.js >= 1.13 for Ember Inspector support', !!modelName);
         return this.get('store').peekAll(modelName);
       },
 
@@ -14565,7 +14741,7 @@
       @param {Ember.Registry} registry
     */
     function ember$data$lib$initializers$data$adapter$$initializeDebugAdapter(registry) {
-      registry.register('data-adapter:main', ember$data$lib$system$debug$debug$adapter$$default);
+      registry.register("data-adapter:main", ember$data$lib$system$debug$debug$adapter$$default);
     }
     var ember$data$lib$instance$initializers$initialize$store$service$$default = ember$data$lib$instance$initializers$initialize$store$service$$initializeStoreService;
     /**
@@ -14659,51 +14835,51 @@
     Ember.onLoad('Ember.Application', function (Application) {
 
       Application.initializer({
-        name: "ember-data",
+        name: 'ember-data',
         initialize: ember$data$lib$setup$container$$initializeInjects
       });
 
       if (Application.instanceInitializer) {
         Application.instanceInitializer({
-          name: "ember-data",
+          name: 'ember-data',
           initialize: ember$data$lib$instance$initializers$initialize$store$service$$default
         });
       } else {
         Application.initializer({
-          name: "ember-data-store-service",
-          after: "ember-data",
+          name: 'ember-data-store-service',
+          after: 'ember-data',
           initialize: ember$data$lib$instance$initializers$initialize$store$service$$default
         });
       }
 
       // Deprecated initializers to satisfy old code that depended on them
       Application.initializer({
-        name: "store",
-        after: "ember-data",
+        name: 'store',
+        after: 'ember-data',
         initialize: ember$data$lib$ember$initializer$$K
       });
 
       Application.initializer({
-        name: "activeModelAdapter",
-        before: "store",
+        name: 'activeModelAdapter',
+        before: 'store',
         initialize: ember$data$lib$ember$initializer$$K
       });
 
       Application.initializer({
-        name: "transforms",
-        before: "store",
+        name: 'transforms',
+        before: 'store',
         initialize: ember$data$lib$ember$initializer$$K
       });
 
       Application.initializer({
-        name: "data-adapter",
-        before: "store",
+        name: 'data-adapter',
+        before: 'store',
         initialize: ember$data$lib$ember$initializer$$K
       });
 
       Application.initializer({
-        name: "injectStore",
-        before: "store",
+        name: 'injectStore',
+        before: 'store',
         initialize: ember$data$lib$ember$initializer$$K
       });
     });
@@ -15106,7 +15282,7 @@
           key = this.keyForAttribute(attr, 'serialize');
           hasMany = snapshot.hasMany(attr);
 
-          Ember.warn("The embedded relationship '" + key + "' is undefined for '" + snapshot.modelName + "' with id '" + snapshot.id + "'. Please include it in your original payload.", Ember.typeOf(hasMany) !== 'undefined');
+          Ember.warn('The embedded relationship \'' + key + '\' is undefined for \'' + snapshot.modelName + '\' with id \'' + snapshot.id + '\'. Please include it in your original payload.', Ember.typeOf(hasMany) !== 'undefined', { id: 'ds.serializer.embedded-relationship-undefined' });
 
           json[key] = Ember.A(hasMany).map(function (embeddedSnapshot) {
             var embeddedJson = embeddedSnapshot.record.serialize({ includeId: true });
@@ -15199,14 +15375,14 @@
         typeClass.eachRelationship(function (key, relationship) {
           if (serializer.hasDeserializeRecordsOption(key)) {
             var embeddedTypeClass = store.modelFor(relationship.type);
-            if (relationship.kind === "hasMany") {
+            if (relationship.kind === 'hasMany') {
               if (relationship.options.polymorphic) {
                 this._extractEmbeddedHasManyPolymorphic(store, key, partial);
               } else {
                 this._extractEmbeddedHasMany(store, key, embeddedTypeClass, partial);
               }
             }
-            if (relationship.kind === "belongsTo") {
+            if (relationship.kind === 'belongsTo') {
               if (relationship.options.polymorphic) {
                 this._extractEmbeddedBelongsToPolymorphic(store, key, partial);
               } else {
@@ -15359,10 +15535,10 @@
 
       typeClass.eachRelationship(function (key, relationship) {
         if (serializer.hasDeserializeRecordsOption(key)) {
-          if (relationship.kind === "hasMany") {
+          if (relationship.kind === 'hasMany') {
             _this2._extractEmbeddedHasMany(store, key, partial, relationship);
           }
-          if (relationship.kind === "belongsTo") {
+          if (relationship.kind === 'belongsTo') {
             _this2._extractEmbeddedBelongsTo(store, key, partial, relationship);
           }
         }
@@ -15506,7 +15682,7 @@
     */
     function ember$data$lib$system$relationships$belongs$to$$belongsTo(modelName, options) {
       var opts, userEnteredModelName;
-      if (typeof modelName === 'object') {
+      if (typeof modelName === "object") {
         opts = modelName;
         userEnteredModelName = undefined;
       } else {
@@ -15514,16 +15690,16 @@
         userEnteredModelName = modelName;
       }
 
-      if (typeof userEnteredModelName === 'string') {
+      if (typeof userEnteredModelName === "string") {
         userEnteredModelName = ember$data$lib$system$normalize$model$name$$default(userEnteredModelName);
       }
 
-      Ember.assert("The first argument to DS.belongsTo must be a string representing a model type key, not an instance of " + Ember.inspect(userEnteredModelName) + ". E.g., to define a relation to the Person model, use DS.belongsTo('person')", typeof userEnteredModelName === 'string' || typeof userEnteredModelName === 'undefined');
+      Ember.assert("The first argument to DS.belongsTo must be a string representing a model type key, not an instance of " + Ember.inspect(userEnteredModelName) + ". E.g., to define a relation to the Person model, use DS.belongsTo('person')", typeof userEnteredModelName === "string" || typeof userEnteredModelName === "undefined");
 
       opts = opts || {};
 
       var shouldWarnAsync = false;
-      if (typeof opts.async === 'undefined') {
+      if (typeof opts.async === "undefined") {
         shouldWarnAsync = true;
       }
 
@@ -15531,18 +15707,30 @@
         type: userEnteredModelName,
         isRelationship: true,
         options: opts,
-        kind: 'belongsTo',
+        kind: "belongsTo",
         key: null,
         shouldWarnAsync: shouldWarnAsync
       };
 
       return ember$new$computed$lib$main$$default({
         get: function (key) {
-          Ember.warn('You provided a serialize option on the "' + key + '" property in the "' + this._internalModel.modelName + '" class, this belongs in the serializer. See DS.Serializer and it\'s implementations http://emberjs.com/api/data/classes/DS.Serializer.html', !opts.hasOwnProperty('serialize'));
-          Ember.warn('You provided an embedded option on the "' + key + '" property in the "' + this._internalModel.modelName + '" class, this belongs in the serializer. See DS.EmbeddedRecordsMixin http://emberjs.com/api/data/classes/DS.EmbeddedRecordsMixin.html', !opts.hasOwnProperty('embedded'));
+          if (opts.hasOwnProperty("serialize")) {
+            Ember.warn("You provided a serialize option on the \"" + key + "\" property in the \"" + this._internalModel.modelName + "\" class, this belongs in the serializer. See DS.Serializer and it's implementations http://emberjs.com/api/data/classes/DS.Serializer.html", false, {
+              id: "ds.model.serialize-option-in-belongs-to"
+            });
+          }
+
+          if (opts.hasOwnProperty("embedded")) {
+            Ember.warn("You provided an embedded option on the \"" + key + "\" property in the \"" + this._internalModel.modelName + "\" class, this belongs in the serializer. See DS.EmbeddedRecordsMixin http://emberjs.com/api/data/classes/DS.EmbeddedRecordsMixin.html", false, {
+              id: "ds.model.embedded-option-in-belongs-to"
+            });
+          }
 
           if (meta.shouldWarnAsync) {
-            Ember.deprecate("In Ember Data 2.0, relationships will be asynchronous by default. You must set `" + key + ": DS.belongsTo('" + modelName + "', { async: false })` if you wish for a relationship remain synchronous.");
+            Ember.deprecate("In Ember Data 2.0, relationships will be asynchronous by default. You must set `" + key + ": DS.belongsTo('" + modelName + "', { async: false })` if you wish for a relationship remain synchronous.", false, {
+              id: "ds.model.relationship-changing-to-asynchrounous-by-default",
+              until: "2.0.0"
+            });
             meta.shouldWarnAsycn = false;
           }
 
@@ -15684,21 +15872,21 @@
       @return {Ember.computed} relationship
     */
     function ember$data$lib$system$relationships$has$many$$hasMany(type, options) {
-      if (typeof type === 'object') {
+      if (typeof type === "object") {
         options = type;
         type = undefined;
       }
 
-      Ember.assert("The first argument to DS.hasMany must be a string representing a model type key, not an instance of " + Ember.inspect(type) + ". E.g., to define a relation to the Comment model, use DS.hasMany('comment')", typeof type === 'string' || typeof type === 'undefined');
+      Ember.assert("The first argument to DS.hasMany must be a string representing a model type key, not an instance of " + Ember.inspect(type) + ". E.g., to define a relation to the Comment model, use DS.hasMany('comment')", typeof type === "string" || typeof type === "undefined");
 
       options = options || {};
 
       var shouldWarnAsync = false;
-      if (typeof options.async === 'undefined') {
+      if (typeof options.async === "undefined") {
         shouldWarnAsync = true;
       }
 
-      if (typeof type === 'string') {
+      if (typeof type === "string") {
         type = ember$data$lib$system$normalize$model$name$$default(type);
       }
 
@@ -15710,7 +15898,7 @@
         type: type,
         isRelationship: true,
         options: options,
-        kind: 'hasMany',
+        kind: "hasMany",
         key: null,
         shouldWarnAsync: shouldWarnAsync
       };
@@ -15718,7 +15906,10 @@
       return ember$new$computed$lib$main$$default({
         get: function (key) {
           if (meta.shouldWarnAsync) {
-            Ember.deprecate("In Ember Data 2.0, relationships will be asynchronous by default. You must set `" + key + ": DS.hasMany('" + type + "', { async: false })` if you wish for a relationship remain synchronous.");
+            Ember.deprecate("In Ember Data 2.0, relationships will be asynchronous by default. You must set `" + key + ": DS.hasMany('" + type + "', { async: false })` if you wish for a relationship remain synchronous.", false, {
+              id: "ds.model.relationship-changing-to-asynchrounous-by-default",
+              until: "2.0.0"
+            });
             meta.shouldWarnAsync = false;
           }
           var relationship = this._internalModel._relationships.get(key);
@@ -15728,7 +15919,7 @@
           var relationship = this._internalModel._relationships.get(key);
           relationship.clear();
           Ember.assert("You must pass an array of records to set a hasMany relationship", Ember.isArray(records));
-          relationship.addRecords(Ember.A(records).mapBy('_internalModel'));
+          relationship.addRecords(Ember.A(records).mapBy("_internalModel"));
           return relationship.getRecords();
         }
       }).meta(meta);
@@ -15932,7 +16123,7 @@
         @return {DS.Model} the type of the relationship, or undefined
       */
       typeForRelationship: function (name, store) {
-        var relationship = ember$data$lib$system$relationships$ext$$get(this, 'relationshipsByName').get(name);
+        var relationship = ember$data$lib$system$relationships$ext$$get(this, "relationshipsByName").get(name);
         return relationship && store.modelFor(relationship.type);
       },
 
@@ -15963,7 +16154,7 @@
         @return {Object} the inverse relationship, or null
       */
       inverseFor: function (name, store) {
-        var inverseMap = ember$data$lib$system$relationships$ext$$get(this, 'inverseMap');
+        var inverseMap = ember$data$lib$system$relationships$ext$$get(this, "inverseMap");
         if (inverseMap[name]) {
           return inverseMap[name];
         } else {
@@ -15990,18 +16181,22 @@
 
         var inverseName, inverseKind, inverse;
 
-        Ember.warn("Detected a reflexive relationship by the name of '" + name + "' without an inverse option. Look at http://emberjs.com/guides/models/defining-models/#toc_reflexive-relation for how to explicitly specify inverses.", options.inverse || propertyMeta.type !== propertyMeta.parentType.modelName);
-
         //If inverse is specified manually, return the inverse
         if (options.inverse) {
           inverseName = options.inverse;
-          inverse = Ember.get(inverseType, 'relationshipsByName').get(inverseName);
+          inverse = Ember.get(inverseType, "relationshipsByName").get(inverseName);
 
           Ember.assert("We found no inverse relationships by the name of '" + inverseName + "' on the '" + inverseType.modelName + "' model. This is most likely due to a missing attribute on your model definition.", !Ember.isNone(inverse));
 
           inverseKind = inverse.kind;
         } else {
           //No inverse was specified manually, we need to use a heuristic to guess one
+          if (propertyMeta.type === propertyMeta.parentType.modelName) {
+            Ember.warn("Detected a reflexive relationship by the name of '" + name + "' without an inverse option. Look at http://emberjs.com/guides/models/defining-models/#toc_reflexive-relation for how to explicitly specify inverses.", false, {
+              id: "ds.model.reflexive-relationship-without-inverse"
+            });
+          }
+
           var possibleRelationships = findPossibleInverses(this, inverseType);
 
           if (possibleRelationships.length === 0) {
@@ -16028,7 +16223,7 @@
         function findPossibleInverses(type, inverseType, relationshipsSoFar) {
           var possibleRelationships = relationshipsSoFar || [];
 
-          var relationshipMap = ember$data$lib$system$relationships$ext$$get(inverseType, 'relationships');
+          var relationshipMap = ember$data$lib$system$relationships$ext$$get(inverseType, "relationships");
           if (!relationshipMap) {
             return possibleRelationships;
           }
@@ -16236,7 +16431,7 @@
           if (meta.isRelationship) {
             map.set(name, meta.kind);
           } else if (meta.isAttribute) {
-            map.set(name, 'attribute');
+            map.set(name, "attribute");
           }
         });
 
@@ -16253,7 +16448,7 @@
         @param {any} binding the value to which the callback's `this` should be bound
       */
       eachRelationship: function (callback, binding) {
-        ember$data$lib$system$relationships$ext$$get(this, 'relationshipsByName').forEach(function (relationship, name) {
+        ember$data$lib$system$relationships$ext$$get(this, "relationshipsByName").forEach(function (relationship, name) {
           callback.call(binding, name, relationship);
         });
       },
@@ -16269,7 +16464,7 @@
         @param {any} binding the value to which the callback's `this` should be bound
       */
       eachRelatedType: function (callback, binding) {
-        ember$data$lib$system$relationships$ext$$get(this, 'relatedTypes').forEach(function (type) {
+        ember$data$lib$system$relationships$ext$$get(this, "relatedTypes").forEach(function (type) {
           callback.call(binding, type);
         });
       },
@@ -16281,16 +16476,16 @@
         var key, otherKind;
 
         if (!inverse) {
-          return knownKind === 'belongsTo' ? 'oneToNone' : 'manyToNone';
+          return knownKind === "belongsTo" ? "oneToNone" : "manyToNone";
         }
 
         key = inverse.name;
         otherKind = inverse.kind;
 
-        if (otherKind === 'belongsTo') {
-          return knownKind === 'belongsTo' ? 'oneToOne' : 'manyToOne';
+        if (otherKind === "belongsTo") {
+          return knownKind === "belongsTo" ? "oneToOne" : "manyToOne";
         } else {
-          return knownKind === 'belongsTo' ? 'oneToMany' : 'manyToMany';
+          return knownKind === "belongsTo" ? "oneToMany" : "manyToMany";
         }
       }
 
@@ -16341,7 +16536,7 @@
       },
 
       relationshipFor: function (name) {
-        return ember$data$lib$system$relationships$ext$$get(this.constructor, 'relationshipsByName').get(name);
+        return ember$data$lib$system$relationships$ext$$get(this.constructor, "relationshipsByName").get(name);
       },
 
       inverseFor: function (key) {
@@ -16419,11 +16614,13 @@
     var ember$data$lib$main$$_ActiveModelSerializer = activemodel$adapter$lib$system$active$model$serializer$$default;
 
     if (Ember.platform.hasPropertyAccessors) {
-      Ember.defineProperty(ember$data$lib$core$$default, 'ActiveModelAdapter', {
+      Ember.defineProperty(ember$data$lib$core$$default, "ActiveModelAdapter", {
         get: function () {
           if (ember$data$lib$main$$_ActiveModelSerializer === activemodel$adapter$lib$system$active$model$adapter$$default) {
-            Ember.deprecate('The ActiveModelAdapter has been moved into a plugin. It will not be bundled with Ember Data in 2.0', false, {
-              url: 'https://github.com/ember-data/active-model-adapter'
+            Ember.deprecate("The ActiveModelAdapter has been moved into a plugin. It will not be bundled with Ember Data in 2.0", false, {
+              url: "https://github.com/ember-data/active-model-adapter",
+              id: "ds.adapter.active-model-adapter-deprecated",
+              until: "2.0.0"
             });
           }
           return ember$data$lib$main$$_ActiveModelAdapter;
@@ -16432,11 +16629,13 @@
           ember$data$lib$main$$_ActiveModelAdapter = ActiveModelAdapter;
         }
       });
-      Ember.defineProperty(ember$data$lib$core$$default, 'ActiveModelSerializer', {
+      Ember.defineProperty(ember$data$lib$core$$default, "ActiveModelSerializer", {
         get: function () {
           if (ember$data$lib$main$$_ActiveModelSerializer === activemodel$adapter$lib$system$active$model$serializer$$default) {
-            Ember.deprecate('The ActiveModelSerializer has been moved into a plugin. It will not be bundled with Ember Data in 2.0', false, {
-              url: 'https://github.com/ember-data/active-model-adapter'
+            Ember.deprecate("The ActiveModelSerializer has been moved into a plugin. It will not be bundled with Ember Data in 2.0", false, {
+              url: "https://github.com/ember-data/active-model-adapter",
+              id: "ds.serializer.active-model-serializer-deprecated",
+              until: "2.0.0"
             });
           }
           return ember$data$lib$main$$_ActiveModelSerializer;
@@ -16460,7 +16659,7 @@
 
     ember$data$lib$core$$default._setupContainer = ember$data$lib$setup$container$$default;
 
-    Ember.defineProperty(ember$data$lib$core$$default, 'normalizeModelName', {
+    Ember.defineProperty(ember$data$lib$core$$default, "normalizeModelName", {
       enumerable: true,
       writable: false,
       configurable: false,
@@ -16470,10 +16669,13 @@
     var ember$data$lib$main$$_FixtureAdapter = ember$data$lib$adapters$fixture$adapter$$default;
 
     if (Ember.platform.hasPropertyAccessors) {
-      Ember.defineProperty(ember$data$lib$core$$default, 'FixtureAdapter', {
+      Ember.defineProperty(ember$data$lib$core$$default, "FixtureAdapter", {
         get: function () {
           if (ember$data$lib$main$$_FixtureAdapter === ember$data$lib$adapters$fixture$adapter$$default) {
-            Ember.deprecate('DS.FixtureAdapter has been deprecated and moved into an unsupported addon: https://github.com/emberjs/ember-data-fixture-adapter/tree/master');
+            Ember.deprecate("DS.FixtureAdapter has been deprecated and moved into an unsupported addon: https://github.com/emberjs/ember-data-fixture-adapter/tree/master", false, {
+              id: "ds.adapter.fixture-adapter-deprecated",
+              until: "2.0.0"
+            });
           }
           return ember$data$lib$main$$_FixtureAdapter;
         },