sproutcore 1.0.1043 → 1.0.1046

data/Rakefile

@@ -189,7 +189,7 @@ namespace :release do
   task :gemcutter => [:prepare, 'gemcutter:release']
   
   desc "one release to rule them all"
-  task :all => [:prepare, 'release:gemcutter', 'release:rubyforge']
+  task :all => [:prepare, 'release:gemcutter']
 
 end
 

data/VERSION.yml

@@ -1,7 +1,7 @@
 --- 
-:digest: 27241da4db9a4fd342f444b171b497ccb7272fe0
+:digest: 991afd0db6e66c3e4067d9ad4c2bd6a105eeba97
 :dist: 
-  frameworks/sproutcore: e9b957ac68b9adc9eb9cef27396eea85f3075553
+  frameworks/sproutcore: e3bbb4a88ae2bc9fa217d0cf5a24868683f6ae91
 :major: 1
 :minor: 0
-:patch: 1043
+:patch: 1046

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

@@ -531,6 +531,12 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
     
     // 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

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

@@ -1711,7 +1711,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
   */
   loadRecord: function(recordType, dataHash, id) {
     var K       = SC.Record,
-        ret, primaryKey, dataHash, storeKey;
+        ret, primaryKey, storeKey;
         
     // save lookup info
     recordType = recordType || SC.Record;

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

@@ -129,6 +129,49 @@ test("calling storeDidChangeStoreKeys() to remove a record", function() {
 });
 
 
+// ..........................................................
+// SPECIAL CASES
+// 
+
+var json2, foo, bar ;
+
+module("SC.RecordArray core methods", {
+  setup: function() {
+    // setup dummy store
+    store = SC.Store.create();
+
+    storeKey = SC.Record.storeKeyFor('foo');
+    json = {  guid: "foo", name: "foo" };
+    store.writeDataHash(storeKey, json, SC.Record.READY_CLEAN); 
+    foo = store.materializeRecord(storeKey);
+    equals(foo.get('name'), 'foo', 'record should have json');
+
+    storeKey = SC.Record.storeKeyFor('bar');
+    json2 = { guid: "bar", name: "bar" };
+    store.writeDataHash(storeKey, json2, SC.Record.READY_CLEAN); 
+    bar = store.materializeRecord(storeKey);
+    equals(bar.get('name'), 'bar', 'record should have json');
+    
+    // get record array.
+    query = SC.Query.create({ recordType: SC.Record, orderBy: 'name' });
+    recs = store.find(query);
+  }
+});
+
+test("local query should notify changes", function() {
+  
+    // note: important to retrieve records from RecordArray first to prime
+    // any cache
+    same(recs.mapProperty('id'), ['bar', 'foo'], 'PRECOND - bar should appear before foo');
+
+    SC.stopIt = YES;
+    
+    SC.RunLoop.begin();
+    bar.set('name', 'zzbar');
+    SC.RunLoop.end(); // should resort record array
+
+    same(recs.mapProperty('id'), ['foo', 'bar'], 'order of records should change');
+});
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sproutcore
 version: !ruby/object:Gem::Version 
-  version: 1.0.1043
+  version: 1.0.1046
 platform: ruby
 authors: 
 - Sprout Systems, Inc.  Apple Inc. and contributors
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -08:00
+date: 2010-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency