build for bower v0.0.14

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-json-api",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "homepage": "https://github.com/plyfe/ember-json-api",
   "authors": [
     "Dali Zheng <dali@series.ac>",
@@ -15,7 +15,7 @@
     "tests"
   ],
   "dependencies": {
-    "ember-data": "https://s3.amazonaws.com/asset-staging-playground/ember-data-1.0.0-patch-beta.10.tar.gz",
+    "ember-data": "https://s3.amazonaws.com/asset-staging-playground/ember-data-1.0.0-patch2-beta.10.tar.gz",
     "ember": "v1.7.0"
   },
   "devDependencies": {

dist/ember-json-api.js

@@ -168,7 +168,7 @@
       /**
        * Patch the extractSingle method, since there are no singular records
        */
-      extractSingle: function(store, primaryType, payload, recordId, requestType) {
+      extractSingle: function(store, primaryType, payload, recordId, requestType, record) {
         var primaryTypeName;
         if (this.keyForAttribute) {
           primaryTypeName = this.keyForAttribute(primaryType.typeKey);
@@ -187,7 +187,7 @@
             json[key] = payload[key];
           }
         }
-        return this._super(store, primaryType, json, recordId, requestType);
+        return this._super(store, primaryType, json, recordId, requestType, record);
       },
 
       /**
@@ -220,17 +220,16 @@
           delete payload.links;
         }
         if (payload.linked) {
-          this.extractLinked(payload.linked);
-          delete payload.linked;
+          this.extractLinked(payload);
         }
         return payload;
       },
 
       /**
        * Extract top-level "linked" containing associated objects
        */
-      extractLinked: function(linked) {
-        var link, values, value, relation;
+      extractLinked: function(payload) {
+        var link, values, value, relation, linked = payload.linked;
         var store = get(this, 'store');
 
         for (link in linked) {
@@ -245,8 +244,16 @@
               delete value.links;
             }
           }
+
+          if (payload[link]){
+            payload[link].pushObjects(linked[link]);
+          }else{
+            payload[link] = linked[link];
+          }
+
+          delete linked[link];
         }
-        store.pushPayload(linked);
+        delete payload.linked;
       },
 
       /**