Intercom Fork

bower.json

@@ -1,9 +1,9 @@
 {
   "name": "ember-model",
-  "version": "0.0.18",
+  "version": "0.0.22-intercom",
   "main": "ember-model.js",
   "dependencies": {
-    "ember": "2.0.3"
+    "ember": "2.8.3"
   },
   "devDependencies": {
     "qunit": "~1.11"
@@ -14,6 +14,6 @@
     "components"
   ],
   "resolutions": {
-    "ember": "2.0.3"
+    "ember": "2.8.3"
   }
 }

ember-model.js

@@ -1,6 +1,6 @@
 (function() {
 
-var VERSION = '0.0.17';
+var VERSION = '0.0.22-intercom';
 
 if (Ember.libraries) {
   Ember.libraries.register('Ember Model', VERSION);
@@ -191,7 +191,7 @@ Ember.RecordArray = Ember.ArrayProxy.extend(Ember.Evented, {
     var modelClass = this.get('modelClass'),
         self = this,
         promises;
-    
+
     set(this, 'isLoaded', false);
     if (modelClass._findAllRecordArray === this) {
       return modelClass.adapter.findAll(modelClass, this);
@@ -249,7 +249,7 @@ Ember.FilteredRecordArray = Ember.RecordArray.extend({
 
   updateFilterForRecord: function(record) {
     var results = get(this, 'content');
-    if (this.filterFunction(record) && !results.contains(record)) {
+    if (this.filterFunction(record) && !results.includes(record)) {
       results.pushObject(record);
     }
   },
@@ -271,6 +271,7 @@ Ember.FilteredRecordArray = Ember.RecordArray.extend({
   }
 });
 
+
 })();
 
 (function() {
@@ -303,7 +304,7 @@ Ember.ManyArray = Ember.RecordArray.extend({
     var isDirty = false;
 
     for (var i = 0, l = contentLength; i < l; i++) {
-      if (!originalContent.contains(content[i])) {
+      if (!originalContent.includes(content[i])) {
         isDirty = true;
         break;
       }
@@ -315,7 +316,7 @@ Ember.ManyArray = Ember.RecordArray.extend({
   objectAtContent: function(idx) {
     var content = get(this, 'content');
 
-    if (!content.length) { return; }
+    if (!content.length || idx >= content.length) { return; }
 
     // need to add observer if it wasn't materialized before
     var observerNeeded = (content[idx].record) ? false : true;
@@ -1418,9 +1419,9 @@ function getType(record) {
     this.type = get(Ember.lookup, this.type);
 
     if (!this.type) {
-      var store = record.container.lookup('store:main');
-      this.type = store.modelFor(type);
-      this.type.reopenClass({ adapter: store.adapterFor(type) });
+      var emstore = record.container.lookup('emstore:main');
+      this.type = emstore.modelFor(type);
+      this.type.reopenClass({ adapter: emstore.adapterFor(type) });
     }
   }
 
@@ -1480,7 +1481,7 @@ var get = Ember.get,
 
 function storeFor(record) {
   if (record.container) {
-    return record.container.lookup('store:main');
+    return record.container.lookup('emstore:main');
   }
 
   return null;
@@ -1493,9 +1494,9 @@ function getType(record) {
     type = Ember.get(Ember.lookup, this.type);
 
     if (!type) {
-      var store = storeFor(record);
-      type = store.modelFor(this.type);
-      type.reopenClass({ adapter: store.adapterFor(this.type) });
+      var emstore = storeFor(record);
+      type = emstore.modelFor(this.type);
+      type.reopenClass({ adapter: emstore.adapterFor(this.type) });
     }
   }
 
@@ -1523,8 +1524,8 @@ Ember.belongsTo = function(type, options) {
         }
       };
 
-      var store = storeFor(this),
-          value = this.getBelongsTo(key, type, meta, store);
+      var emstore = storeFor(this),
+          value = this.getBelongsTo(key, type, meta, emstore);
       this._registerBelongsTo(meta);
       if (value !== null && meta.options.embedded) {
         value.get('isDirty'); // getter must be called before adding observer
@@ -1583,7 +1584,7 @@ Ember.belongsTo = function(type, options) {
 };
 
 Ember.Model.reopen({
-  getBelongsTo: function(key, type, meta, store) {
+  getBelongsTo: function(key, type, meta, emstore) {
     var idOrAttrs = get(this, '_data.' + key),
         record;
 
@@ -1597,8 +1598,8 @@ Ember.Model.reopen({
       record = type.create({ isLoaded: false, id: id, container: this.container });
       record.load(id, idOrAttrs);
     } else {
-      if (store) {
-        record = store._findSync(meta.type, idOrAttrs);
+      if (emstore) {
+        record = emstore._findSync(meta.type, idOrAttrs);
       } else {
         record = type.find(idOrAttrs);
       }
@@ -2036,11 +2037,11 @@ var DebugAdapter = Ember.DataAdapter.extend({
 
 Ember.onLoad('Ember.Application', function(Application) {
   Application.initializer({
-    name: "data-adapter",
+    name: "em-data-adapter",
 
     initialize: function() {
       var application = arguments[1] || arguments[0];
-      application.register('data-adapter:main', DebugAdapter);
+      application.register('em-data-adapter:main', DebugAdapter);
     }
   });
 });
@@ -2111,20 +2112,20 @@ Ember.Model.Store = Ember.Object.extend({
 Ember.onLoad('Ember.Application', function(Application) {
 
   Application.initializer({
-    name: "store",
+    name: "emstore",
 
     initialize: function() {
       var application = arguments[1] || arguments[0];
-      var store = application.Store || Ember.Model.Store;
-      application.register('store:application', store);
-      application.register('store:main', store);
+      var emstore = application.Store || Ember.Model.Store;
+      application.register('emstore:application', emstore);
+      application.register('emstore:main', emstore);
 
-      application.inject('route', 'store', 'store:main');
-      application.inject('controller', 'store', 'store:main');
+      application.inject('route', 'emstore', 'emstore:main');
+      application.inject('controller', 'emstore', 'emstore:main');
     }
   });
 
 });
 
 
-})();
+})();

package.json

@@ -32,5 +32,5 @@
     "grunt-contrib-watch": "~0.4.4",
     "grunt-ember-s3": "~1.0.2"
   },
-  "version": "0.0.18"
+  "version": "0.0.22-intercom"
 }

packages/ember-model/lib/belongs_to.js

@@ -4,7 +4,7 @@ var get = Ember.get,
 
 function storeFor(record) {
   if (record.container) {
-    return record.container.lookup('store:main');
+    return record.container.lookup('emstore:main');
   }
 
   return null;
@@ -17,9 +17,9 @@ function getType(record) {
     type = Ember.get(Ember.lookup, this.type);
 
     if (!type) {
-      var store = storeFor(record);
-      type = store.modelFor(this.type);
-      type.reopenClass({ adapter: store.adapterFor(this.type) });
+      var emstore = storeFor(record);
+      type = emstore.modelFor(this.type);
+      type.reopenClass({ adapter: emstore.adapterFor(this.type) });
     }
   }
 
@@ -47,8 +47,8 @@ Ember.belongsTo = function(type, options) {
         }
       };
 
-      var store = storeFor(this),
-          value = this.getBelongsTo(key, type, meta, store);
+      var emstore = storeFor(this),
+          value = this.getBelongsTo(key, type, meta, emstore);
       this._registerBelongsTo(meta);
       if (value !== null && meta.options.embedded) {
         value.get('isDirty'); // getter must be called before adding observer
@@ -107,7 +107,7 @@ Ember.belongsTo = function(type, options) {
 };
 
 Ember.Model.reopen({
-  getBelongsTo: function(key, type, meta, store) {
+  getBelongsTo: function(key, type, meta, emstore) {
     var idOrAttrs = get(this, '_data.' + key),
         record;
 
@@ -121,8 +121,8 @@ Ember.Model.reopen({
       record = type.create({ isLoaded: false, id: id, container: this.container });
       record.load(id, idOrAttrs);
     } else {
-      if (store) {
-        record = store._findSync(meta.type, idOrAttrs);
+      if (emstore) {
+        record = emstore._findSync(meta.type, idOrAttrs);
       } else {
         record = type.find(idOrAttrs);
       }

packages/ember-model/lib/debug_adapter.js

@@ -105,11 +105,11 @@ var DebugAdapter = Ember.DataAdapter.extend({
 
 Ember.onLoad('Ember.Application', function(Application) {
   Application.initializer({
-    name: "data-adapter",
+    name: "em-data-adapter",
 
     initialize: function() {
       var application = arguments[1] || arguments[0];
-      application.register('data-adapter:main', DebugAdapter);
+      application.register('em-data-adapter:main', DebugAdapter);
     }
   });
 });

packages/ember-model/lib/filtered_record_array.js

@@ -36,7 +36,7 @@ Ember.FilteredRecordArray = Ember.RecordArray.extend({
 
   updateFilterForRecord: function(record) {
     var results = get(this, 'content');
-    if (this.filterFunction(record) && !results.contains(record)) {
+    if (this.filterFunction(record) && !results.includes(record)) {
       results.pushObject(record);
     }
   },
@@ -56,4 +56,4 @@ Ember.FilteredRecordArray = Ember.RecordArray.extend({
       record.addObserver(filterProperties[i], self, 'updateFilterForRecord');
     }
   }
-});
+});

packages/ember-model/lib/has_many.js

@@ -8,9 +8,9 @@ function getType(record) {
     this.type = get(Ember.lookup, this.type);
 
     if (!this.type) {
-      var store = record.container.lookup('store:main');
-      this.type = store.modelFor(type);
-      this.type.reopenClass({ adapter: store.adapterFor(type) });
+      var emstore = record.container.lookup('emstore:main');
+      this.type = emstore.modelFor(type);
+      this.type.reopenClass({ adapter: emstore.adapterFor(type) });
     }
   }
 

packages/ember-model/lib/has_many_array.js

@@ -26,7 +26,7 @@ Ember.ManyArray = Ember.RecordArray.extend({
     var isDirty = false;
 
     for (var i = 0, l = contentLength; i < l; i++) {
-      if (!originalContent.contains(content[i])) {
+      if (!originalContent.includes(content[i])) {
         isDirty = true;
         break;
       }
@@ -38,7 +38,7 @@ Ember.ManyArray = Ember.RecordArray.extend({
   objectAtContent: function(idx) {
     var content = get(this, 'content');
 
-    if (!content.length) { return; }
+    if (!content.length || idx >= content.length) { return; }
 
     // need to add observer if it wasn't materialized before
     var observerNeeded = (content[idx].record) ? false : true;

packages/ember-model/lib/rest_adapter.js

@@ -154,7 +154,7 @@ Ember.RESTAdapter = Ember.Adapter.extend({
 
 
       Ember.$.ajax(settings);
-   });
+   }, 'ember-model: RESTAdapter#ajax ' + method + ' to ' + url);
   },
 
   _handleRejections: function(method, jqXHR, resolve, reject) {

packages/ember-model/lib/store.js

@@ -1,7 +1,7 @@
 function NIL() {}
 
 Ember.Model.Store = Ember.Object.extend({
-  container: null,
+  //container: null, //NOTE: GJ: see https://github.com/emberjs/ember.js/issues/15322#issuecomment-334132107
 
   modelFor: function(type) {
     return this.container.lookupFactory('model:'+type);
@@ -59,16 +59,16 @@ Ember.Model.Store = Ember.Object.extend({
 Ember.onLoad('Ember.Application', function(Application) {
 
   Application.initializer({
-    name: "store",
+    name: "emstore",
 
     initialize: function() {
       var application = arguments[1] || arguments[0];
       var store = application.Store || Ember.Model.Store;
-      application.register('store:application', store);
-      application.register('store:main', store);
+      application.register('emstore:application', store);
+      application.register('emstore:main', store);
 
-      application.inject('route', 'store', 'store:main');
-      application.inject('controller', 'store', 'store:main');
+      application.inject('route', 'emstore', 'emstore:main');
+      application.inject('controller', 'emstore', 'emstore:main');
     }
   });
 

packages/ember-model/lib/version.js

@@ -1,4 +1,4 @@
-var VERSION = '0.0.17';
+var VERSION = '0.0.22-intercom';
 
 if (Ember.libraries) {
   Ember.libraries.register('Ember Model', VERSION);

packages/ember-model/tests/adapter/find_query_test.js

@@ -19,12 +19,11 @@ test(".find({}) delegates to the adapter's findQuery method", function() {
   var records = Model.find({query: "derp"});
   ok(records instanceof Ember.RecordArray, "RecordArray is returned");
   ok(!records.get('isLoaded'), "RecordArray isn't initially loaded");
-  ok(!(Model.recordArrays || Ember.A()).contains(records), "The RecordArray created by a findQuery should not be registered");
+  ok(!(Model.recordArrays || Ember.A()).includes(records), "The RecordArray created by a findQuery should not be registered");
 
   stop();
   records.one('didLoad', function() {
     start();
     ok(records.get('isLoaded'), "RecordArray is loaded after resolved");
   });
 });
-

packages/ember-model/tests/belongs_to_test.js

@@ -335,7 +335,7 @@ test("should be able to set nonembedded relationship to null", function() {
   });
 
   equal(post.get('author'), null);
-  deepEqual(post.toJSON(), {id: 1, author_id: null});
+  deepEqual(post.toJSON(), {id: 1, author_id: undefined});
 });
 
 test("materializing the relationship should should not dirty the record", function() {
@@ -721,4 +721,4 @@ test("non embedded belongsTo should return a record with a container", function(
   var article = Ember.run(comment, comment.get, 'article');
   ok(article.get('container'));
   Ember.run(App, 'destroy');
-});
+});