ember-data-source 1.13.8 → 1.13.9

data/dist/ember-data.js

@@ -4,12 +4,13 @@
     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";
 
@@ -81,9 +82,10 @@
       @class InvalidError
       @namespace DS
     */
+
     function ember$data$lib$adapters$errors$$InvalidError(errors) {
       if (!Ember.isArray(errors)) {
-        Ember.deprecate("`InvalidError` expects json-api formatted errors.", false, { id: "ds.errors.invalid-error-expects-json-api-format", until: "2.0.0" });
+        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");
@@ -95,6 +97,7 @@
       @class TimeoutError
       @namespace DS
     */
+
     function ember$data$lib$adapters$errors$$TimeoutError() {
       ember$data$lib$adapters$errors$$AdapterError.call(this, null, "The adapter operation timed out");
     }
@@ -105,6 +108,7 @@
       @class AbortError
       @namespace DS
     */
+
     function ember$data$lib$adapters$errors$$AbortError() {
       ember$data$lib$adapters$errors$$AdapterError.call(this, null, "The adapter operation was aborted");
     }
@@ -114,6 +118,7 @@
     /**
       @private
     */
+
     function ember$data$lib$adapters$errors$$errorsHashToArray(errors) {
       var out = [];
 
@@ -122,7 +127,7 @@
           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
@@ -888,16 +893,21 @@
         if (path) {
           // Protocol relative url
           //jscs:disable disallowEmptyBlocks
-          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);
-          }
+          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);
+              }
         } else {
           if (host) {
             url.push(host);
@@ -959,27 +969,25 @@
 
     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": {
@@ -989,10 +997,10 @@
         }
       }
       ```
-    
+
       Similarly, in response to a `GET` request for `/posts`, the JSON should
       look like this:
-    
+
       ```js
       {
         "posts": [
@@ -1009,26 +1017,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": {
@@ -1039,45 +1047,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",
@@ -1085,14 +1093,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 {
@@ -1102,17 +1110,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 {
@@ -1122,15 +1130,17 @@
         }.property().volatile()
       });
       ```
-    
+
       @class RESTAdapter
       @constructor
       @namespace DS
       @extends DS.Adapter
       @uses DS.BuildURLMixin
     */
-    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$$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',
 
       /**
         By default, the RESTAdapter will send the query params sorted alphabetically to the
@@ -1272,11 +1282,11 @@
         @deprecated Use [findRecord](#method_findRecord) instead
       */
       find: function (store, type, id, snapshot) {
-        Ember.deprecate("RestAdapter#find has been deprecated and renamed to `findRecord`.", false, {
-          id: "ds.adapter.find-renamed-to-find-record",
-          until: "2.0.0"
+        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");
+        return this.ajax(this.buildURL(type.modelName, id, snapshot, 'find'), 'GET');
       },
 
       /**
@@ -1295,13 +1305,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`.", false, {
-            id: "ds.adapter.find-renamed-to-find-record",
-            until: "2.0.0"
+          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');
       },
 
       /**
@@ -1323,9 +1333,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 });
       },
 
       /**
@@ -1344,17 +1354,17 @@
         @deprecated Use [query](#method_query) instead
       */
       findQuery: function (store, type, 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"
+        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);
+        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 });
       },
 
       /**
@@ -1374,20 +1384,20 @@
       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`.", false, {
-            id: "ds.adapter.find-query-renamed-to-query",
-            until: "2.0.0"
+          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 });
       },
 
       /**
@@ -1406,13 +1416,13 @@
         @return {Promise} promise
       */
       queryRecord: function (store, type, query) {
-        var url = this.buildURL(type.modelName, null, null, "queryRecord", 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 });
+        return this.ajax(url, 'GET', { data: query });
       },
 
       /**
@@ -1442,8 +1452,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 } });
       },
 
       /**
@@ -1472,9 +1482,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');
       },
 
       /**
@@ -1503,8 +1513,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');
       },
 
       /**
@@ -1523,7 +1533,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 });
 
@@ -1550,7 +1560,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 });
       },
@@ -1567,24 +1577,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
@@ -1643,7 +1653,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) {
@@ -1764,8 +1774,8 @@
 
             if (adapter.ajaxSuccess) {
               Ember.deprecate("`ajaxSuccess` has been deprecated. Use `isSuccess`, `isInvalid` or `handleResponse` instead.", false, {
-                id: "ds.adapter.ajax-success-deprecated",
-                until: "2.0.0"
+                id: 'ds.adapter.ajax-success-deprecated',
+                until: '2.0.0'
               });
               response = adapter.ajaxSuccess(jqXHR, payload);
             }
@@ -1786,8 +1796,8 @@
 
             if (adapter.ajaxError) {
               Ember.deprecate("`ajaxError` has been deprecated. Use `isSuccess`, `isInvalid` or `handleResponse` instead.", false, {
-                id: "ds.adapter.ajax-error-deprecated",
-                until: "2.0.0"
+                id: 'ds.adapter.ajax-error-deprecated',
+                until: '2.0.0'
               });
               error = adapter.ajaxError(jqXHR, textStatus, errorThrown);
             }
@@ -1795,9 +1805,9 @@
             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);
@@ -1808,7 +1818,7 @@
           };
 
           Ember.$.ajax(hash);
-        }, "DS: RESTAdapter#ajax " + type + " to " + url);
+        }, 'DS: RESTAdapter#ajax ' + type + ' to ' + url);
       },
 
       /**
@@ -1823,15 +1833,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) {
@@ -1868,7 +1878,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 [{
@@ -1886,12 +1896,12 @@
         return headers;
       }
 
-      var headerPairs = headerStr.split("\r\n");
+      var headerPairs = headerStr.split('\u000d\u000a');
       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(": ");
+        var index = headerPair.indexOf('\u003a\u0020');
         if (index > 0) {
           var key = headerPair.substring(0, index);
           var val = headerPair.substring(index + 2);
@@ -1904,7 +1914,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);
@@ -1912,22 +1922,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.", false, {
-            id: "ds.adapter.max-url-length-deprecated-case",
-            until: "2.0.0"
+          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.", false, {
-            id: "ds.adapter.max-url-length-deprecated-case",
-            until: "2.0.0"
+          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);
+          ember$data$lib$adapters$rest$adapter$$set(this, 'maxURLLength', value);
         }
       });
     }
@@ -2041,7 +2051,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() {
@@ -2177,12 +2187,12 @@
         @param {Object} irregular
       */
       inflect: function (word, typeRules, irregular) {
-        var inflection, substitution, result, lowercase, wordSplit, firstPhrase, lastWord, isBlank, isCamelized, isUncountable, isIrregular, rule;
+        var inflection, substitution, result, lowercase, wordSplit, firstPhrase, lastWord, isBlank, isCamelized, 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;
@@ -2190,25 +2200,28 @@
 
         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();
         }
 
-        isUncountable = this.rules.uncountable[lowercase] || this.rules.uncountable[lastWord];
-
-        if (isUncountable) {
-          return word;
+        for (rule in this.rules.uncountable) {
+          if (lowercase.match(rule + "$")) {
+            return word;
+          }
         }
 
-        isIrregular = irregular && (irregular[lowercase] || irregular[lastWord]);
+        for (rule in this.rules.irregular) {
+          if (lowercase.match(rule + "$")) {
+            substitution = irregular[rule];
 
-        if (isIrregular) {
-          if (irregular[lowercase]) {
-            return isIrregular;
-          } else {
-            isIrregular = isCamelized ? ember$inflector$lib$lib$system$inflector$$capitalize(isIrregular) : isIrregular;
-            return firstPhrase + isIrregular;
+            if (isCamelized && irregular[lastWord]) {
+              substitution = ember$inflector$lib$lib$system$inflector$$capitalize(substitution);
+              rule = ember$inflector$lib$lib$system$inflector$$capitalize(rule);
+            }
+
+            return word.replace(rule, substitution);
           }
         }
 
@@ -2254,93 +2267,6 @@
 
     ember$inflector$lib$lib$system$inflector$$default.inflector = new ember$inflector$lib$lib$system$inflector$$default(ember$inflector$lib$lib$system$inflections$$default);
 
-    var ember$inflector$lib$lib$utils$register$helper$$default = ember$inflector$lib$lib$utils$register$helper$$registerHelper;
-
-    function ember$inflector$lib$lib$utils$register$helper$$registerHelperIteration1(name, helperFunction) {
-      //earlier versions of ember with htmlbars used this
-      ember$lib$main$$default.HTMLBars.helpers[name] = helperFunction;
-    }
-
-    function ember$inflector$lib$lib$utils$register$helper$$registerHelperIteration2(name, helperFunction) {
-      //registerHelper has been made private as _registerHelper
-      //this is kept here if anyone is using it
-      ember$lib$main$$default.HTMLBars.registerHelper(name, helperFunction);
-    }
-
-    function ember$inflector$lib$lib$utils$register$helper$$registerHelperIteration3(name, helperFunction) {
-      //latest versin of ember uses this
-      ember$lib$main$$default.HTMLBars._registerHelper(name, helperFunction);
-    }
-    function ember$inflector$lib$lib$utils$register$helper$$registerHelper(name, helperFunction) {
-      if (ember$lib$main$$default.HTMLBars) {
-        var fn = ember$lib$main$$default.HTMLBars.makeBoundHelper(helperFunction);
-
-        if (ember$lib$main$$default.HTMLBars._registerHelper) {
-          if (ember$lib$main$$default.HTMLBars.helpers) {
-            ember$inflector$lib$lib$utils$register$helper$$registerHelperIteration1(name, fn);
-          } else {
-            ember$inflector$lib$lib$utils$register$helper$$registerHelperIteration3(name, fn);
-          }
-        } else if (ember$lib$main$$default.HTMLBars.registerHelper) {
-          ember$inflector$lib$lib$utils$register$helper$$registerHelperIteration2(name, fn);
-        }
-      } else if (ember$lib$main$$default.Handlebars) {
-        ember$lib$main$$default.Handlebars.helper(name, helperFunction);
-      }
-    }
-
-    /**
-     *
-     * If you have Ember Inflector (such as if Ember Data is present),
-     * singularize a word. For example, turn "oxen" into "ox".
-     *
-     * Example:
-     *
-     * {{singularize myProperty}}
-     * {{singularize "oxen"}}
-     *
-     * @for Ember.HTMLBars.helpers
-     * @method singularize
-     * @param {String|Property} word word to singularize
-    */
-    ember$inflector$lib$lib$utils$register$helper$$default('singularize', function (params) {
-      return ember$inflector$lib$lib$system$string$$singularize(params[0]);
-    });
-
-    /**
-     *
-     * If you have Ember Inflector (such as if Ember Data is present),
-     * pluralize a word. For example, turn "ox" into "oxen".
-     *
-     * Example:
-     *
-     * {{pluralize count myProperty}}
-     * {{pluralize 1 "oxen"}}
-     * {{pluralize myProperty}}
-     * {{pluralize "ox"}}
-     *
-     * @for Ember.HTMLBars.helpers
-     * @method pluralize
-     * @param {Number|Property} [count] count of objects
-     * @param {String|Property} word word to pluralize
-    */
-    ember$inflector$lib$lib$utils$register$helper$$default('pluralize', function (params) {
-      var count, word;
-
-      if (params.length === 1) {
-        word = params[0];
-        return ember$inflector$lib$lib$system$string$$pluralize(word);
-      } else {
-        count = params[0];
-        word = params[1];
-
-        if (count !== 1) {
-          word = ember$inflector$lib$lib$system$string$$pluralize(word);
-        }
-        return count + ' ' + word;
-      }
-    });
-
     if (ember$lib$main$$default.EXTEND_PROTOTYPES === true || ember$lib$main$$default.EXTEND_PROTOTYPES.String) {
       /**
         See {{#crossLink "Ember.String/pluralize"}}{{/crossLink}}
@@ -2368,13 +2294,13 @@
     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;
@@ -2706,7 +2632,7 @@
         @type {String}
         @default 'id'
       */
-      primaryKey: "id",
+      primaryKey: 'id',
 
       /**
         The `attrs` object can be used to declare a simple mapping between
@@ -2757,7 +2683,7 @@
          @property attrs
         @type {Object}
       */
-      mergedProperties: ["attrs"],
+      mergedProperties: ['attrs'],
 
       /**
        Given a subclass of `DS.Model` and a JSON object this method will
@@ -2813,25 +2739,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);
         }
       },
@@ -3026,7 +2952,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;
         }
 
@@ -3090,7 +3016,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);
         }
 
@@ -3115,7 +3041,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);
       },
@@ -3133,7 +3059,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];
           }
@@ -3159,7 +3085,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);
           }
@@ -3184,13 +3110,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);
@@ -3254,7 +3180,7 @@
 
         if (this.keyForAttribute) {
           typeClass.eachAttribute(function (key) {
-            payloadKey = this.keyForAttribute(key, "deserialize");
+            payloadKey = this.keyForAttribute(key, 'deserialize');
             if (key === payloadKey) {
               return;
             }
@@ -3277,7 +3203,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;
             }
@@ -3296,7 +3222,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) {
@@ -3319,9 +3245,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;
         }
 
@@ -3349,7 +3275,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];
@@ -3358,7 +3284,7 @@
           if (mappedKey.key) {
             mappedKey = mappedKey.key;
           }
-          if (typeof mappedKey === "string") {
+          if (typeof mappedKey === 'string') {
             key = mappedKey;
           }
         }
@@ -3375,7 +3301,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;
       },
@@ -3390,7 +3316,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;
       },
@@ -3409,7 +3335,7 @@
         if (this._mustSerialize(key)) {
           return true;
         }
-        return this._canSerialize(key) && (relationshipType === "manyToNone" || relationshipType === "manyToMany");
+        return this._canSerialize(key) && (relationshipType === 'manyToNone' || relationshipType === 'manyToMany');
       },
 
       // SERIALIZE
@@ -3533,7 +3459,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;
           }
         }
 
@@ -3542,9 +3468,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);
@@ -3614,7 +3540,7 @@
           var payloadKey = this._getMappedKey(key);
 
           if (payloadKey === key && this.keyForAttribute) {
-            payloadKey = this.keyForAttribute(key, "serialize");
+            payloadKey = this.keyForAttribute(key, 'serialize');
           }
 
           json[payloadKey] = value;
@@ -3803,8 +3729,7 @@
         return this.extractArray(store, typeClass, payload, id, requestType);
       },
       /**
-        TODO: remove this in a couple of days
-         `extractQueryRecord` is a hook into the extract method used when a
+        `extractQueryRecord` is a hook into the extract method used when a
         call is made to `DS.Store#queryRecord`. By default this method is an
         alias for [extractSingle](#method_extractSingle).
          @method extractQueryRecord
@@ -3965,11 +3890,11 @@
         @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, {
-            id: "ds.serializer.normalize-payload-deprecated",
-            until: "2.0.0"
+        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);
@@ -3999,11 +3924,11 @@
         @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, {
-            id: "ds.serializer.normalize-payload-deprecated",
-            until: "2.0.0"
+        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);
@@ -4036,7 +3961,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);
         }
 
@@ -4072,7 +3997,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);
         }
@@ -4146,7 +4071,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;
       }
@@ -4187,7 +4112,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;
@@ -4325,6 +4250,92 @@
       });
     };
 
+    /**
+    @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;
@@ -4654,9 +4665,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();
 
@@ -4741,12 +4752,12 @@
         @readOnly
         @deprecated
       */
-      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"
+      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");
+        return this.get('currentState.isDirty');
       }),
 
       /**
@@ -4754,13 +4765,13 @@
         @type {Boolean}
         @deprecated
       */
-      error: ember$new$computed$lib$main$$default("adapterError", {
+      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.deprecate('DS.Model#error has been deprecated please use adapterError instead');
             ember$data$lib$system$model$model$$errorDeprecationShown = true;
           }
-          return Ember.get(this, "adapterError");
+          return Ember.get(this, 'adapterError');
         }
       }),
 
@@ -4783,8 +4794,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
@@ -4986,9 +4997,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;
@@ -5030,7 +5041,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);
@@ -5090,7 +5101,7 @@
         @private
         @type {Object}
       */
-      data: Ember.computed.readOnly("_internalModel._data"),
+      data: Ember.computed.readOnly('_internalModel._data'),
 
       //TODO Do we want to deprecate these?
       /**
@@ -5212,9 +5223,9 @@
           and value is an [oldProp, newProp] array.
       */
       changedAttributes: function () {
-        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 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);
 
@@ -5260,9 +5271,9 @@
         @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.", false, {
-          id: "ds.model.rollback-deprecated",
-          until: "2.0.0"
+        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();
       },
@@ -5293,7 +5304,7 @@
       },
 
       toStringExtension: function () {
-        return ember$data$lib$system$model$model$$get(this, "id");
+        return ember$data$lib$system$model$model$$get(this, 'id');
       },
 
       /**
@@ -5385,7 +5396,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 () {
@@ -5467,6 +5478,7 @@
       @param {Object} doc JSON API document
       @return {array} An array of errors found in the document structure
     */
+
     function ember$data$lib$system$store$serializer$response$$validateDocumentStructure(doc) {
       var errors = [];
       if (!doc || typeof doc !== 'object') {
@@ -5532,6 +5544,7 @@
       @param {String} requestType
       @return {Object} JSON-API Document
     */
+
     function ember$data$lib$system$store$serializer$response$$normalizeResponseHelper(serializer, store, modelClass, payload, id, requestType) {
       if (ember$data$lib$system$store$serializer$response$$get(serializer, 'isNewSerializerAPI')) {
         var _ret = (function () {
@@ -5570,6 +5583,7 @@
       @param {Object} payload
       @return {Object} JSON-API Document
     */
+
     function ember$data$lib$system$store$serializer$response$$_normalizeSerializerPayload(modelClass, payload) {
       var data = null;
 
@@ -5596,6 +5610,7 @@
       @param {Object} payload
       @return {Object} JSON-API Resource Object
     */
+
     function ember$data$lib$system$store$serializer$response$$_normalizeSerializerPayloadItem(modelClass, itemPayload) {
       var item = {};
 
@@ -5635,7 +5650,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 };
             };
 
@@ -5647,7 +5662,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 || []);
 
@@ -5687,6 +5702,7 @@
       @param {Object} payload
       @return {DS.Model|Array} one or multiple records from `data`
     */
+
     function ember$data$lib$system$store$serializer$response$$pushPayload(store, payload) {
       var result = ember$data$lib$system$store$serializer$response$$pushPayloadData(store, payload);
       ember$data$lib$system$store$serializer$response$$pushPayloadIncluded(store, payload);
@@ -5703,6 +5719,7 @@
       @param {Object} payload
       @return {DS.Model|Array} one or multiple records from `data`
     */
+
     function ember$data$lib$system$store$serializer$response$$pushPayloadData(store, payload) {
       var result;
       if (payload && payload.data) {
@@ -5727,6 +5744,7 @@
       @param {Object} payload
       @return {Array} an array containing zero or more records from `included`
     */
+
     function ember$data$lib$system$store$serializer$response$$pushPayloadIncluded(store, payload) {
       var result;
       if (payload && payload.included && Ember.isArray(payload.included)) {
@@ -5745,6 +5763,7 @@
       @param {Object} resourceObject
       @return {DS.Model} a record
     */
+
     function ember$data$lib$system$store$serializer$response$$_pushResourceObject(store, resourceObject) {
       return store.push({ data: resourceObject });
     }
@@ -5759,6 +5778,7 @@
       @param {Object} payload
       @return {Object} an object formatted the way DS.Store understands
     */
+
     function ember$data$lib$system$store$serializer$response$$convertResourceObject(payload) {
       if (!payload) {
         return payload;
@@ -5941,7 +5961,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);
         }
@@ -5953,9 +5973,9 @@
         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.", false, {
-            id: "ds.serializer.normalize-hash-deprecated",
-            until: "2.0.0"
+          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);
         }
@@ -5983,7 +6003,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) {
@@ -6022,7 +6042,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;
         }
 
@@ -6050,7 +6070,7 @@
             ```
              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);
           }
@@ -6058,7 +6078,7 @@
           var typeName = this.modelNameFromPayloadKey(modelName);
           if (!store.modelFactoryFor(typeName)) {
             Ember.warn(this.warnMessageNoModelForKey(modelName, typeName), false, {
-              id: "ds.serializer.model-for-key-missing"
+              id: 'ds.serializer.model-for-key-missing'
             });
             continue;
           }
@@ -6079,7 +6099,7 @@
             }
             ```
            */
-          if (isPrimary && Ember.typeOf(value) !== "array") {
+          if (isPrimary && Ember.typeOf(value) !== 'array') {
             var _normalize = this.normalize(primaryModelClass, value, prop);
 
             var _data = _normalize.data;
@@ -6206,9 +6226,9 @@
         @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, {
-          id: "ds.serializer.normalize-payload-deprecated",
-          until: "2.0.0"
+        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;
@@ -6218,7 +6238,7 @@
 
           if (!store.modelFactoryFor(modelName)) {
             Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false, {
-              id: "ds.serializer.model-for-key-missing"
+              id: 'ds.serializer.model-for-key-missing'
             });
             continue;
           }
@@ -6241,7 +6261,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);
 
@@ -6351,9 +6371,9 @@
           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, {
-          id: "ds.serializer.normalize-payload-deprecated",
-          until: "2.0.0"
+        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;
@@ -6362,7 +6382,7 @@
           var modelName = prop;
           var forcedSecondary = false;
 
-          if (prop.charAt(0) === "_") {
+          if (prop.charAt(0) === '_') {
             forcedSecondary = true;
             modelName = prop.substr(1);
           }
@@ -6370,14 +6390,14 @@
           var typeName = this.modelNameFromPayloadKey(modelName);
           if (!store.modelFactoryFor(typeName)) {
             Ember.warn(this.warnMessageNoModelForKey(prop, typeName), false, {
-              id: "ds.serializer.model-for-key-missing"
+              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);
 
@@ -6430,14 +6450,14 @@
         @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, {
-          id: "ds.serializer.normalize-payload-deprecated",
-          until: "2.0.0"
+        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);
 
@@ -6445,14 +6465,14 @@
           var modelName = this.modelNameFromPayloadKey(prop);
           if (!store.modelFactoryFor(modelName)) {
             Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false, {
-              id: "ds.serializer.model-for-key-missing"
+              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) {
@@ -6708,8 +6728,8 @@
       */
       typeForRoot: function (modelName) {
         Ember.deprecate("typeForRoot is deprecated. Use modelNameFromPayloadKey instead.", false, {
-          id: "ds.serializer.type-for-root-deprecated",
-          until: "2.0.0"
+          id: 'ds.serializer.type-for-root-deprecated',
+          until: '2.0.0'
         });
         return this.modelNameFromPayloadKey(modelName);
       },
@@ -6738,7 +6758,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 + '"))';
         }
       });
     });
@@ -6755,9 +6775,9 @@
     */
     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.", false, {
-          id: "ds.serializer.normalize-hash-deprecated",
-          until: "2.0.0"
+        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);
       }
@@ -6774,9 +6794,9 @@
         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, {
-        id: "ds.serializer.normalize-payload-deprecated",
-        until: "2.0.0"
+      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);
 
@@ -6784,14 +6804,14 @@
         var modelName = this.modelNameFromPayloadKey(prop);
         if (!store.modelFactoryFor(modelName)) {
           Ember.warn(this.warnMessageNoModelForKey(prop, modelName), false, {
-            id: "ds.serializer.model-for-key-missing"
+            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) {
@@ -6933,10 +6953,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;
         }
@@ -6979,7 +6999,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;
@@ -7070,18 +7090,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;
               }
@@ -7099,7 +7119,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}
@@ -7138,23 +7158,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 });
+              array.push({ id: id, type: type });
+            }
+            resourceHash[relationshipKey] = array;
           }
-          resourceHash[relationshipKey] = array;
-        }
       }
     }
 
@@ -7210,12 +7230,29 @@
     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
     */
@@ -7265,9 +7302,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;
           });
         }
@@ -7283,7 +7320,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.');
       },
 
       /**
@@ -7338,7 +7375,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) {
@@ -7501,7 +7538,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;
@@ -7520,14 +7557,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);
             });
           }
@@ -7609,7 +7646,7 @@
     });
 
     var ember$data$lib$core$$DS = Ember.Namespace.create({
-      VERSION: '1.13.8'
+      VERSION: '1.13.9'
     });
 
     if (Ember.libraries) {
@@ -7623,6 +7660,7 @@
 
     var ember$data$lib$core$$default = ember$data$lib$core$$DS;
     var ember$data$lib$system$store$common$$get = Ember.get;
+
     function ember$data$lib$system$store$common$$_bind(fn) {
       var args = Array.prototype.slice.call(arguments, 1);
 
@@ -7632,7 +7670,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;
         }
@@ -7670,13 +7708,14 @@
     var ember$data$lib$system$store$finders$$Promise = Ember.RSVP.Promise;
     var ember$data$lib$system$store$finders$$map = Ember.ArrayPolyfills.map;
     var ember$data$lib$system$store$finders$$get = Ember.get;
+
     function ember$data$lib$system$store$finders$$_find(adapter, store, typeClass, id, internalModel, options) {
       var snapshot = internalModel.createSnapshot(options);
       var promise;
       if (!adapter.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"
+        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 {
@@ -7691,7 +7730,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);
@@ -7708,13 +7747,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);
@@ -7722,7 +7761,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) {
@@ -7745,13 +7784,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;
@@ -7772,7 +7811,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;
@@ -7798,7 +7837,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);
         });
@@ -7813,9 +7852,9 @@
       var promise;
 
       if (!adapter.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"
+        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 {
@@ -7831,7 +7870,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);
@@ -7854,7 +7893,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);
         });
@@ -7919,24 +7958,6 @@
     };
 
     var ember$data$lib$system$snapshot$record$array$$default = ember$data$lib$system$snapshot$record$array$$SnapshotRecordArray;
-    var ember$data$lib$system$record$arrays$filtered$subset$$FilteredSubset = Ember.ArrayProxy.extend({
-      init: function () {
-        this._super.apply(this, arguments);
-
-        var _getProperties = this.getProperties('filterByArgs', 'recordArray');
-
-        var filterByArgs = _getProperties.filterByArgs;
-        var recordArray = _getProperties.recordArray;
-        var key = filterByArgs[0];
-
-        var path = 'recordArray.@each.' + key;
-        Ember.defineProperty(this, 'content', Ember.computed(path, function () {
-          return this.filterBy.apply(recordArray, filterByArgs);
-        }));
-      }
-    });
-
-    var ember$data$lib$system$record$arrays$filtered$subset$$default = ember$data$lib$system$record$arrays$filtered$subset$$FilteredSubset;
 
     var ember$data$lib$system$record$arrays$record$array$$get = Ember.get;
     var ember$data$lib$system$record$arrays$record$array$$set = Ember.set;
@@ -8001,42 +8022,11 @@
         @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();
       },
 
-      /**
-        Get a filtered subset of the underlying `RecordArray`.
-        The subset updates when a record would match or mismatch the
-        specified filter parameters.
-         Example
-         ```javascript
-        var allToms = store.all('person').filterBy('name', 'Tom');
-         allToms.get('length'); // 0, since no toms yet in store
-         var tom = store.push('person', { id: 1, name: 'Tom' });
-        allToms.get('length'); // Tom is added
-         tom.set('name', 'Thomas');
-        allToms.get('length'); // 0, since no more records with name === 'Tom'
-        ```
-         @method filterBy
-        @param {String} key property path
-        @param {*} value optional
-       */
-      filterBy: function (key, value) {
-        // only pass value to the arguments if it is present; this mimics the same
-        // behavior for `filterBy`: http://git.io/vIurH
-        var filterByArgs = [key];
-        if (arguments.length === 2) {
-          filterByArgs.push(value);
-        }
-
-        return ember$data$lib$system$record$arrays$filtered$subset$$default.create({
-          filterByArgs: filterByArgs,
-          recordArray: this
-        });
-      },
-
       /**
         Used to get the latest version of all of the records in this array
         from the adapter.
@@ -8050,12 +8040,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 });
       },
@@ -8068,7 +8058,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)) {
@@ -8083,7 +8073,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);
       },
 
       /**
@@ -8101,7 +8091,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");
@@ -8112,7 +8102,7 @@
       _dissociateFromOwnRecords: function () {
         var array = this;
 
-        this.get("content").forEach(function (record) {
+        this.get('content').forEach(function (record) {
           var recordArrays = record._recordArrays;
 
           if (recordArrays) {
@@ -8126,20 +8116,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);
       }
     });
@@ -8176,7 +8166,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.");
       },
 
@@ -8185,11 +8175,11 @@
         @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("filterFunction", function () {
+      updateFilter: Ember.observer('filterFunction', function () {
         Ember.run.once(this, this._updateFilter);
       })
     });
@@ -8213,7 +8203,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.");
       },
 
@@ -8223,8 +8213,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);
 
@@ -8237,13 +8227,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,
@@ -8255,7 +8245,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');
       }
     });
 
@@ -8327,7 +8317,7 @@
           return;
         }
 
-        Ember.run.schedule("actions", this, this.updateRecordArrays);
+        Ember.run.schedule('actions', this, this.updateRecordArrays);
       },
 
       recordArraysForRecord: function (record) {
@@ -8373,7 +8363,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);
       },
@@ -8385,7 +8375,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);
 
@@ -8566,11 +8556,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 () {
@@ -9142,7 +9132,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;
@@ -9461,14 +9451,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;
 
@@ -9684,7 +9674,7 @@
         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);
+        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;
@@ -9760,7 +9750,7 @@
         toSet = toSet.concat(newRecords);
         var oldLength = this.length;
         this.arrayContentWillChange(0, this.length, toSet.length);
-        this.set("length", toSet.length);
+        this.set('length', toSet.length);
         this.currentState = toSet;
         this.arrayContentDidChange(0, oldLength, this.length);
         //TODO Figure out to notify only on additions and maybe only if unloaded
@@ -9825,7 +9815,7 @@
         }
         this.arrayContentWillChange(idx, amt, objects.length);
         this.currentState.splice.apply(this.currentState, [idx, amt].concat(objects));
-        this.set("length", this.currentState.length);
+        this.set('length', this.currentState.length);
         this.arrayContentDidChange(idx, amt, objects.length);
         if (objects) {
           //TODO(Igor) probably needed only for unloaded records
@@ -9855,11 +9845,11 @@
         var records;
         if (amt > 0) {
           records = this.currentState.slice(idx, idx + amt);
-          this.get("relationship").removeRecords(records);
+          this.get('relationship').removeRecords(records);
         }
         var map = objects.map || Ember.ArrayPolyfills.map;
         if (objects) {
-          this.get("relationship").addRecords(map.call(objects, function (obj) {
+          this.get('relationship').addRecords(map.call(objects, function (obj) {
             return obj._internalModel;
           }), idx);
         }
@@ -9888,8 +9878,8 @@
       loadedRecord: function () {
         this.loadingRecordsCount--;
         if (this.loadingRecordsCount === 0) {
-          ember$data$lib$system$many$array$$set(this, "isLoaded", true);
-          this.trigger("didLoad");
+          ember$data$lib$system$many$array$$set(this, 'isLoaded', true);
+          this.trigger('didLoad');
         }
       },
 
@@ -9919,7 +9909,7 @@
       */
       save: function () {
         var manyArray = this;
-        var promiseLabel = "DS: ManyArray#save " + ember$data$lib$system$many$array$$get(this, "type");
+        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");
@@ -9935,11 +9925,11 @@
         @return {DS.Model} record
       */
       createRecord: function (hash) {
-        var store = ember$data$lib$system$many$array$$get(this, "store");
-        var type = ember$data$lib$system$many$array$$get(this, "type");
+        var store = ember$data$lib$system$many$array$$get(this, 'store');
+        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);
@@ -9953,9 +9943,9 @@
         @deprecated Use `addObject()` instead
       */
       addRecord: function (record) {
-        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"
+        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);
       },
@@ -9966,39 +9956,11 @@
         @deprecated Use `removeObject()` instead
       */
       removeRecord: function (record) {
-        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"
+        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);
-      },
-
-      /**
-        Get a filtered subset of the underlying `ManyArray`.
-        The subset updates when a record would match or mismatch the
-        specified filter parameters.
-         Example
-         ```javascript
-        var post = store.peekRecord('post', 1)
-        // All the comments that are deleted locally but not yet saved to the server.
-        var deletedComments = post.get('comments').filterBy('isDeleted');
-        ```
-         @method filterBy
-        @param {String} key property path
-        @param {*} value optional
-       */
-      filterBy: function (key, value) {
-        // only pass value to the arguments if it is present; this mimics the same
-        // behavior for `filterBy`: http://git.io/vIurH
-        var filterByArgs = [key];
-        if (arguments.length === 2) {
-          filterByArgs.push(value);
-        }
-
-        return ember$data$lib$system$record$arrays$filtered$subset$$default.create({
-          filterByArgs: filterByArgs,
-          recordArray: this
-        });
       }
     });
 
@@ -10072,7 +10034,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;
@@ -10145,7 +10107,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;
         });
       }
@@ -10187,7 +10149,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 () {
@@ -10204,7 +10166,7 @@
         return rec._internalModel;
       })).then(function () {
         //Goes away after the manyArray refactor
-        manyArray.set("isLoaded", true);
+        manyArray.set('isLoaded', true);
         return manyArray;
       });
     };
@@ -10229,11 +10191,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;
       }
@@ -10327,7 +10289,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);
     };
@@ -10391,7 +10353,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;
       }
     };
@@ -10408,7 +10370,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);
@@ -10426,7 +10388,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);
       }
@@ -10436,17 +10398,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
     */
-    function ember$data$lib$system$snapshot$$Snapshot(internalModel) {
+    /**
+      @module ember-data
+    */
+
+    var ember$data$lib$system$snapshot$$get = Ember.get;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);
@@ -10556,7 +10518,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.");
       },
 
       /**
@@ -10638,7 +10600,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');
@@ -10702,7 +10664,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');
@@ -10820,7 +10782,7 @@
         @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.', false, {
+        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'
         });
@@ -10854,7 +10816,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) {
@@ -10925,15 +10887,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 () {
@@ -10945,7 +10907,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
         });
@@ -10957,7 +10919,7 @@
       },
 
       deleteRecord: function () {
-        this.send("deleteRecord");
+        this.send('deleteRecord');
       },
 
       save: function (options) {
@@ -10971,14 +10933,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);
         }
       },
 
@@ -10987,7 +10949,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;
@@ -11008,7 +10970,7 @@
       },
 
       unloadRecord: function () {
-        this.send("unloadRecord");
+        this.send('unloadRecord');
       },
 
       eachRelationship: function (callback, binding) {
@@ -11034,7 +10996,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 () {
@@ -11067,7 +11029,7 @@
         @param {Promise} promise
       */
       loadingData: function (promise) {
-        this.send("loadingData", promise);
+        this.send('loadingData', promise);
       },
 
       /**
@@ -11075,7 +11037,7 @@
         @private
       */
       loadedData: function () {
-        this.send("loadedData");
+        this.send('loadedData');
         this.didInitalizeData();
       },
 
@@ -11084,7 +11046,7 @@
         @private
       */
       notFound: function () {
-        this.send("notFound");
+        this.send('notFound');
       },
 
       /**
@@ -11092,7 +11054,7 @@
         @private
       */
       pushedData: function () {
-        this.send("pushedData");
+        this.send('pushedData');
       },
 
       flushChangedAttributes: function () {
@@ -11105,7 +11067,7 @@
         @private
       */
       adapterWillCommit: function () {
-        this.send("willCommit");
+        this.send('willCommit');
       },
 
       /**
@@ -11113,7 +11075,7 @@
         @private
       */
       adapterDidDirty: function () {
-        this.send("becomeDirty");
+        this.send('becomeDirty');
         this.updateRecordArraysLater();
       },
 
@@ -11124,7 +11086,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);
@@ -11162,7 +11124,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();
         }
@@ -11184,7 +11146,7 @@
           this._inFlightAttributes = ember$data$lib$system$object$polyfills$$create(null);
         }
 
-        this.send("rolledBack");
+        this.send('rolledBack');
 
         this.record._notifyProperties(dirtyKeys);
       },
@@ -11198,7 +11160,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 {
@@ -11228,10 +11190,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++) {
@@ -11264,7 +11226,7 @@
         if (this._deferredTriggers.push(args) !== 1) {
           return;
         }
-        Ember.run.scheduleOnce("actions", this, "_triggerDeferredTriggers");
+        Ember.run.scheduleOnce('actions', this, '_triggerDeferredTriggers');
       },
 
       _triggerDeferredTriggers: function () {
@@ -11350,7 +11312,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);
@@ -11378,7 +11340,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) {
@@ -11399,7 +11361,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) {
@@ -11446,7 +11408,7 @@
 
         this._inFlightAttributes = ember$data$lib$system$object$polyfills$$create(null);
 
-        this.send("didCommit");
+        this.send('didCommit');
         this.updateRecordArraysLater();
 
         if (!data) {
@@ -11466,22 +11428,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
@@ -11507,7 +11469,7 @@
         @private
       */
       adapterDidError: function (error) {
-        this.send("becameError");
+        this.send('becameError');
         this.didError(error);
         this._saveWasRejected();
       },
@@ -11597,15 +11559,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 () {
+      ember$data$lib$system$store$$Backburner.prototype.join = function () /*target, method, args */{
         var method, target;
 
         if (this.currentInstance) {
@@ -11760,7 +11722,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({
@@ -11783,7 +11745,7 @@
         @default DS.RESTAdapter
         @type {(DS.Adapter|String)}
       */
-      adapter: "-rest",
+      adapter: '-rest',
 
       /**
         Returns a JSON representation of the record using a custom
@@ -11813,12 +11775,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;
       }),
@@ -11851,7 +11813,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);
 
@@ -11993,25 +11955,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.", false, {
-            id: "ds.store.find-with-type-deprecated",
-            until: "2.0.0"
+          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.", false, {
-            id: "ds.store.find-with-type-deprecated",
-            until: "2.0.0"
+        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);
       },
 
@@ -12025,11 +11987,11 @@
         @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.", false, {
-          id: "ds.store.fetch-by-id-deprecated",
-          until: "2.0.0"
+        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();
@@ -12047,9 +12009,9 @@
         @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.", false, {
-          id: "ds.store.fetch-all-deprecated",
-          until: "2.0.0"
+        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 });
       },
@@ -12063,10 +12025,10 @@
         @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", false, {
-          id: "ds.store.fetch-deprecated",
-          until: "2.0.0"
+        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 });
       },
@@ -12081,11 +12043,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.", false, {
-          id: "ds.store.find-by-id-deprecated",
-          until: "2.0.0"
+        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");
+        var options = ember$data$lib$system$store$$deprecatePreload(preload, this.modelFor(modelName), 'findById');
         return this.findRecord(modelName, id, options);
       },
 
@@ -12124,7 +12086,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 || {};
 
@@ -12134,7 +12096,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) {
@@ -12170,7 +12132,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) {
@@ -12196,7 +12158,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) {
@@ -12220,7 +12182,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;
@@ -12240,7 +12202,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,
@@ -12255,7 +12217,7 @@
         } else {
           this._pendingFetch.get(typeClass).push(pendingFetchItem);
         }
-        Ember.run.scheduleOnce("afterRender", this, this.flushAllPendingFetches);
+        Ember.run.scheduleOnce('afterRender', this, this.flushAllPendingFetches);
 
         return promise;
       },
@@ -12273,7 +12235,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
@@ -12281,7 +12243,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);
@@ -12297,8 +12259,8 @@
               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, {
-                id: "ds.store.missing-records-from-adapter"
+              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);
@@ -12313,7 +12275,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);
@@ -12336,16 +12298,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);
@@ -12372,9 +12334,9 @@
         @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.", false, {
-          id: "ds.store.get-by-id-deprecated",
-          until: "2.0.0"
+        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);
       },
@@ -12395,7 +12357,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 {
@@ -12420,7 +12382,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);
       },
@@ -12433,7 +12395,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];
@@ -12450,7 +12412,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();
       },
 
@@ -12499,7 +12461,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);
       },
@@ -12516,7 +12478,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);
       },
@@ -12557,14 +12519,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));
       },
@@ -12585,13 +12547,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));
       },
@@ -12611,9 +12573,9 @@
         @deprecated Use `store.query instead`
       */
       findQuery: function (modelName, query) {
-        Ember.deprecate("store#findQuery is deprecated. You should use store#query instead.", false, {
-          id: "ds.store.find-query-deprecated",
-          until: "2.0.0"
+        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);
       },
@@ -12638,7 +12600,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);
@@ -12656,10 +12618,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));
         }
@@ -12680,7 +12642,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);
       },
 
       /**
@@ -12702,9 +12664,9 @@
         @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.", false, {
-          id: "ds.store.all-renamed-deprecated",
-          until: "2.0.0"
+        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);
       },
@@ -12728,7 +12690,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);
@@ -12748,7 +12710,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);
@@ -12772,7 +12734,7 @@
         }
 
         function byType(entry) {
-          return typeMaps[entry]["type"].modelName;
+          return typeMaps[entry]['type'].modelName;
         }
       },
 
@@ -12819,13 +12781,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",
-            id: "ds.store.filter-deprecated",
-            until: "2.0.0"
+          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'
           });
         }
 
@@ -12873,7 +12835,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);
       },
 
@@ -12886,8 +12848,8 @@
       */
       metadataFor: function (modelName) {
         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"
+          id: 'ds.store.metadata-for-deprecated',
+          until: '2.0.0'
         });
         return this._metadataFor(modelName);
       },
@@ -12899,7 +12861,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;
       },
@@ -12914,8 +12876,8 @@
       */
       setMetadataFor: function (modelName, metadata) {
         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"
+          id: 'ds.store.set-metadata-for-deprecated',
+          until: '2.0.0'
         });
         this._setMetadataFor(modelName, metadata);
       },
@@ -12927,7 +12889,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);
       },
@@ -12972,7 +12934,7 @@
           snapshot: snapshot,
           resolver: resolver
         });
-        ember$data$lib$system$store$$once(this, "flushPendingSave");
+        ember$data$lib$system$store$$once(this, 'flushPendingSave');
       },
 
       /**
@@ -12992,14 +12954,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));
@@ -13024,7 +12986,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);
         }
 
@@ -13087,7 +13049,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];
 
@@ -13148,10 +13110,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) {
@@ -13171,7 +13133,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) {
@@ -13184,14 +13146,14 @@
         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 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"
+              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) {
@@ -13200,7 +13162,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.');
             }
           });
         }
@@ -13209,9 +13171,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);
       },
 
       /**
@@ -13274,18 +13236,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.", false, {
-            id: "ds.store.push-with-type-and-data-deprecated",
-            until: "2.0.0"
+          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 !== "");
+          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) {
@@ -13294,7 +13256,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);
           });
@@ -13314,8 +13276,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);
@@ -13326,10 +13288,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, { id: "ds.store.unknown-keys-in-payload" });
+            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.
@@ -13338,7 +13300,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;
@@ -13409,10 +13371,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;
@@ -13438,7 +13400,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);
@@ -13452,10 +13414,10 @@
         @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.", false, {
-          id: "ds.store.update-deprecated",
-          until: "2.0.0"
+        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);
       },
@@ -13470,10 +13432,10 @@
         @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.", false, {
-          id: "ds.store.push-many-deprecated",
-          until: "2.0.0"
+        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);
@@ -13492,10 +13454,10 @@
         @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.", false, {
-          id: "ds.store.meta-for-type-deprecated",
-          until: "2.0.0"
+        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);
       },
@@ -13514,8 +13476,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
@@ -13548,9 +13510,9 @@
         @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.", false, {
-          id: "ds.store.dematerialize-record-deprecated",
-          until: "2.0.0"
+        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);
       },
@@ -13598,10 +13560,10 @@
       adapterFor: function (modelOrClass) {
         var modelName;
 
-        if (typeof modelOrClass === "string") {
+        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" });
+          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;
         }
 
@@ -13636,14 +13598,14 @@
       serializerFor: function (modelOrClass) {
         var modelName;
 
-        if (typeof modelOrClass === "string") {
+        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" });
+          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;
@@ -13666,21 +13628,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 () {
@@ -13705,9 +13667,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);
           }
         }
@@ -13741,7 +13703,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) {
@@ -13810,10 +13772,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);
           }
@@ -13824,7 +13786,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);
         });
@@ -13832,7 +13794,7 @@
         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;
           }
@@ -13840,8 +13802,8 @@
 
         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.", false, {
-            id: "ds.store.preload-outside-options",
-            until: "2.0.0"
+            id: 'ds.store.preload-outside-options',
+            until: '2.0.0'
           });
           var preload = preloadOrOptions;
           return {
@@ -14234,50 +14196,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), { id: "ds.initializer.specifying-custom-store-on-global-namespace-deprecated", until: "2.0.0" });
+      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`", false, {
-          id: "ds.initializer.custom-store-as-store-main-deprecated",
-          until: "2.0.0"
+      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");
+        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: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"
+      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");
+        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);
       }
     }
 
@@ -14368,9 +14330,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
@@ -14497,7 +14459,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);
@@ -14583,7 +14545,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);
       },
@@ -14623,7 +14585,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);
         });
       }
@@ -14708,7 +14670,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 {
@@ -14731,7 +14693,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);
 
@@ -14740,7 +14702,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],
@@ -14796,7 +14758,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);
       },
 
@@ -14885,7 +14847,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;
     /**
@@ -14979,51 +14941,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
       });
     });
@@ -15519,14 +15481,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 {
@@ -15679,10 +15641,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);
           }
         }
@@ -15826,7 +15788,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 {
@@ -15834,16 +15796,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;
       }
 
@@ -15851,31 +15813,31 @@
         type: userEnteredModelName,
         isRelationship: true,
         options: opts,
-        kind: "belongsTo",
+        kind: 'belongsTo',
         key: null,
         shouldWarnAsync: shouldWarnAsync
       };
 
       return ember$new$computed$lib$main$$default({
         get: function (key) {
-          if (opts.hasOwnProperty("serialize")) {
+          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"
+              id: 'ds.model.serialize-option-in-belongs-to'
             });
           }
 
-          if (opts.hasOwnProperty("embedded")) {
+          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"
+              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.", false, {
-              id: "ds.model.relationship-changing-to-asynchrounous-by-default",
-              until: "2.0.0"
+              id: 'ds.model.relationship-changing-to-asynchrounous-by-default',
+              until: '2.0.0'
             });
-            meta.shouldWarnAsycn = false;
+            meta.shouldWarnAsync = false;
           }
 
           return this._internalModel._relationships.get(key).getRecord();
@@ -16016,21 +15978,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);
       }
 
@@ -16042,7 +16004,7 @@
         type: type,
         isRelationship: true,
         options: options,
-        kind: "hasMany",
+        kind: 'hasMany',
         key: null,
         shouldWarnAsync: shouldWarnAsync
       };
@@ -16051,8 +16013,8 @@
         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.", false, {
-              id: "ds.model.relationship-changing-to-asynchrounous-by-default",
-              until: "2.0.0"
+              id: 'ds.model.relationship-changing-to-asynchrounous-by-default',
+              until: '2.0.0'
             });
             meta.shouldWarnAsync = false;
           }
@@ -16063,7 +16025,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);
@@ -16081,6 +16043,7 @@
     });
 
     var ember$data$lib$system$relationships$has$many$$default = ember$data$lib$system$relationships$has$many$$hasMany;
+
     function ember$data$lib$system$relationship$meta$$typeForRelationshipMeta(meta) {
       var modelName;
 
@@ -16267,7 +16230,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);
       },
 
@@ -16298,7 +16261,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 {
@@ -16328,7 +16291,7 @@
         //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));
 
@@ -16337,7 +16300,7 @@
           //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"
+              id: 'ds.model.reflexive-relationship-without-inverse'
             });
           }
 
@@ -16367,7 +16330,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;
           }
@@ -16575,7 +16538,7 @@
           if (meta.isRelationship) {
             map.set(name, meta.kind);
           } else if (meta.isAttribute) {
-            map.set(name, "attribute");
+            map.set(name, 'attribute');
           }
         });
 
@@ -16592,7 +16555,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);
         });
       },
@@ -16608,7 +16571,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);
         });
       },
@@ -16620,16 +16583,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';
         }
       }
 
@@ -16680,7 +16643,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) {
@@ -16758,13 +16721,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",
-              id: "ds.adapter.active-model-adapter-deprecated",
-              until: "2.0.0"
+            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;
@@ -16773,13 +16736,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",
-              id: "ds.serializer.active-model-serializer-deprecated",
-              until: "2.0.0"
+            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;
@@ -16803,7 +16766,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,
@@ -16813,12 +16776,12 @@
     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", false, {
-              id: "ds.adapter.fixture-adapter-deprecated",
-              until: "2.0.0"
+            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;
@@ -16834,6 +16797,37 @@
     Ember.lookup.DS = ember$data$lib$core$$default;
 
     var ember$data$lib$main$$default = ember$data$lib$core$$default;
+    var ember$inflector$lib$lib$utils$make$helper$$default = ember$inflector$lib$lib$utils$make$helper$$makeHelper;
+    function ember$inflector$lib$lib$utils$make$helper$$makeHelper(helperFunction) {
+      if (ember$lib$main$$default.Helper) {
+        return ember$lib$main$$default.Helper.helper(helperFunction);
+      }
+      if (ember$lib$main$$default.HTMLBars) {
+        return ember$lib$main$$default.HTMLBars.makeBoundHelper(helperFunction);
+      }
+      return ember$lib$main$$default.Handlebars.makeBoundHelper(helperFunction);
+    }
+
+    var ember$inflector$lib$lib$helpers$pluralize$$default = ember$inflector$lib$lib$utils$make$helper$$default(function (params) {
+      var count, word;
+
+      if (params.length === 1) {
+        word = params[0];
+        return ember$inflector$lib$lib$system$string$$pluralize(word);
+      } else {
+        count = params[0];
+        word = params[1];
+
+        if ((count | 0) !== 1) {
+          word = ember$inflector$lib$lib$system$string$$pluralize(word);
+        }
+        return count + " " + word;
+      }
+    });
+
+    var ember$inflector$lib$lib$helpers$singularize$$default = ember$inflector$lib$lib$utils$make$helper$$default(function (params) {
+      return ember$inflector$lib$lib$system$string$$singularize(params[0]);
+    });
 }).call(this);
 
 //# sourceMappingURL=ember-data.js.map