Serializer rework

addon/assert.js

@@ -14,7 +14,7 @@ export default function assert(bool, text) {
   }
 
   if (!bool) {
-    throw new MirageError(text || 'Assertion failed');
+    throw new MirageError(text.replace(/^ +/gm, '') || 'Assertion failed');
   }
 }
 

addon/orm/associations/belongs-to.js

@@ -131,13 +131,13 @@ class BelongsTo extends Association {
 
     /*
       object.createParent
-        - creates an associated parent, persists directly to db,
-          and updates the owner's foreign key
+        - creates a new saved associated parent, and immediately persists both models
     */
     modelPrototype[`create${capitalize(key)}`] = function(attrs) {
       let parent = schema[toCollectionName(association.modelName)].create(attrs);
 
-      this[foreignKey] = parent.id;
+      this[key] = parent;
+      this.save();
 
       return parent;
     };

addon/orm/schema.js

@@ -55,6 +55,7 @@ export default class Schema {
     ModelClass.prototype.associationKeys = [];       // ex: address.user, user.addresses
     ModelClass.prototype.associationIdKeys = [];     // ex: address.user_id, user.address_ids. may or may not be a fk.
 
+    let fksAddedFromThisModel = {};
     for (let associationProperty in ModelClass.prototype) {
       if (ModelClass.prototype[associationProperty] instanceof Association) {
         let association = ModelClass.prototype[associationProperty];
@@ -64,8 +65,17 @@ export default class Schema {
 
         // Update the registry with this association's foreign keys. This is
         // essentially our "db migration", since we must know about the fks.
-        let result = association.getForeignKeyArray();
-        let [ fkHolder, fk ] = result;
+        let [ fkHolder, fk ] = association.getForeignKeyArray();
+
+        fksAddedFromThisModel[fkHolder] = fksAddedFromThisModel[fkHolder] || [];
+        assert(
+          !_includes(fksAddedFromThisModel[fkHolder], fk),
+          `Your '${type}' model definition has multiple possible inverse relationships of type '${fkHolder}'.
+
+          Please read the associations guide and specify explicit inverses: http://www.ember-cli-mirage.com/docs/v0.2.x/models/#associations`
+        );
+        fksAddedFromThisModel[fkHolder].push(fk);
+
         this._addForeignKeyToRegistry(fkHolder, fk);
 
         // Augment the Model's class with any methods added by this association

addon/route-handlers/shorthands/base.js

@@ -25,7 +25,12 @@ export default class BaseShorthandRouteHandler extends BaseRouteHandler {
     }
   }
 
-  handleStringShorthand() { }
-  handleArrayShorthand() { }
+  // handleStringShorthand() {
+  //
+  // }
+  //
+  // handleArrayShorthand() {
+  //
+  // }
 
 }

addon/serializer-registry.js

@@ -20,6 +20,8 @@ export default class SerializerRegistry {
   }
 
   serialize(response, request) {
+    this.request = request;
+
     if (this._isModelOrCollection(response)) {
       let serializer = this.serializerFor(response.modelName);
 
@@ -29,9 +31,9 @@ export default class SerializerRegistry {
         let serializer = this.serializerFor(collection.modelName);
 
         if (serializer.embed) {
-          json[pluralize(collection.modelName)] = serializer._serializeModelOrCollection(collection, request);
+          json[pluralize(collection.modelName)] = serializer.serialize(collection, request);
         } else {
-          json = _assign(json, serializer._serializeSideloadedModelOrCollection(collection, request));
+          json = _assign(json, serializer.serialize(collection, request));
         }
 
         return json;
@@ -42,7 +44,7 @@ export default class SerializerRegistry {
     }
   }
 
-  serializerFor(type, { explicit = false, included = [], alreadySerialized = {} } = {}) {
+  serializerFor(type, { explicit = false } = {}) {
     let SerializerForResponse = this._serializerMap && (this._serializerMap[camelize(type)]);
 
     if (explicit) {
@@ -59,7 +61,7 @@ export default class SerializerRegistry {
       );
     }
 
-    return new SerializerForResponse(this, type, included, alreadySerialized);
+    return new SerializerForResponse(this, type, this.request);
   }
 
   _isModel(object) {