active-model-adapter-source 1.13.3 → 1.13.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjcyOWE1YjIxMTgwYjQ5NjU3ZjAwNDA3NmY5NjQ0NDkzMWYxMzQ1MQ==
+    Mzg4YTAwNzdhYzQ3ZDUxZDg3OWE2NmFlOWFmNTE5NjdiOWYxYTUyOA==
   data.tar.gz: !binary |-
-    OWE2MWIwYzAwNjFkYTAzZjRkODYwMGQ1ZDc1MDY0OGNiMjk5NzAwNA==
+    NjQ0Nzg4Yzc2Yjg4NDY3ZGIxYjJjYmRkMjZkMDI1MmYwZTNjOGQ1Yw==
 SHA512:
   metadata.gz: !binary |-
-    NTlmOGRkMTcyNWFmZDEzMTViMjBjNGFmZTdiNzEwMjliZDcwNDE0N2NjMjVj
-    MDhiMTFiZDRlZDhhZjI4NjhmMDczY2JiYjA0OTBhYjFhOGI0MzE2MjllZjA3
-    Yzk1MmJjMzM2MTZjNjEyYzI2ODEzNzNmMzQ4MGJlNGFjNjE4NmY=
+    YmZkMWUyOTlmYjM3MGZkZTcwNzI5YzE5OWZhY2IyMGNjOTgyZGE1ZTFjMWYx
+    NDZiNjI4YzhmOTlkNjY3MjYzNmQzZWMxMzNmNDRhZTgwYmY5MGRlZmI4NjRh
+    MjA2ZGZiMjZkZDRiNzAxYjYwOGY0ZjM5ZDM3ODY2ZGMyNWY5NzI=
   data.tar.gz: !binary |-
-    OWM1MmEwYTFhMmQ1MzVjODIwZWY1ODY4NjM0NWQ4YzgwNjczMGI2NTcyYzVk
-    MzM4YTk0MjVmMGY0NWRjMTNmNjBkZjM4NDk0YzZiNjdhYmFkZGM2YWEwNTk1
-    OTE0NmMwYjRkOTU2ZTFkYWZlY2U2MmMwMGM1N2FmMWRlNmViYTc=
+    ZjMzYmZkYjI0OWFhMGMxOWI4OGM2MGNmNzU5YTAzMGU2MGNmNzkxOTk4ZmNl
+    ZGU3NWZkNWNmZDg1NzUwY2UwMjJiNDk4N2Q1OWVjNjJjOGMwOGY3N2Q3MTZk
+    NGJkMWNhYTc1ODcxOThlYWNiZGVhMTA1NTI1ZTM1NWQxNzNlNDU=

data/dist/active-model-adapter.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.13.3
+ * @version   1.13.4
  */
 
 (function() {
@@ -647,12 +647,68 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
         }, this);
       }
     },
+
+    extractRelationships: function (modelClass, resourceHash) {
+      modelClass.eachRelationship(function (key, relationshipMeta) {
+        var relationshipKey = this.keyForRelationship(key, relationshipMeta.kind, 'deserialize');
+
+        // prefer the format the AMS gem expects, e.g.:
+        // relationship: {id: id, type: type}
+        if (relationshipMeta.options.polymorphic) {
+          extractPolymorphicRelationships(key, relationshipMeta, resourceHash, relationshipKey);
+        }
+        // If the preferred format is not found, use {relationship_name_id, relationship_name_type}
+        if (resourceHash.hasOwnProperty(relationshipKey) && typeof resourceHash[relationshipKey] !== 'object') {
+          var polymorphicTypeKey = this.keyForRelationship(key) + '_type';
+          if (resourceHash[polymorphicTypeKey] && relationshipMeta.options.polymorphic) {
+            var id = resourceHash[relationshipKey];
+            var type = resourceHash[polymorphicTypeKey];
+            delete resourceHash[polymorphicTypeKey];
+            delete resourceHash[relationshipKey];
+            resourceHash[relationshipKey] = { id: id, type: type };
+          }
+        }
+      }, this);
+      return this._super.apply(this, arguments);
+    },
+
     modelNameFromPayloadKey: function (key) {
       var convertedFromRubyModule = singularize(key.replace('::', '/'));
       return normalizeModelName(convertedFromRubyModule);
     }
   });
 
+  function extractPolymorphicRelationships(key, relationshipMeta, resourceHash, relationshipKey) {
+    var polymorphicKey = decamelize(key);
+    if (polymorphicKey in resourceHash && typeof resourceHash[polymorphicKey] === 'object') {
+      if (relationshipMeta.kind === 'belongsTo') {
+        var hash = resourceHash[polymorphicKey];
+        var id = hash.id;
+        var type = hash.type;
+
+        resourceHash[relationshipKey] = { id: id, type: type };
+        // otherwise hasMany
+      } else {
+        var hashes = resourceHash[polymorphicKey];
+
+        if (!hashes) {
+          return;
+        }
+
+        // TODO: replace this with map when ActiveModelAdapter branches for Ember Data 2.0
+        var array = [];
+        for (var i = 0, _length = hashes.length; i < _length; i++) {
+          var hash = hashes[i];
+          var id = hash.id;
+          var type = hash.type;
+
+          array.push({ id: id, type: type });
+        }
+        resourceHash[relationshipKey] = array;
+      }
+    }
+  }
+
   exports["default"] = ActiveModelSerializer;
 });
 define('index', ['exports', './active-model-adapter', './active-model-serializer'], function (exports, _activeModelAdapter, _activeModelSerializer) {

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "active-model-adapter",
-  "version": "1.13.3",
-  "repository": "",
+  "version": "1.13.4",
+  "repository": "https://github.com/ember-data/active-model-adapter",
   "description": "The default blueprint for ember-cli addons.",
   "directories": {
     "doc": "doc",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-model-adapter-source
 version: !ruby/object:Gem::Version
-  version: 1.13.3
+  version: 1.13.4
 platform: ruby
 authors:
 - Igor Terzic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-data-source