Merge pull request #3026 from artych/3019-AMS-polymorphic-type-for-na…

…mespaced-models [BUGFIX] AMS polymorphic type for namespaced models
emberjs · May 3, 2015 · 7f86945 · 7f86945
2 parents 8c81d41 + b896329
commit 7f86945
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ### Master
 
+ * Fix ActiveModelSerializer polymorphic type processing for namespaced model names. Now AMS accepts '::' instead of '/'.
+
 ### Release 1.0.0-beta.16.1 (March 24, 2015)
 
  * Use ember-inflector 1.5

diff --git a/packages/activemodel-adapter/lib/system/active-model-serializer.js b/packages/activemodel-adapter/lib/system/active-model-serializer.js
@@ -6,7 +6,7 @@ import RESTSerializer from "ember-data/serializers/rest-serializer";
 
 var forEach = Ember.EnumerableUtils.forEach;
 var camelize =   Ember.String.camelize;
-var capitalize = Ember.String.capitalize;
+var classify = Ember.String.classify;
 var decamelize = Ember.String.decamelize;
 var underscore = Ember.String.underscore;
 
@@ -166,7 +166,9 @@ var ActiveModelSerializer = RESTSerializer.extend({
     if (Ember.isNone(belongsTo)) {
       json[jsonKey] = null;
     } else {
-      json[jsonKey] = capitalize(camelize(belongsTo.typeKey));
+      json[jsonKey] = classify(belongsTo.typeKey).replace(/(\/)([a-z])/g, function(match, separator, chr) {
+        return match.toUpperCase();
+      }).replace('/', '::');
     }
   },
 
@@ -286,6 +288,11 @@ var ActiveModelSerializer = RESTSerializer.extend({
         }
       }, this);
     }
+  },
+  typeForRoot: function(key) {
+    return camelize(singularize(key)).replace(/(^|\:)([A-Z])/g, function(match, separator, chr) {
+      return match.toLowerCase();
+    }).replace('::', '/');
   }
 });
 

diff --git a/...ctivemodel-adapter/tests/integration/active-model-serializer-namespaced-modelname-test.js b/...ctivemodel-adapter/tests/integration/active-model-serializer-namespaced-modelname-test.js
@@ -0,0 +1,118 @@
+var SuperVillain, EvilMinion, YellowMinion, DoomsdayDevice, MediocreVillain, env;
+var run = Ember.run;
+
+module("integration/active_model - AMS-namespaced-model-names", {
+  setup: function() {
+    SuperVillain = DS.Model.extend({
+      firstName:     DS.attr('string'),
+      lastName:      DS.attr('string'),
+      evilMinions:   DS.hasMany("evilMinion")
+    });
+
+    EvilMinion = DS.Model.extend({
+      superVillain: DS.belongsTo('superVillain'),
+      name:         DS.attr('string')
+    });
+    YellowMinion = EvilMinion.extend();
+    DoomsdayDevice = DS.Model.extend({
+      name:         DS.attr('string'),
+      evilMinion:   DS.belongsTo('evilMinion', { polymorphic: true })
+    });
+    MediocreVillain = DS.Model.extend({
+      name:         DS.attr('string'),
+      evilMinions:  DS.hasMany('evilMinion', { polymorphic: true })
+    });
+    env = setupStore({
+      superVillain:   SuperVillain,
+      evilMinion:     EvilMinion,
+      'evilMinions/yellowMinion':   YellowMinion,
+      doomsdayDevice: DoomsdayDevice,
+      mediocreVillain: MediocreVillain
+    });
+    env.store.modelFor('superVillain');
+    env.store.modelFor('evilMinion');
+    env.store.modelFor('evilMinions/yellowMinion');
+    env.store.modelFor('doomsdayDevice');
+    env.store.modelFor('mediocreVillain');
+    env.registry.register('serializer:application', DS.ActiveModelSerializer);
+    env.registry.register('serializer:-active-model', DS.ActiveModelSerializer);
+    env.registry.register('adapter:-active-model', DS.ActiveModelAdapter);
+    env.amsSerializer = env.container.lookup("serializer:-active-model");
+    env.amsAdapter    = env.container.lookup("adapter:-active-model");
+  },
+
+  teardown: function() {
+    run(env.store, 'destroy');
+  }
+});
+
+test("serialize polymorphic", function() {
+  var tom, ray;
+  run(function() {
+    tom = env.store.createRecord('evilMinions/yellowMinion', { name: "Alex", id: "124" });
+    ray = env.store.createRecord(DoomsdayDevice, { evilMinion: tom, name: "DeathRay" });
+  });
+
+  var json = env.amsSerializer.serialize(ray._createSnapshot());
+
+  deepEqual(json, {
+    name: "DeathRay",
+    evil_minion_type: "EvilMinions::YellowMinion",
+    evil_minion_id: "124"
+  });
+});
+
+test("serialize polymorphic when type key is not camelized", function() {
+  YellowMinion.typeKey = 'evil-minions/yellow-minion';
+  var tom, ray;
+  run(function() {
+    tom = env.store.createRecord(YellowMinion, { name: "Alex", id: "124" });
+    ray = env.store.createRecord(DoomsdayDevice, { evilMinion: tom, name: "DeathRay" });
+  });
+
+  var json = env.amsSerializer.serialize(ray._createSnapshot());
+
+  deepEqual(json["evil_minion_type"], "EvilMinions::YellowMinion");
+});
+
+test("extractPolymorphic hasMany", function() {
+  var json_hash = {
+    mediocre_villain: { id: 1, name: "Dr Horrible", evil_minions: [{ type: "EvilMinions::YellowMinion", id: 12 }] },
+    evil_minions:    [{ id: 12, name: "Alex", doomsday_device_ids: [1] }]
+  };
+  var json;
+
+  run(function() {
+    json = env.amsSerializer.extractSingle(env.store, MediocreVillain, json_hash);
+  });
+
+  deepEqual(json, {
+    "id": 1,
+    "name": "Dr Horrible",
+    "evilMinions": [{
+      type: "evilMinions/yellowMinion",
+      id: 12
+    }]
+  });
+});
+
+test("extractPolymorphic", function() {
+  var json_hash = {
+    doomsday_device: { id: 1, name: "DeathRay", evil_minion: { type: "EvilMinions::YellowMinion", id: 12 } },
+    evil_minions:    [{ id: 12, name: "Alex", doomsday_device_ids: [1] }]
+  };
+  var json;
+
+  run(function() {
+    json = env.amsSerializer.extractSingle(env.store, DoomsdayDevice, json_hash);
+  });
+
+  deepEqual(json, {
+    "id": 1,
+    "name": "DeathRay",
+    "evilMinion": {
+      type: "evilMinions/yellowMinion",
+      id: 12
+    }
+  });
+});