Merge pull request #4870 from emberjs/hjdivad/cleanup-names-many-array

More record -> internalModel fixes
emberjs · Mar 16, 2017 · c8e45ec · c8e45ec
2 parents 5036248 + d7d77b6
commit c8e45ec
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/addon/-private/system/many-array.js b/addon/-private/system/many-array.js
@@ -150,13 +150,13 @@ export default Ember.Object.extend(Ember.MutableArray, Ember.Evented, {
 
     //a hack for not removing new records
     //TODO remove once we have proper diffing
-    let newRecords = this.currentState.filter(
+    let newInternalModels = this.currentState.filter(
       // only add new records which are not yet in the canonical state of this
       // relationship (a new record can be in the canonical state if it has
       // been 'acknowleged' to be in the relationship via a store.push)
       (internalModel) => internalModel.isNew() && toSet.indexOf(internalModel) === -1
     );
-    toSet = toSet.concat(newRecords);
+    toSet = toSet.concat(newInternalModels);
 
     // diff to find changes
     let diff = diffArray(this.currentState, toSet);
@@ -186,15 +186,15 @@ export default Ember.Object.extend(Ember.MutableArray, Ember.Evented, {
   },
 
   //TODO(Igor) optimize
-  internalRemoveRecords(records) {
+  internalRemoveInternalModels(records) {
     for (let i=0; i < records.length; i++) {
       let index = this.currentState.indexOf(records[i]);
       this.internalReplace(index, 1);
     }
   },
 
   //TODO(Igor) optimize
-  internalAddRecords(records, idx) {
+  internalAddInternalModels(records, idx) {
     if (idx === undefined) {
       idx = this.currentState.length;
     }
@@ -205,10 +205,10 @@ export default Ember.Object.extend(Ember.MutableArray, Ember.Evented, {
     let records;
     if (amt > 0) {
       records = this.currentState.slice(idx, idx+amt);
-      this.get('relationship').removeRecords(records);
+      this.get('relationship').removeInternalModels(records);
     }
     if (objects) {
-      this.get('relationship').addRecords(objects.map(obj => obj._internalModel), idx);
+      this.get('relationship').addInternalModels(objects.map(obj => obj._internalModel), idx);
     }
   },
 

diff --git a/addon/-private/system/relationships/has-many.js b/addon/-private/system/relationships/has-many.js
@@ -154,7 +154,7 @@ export default function hasMany(type, options) {
 
       let relationship = this._internalModel._relationships.get(key);
       relationship.clear();
-      relationship.addRecords(records.map(record => get(record, '_internalModel')));
+      relationship.addInternalModels(records.map(record => get(record, '_internalModel')));
       return relationship.getRecords();
     }
   }).meta(meta);

diff --git a/addon/-private/system/relationships/state/has-many.js b/addon/-private/system/relationships/state/has-many.js
@@ -91,7 +91,7 @@ export default class ManyRelationship extends Relationship {
     }
     super.addRecord(record, idx);
     // make lazy later
-    this.manyArray.internalAddRecords([record], idx);
+    this.manyArray.internalAddInternalModels([record], idx);
   }
 
   removeCanonicalRecordFromOwn(record, idx) {
@@ -125,7 +125,7 @@ export default class ManyRelationship extends Relationship {
       //TODO(Igor) not used currently, fix
       manyArray.currentState.removeAt(idx);
     } else {
-      manyArray.internalRemoveRecords([record]);
+      manyArray.internalRemoveInternalModels([record]);
     }
   }
 

diff --git a/addon/-private/system/relationships/state/relationship.js b/addon/-private/system/relationships/state/relationship.js
@@ -7,7 +7,7 @@ const {
   addCanonicalRecord,
   addCanonicalRecords,
   addRecord,
-  addRecords,
+  addInternalModels,
   clear,
   findLink,
   flushCanonical,
@@ -21,7 +21,7 @@ const {
   removeRecord,
   removeRecordFromInverse,
   removeRecordFromOwn,
-  removeRecords,
+  removeInternalModels,
   setHasData,
   setHasLoaded,
   updateLink,
@@ -31,7 +31,7 @@ const {
   'addCanonicalRecord',
   'addCanonicalRecords',
   'addRecord',
-  'addRecords',
+  'addInternalModels',
   'clear',
   'findLink',
   'flushCanonical',
@@ -45,7 +45,7 @@ const {
   'removeRecord',
   'removeRecordFromInverse',
   'removeRecordFromOwn',
-  'removeRecords',
+  'removeInternalModels',
   'setHasData',
   'setHasLoaded',
   'updateLink',
@@ -125,15 +125,15 @@ export default class Relationship {
     }
   }
 
-  removeRecords(records) {
-    heimdall.increment(removeRecords);
-    records.forEach((record) => this.removeRecord(record));
+  removeInternalModels(internalModels) {
+    heimdall.increment(removeInternalModels);
+    internalModels.forEach((intenralModel) => this.removeRecord(intenralModel));
   }
 
-  addRecords(records, idx) {
-    heimdall.increment(addRecords);
-    records.forEach(record => {
-      this.addRecord(record, idx);
+  addInternalModels(internalModels, idx) {
+    heimdall.increment(addInternalModels);
+    internalModels.forEach(internalModel => {
+      this.addRecord(internalModel, idx);
       if (idx !== undefined) {
         idx++;
       }