remove embedded adapter (ember-data-extensions) and use core EmbeddedRecordMixin instead

Author: jelhan

.gitignore

@@ -18,6 +18,3 @@
 .DS_Store
 Thumbs.db
 /coverage/*
-
-# IDE
-/nbproject

app/controllers/poll.js

@@ -39,12 +39,8 @@ export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
 
             // save new user
             newUser.save().then(function(){
-                self.get('model.users').then(function(users){
-                    // assign new user to poll
-                    users.pushObject(newUser);
-                });
-                // reload as workaround for bug: duplicated records after save
-                self.get('model').reload();
+                // assign new user to poll
+                self.get('model.users').pushObject(newUser);
             });
         }
     },

app/index.html

@@ -38,16 +38,13 @@
       <script src="/vendor/handlebars/handlebars.js"></script>
       <script src="/vendor/ember/ember.js"></script>
       <script src="/vendor/ember-data/ember-data.js"></script>
-      <script src="/vendor/ember-data-extensions/dist/embedded-adapter.js"></script>
       <script src="/vendor/floatThead/dist/jquery.floatThead.js"></script>
     <!-- @endif -->
     <!-- @if dist=true -->
       <script src="/vendor/jquery/dist/jquery.min.js"></script>
       <script src="/vendor/handlebars/handlebars.runtime.js"></script>
       <script src="/vendor/ember/ember.prod.js"></script>
       <script src="/vendor/ember-data/ember-data.prod.js"></script>
-      <!-- embedded adapter should use prod version but only works if ember is only prod version -->
-      <script src="/vendor/ember-data-extensions/dist/embedded-adapter.js"></script>
       <script src="/vendor/floatThead/dist/jquery.floatThead.min.js"></script>
     <!-- @endif -->
 

app/models/poll.js

@@ -1,32 +1,47 @@
 export default DS.Model.extend({
+    // relationship
+    users : DS.hasMany('user'),
+    
+    // properties
     encryptedTitle : DS.attr('string'),
     title : Ember.computed.encrypted('encryptedTitle', 'string'),
+    
     encryptedDescription : DS.attr('string'),
     description: Ember.computed.encrypted('encryptedDescription', 'string'),
+    
     encryptedPollType : DS.attr('string'),
     pollType : Ember.computed.encrypted('encryptedPollType', 'string'),
+    
     encryptedAnswerType: DS.attr('string'),
     answerType : Ember.computed.encrypted('encryptedAnswerType', 'string'),
+    
     encryptedAnswers : DS.attr('string'),
     answers : Ember.computed.encrypted('encryptedAnswers', 'array'),
+    
     encryptedOptions : DS.attr('string'),
     options : Ember.computed.encrypted('encryptedOptions', 'array'),
-    users : DS.hasMany('user', {async: true}),
+    
     encryptedCreationDate : DS.attr('string'),
     creationDate : Ember.computed.encrypted('encryptedCreationDate', 'date'),
+    
     encryptedForceAnswer : DS.attr('string'),
     forceAnswer : Ember.computed.encrypted('encryptedForceAnswer', 'boolean'),
+    
     encryptedAnonymousUser : DS.attr('string'),
     anonymousUser : Ember.computed.encrypted('encryptedAnonymousUser', 'boolean'),
+    
     encryptedIsDateTime : DS.attr('string'),
     isDateTime : Ember.computed.encrypted('encryptedIsDateTime', 'boolean'),
 
+    // computed properties
     isFindADate: function() {
         return this.get('pollType') === 'FindADate';
     }.property('pollType'),
+    
     isFreeText: function() {
         return this.get('answerType') === 'FreeText';
     }.property('answerType'),
+    
     isMakeAPoll: function() {
         return this.get('pollType') === 'MakeAPoll';
     }.property('pollType')

app/models/user.js

@@ -1,9 +1,14 @@
 export default DS.Model.extend({
+    // relationship
     poll : DS.belongsTo('poll'),
+    
+    // properties
     encryptedName : DS.attr('string'),
     name : Ember.computed.encrypted('encryptedName', 'string'),
+    
     encryptedSelections : DS.attr('string'),
     selections : Ember.computed.encrypted('encryptedSelections', 'array'),
+    
     encryptedCreationDate : DS.attr('string'),
     creationDate : Ember.computed.encrypted('encryptedCreationDate', 'date')
 });

app/serializers/application.js

@@ -1 +1 @@
-export default DS.EmbeddedSerializer.extend();
+export default DS.RESTSerializer.extend();

app/serializers/poll.js

@@ -1,5 +1,5 @@
-export default DS.EmbeddedSerializer.extend({
-    attrs: {
-        users: {embedded: 'load'}
-    }
+export default App.PostSerializer = DS.RESTSerializer.extend(DS.EmbeddedRecordsMixin, {
+  attrs: {
+    users: {embedded: 'always'}
+  }
 });

bower.json

@@ -18,7 +18,6 @@
     "bootstrap": "~3.2.0",
     "bootstrap-datepicker": "~1.3.0",
     "ember-forms": "f6456c334a07950365ecfebd087596dedc1bdec5",
-    "ember-data-extensions": "~1.0.0",
     "floatThead": "~1.2.8"
   },
   "resolutions": {

public/api.php

@@ -79,7 +79,7 @@
             case "users":
                 // get poll id from user data
                 $data_decoded = json_decode($data);
-                $poll_id = $data_decoded->user->poll_id;
+                $poll_id = $data_decoded->user->poll;
 
                 $newId = $datahandler->writeUser($poll_id, $data);
                 break;