active-model-adapter-source 2.0.1 → 2.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzg5OGYwYTNkYmJiNWQ3YzdkM2NhMTBmMDc2ZTlmN2YxODU3OGQzNA==
+    NWRlOTU5OGQ5ODI4NGViZmY2YTVjMDZkMjc2MGEyZGQ2ODRiMTdjNA==
   data.tar.gz: !binary |-
-    OGE4MzZlMjVkYzc2YTZiMDYzZTI3ZjdjMjcwMWU3YzcxMmM4YzQ2ZQ==
+    M2UwNmE3MDM4ZmIyZjI3YTU3Y2RkZjg1NmJjYmE5NjJlMDIwMGZlZg==
 SHA512:
   metadata.gz: !binary |-
-    ZTBkNzk5N2JiM2M4ODVmZDcxOThhOTc2NTllN2IyOTI2MTA1NWRiMjhiOWIx
-    OGYzMDU0OGQ4NzNlNTFjZGNlMWEyNjQwMjZhMmQ1NzhmMmRjNGE3Y2MwODk3
-    NjNkZmZkZTRjODBlZjYyNmE2ZTcyMDIwMTYxZjE2MGUwOTg4NDY=
+    NjlhZDQyNzE3MzQ4OTcxMGExYjc5NTYzZTJmYjdkMTkzMWE0YzE0ZjI4MTAw
+    OWFkZTQ4N2YzMWYzMGMxMzVmM2JiMjdkNjI5MTk3MzVkODIxZTUwOTYxZTNh
+    YWM5Yjg5Mzc0MjUyOThkNWZmNWJkOWEzNzAyZDMyNTQxYmVjZDQ=
   data.tar.gz: !binary |-
-    MDg4YjI0OGE2OTBiMWU3ODE2MDBlZmM2Mjc4MGQ4NTQxOGM1ZGVmZDQyNWNi
-    YTgxMTE2ZjQzMTM2YjAxNDQ2YzU2MDRlYmNjODM1MDNhMDA3Y2U2NDkyMzFh
-    MTgxNDZhMTZjMmQzZDFlMTFiMTAyZTRiOTY4YjZmNzNlYTVlMjY=
+    ZDY0ZGViN2Y4Yzg3Njg4ZjAzMzIwNTllZjgwOTA2ZDYxNjZjMTI0OGE0OTdk
+    YWFhYzQ0MmE5ZjRiOGUyM2IyMzI3MTA5MTkxOGFlM2JlZTg2NjcxMjhmNzll
+    NzE1Nzc2ZjgxNTExZWFjYjlhOTdkNDc1ZTAwNmM3NjJhMzY4NmM=

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   2.0.1
+ * @version   2.0.2
  */
 
 (function() {
@@ -214,6 +214,9 @@ define('active-model-adapter', ['exports', 'ember', 'ember-data'], function (exp
   var errorsHashToArray = _emberData["default"].errorsHashToArray;
   var RESTAdapter = _emberData["default"].RESTAdapter;
   var _Ember$String = _ember["default"].String;
+  var pluralize = _Ember$String.pluralize;
+  var decamelize = _Ember$String.decamelize;
+  var underscore = _Ember$String.underscore;
 
   /**
     @module ember-data
@@ -310,9 +313,6 @@ define('active-model-adapter', ['exports', 'ember', 'ember-data'], function (exp
     @extends DS.RESTAdapter
   **/
 
-  var pluralize = _Ember$String.pluralize;
-  var decamelize = _Ember$String.decamelize;
-  var underscore = _Ember$String.underscore;
   var ActiveModelAdapter = RESTAdapter.extend({
     defaultSerializer: '-active-model',
     /**
@@ -371,6 +371,7 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
   var camelize = _Ember$String.camelize;
   var underscore = _Ember$String.underscore;
   var RESTSerializer = _emberData["default"].RESTSerializer;
+  var normalizeModelName = _emberData["default"].normalizeModelName;
 
   /**
     The ActiveModelSerializer is a subclass of the RESTSerializer designed to integrate
@@ -459,7 +460,6 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
     @namespace DS
     @extends DS.RESTSerializer
   */
-  var normalizeModelName = _emberData["default"].normalizeModelName;
   var ActiveModelSerializer = RESTSerializer.extend({
     // SERIALIZE
 
@@ -626,23 +626,10 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
     var polymorphicKey = decamelize(key);
     var hash = resourceHash[polymorphicKey];
     if (hash !== null && typeof hash === 'object') {
-      if (relationshipMeta.kind === 'belongsTo') {
-        resourceHash[relationshipKey] = extractIDAndType(hash);
-        // otherwise hasMany
-      } else if (hash.length) {
-          var hashes = hash;
-          resourceHash[relationshipKey] = hashes.map(extractIDAndType);
-        }
+      resourceHash[relationshipKey] = hash;
     }
   }
 
-  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) {
@@ -664,21 +651,21 @@ define('instance-initializers/active-model-adapter', ['exports', 'active-model-a
   exports["default"] = {
     name: 'active-model-adapter',
     initialize: function (applicationOrRegistry) {
-      var registry;
-      if (applicationOrRegistry.registry) {
+      var register;
+      if (applicationOrRegistry.register) {
+        // initializeStoreService was called by an initializer instead of
+        // an instanceInitializer. The first argument is a registry for
+        // Ember pre 1.12, or an application instance for Ember >2.1.
+        register = applicationOrRegistry.register;
+      } else {
         // initializeStoreService was registered with an
         // instanceInitializer. The first argument is the application
         // instance.
-        registry = applicationOrRegistry.registry;
-      } 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;
+        register = applicationOrRegistry.registry.register;
       }
 
-      registry.register('adapter:-active-model', _activeModelAdapter["default"]);
-      registry.register('serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"]);
+      register.call(applicationOrRegistry, 'adapter:-active-model', _activeModelAdapter["default"]);
+      register.call(applicationOrRegistry, 'serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"]);
     }
   };
 });

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "active-model-adapter",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "repository": "https://github.com/ember-data/active-model-adapter",
   "description": "The default blueprint for ember-cli addons.",
   "directories": {
@@ -40,7 +40,9 @@
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
     "ember-try": "0.0.7",
-    "ember-watson": "^0.5.7"
+    "ember-watson": "^0.5.7",
+    "github": "^0.2.4",
+    "rsvp": "^3.1.0"
   },
   "keywords": [
     "ember-addon"

metadata

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