cleanup

emberjs · Jun 1, 2015 · 077d939 · 077d939
1 parent cf1b2d5
commit 077d939
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 38 deletions.
diff --git a/packages/ember-data/lib/system/many-array.js b/packages/ember-data/lib/system/many-array.js
@@ -67,14 +67,14 @@ export default Ember.Object.extend(Ember.MutableArray, Ember.Evented, {
 
   flushCanonical: function() {
     //TODO make this smarter, currently its plenty stupid
-    var toSet = filter.call(this.canonicalState, function(record) {
-      return !record.isDeleted();
+    var toSet = filter.call(this.canonicalState, function(internalModel) {
+      return !internalModel.isDeleted();
     });
 
     //a hack for not removing new records
     //TODO remove once we have proper diffing
-    var newRecords = this.currentState.filter(function(record) {
-      return record.isNew();
+    var newRecords = this.currentState.filter(function(internalModel) {
+      return internalModel.isNew();
     });
     toSet = toSet.concat(newRecords);
     var oldLength = this.length;

diff --git a/packages/ember-data/lib/system/model/internal-model.js b/packages/ember-data/lib/system/model/internal-model.js
@@ -31,7 +31,7 @@ function retrieveFromCurrentState(key) {
   };
 }
 
-/*
+/**
   `InternalModel` is the Model class that we use internally inside Ember Data to represent models.
   Internal ED methods should only deal with `InternalModel` objects. It is a fast, plain Javascript class.
 
@@ -43,9 +43,11 @@ function retrieveFromCurrentState(key) {
 
   We need to make sure that the properties from `InternalModel` are correctly exposed/proxied on `Model`
   if they are needed.
+
+  @class InternalModel
 */
 
-var InternalModel = function(type, id, store, container, data) {
+var InternalModel = function InternalModel(type, id, store, container, data) {
   this.type = type;
   this.id = id;
   this.store = store;
@@ -60,6 +62,7 @@ var InternalModel = function(type, id, store, container, data) {
   this._inFlightAttributes = Ember.create(null);
   this._relationships = {};
   this.currentState = RootState.empty;
+  this.isReloading = false;
   /*
     implicit relationships are relationship which have not been declared but the inverse side exists on
     another record somewhere

diff --git a/packages/ember-data/lib/system/record-arrays/adapter-populated-record-array.js b/packages/ember-data/lib/system/record-arrays/adapter-populated-record-array.js
@@ -43,14 +43,14 @@ export default RecordArray.extend({
     var meta = store.metadataFor(type);
 
     //TODO Optimize
-    var refs = Ember.A(records).mapBy('_internalModel');
+    var internalModels = Ember.A(records).mapBy('_internalModel');
     this.setProperties({
-      content: Ember.A(refs),
+      content: Ember.A(internalModels),
       isLoaded: true,
       meta: cloneNull(meta)
     });
 
-    refs.forEach(function(record) {
+    internalModels.forEach(function(record) {
       this.manager.recordArraysForRecord(record).add(this);
     }, this);
 

diff --git a/packages/ember-data/lib/system/relationships/state/belongs-to.js b/packages/ember-data/lib/system/relationships/state/belongs-to.js
@@ -106,7 +106,7 @@ BelongsToRelationship.prototype.removeCanonicalRecordFromOwn = function(record)
 
 BelongsToRelationship.prototype.findRecord = function() {
   if (this.inverseRecord) {
-    return this.store._findByRecord(this.inverseRecord);
+    return this.store._findByInternalModel(this.inverseRecord);
   } else {
     return Ember.RSVP.Promise.resolve(null);
   }

diff --git a/packages/ember-data/lib/system/snapshot.js b/packages/ember-data/lib/system/snapshot.js
@@ -24,7 +24,7 @@ function Snapshot(internalModel) {
     this._attributes[keyName] = get(record, keyName);
   }, this);
 
-  this.id = get(internalModel, 'id');
+  this.id = internalModel.id;
   this._internalModel = internalModel;
   this.type = internalModel.type;
   this.modelName = internalModel.type.modelName;

diff --git a/packages/ember-data/lib/system/store.js b/packages/ember-data/lib/system/store.js
@@ -618,7 +618,7 @@ Store = Service.extend({
     var type = this.modelFor(modelName);
     var internalModel = this._internalModelForId(type, id);
 
-    return this._findByRecord(internalModel, preload);
+    return this._findByInternalModel(internalModel, preload);
   },
 
   _findByInternalModel: function(internalModel, preload) {
@@ -637,25 +637,6 @@ Store = Service.extend({
 
     return promiseRecord(fetchedInternalModel || internalModel, "DS: Store#findByRecord " + internalModel.typeKey + " with id: " + get(internalModel, 'id'));
   },
-
-
-  _findByRecord: function(record, preload) {
-    var fetchedRecord;
-
-    if (preload) {
-      record._preloadData(preload);
-    }
-
-    if (record.isEmpty()) {
-      fetchedRecord = this.scheduleFetch(record);
-      //TODO double check about reloading
-    } else if (record.isLoading()) {
-      fetchedRecord = record._loadingPromise;
-    }
-
-    return promiseRecord(fetchedRecord || record, "DS: Store#findByRecord " + record.modelName + " with id: " + get(record, 'id'));
-  },
-
   /**
     This method makes a series of requests to the adapter's `find` method
     and returns a promise that resolves once they are all loaded.
@@ -922,16 +903,13 @@ Store = Service.extend({
   /**
     @method findMany
     @private
-    @param {DS.Model} owner
-    @param {Array} records
-    @param {String or subclass of DS.Model} type
-    @param {Resolver} resolver
+    @param {Array} internalModels
     @return {Promise} promise
   */
-  findMany: function(records) {
+  findMany: function(internalModels) {
     var store = this;
-    return Promise.all(map(records, function(record) {
-      return store._findByRecord(record);
+    return Promise.all(map(internalModels, function(internalModel) {
+      return store._findByInternalModel(internalModel);
     }));
   },