sproutcore 1.8.2.1 → 1.9.0

data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/array.js

@@ -48,17 +48,23 @@ var DummyArray = SC.Object.extend(SC.Array, {
 
     // Update the length property
     this.set('length', this.content.length) ;
+    this.endPropertyChanges();
 
+    // Both arrayContentDidChange and enumerableContentDidChange will invoke
+    // "this.notifyPropertyChange('[]')". To prevent multiple notifications 
+    // these calls are made as grouped property changes.
+    this.beginPropertyChanges();
+    
     // Call the general-purpose enumerableContentDidChange
     // Enumerable method.
     this.enumerableContentDidChange(idx, amt, len - amt) ;
-    this.endPropertyChanges() ;
-
+    
     // SC.Array implementations must call arrayContentDidChange
     // after making mutations. This allows observers to perform
     // operations based on the mutation. For instance, a listener
     // might want to reflect additions onto itself.
     this.arrayContentDidChange(idx, amt, len);
+    this.endPropertyChanges();
   },
 
   // SC.Arrays must implement objectAt, which returns an object

data/lib/frameworks/sproutcore/frameworks/runtime/tests/mixins/enumerable/enumerable.js

@@ -10,15 +10,15 @@
 var enumerables ; // global variables
 
 var DummyEnumerable = SC.Object.extend( SC.Enumerable, {
-  
+
   content: [],
-  
+
   length: function() { return this.content.length; }.property(),
-  
+
   objectAt: function(idx) { return this.content[idx]; },
-  
+
   nextObject: function(idx) { return this.content[idx]; },
-  
+
   // add support for reduced properties.
   unknownProperty: function(key, value) {
     var ret = this.reducedProperty(key, value) ;
@@ -28,12 +28,18 @@ var DummyEnumerable = SC.Object.extend( SC.Enumerable, {
     }
     return ret ;
   },
-  
+
+  shiftObject: function() {
+    var ret = this.content.shift();
+    this.enumerableContentDidChange(0, 1);
+    return ret;
+  },
+
   pushObject: function(object) {
     this.content.push(object) ;
-    this.enumerableContentDidChange() ;
+    this.enumerableContentDidChange(this.content.length - 2, 1);
   }
-  
+
 });
 
 var runFunc = function(a,b) { return ['DONE', a, b]; } ;
@@ -43,48 +49,48 @@ var reduceTestFunc = function(prev, item, idx, e, pname) { return pname||'TEST';
 
 var CommonArray = [
   {
-    first: "Charles", 
-    gender: "male", 
-    californian: NO, 
-    ready: YES, 
-    visited: "Prague", 
-    doneTravelling: NO, 
+    first: "Charles",
+    gender: "male",
+    californian: NO,
+    ready: YES,
+    visited: "Prague",
+    doneTravelling: NO,
     run: runFunc,
     invokeWhileTest: invokeWhileOK,
     balance: 1
   },
-  
+
   {
-    first: "Jenna", 
-    gender: "female", 
-    californian: YES, 
-    ready: YES, 
-    visited: "Prague", 
-    doneTravelling: NO, 
+    first: "Jenna",
+    gender: "female",
+    californian: YES,
+    ready: YES,
+    visited: "Prague",
+    doneTravelling: NO,
     run: runFunc,
     invokeWhileTest: invokeWhileOK,
-    balance: 2 
+    balance: 2
   },
-  
+
   {
-    first: "Peter", 
-    gender: "male", 
-    californian: NO, 
-    ready: YES, 
-    visited: "Prague", 
-    doneTravelling: NO, 
+    first: "Peter",
+    gender: "male",
+    californian: NO,
+    ready: YES,
+    visited: "Prague",
+    doneTravelling: NO,
     run: runFunc,
     invokeWhileTest: invokeWhileNotOK,
-    balance: 3 
+    balance: 3
   },
-  
+
   {
-    first: "Chris", 
-    gender: "male", 
-    californian: NO, 
-    ready: YES, 
-    visited: "Prague", 
-    doneTravelling: NO, 
+    first: "Chris",
+    gender: "male",
+    californian: NO,
+    ready: YES,
+    visited: "Prague",
+    doneTravelling: NO,
     run: runFunc,
     invokeWhileTest: invokeWhileOK,
     balance: 4
@@ -92,17 +98,17 @@ var CommonArray = [
 ];
 
 module("Real Array & DummyEnumerable", {
-  
-  setup: function() { 
-    enumerables = [SC.$A(CommonArray), DummyEnumerable.create({ content: CommonArray })] ;
+
+  setup: function() {
+    enumerables = [SC.$A(CommonArray), DummyEnumerable.create({ content: SC.clone(CommonArray) })] ;
   },
-  
+
   teardown: function() {
     delete enumerables;
     delete Array.prototype["@max(balance)"] ; // remove cached value
     delete Array.prototype["@min(balance)"] ;
   }
-  
+
 });
 
 test("should get enumerator that iterates through objects", function() {
@@ -111,14 +117,14 @@ test("should get enumerator that iterates through objects", function() {
     src = ary2[idx2] ;
     var e = src.enumerator() ;
     ok(e !== null, 'enumerator must not be null');
-    
+
     var idx = 0;
     var cur ;
     while(cur = e.nextObject()) {
       equals(src.objectAt(idx), cur, "object at index %@".fmt(idx)) ;
       idx++;
     }
-    
+
     equals(src.get('length'), idx) ;
   }
 });
@@ -129,7 +135,7 @@ test("should return firstObject for item with content", function() {
     src = ary2[idx2] ;
     equals(src.firstObject(), CommonArray[0], 'firstObject should return first object');
   }
-  
+
   equals([].firstObject(), undefined, 'firstObject() on empty enumerable should return undefined');
 });
 
@@ -138,20 +144,20 @@ test("should run forEach() to go through objects", function() {
   for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
     src = ary2[idx2] ;
     var idx = 0;
-    
+
     // save for testing later
     var items = [] ;
     var indexes = [] ;
     var arrays = [] ;
     var targets = [] ;
-    
+
     src.forEach(function(item, index, array) {
       items.push(item);
       indexes.push(index);
       arrays.push(array);
       targets.push(this);
     }, this);
-    
+
     var len = src.get('length') ;
     for(idx=0;idx<len;idx++) {
       equals(items[idx], src.objectAt(idx)) ;
@@ -170,29 +176,29 @@ test("should map to values while passing proper params", function() {
   for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
     src = ary2[idx2] ;
     var idx = 0;
-    
+
     // save for testing later
     var items = [] ;
     var indexes = [] ;
     var arrays = [] ;
     var targets = [] ;
-    
+
     var mapped = src.map(function(item, index, array) {
       items.push(item);
       indexes.push(index);
       arrays.push(array);
       targets.push(this);
-      
+
       return index ;
     }, this);
-    
+
     var len = src.get('length') ;
     for(idx=0;idx<len;idx++) {
       equals(src.objectAt(idx), items[idx], "items") ;
       equals(idx, indexes[idx], "indexes") ;
       equals(src, arrays[idx], 'arrays') ;
       equals(SC.guidFor(this), SC.guidFor(targets[idx]), "this") ;
-      
+
       equals(idx, mapped[idx], "mapped") ;
     }
   }
@@ -203,22 +209,22 @@ test("should filter to items that return for callback", function() {
   for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
     src = ary2[idx2] ;
     var idx = 0;
-    
+
     // save for testing later
     var items = [] ;
     var indexes = [] ;
     var arrays = [] ;
     var targets = [] ;
-    
+
     var filtered = src.filter(function(item, index, array) {
       items.push(item);
       indexes.push(index);
       arrays.push(array);
       targets.push(this);
-      
+
       return item.gender === "female" ;
     }, this);
-    
+
     var len = src.get('length') ;
     for(idx=0;idx<len;idx++) {
       equals(src.objectAt(idx), items[idx], "items") ;
@@ -226,7 +232,7 @@ test("should filter to items that return for callback", function() {
       equals(src, arrays[idx], 'arrays') ;
       equals(SC.guidFor(this), SC.guidFor(targets[idx]), "this") ;
     }
-    
+
     equals(filtered.length, 1) ;
     equals(filtered[0].first, "Jenna") ;
   }
@@ -237,22 +243,22 @@ test("should return true if function for every() returns true", function() {
   for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
     src = ary2[idx2] ;
     var idx = 0 ;
-    
+
     // save for testing later
     var items = [] ;
     var indexes = [] ;
     var arrays = [] ;
     var targets = [] ;
-    
+
     var result = src.every(function(item, index, array) {
       items.push(item) ;
       indexes.push(index) ;
       arrays.push(array) ;
       targets.push(this) ;
-      
+
       return true ;
     }, this);
-    
+
     var len = src.get('length') ;
     for(idx=0;idx<len;idx++) {
       equals(src.objectAt(idx), items[idx], "items") ;
@@ -260,7 +266,7 @@ test("should return true if function for every() returns true", function() {
       equals(src, arrays[idx], 'arrays') ;
       equals(SC.guidFor(this), SC.guidFor(targets[idx]), "this") ;
     }
-    
+
     equals(result, YES) ;
   }
 });
@@ -281,22 +287,22 @@ test("should return false if all functions for some() returns false", function()
   for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
     src = ary2[idx2] ;
     var idx = 0 ;
-    
+
     // save for testing later
     var items = [] ;
     var indexes = [] ;
     var arrays = [] ;
     var targets = [] ;
-    
+
     var result = src.some(function(item, index, array) {
       items.push(item) ;
       indexes.push(index) ;
       arrays.push(array) ;
       targets.push(this) ;
-      
+
       return false ;
     }, this);
-    
+
     var len = src.get('length') ;
     for(idx=0;idx<len;idx++) {
       equals(src.objectAt(idx), items[idx], "items") ;
@@ -304,7 +310,7 @@ test("should return false if all functions for some() returns false", function()
       equals(src, arrays[idx], 'arrays') ;
       equals(SC.guidFor(this), SC.guidFor(targets[idx]), "this") ;
     }
-    
+
     equals(result, NO) ;
   }
 });
@@ -486,34 +492,73 @@ test("should invoke custom reducer", function() {
   }
 });
 
+test("should trigger observer on property when lastObject changes", function() {
+  var src, ary2 = enumerables;
+  for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
+    src = ary2[idx2];
+
+    var callCount = 0;
+    src.addObserver("lastObject", function() {
+      callCount++;
+    });
+
+    src.pushObject({
+      first: "John",
+      gender: "male",
+      californian: NO,
+      ready: YES,
+      visited: "Paris",
+      balance: 5
+    });
+
+    equals(callCount, 1, "callCount");
+  }
+});
+
+test("should trigger observer on property when firstObject changes", function() {
+  var src, ary2 = enumerables;
+  for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
+    src = ary2[idx2] ;
+
+    var callCount = 0;
+    src.addObserver("firstObject", function() {
+      callCount++;
+    });
+
+    src.shiftObject();
+
+    equals(callCount, 1, "callCount");
+  }
+});
+
 test("should trigger observer of reduced prop when array changes once property retrieved once", function() {
   var src, ary2 = enumerables ;
   for (var idx2=0, len2=ary2.length; idx2<len2; idx2++) {
     src = ary2[idx2] ;
     // get the property...this will install the reducer property...
     src.get("@max(balance)") ;
-    
+
     // install observer
     var observedValue = null ;
-    src.addObserver("@max(balance)", function() { 
+    src.addObserver("@max(balance)", function() {
       observedValue = src.get("@max(balance)");
     }) ;
-    
+
     //src.addProbe('[]') ;
     //src.addProbe('@max(balance)');
-    
+
     // add record to array
-    src.pushObject({ 
-      first: "John", 
-      gender: "male", 
-      californian: NO, 
-      ready: YES, 
-      visited: "Paris", 
+    src.pushObject({
+      first: "John",
+      gender: "male",
+      californian: NO,
+      ready: YES,
+      visited: "Paris",
       balance: 5
     }) ;
-    
+
     //SC.NotificationQueue.flush() ; // force observers to trigger
-    
+
     // observed value should now be set because the reduced property observer
     // was triggered when we changed the array contents.
     equals(5, observedValue, "observedValue") ;
@@ -527,22 +572,22 @@ test("should trigger observer of reduced prop when array changes - even if you n
     src = ary2[idx2] ;
     // install observer
     var observedValue = null ;
-    src.addObserver("@max(balance)", function() { 
+    src.addObserver("@max(balance)", function() {
       observedValue = src.get("@max(balance)");
     }) ;
-    
+
     // add record to array
-    src.pushObject({ 
-      first: "John", 
-      gender: "male", 
-      californian: NO, 
-      ready: YES, 
-      visited: "Paris", 
+    src.pushObject({
+      first: "John",
+      gender: "male",
+      californian: NO,
+      ready: YES,
+      visited: "Paris",
       balance: 5
     }) ;
-    
+
     //SC.NotificationQueue.flush() ; // force observers to trigger
-    
+
     // observed value should now be set because the reduced property observer
     // was triggered when we changed the array contents.
     equals(5, observedValue, "observedValue") ;
@@ -558,14 +603,14 @@ test("should find the first element matching the criteria", function() {
 var source ; // global variables
 
 module("Real Array", {
-  
-  setup: function() { 
-    source = SC.$A(CommonArray); 
+
+  setup: function() {
+    source = SC.$A(CommonArray);
   },
-  
-  teardown: function() { 
-    delete source ; 
-    
+
+  teardown: function() {
+    delete source ;
+
     delete Array.prototype["@max(balance)"] ; // remove cached value
     delete Array.prototype["@min(balance)"] ;
   }
@@ -574,47 +619,47 @@ module("Real Array", {
 
 /*
   This is a particular problem because reduced properties are registered
-  as dependent keys, which are not automatically configured in native 
-  Arrays (where the SC.Object.init method is not run).  
+  as dependent keys, which are not automatically configured in native
+  Arrays (where the SC.Object.init method is not run).
 
-  The fix for this problem was to add an initObservable() method to 
+  The fix for this problem was to add an initObservable() method to
   SC.Observable that will configure bindings and dependent keys.  This
   method is called from SC.Object.init() and it is called in
   SC.Observable._notifyPropertyChanges if it has not been called already.
 
-  SC.Enumerable was in turn modified to register reducers as dependent 
-  keys so that now they will be registered on the Array before any 
+  SC.Enumerable was in turn modified to register reducers as dependent
+  keys so that now they will be registered on the Array before any
   property change notifications are sent.
 */
 test("should notify observers even if reduced property is cached on prototype", function() {
   // make sure reduced property is cached
   source.get("@max(balance)") ;
-  
+
   // now make a clone and observe
   source = SC.$A(CommonArray) ;
-  
+
   // get the property...this will install the reducer property...
   source.get("@max(balance)") ;
-  
+
   // install observer
   var observedValue = null ;
-  source.addObserver("@max(balance)", function() { 
+  source.addObserver("@max(balance)", function() {
     observedValue = source.get("@max(balance)");
   }) ;
-  
+
   //source.addProbe('[]') ;
   //source.addProbe('@max(balance)');
-  
+
   // add record to array
-  source.pushObject({ 
-    first: "John", 
-    gender: "male", 
-    californian: NO, 
-    ready: YES, 
-    visited: "Paris", 
+  source.pushObject({
+    first: "John",
+    gender: "male",
+    californian: NO,
+    ready: YES,
+    visited: "Paris",
     balance: 5
   }) ;
-  
+
   //SC.NotificationQueue.flush() ; // force observers to trigger
 
   // observed value should now be set because the reduced property observer