Support async: false relationships

Author: Lee Richmond

addon/mixins/nested-relations.js

@@ -11,9 +11,13 @@ const iterateRelations = function(record, relations, callback) {
   Object.keys(relations).forEach((relationName) => {
     let subRelations = relations[relationName];
 
-    let kind = record.relationshipFor(relationName).kind;
+    let metadata      = record.relationshipFor(relationName);
+    let kind          = metadata.kind;
     let relatedRecord = record.get(relationName);
-    relatedRecord = relatedRecord.get('content');
+
+    if (metadata.options.async !== false) {
+      relatedRecord = relatedRecord.get('content');
+    }
 
     if (relatedRecord) {
       callback(relationName, kind, relatedRecord, subRelations);
@@ -158,6 +162,16 @@ export default Ember.Mixin.create({
         delete(json.data.attributes);
       }
 
+      if (adapterOptions.attributes) {
+        if (!json.data.attributes) {
+          json.data.attributes = {};
+        }
+
+        Object.keys(adapterOptions.attributes).forEach((k) => {
+          json.data.attributes[k] = adapterOptions.attributes[k];
+        });
+      }
+
       let relationships = relationshipsDirective(adapterOptions.relationships);
       processRelationships(relationships, json.data, snapshot.record);
       snapshot.record.set('__recordsJustSaved', savedRecords);

tests/unit/mixins/nested-relations-test.js

@@ -36,6 +36,7 @@ const Post = DS.Model.extend(ModelMixin, NestedRelationsMixin, {
   title: DS.attr('string'),
   genre: DS.belongsTo(),
   author: DS.belongsTo(),
+  asyncFalseAuthor: DS.belongsTo('author', { async: false }),
   tags: DS.hasMany()
 });
 
@@ -208,6 +209,29 @@ test('it serializes one-to-one correctly', function(assert) {
   assert.deepEqual(json, expectedJSON, 'has correct json');
 });
 
+test('it serializes async: false relationships correctly', function(assert) {
+  let post = store.createRecord('post', {
+    asyncFalseAuthor: store.createRecord('author', { name: 'Joe Author' })
+  });
+  let json = serialize(post, { attributes: false, relationships: 'asyncFalseAuthor' });
+  let expectedJSON = {
+    data: {
+      type: 'posts',
+      relationships: {
+        'async-false-author': {
+          data: {
+            type: 'authors',
+            attributes: {
+              name: 'Joe Author'
+            }
+          }
+        }
+      }
+    }
+  };
+  assert.deepEqual(json, expectedJSON, 'has correct json');
+});
+
 test('it serializes has one marked for deletion correctly', function(assert) {
   seedPostWithAuthor();