Support multi-word relation names

Author: Lee Richmond

src/util/deserialize.ts

@@ -2,6 +2,7 @@
 
 import Config from '../configuration';
 import Model from '../model';
+import { camelize } from './string';
 
 export default function deserialize(resource : japiResource, payload: japiDoc) : Model {
   let deserializer = new Deserializer(payload);
@@ -33,7 +34,8 @@ class Deserializer {
     let record = this.findModel(resource);
     if (!record) {
       if (isRelation) {
-        resource = this.findResource(resource);
+        let hydrated = this.findResource(resource);
+        if (hydrated) resource = hydrated;
       }
       record = this._deserialize(resource);
     }
@@ -68,10 +70,11 @@ class Deserializer {
 
   _iterateValidRelationships(instance, relationships, callback) {
     for (let key in relationships) {
-      if (instance.klass.attributeList.indexOf(key) >= 0) {
+      let relationName = camelize(key);
+      if (instance.klass.attributeList.indexOf(relationName) >= 0) {
         let relationData = relationships[key].data;
         if(!relationData) continue; // only links, empty, etc
-        callback(key, relationData);
+        callback(relationName, relationData);
       }
     }
   }

test/fixtures.ts

@@ -18,10 +18,11 @@ let Author = Person.extend({
     jsonapiType: 'authors'
   },
 
-  books: hasMany(),
-  tags:  hasMany(),
-  genre: belongsTo('genres'),
-  bio:   hasOne('bios')
+  multiWords: hasMany('multi_words'),
+  books:      hasMany(),
+  tags:       hasMany(),
+  genre:      belongsTo('genres'),
+  bio:        hasOne('bios')
 });
 
 class Book extends Model {
@@ -50,6 +51,10 @@ class Tag extends Model {
   name: string = attr()
 }
 
+class MultiWord extends Model {
+  static jsonapiType = 'multi_words';
+}
+
 Config.setup();
 
 export { Author, Person, Book, Genre, Bio, Tag };

test/unit/model-test.ts

@@ -23,6 +23,12 @@ describe('Model', function() {
               type: 'unknowns'
             }
           },
+          multi_words: {
+            data: [{
+              id: '1',
+              type: 'multi_words'
+            }]
+          },
           tags: {},
           genre: {
             data: {
@@ -105,6 +111,11 @@ describe('Model', function() {
       })
     });
 
+    it('camelizes relationship names', function() {
+      let instance = Model.fromJsonapi(doc.data, doc);
+      expect(instance.multiWords.length).to.eq(1);
+    });
+
     it('does not assign unknown attributes', function() {
       let instance = Model.fromJsonapi(doc.data, doc);
       expect(instance).to.not.have.property('unknown');