sproutcore 1.5.0.rc.1 → 1.5.0.rc.2

data/lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js

@@ -10,106 +10,107 @@ sc_require('models/record');
 /**
   @class
 
-  A RecordArray wraps an array of storeKeys and, optionally, a Query object.
-  When you access the items of a RecordArray it will automatically convert the
-  storeKeys into actual SC.Record objects that the rest of your application
-  can work with.
+  A `RecordArray` wraps an array of `storeKeys` and, optionally, a `Query`
+  object. When you access the items of a `RecordArray`, it will automatically
+  convert the `storeKeys` into actual `SC.Record` objects that the rest of
+  your application can work with.
   
-  Normally you do not create RecordArray's yourself.  Instead, a RecordArray
-  is returned when you call SC.Store.findAll(), already properly configured.
-  You can usually just work with the RecordArray instance just like another
-  array.
+  Normally you do not create `RecordArray`s yourself.  Instead, a
+  `RecordArray` is returned when you call `SC.Store.findAll()`, already
+  properly configured. You can usually just work with the `RecordArray`
+  instance just like any other array.
   
-  The information below about RecordArray internals is only intended for those
-  who need to override this class for some reason to do something special.
+  The information below about `RecordArray` internals is only intended for
+  those who need to override this class for some reason to do something
+  special.
   
   Internal Notes
   ---
   
-  Normally the RecordArray behavior is very simple.  Any array-like operations
-  will be translated into similar calls onto the underlying array of 
-  storeKeys.  The underlying array can be a real array or it may be a 
-  SparseArray, which is how you implement incremental loading.
+  Normally the `RecordArray` behavior is very simple.  Any array-like
+  operations will be translated into similar calls onto the underlying array
+  of `storeKeys`.  The underlying array can be a real array or it may be a 
+  `SparseArray`, which is how you implement incremental loading.
   
-  If the RecordArray is created with an SC.Query object as well (and it 
-  almost always will have a Query object), then the RecordArray will also 
+  If the `RecordArray` is created with an `SC.Query` object as well (and it 
+  almost always will have a `Query` object), then the `RecordArray` will also 
   consult the query for various delegate operations such as determining if 
   the record array should update automatically whenever records in the store
-  changes. It will also ask the Query to refresh the storeKeys whenever records 
-  change in the store.
+  changes. It will also ask the `Query` to refresh the `storeKeys` whenever
+  records change in the store.
   
-  If the SC.Query object has complex matching rules, it might be 
+  If the `SC.Query` object has complex matching rules, it might be 
   computationally heavy to match a large dataset to a query. To avoid the 
   browser from ever showing a slow script timer in this scenario, the query
-  matching is by default paced at 100ms. If query matching takes longer than 
+  matching is by default paced at 100ms. If query matching takes longer than
   100ms, it will chunk the work with setTimeout to avoid too much computation
   to happen in one runloop.
-  
-  
+
+
   @extends SC.Object
   @extends SC.Enumerable
   @extends SC.Array
   @since SproutCore 1.0
 */
 
-SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array, 
+SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   /** @scope SC.RecordArray.prototype */ {
-    
+
   /**
     The store that owns this record array.  All record arrays must have a 
     store to function properly. 
     
-    NOTE: You MUST set this property on the RecordArray when creating it or 
-    else it will fail.
+    NOTE: You **MUST** set this property on the `RecordArray` when creating
+    it or else it will fail.
   
     @type SC.Store
   */
   store: null,
 
   /**
-    The Query object this record array is based upon.  All record arrays MUST 
-    have an associated query in order to function correctly.  You cannot 
-    change this property once it has been set.
+    The `Query` object this record array is based upon.  All record arrays
+    **MUST** have an associated query in order to function correctly.  You
+    cannot change this property once it has been set.
 
-    NOTE: You MUST set this property on the RecordArray when creating it or 
-    else it will fail.
+    NOTE: You **MUST** set this property on the `RecordArray` when creating
+    it or else it will fail.
     
     @type SC.Query
   */
   query: null,
 
   /**
-    The array of storeKeys as retrieved from the owner store.
+    The array of `storeKeys` as retrieved from the owner store.
     
     @type SC.Array
   */
   storeKeys: null,
 
   /**
-    The current status for the record array.  Read from the underlying 
+    The current status for the record array.  Read from the underlying
     store.
-    
+
     @type Number
   */
   status: SC.Record.EMPTY,
-  
+
   /**
     The current editabile state based on the query.
-    
-		@property
+
+    @property
     @type Boolean
   */
   isEditable: function() {
     var query = this.get('query');
     return query ? query.get('isEditable') : NO;
   }.property('query').cacheable(),
-  
+
   // ..........................................................
   // ARRAY PRIMITIVES
-  // 
+  //
 
   /** @private
-    Returned length is a pass-through to the storeKeys array.
+    Returned length is a pass-through to the `storeKeys` array.
 		@property
   */
   length: function() {
@@ -119,11 +120,11 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   }.property('storeKeys').cacheable(),
 
   _scra_records: null,
-  
+
   /** @private
-    Looks up the store key in the store keys array and materializes a
+    Looks up the store key in the `storeKeys array and materializes a
     records.
-    
+
     @param {Number} idx index of the object
     @return {SC.Record} materialized record
   */
@@ -131,20 +132,20 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
     this.flush(); // cleanup pending if needed
 
-    var recs      = this._scra_records, 
+    var recs      = this._scra_records,
         storeKeys = this.get('storeKeys'),
         store     = this.get('store'),
         storeKey, ret ;
-    
+
     if (!storeKeys || !store) return undefined; // nothing to do
     if (recs && (ret=recs[idx])) return ret ; // cached
-    
+
     // not in cache, materialize
     if (!recs) this._scra_records = recs = [] ; // create cache
     storeKey = storeKeys.objectAt(idx);
-    
+
     if (storeKey) {
-      // if record is not loaded already, then ask the data source to 
+      // if record is not loaded already, then ask the data source to
       // retrieve it
       if (store.peekStatus(storeKey) === SC.Record.EMPTY) {
         store.retrieveRecord(null, null, storeKey);
@@ -157,17 +158,17 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   /** @private - optimized forEach loop. */
   forEach: function(callback, target) {
     this.flush();
-    
-    var recs      = this._scra_records, 
+
+    var recs      = this._scra_records,
         storeKeys = this.get('storeKeys'),
-        store     = this.get('store'), 
+        store     = this.get('store'),
         len       = storeKeys ? storeKeys.get('length') : 0,
         idx, storeKey, rec;
-        
-    if (!storeKeys || !store) return this; // nothing to do    
+
+    if (!storeKeys || !store) return this; // nothing to do
     if (!recs) recs = this._scra_records = [] ;
     if (!target) target = this;
-    
+
     for(idx=0;idx<len;idx++) {
       rec = recs[idx];
       if (!rec) {
@@ -175,13 +176,13 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       }
       callback.call(target, rec, idx, this);
     }
-    
+
     return this;
   },
-  
+
   /** @private
     Pass through to the underlying array.  The passed in objects must be
-    records, which can be converted to storeKeys.
+    records, which can be converted to `storeKeys`.
     
     @param {Number} idx start index
     @param {Number} amt end index
@@ -191,42 +192,42 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   replace: function(idx, amt, recs) {
 
     this.flush(); // cleanup pending if needed
-    
-    var storeKeys = this.get('storeKeys'), 
+
+    var storeKeys = this.get('storeKeys'),
         len       = recs ? (recs.get ? recs.get('length') : recs.length) : 0,
         i, keys;
-        
+
     if (!storeKeys) throw "storeKeys required";
 
     var query = this.get('query');
     if (query && !query.get('isEditable')) throw SC.RecordArray.NOT_EDITABLE;
-    
-    // you can't modify an array whose store keys are autogenerated from a 
+
+    // you can't modify an array whose store keys are autogenerated from a
     // query.
-    
+
     // map to store keys
     keys = [] ;
     for(i=0;i<len;i++) keys[i] = recs.objectAt(i).get('storeKey');
-    
-    // pass along - if allowed, this should trigger the content observer 
+
+    // pass along - if allowed, this should trigger the content observer
     storeKeys.replace(idx, amt, keys);
-    return this; 
+    return this;
   },
-  
+
   /**
-    Returns YES if the passed can be found in the record array.  This is 
+    Returns YES if the passed can be found in the record array.  This is
     provided for compatibility with SC.Set.
-    
+
     @param {SC.Record} record
     @returns {Boolean}
   */
   contains: function(record) {
     return this.indexOf(record)>=0;
   },
-  
+
   /** @private
     Returns the first index where the specified record is found.
-    
+
     @param {SC.Record} record
     @param {Number} startAt optional starting index
     @returns {Number} index
@@ -236,18 +237,18 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       SC.Logger.warn("Using indexOf on %@ with an object that is not an SC.Record".fmt(record));
       return -1; // only takes records
     }
-    
+
     this.flush();
-    
-    var storeKey  = record.get('storeKey'), 
+
+    var storeKey  = record.get('storeKey'),
         storeKeys = this.get('storeKeys');
-        
-    return storeKeys ? storeKeys.indexOf(storeKey, startAt) : -1; 
+
+    return storeKeys ? storeKeys.indexOf(storeKey, startAt) : -1;
   },
 
-  /** @private 
+  /** @private
     Returns the last index where the specified record is found.
-    
+
     @param {SC.Record} record
     @param {Number} startAt optional starting index
     @returns {Number} index
@@ -259,15 +260,15 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     }
 
     this.flush();
-    
-    var storeKey  = record.get('storeKey'), 
+
+    var storeKey  = record.get('storeKey'),
         storeKeys = this.get('storeKeys');
-    return storeKeys ? storeKeys.lastIndexOf(storeKey, startAt) : -1; 
+    return storeKeys ? storeKeys.lastIndexOf(storeKey, startAt) : -1;
   },
 
   /** 
     Adds the specified record to the record array if it is not already part 
-    of the array.  Provided for compatibilty with SC.Set.
+    of the array.  Provided for compatibilty with `SC.Set`.
     
     @param {SC.Record} record
     @returns {SC.RecordArray} receiver
@@ -277,10 +278,10 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     if (this.indexOf(record)<0) this.pushObject(record);
     return this ;
   },
-  
+
   /**
     Removes the specified record from the array if it is not already a part
-    of the array.  Provided for compatibility with SC.Set.
+    of the array.  Provided for compatibility with `SC.Set`.
     
     @param {SC.Record} record
     @returns {SC.RecordArray} receiver
@@ -290,43 +291,43 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     this.removeObject(record);
     return this ;
   },
-  
+
   // ..........................................................
   // HELPER METHODS
-  // 
+  //
 
   /**
     Extends the standard SC.Enumerable implementation to return results based
     on a Query if you pass it in.
-    
+
     @param {SC.Query} query a SC.Query object
 		@param {Object} target the target object to use
-		
-    @returns {SC.RecordArray} 
+
+    @returns {SC.RecordArray}
   */
   find: function(query, target) {
     if (query && query.isQuery) {
       return this.get('store').find(query.queryWithScope(this));
     } else return sc_super();
   },
-  
+
   /**
     Call whenever you want to refresh the results of this query.  This will
     notify the data source, asking it to refresh the contents.
-    
+
     @returns {SC.RecordArray} receiver
   */
   refresh: function() {
     this.get('store').refreshQuery(this.get('query'));
     return this;
   },
-  
+
   /**
-    Will recompute the results based on the SC.Query attached to the record
+    Will recompute the results based on the `SC.Query` attached to the record
     array. Useful if your query is based on computed properties that might 
-    have changed. Use refresh() instead of you want to trigger a fetch on your
-    data source since this will purely look at records already loaded into
-    the store.
+    have changed. Use `refresh()` instead of you want to trigger a fetch on
+    your data source since this will purely look at records already loaded
+    into the store.
     
     @returns {SC.RecordArray} receiver
   */
@@ -334,35 +335,35 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     this.flush(YES);
     return this;
   },
-  
+
   /**
-    Destroys the record array.  Releases any storeKeys, and deregisters with
+    Destroys the record array.  Releases any `storeKeys`, and deregisters with
     the owner store.
-    
+
     @returns {SC.RecordArray} receiver
   */
   destroy: function() {
     if (!this.get('isDestroyed')) {
       this.get('store').recordArrayWillDestroy(this);
-    } 
-    
+    }
+
     sc_super();
   },
-  
+
   // ..........................................................
   // STORE CALLBACKS
   // 
   
-  // NOTE: storeWillFetchQuery(), storeDidFetchQuery(), storeDidCancelQuery(),
-  // and storeDidErrorQuery() are tested implicitly through the related
-  // methods in SC.Store.  We're doing it this way because eventually this 
-  // particular implementation is likely to change; moving some or all of this
-  // code directly into the store. -CAJ
+  // **NOTE**: `storeWillFetchQuery()`, `storeDidFetchQuery()`,
+  // `storeDidCancelQuery()`, and `storeDidErrorQuery()` are tested implicitly
+  // through the related methods in `SC.Store`.  We're doing it this way
+  // because eventually this particular implementation is likely to change;
+  // moving some or all of this code directly into the store. -CAJ
   
   /** @private
-    Called whenever the store initiates a refresh of the query.  Sets the 
+    Called whenever the store initiates a refresh of the query.  Sets the
     status of the record array to the appropriate status.
-    
+
     @param {SC.Query} query
     @returns {SC.RecordArray} receiver
   */
@@ -374,10 +375,10 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     this.setIfChanged('status', status);
     return this ;
   },
-  
+
   /** @private
     Called whenever the store has finished fetching a query.
-    
+
     @param {SC.Query} query
     @returns {SC.RecordArray} receiver
   */
@@ -385,11 +386,11 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     this.setIfChanged('status', SC.Record.READY_CLEAN);
     return this ;
   },
-  
+
   /** @private
-    Called whenever the store has cancelled a refresh.  Sets the 
+    Called whenever the store has cancelled a refresh.  Sets the
     status of the record array to the appropriate status.
-    
+
     @param {SC.Query} query
     @returns {SC.RecordArray} receiver
   */
@@ -403,9 +404,9 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   },
 
   /** @private
-    Called whenever the store encounters an error while fetching.  Sets the 
+    Called whenever the store encounters an error while fetching.  Sets the
     status of the record array to the appropriate status.
-    
+
     @param {SC.Query} query
     @returns {SC.RecordArray} receiver
   */
@@ -413,13 +414,13 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     this.setIfChanged('status', SC.Record.ERROR);
     return this ;
   },
-  
+
   /** @private
     Called by the store whenever it changes the state of certain store keys.
     If the receiver cares about these changes, it will mark itself as dirty.
-    The next time you try to access the record array it will update any 
+    The next time you try to access the record array it will update any
     pending changes.
-    
+
     @param {SC.Array} storeKeys the effected store keys
     @param {SC.Set} recordTypes the record types for the storeKeys.
     @returns {SC.RecordArray} receiver
@@ -428,19 +429,19 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     var query =  this.get('query');
     // fast path exits
     if (query.get('location') !== SC.Query.LOCAL) return this;
-    if (!query.containsRecordTypes(recordTypes)) return this;   
-    
+    if (!query.containsRecordTypes(recordTypes)) return this;
+
     // ok - we're interested.  mark as dirty and save storeKeys.
     var changed = this._scq_changedStoreKeys;
     if (!changed) changed = this._scq_changedStoreKeys = SC.IndexSet.create();
     changed.addEach(storeKeys);
-    
+
     this.set('needsFlush', YES);
-    
+
     // if we have storeKeys already, then flush immediately because
     // it will not be as expensive as if we are starting from scratch
-    if (this.get('storeKeys')) { 
-      this.flush(); 
+    if (this.get('storeKeys')) {
+      this.flush();
     }
     else {
       this.enumerableContentDidChange();
@@ -448,18 +449,18 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
     return this;
   },
-  
+
   /**
     Applies the query to any pending changed store keys, updating the record
     array contents as necessary.  This method is called automatically anytime
-    you access the RecordArray to make sure it is up to date, but you can 
+    you access the RecordArray to make sure it is up to date, but you can
     call it yourself as well if you need to force the record array to fully
     update immediately.
     
     Currently this method only has an effect if the query location is 
-    SC.Query.LOCAL.  You can call this method on any RecordArray however,
+    `SC.Query.LOCAL`.  You can call this method on any `RecordArray` however,
     without an error.
-    
+
     @param {Boolean} _flush to force it - use reload() to trigger it
     @returns {SC.RecordArray} receiver
   */
@@ -471,19 +472,19 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       this.set('needsFlush', YES);
       return this;
     }
-    
+
     if (!this.get('needsFlush') && !_flush) return this; // nothing to do
     this.set('needsFlush', NO); // avoid running again.
-    
+
     // fast exit
     var query = this.get('query'),
-        store = this.get('store'); 
+        store = this.get('store');
     if (!store || !query || query.get('location') !== SC.Query.LOCAL) {
       return this;
     }
-    
+
     this._insideFlush = YES;
-    
+
     // OK, actually generate some results
     var storeKeys = this.get('storeKeys'),
         changed   = this._scq_changedStoreKeys,
@@ -492,11 +493,11 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
         storeKeysToPace = [],
         startDate = new Date(),
         rec, status, recordType, sourceKeys, scope, included;
-    
+
     // if we have storeKeys already, just look at the changed keys
     var oldStoreKeys = storeKeys;
     if (storeKeys && !_flush) {
-      
+
       if (changed) {
         changed.forEach(function(storeKey) {
           if(storeKeysToPace.length>0 || new Date()-startDate>SC.RecordArray.QUERY_MATCHING_THRESHOLD) {
@@ -509,12 +510,12 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
             rec = store.materializeRecord(storeKey);
             included = !!(rec && query.contains(rec));
           } else included = NO ;
-          
+
           // if storeKey should be in set but isn't -- add it.
           if (included) {
             if (storeKeys.indexOf(storeKey)<0) {
-              if (!didChange) storeKeys = storeKeys.copy(); 
-              storeKeys.pushObject(storeKey); 
+              if (!didChange) storeKeys = storeKeys.copy();
+              storeKeys.pushObject(storeKey);
             }
           // if storeKey should NOT be in set but IS -- remove it
           } else {
@@ -523,31 +524,31 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
               storeKeys.removeObject(storeKey);
             } // if (storeKeys.indexOf)
           } // if (included)
-          
+
         }, this);
         // make sure resort happens
         didChange = YES ;
-        
+
       } // if (changed)
-      
+
       //console.log(this.toString() + ' partial flush took ' + (new Date()-startDate) + ' ms');
-    
-    // if no storeKeys, then we have to go through all of the storeKeys 
+
+    // if no storeKeys, then we have to go through all of the storeKeys
     // and decide if they belong or not.  ick.
     } else {
-      
+
       // collect the base set of keys.  if query has a parent scope, use that
       if (scope = query.get('scope')) {
         sourceKeys = scope.flush().get('storeKeys');
       // otherwise, lookup all storeKeys for the named recordType...
       } else if (recordType = query.get('expandedRecordTypes')) {
         sourceKeys = SC.IndexSet.create();
-        recordType.forEach(function(cur) { 
+        recordType.forEach(function(cur) {
           sourceKeys.addEach(store.storeKeysFor(recordType));
         });
       }
-      
-      // loop through storeKeys to determine if it belongs in this query or 
+
+      // loop through storeKeys to determine if it belongs in this query or
       // not.
       storeKeys = [];
       sourceKeys.forEach(function(storeKey) {
@@ -555,24 +556,24 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
           storeKeysToPace.push(storeKey);
           return;
         }
-        
+
         status = store.peekStatus(storeKey);
         if (!(status & K.EMPTY) && !((status & K.DESTROYED) || (status === K.BUSY_DESTROYING))) {
           rec = store.materializeRecord(storeKey);
           if (rec && query.contains(rec)) storeKeys.push(storeKey);
         }
       });
-      
+
       //console.log(this.toString() + ' full flush took ' + (new Date()-startDate) + ' ms');
-      
+
       didChange = YES ;
     }
-    
+
     // if we reach our threshold of pacing we need to schedule the rest of the
     // storeKeys to also be updated
     if(storeKeysToPace.length>0) {
       var self = this;
-      // use setTimeout here to guarantee that we hit the next runloop, 
+      // use setTimeout here to guarantee that we hit the next runloop,
       // and not the same runloop which the invoke* methods do not guarantee
       window.setTimeout(function() {
         SC.run(function() {
@@ -583,18 +584,18 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
         });
       }, 1);
     }
-    
+
     // clear set of changed store keys
     if (changed) changed.clear();
-    
+
     // only resort and update if we did change
     if (didChange) {
-      
+
       // storeKeys must be a new instance because orderStoreKeys() works on it
       if (storeKeys && (storeKeys===oldStoreKeys)) {
         storeKeys = storeKeys.copy();
       }
-      
+
       storeKeys = SC.Query.orderStoreKeys(storeKeys, query, store);
       if (SC.compare(oldStoreKeys, storeKeys) !== 0){
         this.set('storeKeys', SC.clone(storeKeys)); // replace content
@@ -606,21 +607,21 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   },
 
   /**
-    Set to YES when the query is dirty and needs to update its storeKeys 
-    before returning any results.  RecordArrays always start dirty and become
+    Set to `YES` when the query is dirty and needs to update its storeKeys 
+    before returning any results.  `RecordArray`s always start dirty and become
     clean the first time you try to access their contents.
-    
+
     @type Boolean
   */
   needsFlush: YES,
 
   // ..........................................................
   // EMULATE SC.ERROR API
-  // 
-  
+  //
+
   /**
-    Returns YES whenever the status is SC.Record.ERROR.  This will allow you 
-    to put the UI into an error state.
+    Returns `YES` whenever the status is `SC.Record.ERROR`.  This will allow
+    you to put the UI into an error state.
     
 		@property
     @type Boolean
@@ -630,8 +631,8 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   }.property('status').cacheable(),
 
   /**
-    Returns the receiver if the record array is in an error state.  Returns null
-    otherwise.
+    Returns the receiver if the record array is in an error state.  Returns
+    `null` otherwise.
     
 		@property
     @type SC.Record
@@ -639,10 +640,11 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   errorValue: function() {
     return this.get('isError') ? SC.val(this.get('errorObject')) : null ;
   }.property('isError').cacheable(),
-  
+
   /**
-    Returns the current error object only if the record array is in an error state.
-    If no explicit error object has been set, returns SC.Record.GENERIC_ERROR.
+    Returns the current error object only if the record array is in an error
+    state. If no explicit error object has been set, returns
+    `SC.Record.GENERIC_ERROR.`
     
 		@property
     @type SC.Error
@@ -653,65 +655,96 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       return store.readQueryError(this.get('query')) || SC.Record.GENERIC_ERROR;
     } else return null ;
   }.property('isError').cacheable(),
-  
+
   // ..........................................................
   // INTERNAL SUPPORT
   // 
-  
-  /** @private 
-    Invoked whenever the storeKeys array changes.  Observes changes.
+
+  propertyWillChange: function(key) {
+    if (key === 'storeKeys') {
+      var storeKeys = this.get('storeKeys');
+      var len = storeKeys ? storeKeys.get('length') : 0;
+
+      this.arrayContentWillChange(0, len, 0);
+    }
+
+    return sc_super();
+  },
+
+  /** @private
+    Invoked whenever the `storeKeys` array changes.  Observes changes.
   */
   _storeKeysDidChange: function() {
     var storeKeys = this.get('storeKeys');
-    
-    var prev = this._prevStoreKeys, 
+
+    var prev = this._prevStoreKeys, oldLen, newLen,
         f    = this._storeKeysContentDidChange,
         fs   = this._storeKeysStateDidChange;
-    
-    if (storeKeys === prev) return; // nothing to do
-    
-    if (prev) prev.removeObserver('[]', this, f);
+
+    if (storeKeys === prev) { return; } // nothing to do
+
+    if (prev) {
+      prev.removeArrayObservers({
+        target: this,
+        willChange: this.arrayContentWillChange,
+        didChange: this._storeKeysContentDidChange
+      });
+
+      oldLen = prev.get('length');
+    } else {
+      oldLen = 0;
+    }
+
     this._prevStoreKeys = storeKeys;
-    if (storeKeys) storeKeys.addObserver('[]', this, f);
-    
-    var rev = (storeKeys) ? storeKeys.propertyRevision : -1 ;
-    this._storeKeysContentDidChange(storeKeys, '[]', storeKeys, rev);
-    
+    if (storeKeys) {
+      storeKeys.addArrayObservers({
+        target: this,
+        willChange: this.arrayContentWillChange,
+        didChange: this._storeKeysContentDidChange
+      });
+
+      newLen = storeKeys.get('length');
+    } else {
+      newLen = 0;
+    }
+
+    this._storeKeysContentDidChange(0, oldLen, newLen);
+
   }.observes('storeKeys'),
-  
+
   /** @private
-    Invoked whenever the content of the storeKeys array changes.  This will
+    Invoked whenever the content of the `storeKeys` array changes.  This will
     dump any cached record lookup and then notify that the enumerable content
     has changed.
   */
-  _storeKeysContentDidChange: function(target, key, value, rev) {
+  _storeKeysContentDidChange: function(start, removedCount, addedCount) {
     if (this._scra_records) this._scra_records.length=0 ; // clear cache
-    
-    this.enumerableContentDidChange();
+
+    this.arrayContentDidChange(start, removedCount, addedCount);
   },
-  
+
   /** @private */
   init: function() {
     sc_super();
     this._storeKeysDidChange();
   }
-  
+
 });
 
-SC.RecordArray.mixin(/** @scope SC.RecordArray.prototype */{  
-  
-  /** 
+SC.RecordArray.mixin(/** @scope SC.RecordArray.prototype */{
+
+  /**
     Standard error throw when you try to modify a record that is not editable
-    
+
     @type SC.Error
   */
   NOT_EDITABLE: SC.Error.desc("SC.RecordArray is not editable"),
-  
+
   /**
     Number of milliseconds to allow a query matching to run for. If this number
-    is exceeded, the query matching will be paced so as to not lock up the 
+    is exceeded, the query matching will be paced so as to not lock up the
     browser (by essentially splitting the work with a setTimeout)
-    
+
     @type Number
   */
   QUERY_MATCHING_THRESHOLD: 100