active-model-adapter-source 1.13.6 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk4ZDg4NmUzMmE0MzRkZWIxZGU5NWIzN2YyNjZiMzZmMTU0NGEwNw==
+    NDY2Y2E1NzQ4Njg1MGJmNDY5NWVkMmNmMjdlODMxMmRiYTYzODBjYw==
   data.tar.gz: !binary |-
-    ZWVhNmQ0ZDM3ZDFiZTkwODVkZDFjNjM2ZDEwZDhlMWU4ZTljMWNjYg==
+    MGZkNzBjMWY5YmRkYTI2YzQ3YzRkM2NjMjdhNDQ0NThkNmE3NjlhYQ==
 SHA512:
   metadata.gz: !binary |-
-    ODM3YTNlZDA0YzgzNGFjNzIwNThmMTIwNzRlZjhiMTA2YWYxZWZmNmM2ZmIz
-    NWYxYjg3MDY0NWY5YjhlOGU3YmU5MmRlOTk1YTYzNzQ0MWI0N2E0MDUyOTI3
-    ZDM3MWExZjQ5YTc0YWU5N2VlNjNmOGQ4MGYyNGRkNmVmM2YwODg=
+    N2RlYTYzYmE4MzI3ZGRkYTY2YmI2YWFjZGZkZWY5MWIwZjkwYWIyMmM3Mjgz
+    OWE2NDRlZjQ2OTcwMzY1M2ExODNjOWIyMmE4ODUxN2E3MWZiMjFlZWU3N2Ix
+    MzQ4NTBmYTA0YjJkZmNkNGNhZjA5NTBhOTJhOWVmOGIzMjE2MTU=
   data.tar.gz: !binary |-
-    OTMzZmI0YjgwYjQzMzQ2ZGFkODJiYzY5NTY0NTA2OTEzMWEzNGFiN2M2Nzgz
-    NWVlNDEyZDU1YjRjMGY2NDRiOGZmOGRhNzliMTc5YzdlNTc3MDYwZjE3YTMx
-    YmI0MGU3ZTcxZjk0NTY5ZjFkNTg2ZjhkZWU3Zjg2NGIzNDQ4MTQ=
+    YTY3YTE3NjEyMGQxM2YyOTMzN2RhMzI3NDJjZWU0MjNjZDFiYTFlNjkxNjY5
+    Y2EzNzZiNmU2YmM4ZWM4NzE0YmM3MWFlODY1ZGRmNjQ1MWU2NTc3YThlNmY3
+    MjA5MTI3Nzk5N2MyN2E4MjMzYzE1OGU4ODk0Y2Y3OTg3YTJkMzE=

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.6
+ * @version   2.0.0
  */
 
 (function() {
@@ -507,7 +507,7 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
     /*
       Does not serialize hasMany relationships by default.
     */
-    serializeHasMany: _ember["default"].K,
+    serializeHasMany: function () {},
 
     /**
      Underscores the JSON root keys when serializing.
@@ -538,8 +538,6 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
       }
     },
 
-    // EXTRACT
-
     /**
       Add extra step to `DS.RESTSerializer.normalize` so links are normalized.
        If your payload looks like:
@@ -594,64 +592,6 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
       }
     },
 
-    /**
-      Normalize the polymorphic type from the JSON.
-       Normalize:
-      ```js
-        {
-          id: "1"
-          minion: { type: "evil_minion", id: "12"}
-        }
-      ```
-       To:
-      ```js
-        {
-          id: "1"
-          minion: { type: "evilMinion", id: "12"}
-        }
-      ```
-       @param {Subclass of DS.Model} typeClass
-      @method normalizeRelationships
-      @private
-    */
-    normalizeRelationships: function (typeClass, hash) {
-
-      if (this.keyForRelationship) {
-        typeClass.eachRelationship(function (key, relationship) {
-          var _this = this;
-
-          var payloadKey, payload;
-          if (relationship.options.polymorphic) {
-            payloadKey = this.keyForAttribute(key, "deserialize");
-            if (!hash.hasOwnProperty(payloadKey)) {
-              return;
-            }
-            payload = hash[payloadKey];
-
-            if (payload && payload.type) {
-              payload.type = this.modelNameFromPayloadKey(payload.type);
-            } else if (payload && relationship.kind === "hasMany") {
-              payload.forEach(function (single) {
-                return single.type = _this.modelNameFromPayloadKey(single.type);
-              });
-            }
-          } else {
-            payloadKey = this.keyForRelationship(key, relationship.kind, "deserialize");
-            if (!hash.hasOwnProperty(payloadKey)) {
-              return;
-            }
-            payload = hash[payloadKey];
-          }
-
-          hash[key] = payload;
-
-          if (key !== payloadKey) {
-            delete hash[payloadKey];
-          }
-        }, this);
-      }
-    },
-
     extractRelationships: function (modelClass, resourceHash) {
       modelClass.eachRelationship(function (key, relationshipMeta) {
         var relationshipKey = this.keyForRelationship(key, relationshipMeta.kind, "deserialize");
@@ -687,32 +627,22 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
     var hash = resourceHash[polymorphicKey];
     if (hash !== null && typeof hash === 'object') {
       if (relationshipMeta.kind === 'belongsTo') {
-        var id = hash.id;
-        var type = hash.type;
-
-        resourceHash[relationshipKey] = { id: id, type: type };
+        resourceHash[relationshipKey] = extractIDAndType(hash);
         // 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;
+      } else if (hash.length) {
+          var hashes = hash;
+          resourceHash[relationshipKey] = hashes.map(extractIDAndType);
         }
     }
   }
 
+  function extractIDAndType(hash) {
+    var id = hash.id;
+    var type = hash.type;
+
+    return { id: id, type: type };
+  }
+
   exports["default"] = ActiveModelSerializer;
 });
 define('index', ['exports', './active-model-adapter', './active-model-serializer'], function (exports, _activeModelAdapter, _activeModelSerializer) {
@@ -723,9 +653,10 @@ define('index', ['exports', './active-model-adapter', './active-model-serializer
 define("initializers/active-model-adapter", ["exports", "active-model-adapter", "active-model-serializer"], function (exports, _activeModelAdapter, _activeModelAdapterActiveModelSerializer) {
   exports["default"] = {
     name: 'active-model-adapter',
-    initialize: function (registry, application) {
-      registry.register('adapter:-active-model', _activeModelAdapter["default"]);
-      registry.register('serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"].extend({ isNewSerializerAPI: true }));
+    initialize: function () {
+      var application = arguments[1] || arguments[0];
+      application.register('adapter:-active-model', _activeModelAdapter["default"]);
+      application.register('serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"]);
     }
   };
 });
@@ -733,29 +664,21 @@ define('instance-initializers/active-model-adapter', ['exports', 'active-model-a
   exports["default"] = {
     name: 'active-model-adapter',
     initialize: function (applicationOrRegistry) {
-      var registry, container;
-      if (applicationOrRegistry.registry && applicationOrRegistry.container) {
+      var registry;
+      if (applicationOrRegistry.registry) {
         // initializeStoreService was registered with an
         // instanceInitializer. The first argument is the application
         // instance.
         registry = applicationOrRegistry.registry;
-        container = applicationOrRegistry.container;
       } else {
         // initializeStoreService was called by an initializer instead of
         // an instanceInitializer. The first argument is a registy. This
         // case allows ED to support Ember pre 1.12
         registry = applicationOrRegistry;
-        if (registry.container) {
-          // Support Ember 1.10 - 1.11
-          container = registry.container();
-        } else {
-          // Support Ember 1.9
-          container = registry;
-        }
       }
 
       registry.register('adapter:-active-model', _activeModelAdapter["default"]);
-      registry.register('serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"].extend({ isNewSerializerAPI: true }));
+      registry.register('serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"]);
     }
   };
 });

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "active-model-adapter",
-  "version": "1.13.6",
+  "version": "2.0.0",
   "repository": "https://github.com/ember-data/active-model-adapter",
   "description": "The default blueprint for ember-cli addons.",
   "directories": {
@@ -26,7 +26,7 @@
     "broccoli-merge-trees": "^0.2.1",
     "broccoli-replace": "^0.3.1",
     "broccoli-stew": "^0.3.2",
-    "ember-cli": "0.2.7",
+    "ember-cli": "^1.13.0",
     "ember-cli-app-version": "0.3.3",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
@@ -35,7 +35,7 @@
     "ember-cli-pretender": "0.4.0",
     "ember-cli-qunit": "0.3.13",
     "ember-cli-uglify": "^1.0.1",
-    "ember-data": "1.0.0-beta.18",
+    "ember-data": "^2.0.0",
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",

metadata

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