sproutit-sproutcore 1.0.20090721145281 → 1.0.20090721145282

data/Buildfile

@@ -17,9 +17,10 @@ mode :all do
     # REQUIRED CONFIGS 
     # You will not usually need to override these configs, but the code 
     # assumes they will be present, so you must support them.
-    :build_prefix => 'tmp/build',
+    :build_prefix   => 'tmp/build',
     :staging_prefix => 'tmp/staging',
-    :url_prefix    => 'static',
+    :cache_prefix   => 'tmp/cache',
+    :url_prefix     => 'static',
   
     # Defines the directories that may contain targets, and maps them to a 
     # target type.  When a project tries to find all of the targets in a 
@@ -27,6 +28,7 @@ mode :all do
     :target_types => { 
       :apps       => :app, 
       :clients    => :app, 
+      :pages      => :app, # used for static pages with your site
       :frameworks => :framework,
       :themes     => :theme
     },
@@ -111,7 +113,6 @@ mode :debug do
     # Do not pack javascripts in development mode, we want each file to 
     # load independently.
     :use_packed => false
-
 end
 
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 0
-:patch: 20090721145281
-:digest: ba83b210ad765939b203da70844f9799493ef006
+:patch: 20090721145282
+:digest: 8d4f830b015e13e58d53e304b9cf421117d5c456
 :major: 1

data/buildtasks/entry.rake

@@ -53,6 +53,9 @@ namespace :entry do
     else
       ENTRY.staging_path ||= MANIFEST.unique_staging_path(File.join(MANIFEST.staging_root, filename_parts))
     end
+    
+    ENTRY.cache_path = MANIFEST.unique_cache_path(File.join(MANIFEST.cache_root, filename_parts))
+    
   end
   
 end

data/buildtasks/manifest.rake

@@ -22,6 +22,10 @@ namespace :manifest do
     MANIFEST.staging_root = File.join(TARGET.staging_root, 
       MANIFEST.language.to_s, TARGET.build_number.to_s)
       
+    # cache_root is target.cache_root + language + build_number
+    MANIFEST.cache_root = File.join(TARGET.cache_root, 
+      MANIFEST.language.to_s, TARGET.build_number.to_s)
+      
     # url_root
     MANIFEST.url_root = 
       [TARGET.url_root, MANIFEST.language, TARGET.build_number].join('/')
@@ -369,7 +373,7 @@ namespace :manifest do
       entries.each do |entry|
         entry.entry_type = :html
         entry.resource = 'index'
-        
+
         entry.render_task = case entry.ext
         when 'rhtml':
           'render:erubis'
@@ -379,13 +383,21 @@ namespace :manifest do
           'render:haml'
         end
         
-        # use a custom scan method since discover_build_directives! is too
-        # general...
-        
-        entry.scan_source(/<%\s*sc_resource\(?\s*['"](.+)['"]\s*\)?/) do |m|
-          entry.resource = m[0].ext ''
+        # items beginning with an underscore are partials.  do not build
+        if entry.filename =~ /^_/
+          entry.hide!
+          entry.is_partial = true
+
+        # not a partial
+        else
+          # use a custom scan method since discover_build_directives! is too
+          # general...
+          entry.scan_source(/<%\s*sc_resource\(?\s*['"](.+)['"]\s*\)?/) do |m|
+            entry.resource = m[0].ext ''
+          end
+          (entries_by_resource[entry.resource] ||= []) << entry
         end
-        (entries_by_resource[entry.resource] ||= []) << entry
+        
       end
       
       # even if no resource was found for the index.html, add one anyway if 
@@ -398,13 +410,27 @@ namespace :manifest do
       entries_by_resource.each do |resource_name, entries|
         resource_name = resource_name.ext('html')
         is_index = resource_name == 'index.html'
+        
+        # compute the friendly_url assuming normal install process
+        friendly_url = [TARGET.index_root]
+        m_language = MANIFEST.language.to_sym
+        t_preferred = (TARGET.config.preferred_language || :en).to_sym
+        if is_index
+          friendly_url << m_language.to_s unless t_preferred == m_language
+        else
+          friendly_url << m_language.to_s
+          friendly_url << resource_name
+        end
+        friendly_url = friendly_url.join('/')
+        
         MANIFEST.add_composite resource_name,
           :entry_type => :html,
           :combined => true,
           :build_task => 'build:html',
           :source_entries => entries,
           :hidden     =>  !TARGET.loadable? && is_index,
-          :include_required_targets => TARGET.loadable? && is_index
+          :include_required_targets => TARGET.loadable? && is_index,
+          :friendly_url => friendly_url
       end
     end
     
@@ -444,7 +470,7 @@ namespace :manifest do
     desc "adds a loc strings entry that generates a yaml file server-side functions can use" 
     task :strings => %w(setup javascript) do
       # find the lproj/strings.js file...
-      if entry = MANIFEST.entry_for('source/lproj/strings.js')
+      if entry = (MANIFEST.entry_for('source/lproj/strings.js') || MANIFEST.entry_for('source/lproj/strings.js', :hidden => true))
         MANIFEST.add_transform entry, 
           :filename   => 'strings.yaml',
           :build_path => File.join(MANIFEST.build_root, 'strings.yaml'),

data/buildtasks/target.rake

@@ -13,24 +13,43 @@ namespace :target do
   task :prepare do
 
     # use url_root config or merge url_prefix + target_name
-    TARGET.url_root = CONFIG.url_root || 
-      [nil, CONFIG.url_prefix, TARGET.target_name].join('/').gsub(/\/+/,'/')
+    if (TARGET.url_root = CONFIG.url_root).nil? 
+      url = [nil, CONFIG.url_prefix, TARGET.target_name].join('/')
+      url = url.gsub(/([^:])\/+/,'\1/').gsub(/^\/+/,'/') # remove extra //
+      url = url[1..-1] if url.match(/^\/[^\/]+:\/\//) # look for protocol
+      TARGET.url_root = url
+    end
+    
     
     # use index_root config or merge index_prefix + target_name
-    TARGET.index_root = CONFIG.index_root || 
-      [nil, CONFIG.index_prefix, TARGET.target_name].join('/').gsub(/\/+/, '/')
+    if (TARGET.index_root = CONFIG.index_root).nil? 
+      url = [nil, CONFIG.index_prefix, TARGET.target_name].join('/')
+      url = url.gsub(/([^:])\/+/,'\1/').gsub(/^\/+/,'/') # remove extra //
+      url = url[1..-1] if url.match(/^\/[^\/]+:\/\//) # look for protocol
+      TARGET.index_root = url
+    end
 
+    url_prefix = CONFIG.url_prefix
+    url_prefix = url_prefix.gsub(/^[^\/]+:\/\/[^\/]+\//,'') if url_prefix
+    
     # Split all of these paths in case we are on windows...
     TARGET.build_root = File.expand_path(CONFIG.build_root || 
       File.join(PROJECT.project_root.to_s, 
         (CONFIG.build_prefix || '').to_s.split('/'), 
-        (CONFIG.url_prefix || '').to_s.split('/'), 
+        (url_prefix || '').to_s.split('/'), 
         TARGET.target_name.to_s.split('/')))
         
     TARGET.staging_root = File.expand_path(CONFIG.staging_root ||
       File.join(PROJECT.project_root.to_s, 
         (CONFIG.staging_prefix || '').to_s.split('/'), 
-        (CONFIG.url_prefix || '').to_s.split('/'), 
+        (url_prefix || '').to_s.split('/'), 
+        TARGET.target_name.to_s))
+
+    # cache is used to store intermediate files
+    TARGET.cache_root = File.expand_path(CONFIG.cache_root ||
+      File.join(PROJECT.project_root.to_s, 
+        (CONFIG.cache_prefix || '').to_s.split('/'), 
+        (url_prefix || '').to_s.split('/'), 
         TARGET.target_name.to_s))
       
     TARGET.build_number = TARGET.compute_build_number

data/frameworks/sproutcore/Buildfile

@@ -14,6 +14,15 @@ config :all,
   :test_required  => ['sproutcore/testing', 'sproutcore/empty_theme'],
   :debug_required => ['sproutcore/debug', 'sproutcore/testing']
 
+# in debug mode, combine the JS for SC by default.  This will improve perf
+# while working with apps.  If you are hacking SC itself, you can turn this
+# off in your project buildfile by referencing sproutcore specifically
+mode :debug do
+  config :all, 
+    :combine_javascript => true,
+    :combine_stylesheet => true
+end
+
 # CORE FRAMEWORKS
 config :runtime,    :required => []
 config :foundation, :required => [:runtime]
@@ -30,6 +39,7 @@ config :mobile,
 
 # WRAPPER FRAMEWORKS
 config :sproutcore, :required => :desktop
+config :mini, :required => [:runtime, :datastore]
 
 # SPECIAL FRAMEWORKS AND THEMES
 # These do not require any of the built-in SproutCore frameworks

data/frameworks/sproutcore/frameworks/datastore/data_sources/data_source.js

@@ -56,7 +56,8 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
       SC.Record or SC.Record.STORE_KEYS if invoked from store.retrieveRecords.
       Could also be an SC.Query if that was passed in to findAll()
     @param {Hash} params optional additonal fetch params. storeKeys if invoked
-      from store.retrieveRecords
+      from store.retrieveRecords. this originated from the commitRecords() 
+      call on the store
     @returns {SC.Array} result set with storeKeys. In case of SC.Array
       it may be sparse.
   */
@@ -70,11 +71,13 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
     @param {SC.Store} store the requesting store
     @param {Array} storeKeys
     @param {Array} ids - optional
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns 
   */
   
-  retrieveRecords: function(store, storeKeys, ids) {
-    return this._handleEach(store, storeKeys, this.retrieveRecord, ids);  
+  retrieveRecords: function(store, storeKeys, ids, params) {
+    return this._handleEach(store, storeKeys, this.retrieveRecord, ids, params);  
   },
   
   /**
@@ -102,13 +105,15 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
     @param {Array} createStoreKeys keys to create
     @param {Array} updateStoreKeys keys to update
     @param {Array} destroyStoreKeys keys to destroy
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns {Boolean} YES if data source can handle keys
   */
-  commitRecords: function(store, createStoreKeys, updateStoreKeys, destroyStoreKeys) {
+  commitRecords: function(store, createStoreKeys, updateStoreKeys, destroyStoreKeys, params) {
     var cret, uret, dret;
-    if(createStoreKeys.length>0) cret = this.createRecords.call(this, store, createStoreKeys);    
-    if(updateStoreKeys.length>0) uret = this.updateRecords.call(this, store, updateStoreKeys);    
-    if(destroyStoreKeys.length>0) dret = this.destroyRecords.call(this, store, destroyStoreKeys); 
+    if(createStoreKeys.length>0) cret = this.createRecords.call(this, store, createStoreKeys, params);    
+    if(updateStoreKeys.length>0) uret = this.updateRecords.call(this, store, updateStoreKeys, params);    
+    if(destroyStoreKeys.length>0) dret = this.destroyRecords.call(this, store, destroyStoreKeys, params); 
     return (cret === uret === dret) ? (cret || uret || dret) : SC.MIXED_STATE ;
   },
   
@@ -149,9 +154,11 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
 
     @param {SC.Store} store the requesting store
     @param {Array} storeKeys keys to update
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
   */
-  updateRecords: function(store, storeKeys) {
-    return this._handleEach(store, storeKeys, this.updateRecord);
+  updateRecords: function(store, storeKeys, params) {
+    return this._handleEach(store, storeKeys, this.updateRecord, null, params);
   },
   
   /**
@@ -166,9 +173,11 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
 
     @param {SC.Store} store the requesting store
     @param {Array} storeKeys keys to update
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
   */
-  createRecords: function(store, storeKeys) {
-    return this._handleEach(store, storeKeys, this.createRecord);
+  createRecords: function(store, storeKeys, params) {
+    return this._handleEach(store, storeKeys, this.createRecord, null, params);
   },
 
   /**
@@ -183,20 +192,24 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
 
     @param {SC.Store} store the requesting store
     @param {Array} storeKeys keys to update
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
   */
-  destroyRecords: function(store, storeKeys) {
-    return this._handleEach(store, storeKeys, this.destroyRecord);
+  destroyRecords: function(store, storeKeys, params) {
+    return this._handleEach(store, storeKeys, this.destroyRecord, null, params);
   },
 
   /** @private
     invokes the named action for each store key.  returns proper value
   */
-  _handleEach: function(store, storeKeys, action, ids) {
-    var len = storeKeys.length, idx, ret, cur;
+  _handleEach: function(store, storeKeys, action, ids, params) {
+    var len = storeKeys.length, idx, ret, cur, lastArg;
     if(!ids) ids = [];
     
     for(idx=0;idx<len;idx++) {
-      cur = action.call(this, store, storeKeys[idx], ids[idx]);
+      lastArg = ids[idx] ? ids[idx] : params;
+      
+      cur = action.call(this, store, storeKeys[idx], lastArg, params);
       if (ret === undefined) {
         ret = cur ;
       } else if (ret === YES) {
@@ -222,9 +235,11 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
     
     @param {SC.Store} store the requesting store
     @param {Array} storeKey key to update
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns {Boolean} YES if handled
   */
-  updateRecord: function(store, storeKey) {
+  updateRecord: function(store, storeKey, params) {
     return NO ;
   },
 
@@ -234,9 +249,11 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
     @param {SC.Store} store the requesting store
     @param {Array} storeKey key to retrieve
     @param {String} id the id to retrieve
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns {Boolean} YES if handled
   */
-  retrieveRecord: function(store, storeKey, id) {
+  retrieveRecord: function(store, storeKey, id, params) {
     return NO ;
   },
 
@@ -249,9 +266,11 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
     
     @param {SC.Store} store the requesting store
     @param {Array} storeKey key to update
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns {Boolean} YES if handled
   */
-  createRecord: function(store, storeKey) {
+  createRecord: function(store, storeKey, params) {
     return NO ;
   },
 
@@ -264,9 +283,11 @@ SC.DataSource = SC.Object.extend( /** SC.DataSource.prototype */ {
     
     @param {SC.Store} store the requesting store
     @param {Array} storeKey key to update
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns {Boolean} YES if handled
   */
-  destroyRecord: function(store, storeKey) {
+  destroyRecord: function(store, storeKey, params) {
     return NO ;
   }  
     

data/frameworks/sproutcore/frameworks/datastore/data_sources/fixtures.js

@@ -86,52 +86,17 @@ SC.FixturesDataSource = SC.DataSource.extend( {
     
   },
   
-  /**
-    Load fixtures for a given fetchKey into the store
-    and push it to the ret array.
-    
-    @param {SC.Store} store
-    @param {SC.Record} fetchKey
-    @param {SC.Array} ret
-  */
-  loadFixturesFor: function(store, fetchKey, ret) {
-    var dataHashes, i, storeKey, hashes = [];
-    dataHashes = this.fixturesFor(fetchKey);
-    for(i in dataHashes){
-      storeKey = fetchKey.storeKeyFor(i);
-      hashes.push(dataHashes[i]);
-      ret.push(storeKey);
-    }
-    store.loadRecords(fetchKey, hashes);
-  },
-  
-  /**
-    Load fixtures for a given fetchKey into the store
-    and push it to the ret array.
-    
-    @param {SC.Store} store
-    @param {SC.Record} fetchKey
-    @param {SC.Array} ret
-  */
-  loadFixturesFor: function(store, fetchKey, ret) {
-    var dataHashes, i, storeKey, hashes = [];
-    dataHashes = this.fixturesFor(fetchKey);
-    for(i in dataHashes){
-      storeKey = fetchKey.storeKeyFor(i);
-      hashes.push(dataHashes[i]);
-      ret.push(storeKey);
-    }
-    store.loadRecords(fetchKey, hashes);
-  },
-  
   /**
     Retrieve a record from fixtures.
     
     @param {SC.Store} store
     @param {Number} storeKey
     @param {SC.Array} ret
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
+    @returns {Array} storeKeys
   */
-  retrieveRecord: function(store, storeKey) {
+  retrieveRecord: function(store, storeKey, params) {
     var ret = [], recordType = SC.Store.recordTypeFor(storeKey),
         id = store.idFor(storeKey),
         hash = this.fixtureForStoreKey(store, storeKey);
@@ -157,9 +122,11 @@ SC.FixturesDataSource = SC.DataSource.extend( {
     
     @param {SC.Store} store
     @param {Number} storeKey
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns {Boolean} YES if handled
   */
-  updateRecord: function(store, storeKey) {
+  updateRecord: function(store, storeKey, params) {
     this.setFixtureForStoreKey(store, storeKey, store.readDataHash(storeKey));
     store.dataSourceDidComplete(storeKey);  
     return YES ;
@@ -171,9 +138,11 @@ SC.FixturesDataSource = SC.DataSource.extend( {
     
     @param {SC.Store} store the store
     @param {Number} storeKey the store key
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns {Boolean} YES if successful
   */
-  createRecord: function(store, storeKey) {
+  createRecord: function(store, storeKey, params) {
     var id         = store.idFor(storeKey),
         recordType = store.recordTypeFor(storeKey),
         dataHash   = store.readDataHash(storeKey), 
@@ -192,9 +161,11 @@ SC.FixturesDataSource = SC.DataSource.extend( {
     
     @param {SC.Store} store the store
     @param {Number} storeKey the store key
+    @param {Hash} params to be passed down to data source. originated
+      from the commitRecords() call on the store
     @returns {Boolean} YES if successful
   */
-  destroyRecord: function(store, storeKey) {
+  destroyRecord: function(store, storeKey, params) {
     var id         = store.idFor(storeKey),
         recordType = store.recordTypeFor(storeKey),
         fixtures   = this.fixturesFor(recordType);
@@ -301,7 +272,7 @@ SC.FixturesDataSource = SC.DataSource.extend( {
   */
   _invalidateCachesFor: function(recordType, storeKey, id) {
     var cache = this._storeKeyCache;
-    if (cache) delete cache[SC.guidFor(recordType)]
+    if (cache) delete cache[SC.guidFor(recordType)];
     return this ;
   }
   

data/frameworks/sproutcore/frameworks/datastore/models/record.js

@@ -341,6 +341,17 @@ SC.Record = SC.Object.extend(
     return this.readAttribute(key);
   },
   
+  /**
+    Lets you commit this specific record to the store which will trigger
+    the appropriate methods in the data source for you.
+    
+    @param {Hash} params optional additonal params that will passed down
+      to the data source
+  */
+  commitRecord: function(params) {
+    this.get('store').commitRecord(undefined, undefined, this.get('storeKey'), params);
+  },
+  
   // ...............................
   // PRIVATE
   //

data/frameworks/sproutcore/frameworks/datastore/models/record_attribute.js

@@ -185,11 +185,14 @@ SC.RecordAttribute = SC.Object.extend(
     @returns {Object} property value
   */
   call: function(record, key, value) {
-    var attrKey = this.get('key') || key;
+    var attrKey = this.get('key') || key, nvalue;
     
     if (value !== undefined) {
-      value = this.fromType(record, key, value) ; // convert to attribute.
-      record.writeAttribute(attrKey, value);
+
+      // careful: don't overwrite value here.  we want the return value to 
+      // cache.
+      nvalue = this.fromType(record, key, value) ; // convert to attribute.
+      record.writeAttribute(attrKey, nvalue); 
     } else {
       value = record.readAttribute(attrKey);
       if (SC.none(value) && (value = this.get('defaultValue'))) {

data/frameworks/sproutcore/frameworks/datastore/system/nested_store.js

@@ -136,8 +136,10 @@ SC.NestedStore = SC.Store.extend(
     if (this.get('hasChanges')) {
       var pstore = this.get('parentStore');
       pstore.commitChangesFromNestedStore(this, this.chainedChanges, force);
-      this.reset(); // clear out custom changes
     }
+
+    // clear out custom changes - even if there is nothing to commit.
+    this.reset();
     return this ;
   },
 
@@ -166,6 +168,7 @@ SC.NestedStore = SC.Store.extend(
     }
     
     this.reset();
+    this.flush();
     return this ;
   },
   
@@ -380,6 +383,7 @@ SC.NestedStore = SC.Store.extend(
     
     // Finally, mark store as dirty if we have changes
     this.setIfChanged('hasChanges', myChanges.get('length')>0);
+    this.flush();
     
     return this ;
   },

data/frameworks/sproutcore/frameworks/datastore/system/query.js

@@ -548,13 +548,15 @@ SC.Query = SC.Object.extend({
     
     if (!inputString) return [];
     
-    for (var i=0; i < inputString.length; i++) {
+    var iStLength = inputString.length;
+    
+    for (var i=0; i < iStLength; i++) {
       
       // end reached?
-      endOfString = (i==inputString.length-1);
+      endOfString = (i===iStLength-1);
       
       // current character
-      c = inputString[i];
+      c = inputString.charAt(i);
     
       // set true after end of delimeted token so that
       // final delimeter is not catched again
@@ -567,7 +569,7 @@ SC.Query = SC.Object.extend({
       
         // some helpers
         t = grammar[currentToken];
-        endOfToken = t.delimeted ? c==currentDelimeter : t.notAllowed.test(c);
+        endOfToken = t.delimeted ? c===currentDelimeter : t.notAllowed.test(c);
       
         // if still in token
         if ( !endOfToken ) currentTokenValue += c;
@@ -859,10 +861,11 @@ SC.Query.mixin( /** @scope SC.Query */ {
     
     for(idx=0,len=storeKeys.length;idx<len;idx++) {
       rec = store.materializeRecord(storeKeys[idx]);
-      status = rec.get('status');
+      if (rec) status = rec.get('status');
+      
       // do not include EMPTY or DESTROYED records
-      if(rec && !(status & K.EMPTY) && !(status & K.DESTROYED) && query.contains(rec)) {
-        ret.push(storeKeys[idx]);
+      if (rec && !(status & K.EMPTY) && !(status & K.DESTROYED)) {
+        if (query.contains(rec)) ret.push(storeKeys[idx]);
       }
     }
     

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

@@ -151,6 +151,7 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       // clear existing storeKeys, start over by applying all storekeys for 
       // this recordType
       this.storeKeys = [];
+      query.parseQuery();
       this.applyQuery(storeKeys, recordTypes);
     }
     
@@ -163,13 +164,12 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     
     @param {Array} storeKeys to evaluate against the query
     @param {SC.Set} recordTypes set of record types that changed
-    @param {Boolean} notify to send length notifyPropertyChange()
   */
-  applyQuery: function(changedStoreKeys, recordTypes, notify) {
-    var newStoreKeys = this.get('storeKeys'), inChangedStoreKeys, 
+  applyQuery: function(changedStoreKeys, recordTypes) {
+    var newStoreKeys = SC.clone(this.get('storeKeys')), inChangedStoreKeys, 
       inMatchingStoreKeys, idx, len, storeKey, queryKey = this.get('queryKey'),
       store = this.get('store');
-      
+    
     // first check if these changes include any of the record types
     if(recordTypes && queryKey.recordType && !recordTypes.contains(queryKey.recordType)) return;
     
@@ -184,7 +184,7 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       inMatchingStoreKeys = (matchingStoreKeys && 
         matchingStoreKeys.indexOf(storeKey)!==-1) ? YES: NO;
       var inRecArray = this.storeKeys.indexOf(storeKey)!==-1 ? YES : NO;
-    
+      
       if(inMatchingStoreKeys && !inRecArray) {
         newStoreKeys.push(storeKey);
       }
@@ -195,11 +195,7 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     }
     
     SC.Query.orderStoreKeys(newStoreKeys, queryKey, store);
-    // clear cache
-    this._records = null;
-    
-    this.storeKeys = newStoreKeys.addObserver('[]', this, this._storeKeysContentDidChange);
-    if(notify) this.notifyPropertyChange('length');
+    this.set('storeKeys', newStoreKeys);
   },
   
   /**
@@ -223,7 +219,6 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     Invoked whenever the storeKeys array changes.  Observes changes.
   */
   _storeKeysDidChange: function() {
-    
     var storeKeys = this.get('storeKeys');
     
     var prev = this._prevStoreKeys, 
@@ -263,13 +258,6 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   */
   _storeKeysContentDidChange: function(target, key, value, rev) {
     this._records = null ; // clear cache
-    // if this record array is based on a queryKey reapply the
-    // the query before setting the storeKeys to ensure it always conforms
-    
-    if(SC.instanceOf(this.queryKey, SC.Query)) {
-      this.storeKeys = SC.Query.containsStoreKeys(this.queryKey, value, this.store);
-      this.notifyPropertyChange('length');
-    }
     
     this.beginPropertyChanges()
       .notifyPropertyChange('length')
@@ -279,9 +267,20 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
   
   init: function() {
     sc_super();
-    this._storeKeysDidChange();
+    
+    // if this record array is based on a queryKey apply the
+    // the query before setting the storeKeys to ensure it always conforms
+    if(SC.instanceOf(this.queryKey, SC.Query)) {
+      var queryKey = this.get('queryKey'), recordTypes = SC.Set.create();
+      recordTypes.push(queryKey.get('recordType'));
+      
+      this.applyQuery(this.get('storeKeys'), recordTypes);
+    }
+    else {
+      this._storeKeysDidChange();
+    }
+    
   }
   
-  
 });