ember-data-source 1.13.7 → 1.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23a24ca3a6f2edbabf4f58560597978f91a19c48
-  data.tar.gz: 5dbf0be7c78fa4ba9244c7322eaef91d41fc3608
+  metadata.gz: 0719f6e05a5484e818ba9d779d3a78b1af0f5a73
+  data.tar.gz: 7e5572c7be9e921fa87080a74e95f5cc5a8a5649
 SHA512:
-  metadata.gz: b0a8544b1dac75e7b5d6dc0ee284ed7d04ea42bd01cf3bdb575c1df8cecc9a6df69d372be0f50d8cca358b1d1dc8f456bfb5e960baa55695bdfed0a4ed4b0826
-  data.tar.gz: a5d6639da554b718b147071e807bf9ffd175d7197b1b8d7a0638b2460052cc301af35e34a6cdf039f363ca0143ee9c2ab896f9f5a41060908c115babcd899882
+  metadata.gz: 0f5f790ef12949fb835f4bf5ff8b5f3b170564499e572283f542e5a75b286fd2e5ca80a8ac390dc1df23d6732859ca3bf4171ef127f16cd0a7fa1cc0b19209ef
+  data.tar.gz: 71feae780572611a1940e397efa55fc7dc66c9b49989b9d79602bc38a64c8990bf84750498dc491ccf36d692ac297de0b609fec460f2c92868734e5b51365975

data/dist/ember-data-tests.js

@@ -19806,6 +19806,205 @@ define(
 );
 
 
+define(
+  "ember-data/tests/integration/store/json-api-validation-test",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+
+    function __es6_export__(name, value) {
+      __exports__[name] = value;
+    }
+
+    var Person, store, env;
+    var run = Ember.run;
+
+    module('integration/store/json-validation', {
+      setup: function () {
+        Person = DS.Model.extend({
+          updatedAt: DS.attr('string'),
+          name: DS.attr('string'),
+          firstName: DS.attr('string'),
+          lastName: DS.attr('string')
+        });
+
+        env = setupStore({
+          person: Person
+        });
+        store = env.store;
+      },
+
+      teardown: function () {
+        run(store, 'destroy');
+      }
+    });
+
+    test('when normalizeResponse returns undefined (or doesn\'t return), throws an error', function () {
+
+      env.registry.register('serializer:person', DS.Serializer.extend({
+        isNewSerializerAPI: true,
+        normalizeResponse: function () {}
+      }));
+
+      env.registry.register('adapter:person', DS.Adapter.extend({
+        findRecord: function () {
+          return Ember.RSVP.resolve({});
+        }
+      }));
+
+      throws(function () {
+        run(function () {
+          store.find('person', 1);
+        });
+      }, /Top level of a JSON API document must be an object/);
+    });
+
+    test('when normalizeResponse returns null, throws an error', function () {
+
+      env.registry.register('serializer:person', DS.Serializer.extend({
+        isNewSerializerAPI: true,
+        normalizeResponse: function () {
+          return null;
+        }
+      }));
+
+      env.registry.register('adapter:person', DS.Adapter.extend({
+        findRecord: function () {
+          return Ember.RSVP.resolve({});
+        }
+      }));
+
+      throws(function () {
+        run(function () {
+          store.find('person', 1);
+        });
+      }, /Top level of a JSON API document must be an object/);
+    });
+
+    test('when normalizeResponse returns an empty object, throws an error', function () {
+
+      env.registry.register('serializer:person', DS.Serializer.extend({
+        isNewSerializerAPI: true,
+        normalizeResponse: function () {
+          return {};
+        }
+      }));
+
+      env.registry.register('adapter:person', DS.Adapter.extend({
+        findRecord: function () {
+          return Ember.RSVP.resolve({});
+        }
+      }));
+
+      throws(function () {
+        run(function () {
+          store.find('person', 1);
+        });
+      }, /One or more of the following keys must be present/);
+    });
+
+    test('when normalizeResponse returns a document with both data and errors, throws an error', function () {
+
+      env.registry.register('serializer:person', DS.Serializer.extend({
+        isNewSerializerAPI: true,
+        normalizeResponse: function () {
+          return {
+            data: [],
+            errors: []
+          };
+        }
+      }));
+
+      env.registry.register('adapter:person', DS.Adapter.extend({
+        findRecord: function () {
+          return Ember.RSVP.resolve({});
+        }
+      }));
+
+      throws(function () {
+        run(function () {
+          store.find('person', 1);
+        });
+      }, /cannot both be present/);
+    });
+
+    function testPayloadError(payload, expectedError) {
+      env.registry.register('serializer:person', DS.Serializer.extend({
+        isNewSerializerAPI: true,
+        normalizeResponse: function (store, type, pld) {
+          return pld;
+        }
+      }));
+      env.registry.register('adapter:person', DS.Adapter.extend({
+        findRecord: function () {
+          return Ember.RSVP.resolve(payload);
+        }
+      }));
+      throws(function () {
+        run(function () {
+          store.find('person', 1);
+        });
+      }, expectedError, 'Payload ' + JSON.stringify(payload) + ' should throw error ' + expectedError);
+      env.registry.unregister('serializer:person');
+      env.registry.unregister('adapter:person');
+    }
+
+    test('normalizeResponse \'data\' cannot be undefined, a number, a string or a boolean', function () {
+
+      testPayloadError({ data: undefined }, /data must be/);
+      testPayloadError({ data: 1 }, /data must be/);
+      testPayloadError({ data: 'lollerskates' }, /data must be/);
+      testPayloadError({ data: true }, /data must be/);
+    });
+
+    test('normalizeResponse \'meta\' cannot be an array, undefined, a number, a string or a boolean', function () {
+
+      testPayloadError({ meta: undefined }, /meta must be an object/);
+      testPayloadError({ meta: [] }, /meta must be an object/);
+      testPayloadError({ meta: 1 }, /meta must be an object/);
+      testPayloadError({ meta: 'lollerskates' }, /meta must be an object/);
+      testPayloadError({ meta: true }, /meta must be an object/);
+    });
+
+    test('normalizeResponse \'links\' cannot be an array, undefined, a number, a string or a boolean', function () {
+
+      testPayloadError({ data: [], links: undefined }, /links must be an object/);
+      testPayloadError({ data: [], links: [] }, /links must be an object/);
+      testPayloadError({ data: [], links: 1 }, /links must be an object/);
+      testPayloadError({ data: [], links: 'lollerskates' }, /links must be an object/);
+      testPayloadError({ data: [], links: true }, /links must be an object/);
+    });
+
+    test('normalizeResponse \'jsonapi\' cannot be an array, undefined, a number, a string or a boolean', function () {
+
+      testPayloadError({ data: [], jsonapi: undefined }, /jsonapi must be an object/);
+      testPayloadError({ data: [], jsonapi: [] }, /jsonapi must be an object/);
+      testPayloadError({ data: [], jsonapi: 1 }, /jsonapi must be an object/);
+      testPayloadError({ data: [], jsonapi: 'lollerskates' }, /jsonapi must be an object/);
+      testPayloadError({ data: [], jsonapi: true }, /jsonapi must be an object/);
+    });
+
+    test('normalizeResponse \'included\' cannot be an object, undefined, a number, a string or a boolean', function () {
+
+      testPayloadError({ included: undefined }, /included must be an array/);
+      testPayloadError({ included: {} }, /included must be an array/);
+      testPayloadError({ included: 1 }, /included must be an array/);
+      testPayloadError({ included: 'lollerskates' }, /included must be an array/);
+      testPayloadError({ included: true }, /included must be an array/);
+    });
+
+    test('normalizeResponse \'errors\' cannot be an object, undefined, a number, a string or a boolean', function () {
+
+      testPayloadError({ errors: undefined }, /errors must be an array/);
+      testPayloadError({ errors: {} }, /errors must be an array/);
+      testPayloadError({ errors: 1 }, /errors must be an array/);
+      testPayloadError({ errors: 'lollerskates' }, /errors must be an array/);
+      testPayloadError({ errors: true }, /errors must be an array/);
+    });
+  }
+);
+
+
 define(
   "ember-data/tests/integration/store/query-record-test",
   ["exports"],
@@ -20152,6 +20351,18 @@ define(
       equal(adapter.buildURL('super-user', null, null, 'query', queryStub), '/superUsers');
     });
 
+    test('buildURL - queryRecord requestType delegates to urlForQueryRecord', function () {
+      expect(3);
+      var originalMethod = adapter.urlForQueryRecord;
+      var queryStub = { companyId: 10 };
+      adapter.urlForQueryRecord = function (query, type) {
+        equal(query, queryStub);
+        equal(type, 'super-user');
+        return originalMethod.apply(this, arguments);
+      };
+      equal(adapter.buildURL('super-user', null, null, 'queryRecord', queryStub), '/superUsers');
+    });
+
     test('buildURL - findMany requestType delegates to urlForFindMany', function () {
       expect(3);
       var originalMethod = adapter.urlForFindMany;
@@ -24288,6 +24499,121 @@ define(
       });
       ok(promise.then && typeof promise.then === "function", "#update returns a promise");
     });
+
+    test("filterBy - returns a filtered subset", function () {
+      var store = createStore({
+        person: Person
+      });
+
+      run(function () {
+        store.push({ data: [{
+            id: "1",
+            type: "person",
+            attributes: {
+              name: "Tom"
+            }
+          }, {
+            id: "2",
+            type: "person",
+            attributes: {
+              name: "Yehuda"
+            }
+          }, {
+            id: "2",
+            type: "person",
+            attributes: {
+              name: "Yehuda"
+            }
+          }] });
+      });
+
+      var all = store.peekAll("person");
+      var toms = all.filterBy("name", "Tom");
+      equal(toms.get("length"), 1);
+      deepEqual(toms.getEach("id"), ["1"]);
+
+      // a new record is added if filter matches
+      run(function () {
+        store.push({ data: { type: "person", id: "4", attributes: { name: "Tom" } } });
+      });
+      equal(toms.get("length"), 2);
+      deepEqual(toms.getEach("id"), ["1", "4"]);
+
+      // a new record is not added if filter doesn't match
+      run(function () {
+        store.push({ data: { type: "person", id: "5", attributes: { name: "Igor" } } });
+      });
+      equal(toms.get("length"), 2);
+      deepEqual(toms.getEach("id"), ["1", "4"]);
+
+      // changing the filtered value remvoves the record from the list
+      run(function () {
+        // we are using a private method here to get the record immediatly
+        store.recordForId("person", "1").set("name", "Thomas");
+      });
+      equal(toms.get("length"), 1);
+      deepEqual(toms.getEach("id"), ["4"]);
+
+      // change value back to original
+      run(function () {
+        store.recordForId("person", "1").set("name", "Tom");
+      });
+      equal(toms.get("length"), 2);
+      deepEqual(toms.getEach("id"), ["1", "4"]);
+    });
+
+    test("filterBy - value is optional", function () {
+      var store = createStore({
+        person: Person
+      });
+
+      run(function () {
+        store.push({ data: [{
+            id: "1",
+            type: "person",
+            attributes: {
+              name: "Tom"
+            }
+          }, {
+            id: "2",
+            type: "person"
+          }] });
+      });
+
+      var all = store.peekAll("person");
+      var allWithNames = all.filterBy("name");
+      equal(allWithNames.get("length"), 1);
+      deepEqual(allWithNames.getEach("id"), ["1"]);
+
+      // a new record is added if filter matches
+      run(function () {
+        store.push({ data: { type: "person", id: "3", attributes: { name: "Igor" } } });
+      });
+      equal(allWithNames.get("length"), 2);
+      deepEqual(allWithNames.getEach("id"), ["1", "3"]);
+
+      // a new record is not added if filter doesn't match
+      run(function () {
+        store.push({ data: { type: "person", id: "4" } });
+      });
+      equal(allWithNames.get("length"), 2);
+      deepEqual(allWithNames.getEach("id"), ["1", "3"]);
+
+      // changing the filtered value remvoves the record from the list
+      run(function () {
+        // we are using a private method here to get the record immediatly
+        store.recordForId("person", "1").set("name", null);
+      });
+      equal(allWithNames.get("length"), 1);
+      deepEqual(allWithNames.getEach("id"), ["3"]);
+
+      // change value back to original
+      run(function () {
+        store.recordForId("person", "1").set("name", "Tom");
+      });
+      equal(allWithNames.get("length"), 2);
+      deepEqual(allWithNames.getEach("id"), ["1", "3"]);
+    });
   }
 );
 
@@ -27732,6 +28058,13 @@ test('ember-data/lib/system/record-arrays/filtered-record-array.js should pass j
   ok(true, 'ember-data/lib/system/record-arrays/filtered-record-array.js should pass jshint.'); 
 });
 
+}
+if (!QUnit.urlParams.nojshint) {
+module('JSHint - ember-data/lib/system/record-arrays');
+test('ember-data/lib/system/record-arrays/filtered-subset.js should pass jshint', function() { 
+  ok(true, 'ember-data/lib/system/record-arrays/filtered-subset.js should pass jshint.'); 
+});
+
 }
 if (!QUnit.urlParams.nojshint) {
 module('JSHint - ember-data/lib/system/record-arrays');
@@ -28243,6 +28576,13 @@ test('ember-data/tests/integration/store-test.js should pass jshint', function()
   ok(true, 'ember-data/tests/integration/store-test.js should pass jshint.'); 
 });
 
+}
+if (!QUnit.urlParams.nojshint) {
+module('JSHint - ember-data/tests/integration/store');
+test('ember-data/tests/integration/store/json-api-validation-test.js should pass jshint', function() { 
+  ok(true, 'ember-data/tests/integration/store/json-api-validation-test.js should pass jshint.'); 
+});
+
 }
 if (!QUnit.urlParams.nojshint) {
 module('JSHint - ember-data/tests/integration/store');

data/dist/ember-data.js

@@ -331,12 +331,14 @@
         to push the record into the store.
          Here is an example `queryRecord` implementation:
          Example
-         ```javascript
-        App.ApplicationAdapter = DS.Adapter.extend({
-          queryRecord: function(store, typeClass, query) {
-            var url = [type.typeKey, id].join('/');
+         ```app/adapters/application.js
+        import DS from 'ember-data';
+        import Ember from 'ember';
+         export default DS.Adapter.extend(DS.BuildURLMixin, {
+          queryRecord: function(store, type, query) {
+            var urlForQueryRecord = this.buildURL(type.modelName, null, null, 'queryRecord', query);
              return new Ember.RSVP.Promise(function(resolve, reject) {
-              jQuery.getJSON(url, query).then(function(data) {
+              Ember.$.getJSON(urlForQueryRecord, query).then(function(data) {
                 Ember.run(null, resolve, data);
               }, function(jqXHR) {
                 jqXHR.then = null; // tame jQuery's ill mannered promises
@@ -350,7 +352,6 @@
         @param {DS.Store} store
         @param {subclass of DS.Model} type
         @param {Object} query
-        @param {String} id
         @return {Promise} promise
       */
       queryRecord: null,
@@ -682,6 +683,8 @@
             return this.urlForFindQuery(query, modelName);
           case 'query':
             return this.urlForQuery(query, modelName);
+          case 'queryRecord':
+            return this.urlForQueryRecord(query, modelName);
           case 'findMany':
             return this.urlForFindMany(id, modelName, snapshot);
           case 'findHasMany':
@@ -735,7 +738,7 @@
       },
 
       /**
-       * @method urlForFind
+       * @method urlForFindRecord
        * @param {String} id
        * @param {String} modelName
        * @param {DS.Snapshot} snapshot
@@ -797,6 +800,16 @@
         return this._buildURL(modelName);
       },
 
+      /**
+       * @method urlForQueryRecord
+       * @param {Object} query
+       * @param {String} modelName
+       * @return {String} url
+       */
+      urlForQueryRecord: function (query, modelName) {
+        return this._buildURL(modelName);
+      },
+
       /**
        * @method urlForFindMany
        * @param {Array} ids
@@ -2612,7 +2625,7 @@
     var ember$data$lib$serializers$json$serializer$$map = Ember.ArrayPolyfills.map;
     var ember$data$lib$serializers$json$serializer$$merge = Ember.merge;
 
-    /*
+    /**
       Ember Data 2.0 Serializer:
 
       In Ember Data a Serializer is used to serialize and deserialize
@@ -2634,8 +2647,10 @@
           house: DS.belongsTo('location'),
         });
       ```
+
       ```js
-        { id: 1,
+        {
+          id: 1,
           name: 'Sebastian',
           friends: [3, 4],
           links: {
@@ -2643,6 +2658,7 @@
           }
         }
       ```
+
       to JSONApi format that the Ember Data store expects.
 
       You can customize how JSONSerializer processes it's payload by passing options in
@@ -2670,23 +2686,6 @@
       @namespace DS
       @extends DS.Serializer
     */
-
-    /**
-      In Ember Data a Serializer is used to serialize and deserialize
-      records when they are transferred in and out of an external source.
-      This process involves normalizing property names, transforming
-      attribute values and serializing relationships.
-
-      For maximum performance Ember Data recommends you use the
-      [RESTSerializer](DS.RESTSerializer.html) or one of its subclasses.
-
-      `JSONSerializer` is useful for simpler or legacy backends that may
-      not support the http://jsonapi.org/ spec.
-
-      @class JSONSerializer
-      @namespace DS
-      @extends DS.Serializer
-    */
     var ember$data$lib$serializers$json$serializer$$JSONSerializer = ember$data$lib$system$serializer$$default.extend({
 
       /**
@@ -2785,7 +2784,7 @@
         return data;
       },
 
-      /*
+      /**
         The `normalizeResponse` method is used to normalize a payload from the
         server to a JSON-API Document.
          http://jsonapi.org/format/#document-structure
@@ -2837,7 +2836,7 @@
         }
       },
 
-      /*
+      /**
         @method normalizeFindRecordResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2850,7 +2849,7 @@
         return this.normalizeSingleResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeQueryRecordResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2863,7 +2862,7 @@
         return this.normalizeSingleResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeFindAllResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2876,7 +2875,7 @@
         return this.normalizeArrayResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeFindBelongsToResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2889,7 +2888,7 @@
         return this.normalizeSingleResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeFindHasManyResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2902,7 +2901,7 @@
         return this.normalizeArrayResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeFindManyResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2915,7 +2914,7 @@
         return this.normalizeArrayResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeQueryResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2928,7 +2927,7 @@
         return this.normalizeArrayResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeCreateRecordResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2941,7 +2940,7 @@
         return this.normalizeSaveResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeDeleteRecordResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2954,7 +2953,7 @@
         return this.normalizeSaveResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeUpdateRecordResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2967,7 +2966,7 @@
         return this.normalizeSaveResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeSaveResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2980,7 +2979,7 @@
         return this.normalizeSingleResponse.apply(this, arguments);
       },
 
-      /*
+      /**
         @method normalizeSingleResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -2993,7 +2992,7 @@
         return this._normalizeResponse(store, primaryModelClass, payload, id, requestType, true);
       },
 
-      /*
+      /**
         @method normalizeArrayResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -3006,7 +3005,7 @@
         return this._normalizeResponse(store, primaryModelClass, payload, id, requestType, false);
       },
 
-      /*
+      /**
         @method _normalizeResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -3108,7 +3107,7 @@
         return hash;
       },
 
-      /*
+      /**
         Returns the resource's ID.
          @method extractId
         @param {Object} modelClass
@@ -3121,7 +3120,7 @@
         return ember$data$lib$system$coerce$id$$default(id);
       },
 
-      /*
+      /**
         Returns the resource's attributes formatted as a JSON-API "attributes object".
          http://jsonapi.org/format/#document-resource-object-attributes
          @method extractAttributes
@@ -3143,7 +3142,7 @@
         return attributes;
       },
 
-      /*
+      /**
         Returns a relationship formatted as a JSON-API "relationship object".
          http://jsonapi.org/format/#document-resource-object-relationships
          @method extractRelationship
@@ -3172,7 +3171,7 @@
         return { id: ember$data$lib$system$coerce$id$$default(relationshipHash), type: relationshipModelName };
       },
 
-      /*
+      /**
         Returns the resource's relationships formatted as a JSON-API "relationships object".
          http://jsonapi.org/format/#document-resource-object-relationships
          @method extractRelationships
@@ -5458,6 +5457,63 @@
     var ember$data$lib$system$store$serializer$response$$map = Ember.ArrayPolyfills.map;
     var ember$data$lib$system$store$serializer$response$$get = Ember.get;
 
+    /**
+      This is a helper method that validates a JSON API top-level document
+
+      The format of a document is described here:
+      http://jsonapi.org/format/#document-top-level
+
+      @method validateDocumentStructure
+      @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') {
+        errors.push('Top level of a JSON API document must be an object');
+      } else {
+        if (!('data' in doc) && !('errors' in doc) && !('meta' in doc)) {
+          errors.push('One or more of the following keys must be present: "data", "errors", "meta".');
+        } else {
+          if ('data' in doc && 'errors' in doc) {
+            errors.push('Top level keys "errors" and "data" cannot both be present in a JSON API document');
+          }
+        }
+        if ('data' in doc) {
+          if (!(doc.data === null || Ember.isArray(doc.data) || typeof doc.data === 'object')) {
+            errors.push('data must be null, an object, or an array');
+          }
+        }
+        if ('meta' in doc) {
+          if (typeof doc.meta !== 'object') {
+            errors.push('meta must be an object');
+          }
+        }
+        if ('errors' in doc) {
+          if (!Ember.isArray(doc.errors)) {
+            errors.push('errors must be an array');
+          }
+        }
+        if ('links' in doc) {
+          if (typeof doc.links !== 'object') {
+            errors.push('links must be an object');
+          }
+        }
+        if ('jsonapi' in doc) {
+          if (typeof doc.jsonapi !== 'object') {
+            errors.push('jsonapi must be an object');
+          }
+        }
+        if ('included' in doc) {
+          if (typeof doc.included !== 'object') {
+            errors.push('included must be an array');
+          }
+        }
+      }
+
+      return errors;
+    }
+
     /**
       This is a helper method that always returns a JSON-API Document.
 
@@ -5478,12 +5534,23 @@
     */
     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 normalizedResponse = serializer.normalizeResponse(store, modelClass, payload, id, requestType);
-        // TODO: Remove after metadata refactor
-        if (normalizedResponse.meta) {
-          store._setMetadataFor(modelClass.modelName, normalizedResponse.meta);
-        }
-        return normalizedResponse;
+        var _ret = (function () {
+          var normalizedResponse = serializer.normalizeResponse(store, modelClass, payload, id, requestType);
+          var validationErrors = [];
+          Ember.runInDebug(function () {
+            validationErrors = ember$data$lib$system$store$serializer$response$$validateDocumentStructure(normalizedResponse);
+          });
+          Ember.assert('normalizeResponse must return a valid JSON API document:\n\t* ' + validationErrors.join('\n\t* '), Ember.isEmpty(validationErrors));
+          // TODO: Remove after metadata refactor
+          if (normalizedResponse.meta) {
+            store._setMetadataFor(modelClass.modelName, normalizedResponse.meta);
+          }
+          return {
+            v: normalizedResponse
+          };
+        })();
+
+        if (typeof _ret === 'object') return _ret.v;
       } else {
         Ember.deprecate('Your custom serializer uses the old version of the Serializer API, with `extract` hooks. Please upgrade your serializers to the new Serializer API using `normalizeResponse` hooks instead.', false, {
           id: 'ds.serializer.extract-hooks-deprecated',
@@ -5897,7 +5964,7 @@
         return hash;
       },
 
-      /*
+      /**
         Normalizes an array of resource payloads and returns a JSON-API Document
         with primary data and, if any, included data as `{ data, included }`.
          @method normalizeArray
@@ -5936,7 +6003,7 @@
         return documentHash;
       },
 
-      /*
+      /**
         @method _normalizeResponse
         @param {DS.Store} store
         @param {DS.Model} primaryModelClass
@@ -7542,7 +7609,7 @@
     });
 
     var ember$data$lib$core$$DS = Ember.Namespace.create({
-      VERSION: '1.13.7'
+      VERSION: '1.13.8'
     });
 
     if (Ember.libraries) {
@@ -7852,6 +7919,24 @@
     };
 
     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;
@@ -7921,6 +8006,37 @@
         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.
@@ -9644,7 +9760,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
@@ -9709,7 +9825,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
@@ -9739,11 +9855,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);
         }
@@ -9772,8 +9888,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");
         }
       },
 
@@ -9803,10 +9919,10 @@
       */
       save: function () {
         var manyArray = this;
-        var promiseLabel = 'DS: ManyArray#save ' + ember$data$lib$system$many$array$$get(this, 'type');
-        var promise = Ember.RSVP.all(this.invoke('save'), promiseLabel).then(function (array) {
+        var promiseLabel = "DS: ManyArray#save " + ember$data$lib$system$many$array$$get(this, "type");
+        var promise = Ember.RSVP.all(this.invoke("save"), promiseLabel).then(function (array) {
           return manyArray;
-        }, null, 'DS: ManyArray#save return ManyArray');
+        }, null, "DS: ManyArray#save return ManyArray");
 
         return ember$data$lib$system$promise$proxies$$PromiseArray.create({ promise: promise });
       },
@@ -9819,11 +9935,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);
@@ -9837,9 +9953,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);
       },
@@ -9850,11 +9966,39 @@
         @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
+        });
       }
     });
 
@@ -12460,7 +12604,7 @@
         implement them.
          This method returns a promise, which is resolved with a `RecordArray`
         once the server returns.
-         @method query
+         @method findQuery
         @param {String} modelName
         @param {any} query an opaque query to be used by the adapter
         @return {Promise} promise
@@ -13716,7 +13860,7 @@
 
     var ember$data$lib$serializers$json$api$serializer$$default = ember$data$lib$serializers$json$serializer$$default.extend({
 
-      /*
+      /**
         This is only to be used temporarily during the transition from the old
         serializer API to the new one.
          `JSONAPISerializer` only supports the new Serializer API.
@@ -13724,7 +13868,7 @@
       */
       isNewSerializerAPI: true,
 
-      /*
+      /**
         @method _normalizeDocumentHelper
         @param {Object} documentHash
         @return {Object}
@@ -13745,7 +13889,7 @@
         return documentHash;
       },
 
-      /*
+      /**
         @method _normalizeRelationshipDataHelper
         @param {Object} relationshipDataHash
         @return {Object}
@@ -13757,7 +13901,7 @@
         return relationshipDataHash;
       },
 
-      /*
+      /**
         @method _normalizeResourceHelper
         @param {Object} resourceHash
         @return {Object}
@@ -13804,7 +13948,7 @@
         return normalizedPayload;
       },
 
-      /*
+      /**
         @method extractAttributes
         @param {DS.Model} modelClass
         @param {Object} resourceHash
@@ -13827,7 +13971,7 @@
         return attributes;
       },
 
-      /*
+      /**
         @method extractRelationship
         @param {Object} relationshipHash
         @return {Object}
@@ -13845,7 +13989,7 @@
         return relationshipHash;
       },
 
-      /*
+      /**
         @method extractRelationships
         @param {Object} modelClass
         @param {Object} resourceHash
@@ -13870,8 +14014,8 @@
         return relationships;
       },
 
-      /*
-        @method extractType
+      /**
+        @method _extractType
         @param {DS.Model} modelClass
         @param {Object} resourceHash
         @return {String}
@@ -13899,7 +14043,7 @@
         return ember$inflector$lib$lib$system$string$$pluralize(modelName);
       },
 
-      /*
+      /**
         @method normalize
         @param {DS.Model} modelClass
         @param {Object} resourceHash