sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/observer_set.js

@@ -0,0 +1,50 @@
+// Author: Richard Klancer <rpk@pobox.com>
+
+/*globals module test ok equals same stop start */
+
+module("Problematic SC.ObserverSet.getMethods() removal", {
+  setup: function () {
+    SC.LOG_OBSERVERS = YES;
+  },
+  teardown: function () {
+    SC.LOG_OBSERVERS = NO;
+  }
+});
+
+// This test succeeds using master up to commit 5826c745874f903f1e4765e5a2bcb5244ff72113 and using the 1-4-stable HEAD 
+// This test fails using subsequent master commit c78e1bf25087a3ebd553dbc513923e0d32d09f7b
+// It triggers an error at line 987 of frameworks/system/runtime/mixins/observable.js (in the method
+// SC.Observable._notifyPropertyObservers()) as of current master commit, 789fe805cd08976b7aab1c346c71cf22b78b7285
+
+test("Observers that remove themselves should fire at least once, and shouldn't cause an error", function () {
+  expect(1);
+
+  var observed = SC.Object.create({
+    key: 'val'
+  });
+
+  var observer1, observer2;
+  var observerFired = NO;
+
+  function removeObservers() {
+    observed.removeObserver('key', observer1);
+    observed.removeObserver('key', observer2);
+  }
+
+  observer1 = function () {
+    observerFired = YES;
+    removeObservers();
+  };
+  observer2 = function () {
+    observerFired = YES;
+    removeObservers();
+  };
+
+  observed.addObserver('key', observer1);
+  observed.addObserver('key', observer2);
+
+  observed.set('key', 'newval');
+
+  ok(observerFired, "At least one observer should have fired.");
+});
+

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/range_observer/create.js

@@ -9,26 +9,26 @@
 var source, indexes, observer, obj ; // base array to work with
 module("SC.RangeObserver#create", {
   setup: function() {
-    
+
     // create array with 5 SC.Object's in them
     source = [1,2,3,4,5].map(function(x) {
       return SC.Object.create({ item: x, foo: "bar" }) ;
-    }, this); 
+    }, this);
 
     indexes = SC.IndexSet.create(2,2); // select 2..3
-    
+
     observer = SC.Object.create({
-      
-      callCount: 0, 
-      
-      rangeDidChange: function() { 
+
+      callCount: 0,
+
+      rangeDidChange: function() {
         this.callCount++;
       }
-      
+
     });
 
     obj = SC.RangeObserver.create(source, indexes, observer, observer.rangeDidChange, "context", YES);
-    
+
   }
 });
 
@@ -47,10 +47,10 @@ test("sets up observing on properties for each object in range in index if isDee
 test("does not observe object properties if isDeep is NO", function() {
   // remove unneeded observer
   obj.destroy();
-  
+
   // use new observer
   obj = SC.RangeObserver.create(source, indexes, observer, observer.rangeDidChange, "context", NO);
-  
+
   var len = source.length, idx;
   for(idx=0;idx<len;idx++) {
     source[idx].set('foo', 'baz');

data/lib/frameworks/sproutcore/frameworks/runtime/tests/system/set.js

@@ -71,7 +71,7 @@ test("should add an SC.Object", function() {
   var oldLength = set.length ;
   set.add(obj) ;
   equals(set.contains(obj), YES, "contains()") ;
-  equals(oldLength+1, set.length, "new set length") ;
+  equals(set.length, oldLength+1, "new set length") ;
 });
 
 test("should add a regular hash", function() {
@@ -80,7 +80,7 @@ test("should add a regular hash", function() {
   var oldLength = set.length ;
   set.add(obj) ;
   equals(set.contains(obj), YES, "contains()") ;
-  equals(oldLength+1, set.length, "new set length") ;
+  equals(set.length, oldLength+1, "new set length") ;
 });
 
 test("should add a string", function() {
@@ -89,7 +89,7 @@ test("should add a string", function() {
   var oldLength = set.length ;
   set.add(obj) ;
   equals(set.contains(obj), YES, "contains()") ;
-  equals(oldLength+1, set.length, "new set length") ;
+  equals(set.length, oldLength+1, "new set length") ;
 });
 
 test("should add a number", function() {
@@ -98,16 +98,27 @@ test("should add a number", function() {
   var oldLength = set.length ;
   set.add(obj) ;
   equals(set.contains(obj), YES, "contains()") ;
-  equals(oldLength+1, set.length, "new set length") ;
+  equals(set.length, oldLength+1, "new set length") ;
 });
 
-test("should add a bool", function() {
-  var obj = true ;
-  
+test("should add bools", function() {
   var oldLength = set.length ;
-  set.add(obj) ;
-  equals(set.contains(obj), YES, "contains()") ;
-  equals(oldLength+1, set.length, "new set length") ;
+
+  set.add(true) ;
+  equals(set.contains(true), YES, "contains(true)");
+  equals(set.length, oldLength+1, "new set length");
+
+  set.add(false);
+  equals(set.contains(false), YES, "contains(false)");
+  equals(set.length, oldLength+2, "new set length");
+});
+
+test("should add 0", function() {
+  var oldLength = set.length ;
+
+  set.add(0) ;
+  equals(set.contains(0), YES, "contains(0)");
+  equals(set.length, oldLength+1, "new set length");
 });
 
 test("should add a function", function() {
@@ -116,7 +127,7 @@ test("should add a function", function() {
   var oldLength = set.length ;
   set.add(obj) ;
   equals(set.contains(obj), YES, "contains()") ;
-  equals(oldLength+1, set.length, "new set length") ;
+  equals(set.length, oldLength+1, "new set length") ;
 });
 
 test("should NOT add a null", function() {
@@ -139,10 +150,10 @@ test("adding an item, removing it, adding another item", function() {
   set.remove(item1) ; //remove from set
   set.add(item2) ;
   
-  equals(NO, set.contains(item1), "set.contains(item1)") ;
+  equals(set.contains(item1), NO, "set.contains(item1)") ;
   
   set.add(item1) ; // re-add to set
-  equals(2, set.length, "set.length") ;
+  equals(set.length, 2, "set.length") ;
 });
 
 module("SC.Set.remove + SC.Set.contains", {
@@ -154,7 +165,7 @@ module("SC.Set.remove + SC.Set.contains", {
       SC.Object.create({ dummy: YES }),
       { isHash: YES },
       "Not the String",
-      16, false]) ;
+      16, true, false, 0]) ;
   },
   
   teardown: function() {
@@ -170,8 +181,8 @@ test("should remove an SC.Object and reduce length", function() {
   var oldLength = set.length ;
   
   set.remove(obj) ;
-  equals(NO, set.contains(obj), "should be removed") ;
-  equals(oldLength-1, set.length, "should be 1 shorter") ;
+  equals(set.contains(obj), NO, "should be removed") ;
+  equals(set.length, oldLength-1, "should be 1 shorter") ;
 });
 
 test("should remove a regular hash and reduce length", function() {
@@ -181,8 +192,8 @@ test("should remove a regular hash and reduce length", function() {
   var oldLength = set.length ;
   
   set.remove(obj) ;
-  equals(NO, set.contains(obj), "should be removed") ;
-  equals(oldLength-1, set.length, "should be 1 shorter") ;
+  equals(set.contains(obj), NO, "should be removed") ;
+  equals(set.length, oldLength-1, "should be 1 shorter") ;
 });
 
 test("should remove a string and reduce length", function() {
@@ -192,8 +203,8 @@ test("should remove a string and reduce length", function() {
   var oldLength = set.length ;
   
   set.remove(obj) ;
-  equals(NO, set.contains(obj), "should be removed") ;
-  equals(oldLength-1, set.length, "should be 1 shorter") ;
+  equals(set.contains(obj), NO, "should be removed") ;
+  equals(set.length, oldLength-1, "should be 1 shorter") ;
 });
 
 test("should remove a number and reduce length", function() {
@@ -203,19 +214,26 @@ test("should remove a number and reduce length", function() {
   var oldLength = set.length ;
   
   set.remove(obj) ;
-  equals(NO, set.contains(obj), "should be removed") ;
-  equals(oldLength-1, set.length, "should be 1 shorter") ;
+  equals(set.contains(obj), NO, "should be removed") ;
+  equals(set.length, oldLength-1, "should be 1 shorter") ;
 });
 
-test("should remove a bool and reduce length", function() {
-  var obj = true ;
-  set.add(obj) ;
-  equals(set.contains(obj), YES) ;
+test("should remove a bools and reduce length", function() {
   var oldLength = set.length ;
-  
-  set.remove(obj) ;
-  equals(NO, set.contains(obj), "should be removed") ;
-  equals(oldLength-1, set.length, "should be 1 shorter") ;
+  set.remove(true) ;
+  equals(set.contains(true), NO, "should be removed") ;
+  equals(set.length, oldLength-1, "should be 1 shorter") ;
+
+  set.remove(false);
+  equals(set.contains(false), NO, "should be removed") ;
+  equals(set.length, oldLength-2, "should be 2 shorter") ;
+});
+
+test("should remove 0 and reduce length", function(){
+  var oldLength = set.length;
+  set.remove(0) ;
+  equals(set.contains(0), NO, "should be removed") ;
+  equals(set.length, oldLength-1, "should be 1 shorter") ;
 });
 
 test("should remove a function and reduce length", function() {
@@ -225,36 +243,36 @@ test("should remove a function and reduce length", function() {
   var oldLength = set.length ;
   
   set.remove(obj) ;
-  equals(NO, set.contains(obj), "should be removed") ;
-  equals(oldLength-1, set.length, "should be 1 shorter") ;
+  equals(set.contains(obj), NO, "should be removed") ;
+  equals(set.length, oldLength-1, "should be 1 shorter") ;
 });
 
 test("should NOT remove a null", function() {
   var oldLength = set.length ;
   set.remove(null) ;
-  equals(oldLength, set.length) ;
+  equals(set.length, oldLength) ;
 });
 
 test("should NOT remove an undefined", function() {
   var oldLength = set.length ;
   set.remove(undefined) ;
-  equals(oldLength, set.length) ;
+  equals(set.length, oldLength) ;
 });
 
 test("should ignore removing an object not in the set", function() {
   var obj = SC.Object.create() ;
   var oldLength = set.length ;
   set.remove(obj) ;
-  equals(oldLength, set.length) ;
+  equals(set.length, oldLength) ;
 });
 
 // test("should remove all the elements in the set", function() {
 // 	var obj = [2,3,4];
 // 	set.add(obj) ;
 // 	var oldLength = set.length ;
-// 	equals(6, oldLength);
+// 	equals(oldLength, 6);
 // 	a = set.removeEach(obj);
-// 	equals(0, a.length);
+// 	equals(a.length, 0);
 // });
 
 module("SC.Set.pop + SC.Set.clone", {
@@ -276,17 +294,25 @@ module("SC.Set.pop + SC.Set.clone", {
 test("the pop() should remove an arbitrary object from the set", function() {
 	var oldLength = set.length ;
 	var obj = set.pop();
-	equals(SC.T_OBJECT,SC.typeOf(obj),'pops up an object');
-	equals(oldLength-1,set.length,'length shorter by 1');
+	ok(!SC.none(obj), 'pops up an item');
+	equals(set.length, oldLength-1, 'length shorter by 1');
+});
+
+test("should pop false and 0", function(){
+  set = SC.Set.create([false]);
+  ok(set.pop() === false, "should pop false");
+
+  set = SC.Set.create([0]);
+  ok(set.pop() === 0, "should pop 0");
 });
 
 test("the clone() should return an indentical set", function() {
 	var oldLength = set.length ;
 	var obj = set.clone();
 	equals(oldLength,obj.length,'length of the clone should be same');
-	equals(YES,obj.contains(set[0]));
-	equals(YES,obj.contains(set[1]));
-	equals(YES,obj.contains(set[2]));
-	equals(YES,obj.contains(set[3]));
-	equals(YES,obj.contains(set[4]));
-});
+	equals(obj.contains(set[0]), YES);
+	equals(obj.contains(set[1]), YES);
+	equals(obj.contains(set[2]), YES);
+	equals(obj.contains(set[3]), YES);
+	equals(obj.contains(set[4]), YES);
+});

data/lib/frameworks/sproutcore/frameworks/statechart/core.js

@@ -1,11 +1,5 @@
 // ==========================================================================
-// SC Statechart - Buildfile
-// copyright (c) 2009 - Evin Grano, and contributors
+// Project:   SC.Statechart - A Statechart Framework for SproutCore
+// Copyright: ©2010 Michael Cohen, and contributors.
+// License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-
-// ..........................................................
-// State Constants
-// 
-
-SC.DEFAULT_TREE = 'default';
-

data/lib/frameworks/sproutcore/frameworks/statechart/debug/monitor.js

@@ -0,0 +1,136 @@
+// ==========================================================================
+// Project:   SC - A Statechart Framework for SproutCore
+// Copyright: ©2010 Michael Cohen, and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*globals SC */
+
+SC.StatechartMonitor = SC.Object.extend({
+  
+  sequence: null,
+  
+  init: function() {
+    sc_super();
+    this.reset();
+  },
+  
+  reset: function() {
+    this.propertyWillChange('length');
+    this.sequence = [];
+    this.propertyDidChange('length');
+  },
+  
+  length: function() {
+    return this.sequence.length;
+  }.property(),
+  
+  pushEnteredState: function(state) {
+    this.propertyWillChange('length');
+    this.sequence.push({ entered: state });
+    this.propertyDidChange('length'); 
+  },
+  
+  pushExitedState: function(state) {
+    this.propertyWillChange('length');
+    this.sequence.push({ exited: state });
+    this.propertyDidChange('length');
+  },
+  
+  matchSequence: function() {
+    return SC.StatechartSequenceMatcher.create({
+      statechartMonitor: this
+    });
+  },
+  
+  toString: function() {
+    var seq = "",
+        i = 0,
+        len = 0,
+        item = null;
+    
+    seq += "[";    
+
+    len = this.sequence.length;
+    for (i = 0; i < len; i += 1) {
+      item = this.sequence[i];
+      if (item.exited) {
+        seq += "exited %@".fmt(item.exited.get('name'));
+      } 
+      else if (item.entered) {
+        seq += "entered %@".fmt(item.entered.get('name'));
+      } 
+      if (i < len - 1) seq += ", ";
+    }
+
+    seq += "]";
+
+    return seq;
+  }
+  
+});
+
+SC.StatechartSequenceMatcher = SC.Object.extend({
+  
+  statechartMonitor: null,
+  
+  position: 0,
+  
+  match: YES,
+  
+  begin: function() {
+    this.position = -1;
+    this.match = YES;
+    return this;
+  },
+  
+  end: function() {
+    return this.match;
+  },
+  
+  entered: function() {
+    return this._doCheck('entered', arguments);
+  },
+  
+  exited: function() {
+    return this._doCheck('exited', arguments);
+  },
+  
+  _doCheck: function(event, args) {
+    var i = 0,
+        len = args.length,
+        seqItem = null,
+        arg = null,
+        seq = this.statechartMonitor.sequence;
+        
+    for (; i < len; i += 1) {
+      this.position += 1;
+  
+      if (this.position >= seq.length) {
+        this.match = NO;
+        return this;
+      }
+      
+      seqItem = seq[this.position];
+      if (!seqItem[event]) {
+        this.match = NO;
+        return this;
+      }
+      
+      arg = args[i];
+      if (SC.typeOf(arg) === SC.T_OBJECT) {
+        if (seqItem[event] !== arg) {
+          this.match = NO;
+          return this;
+        }
+      } 
+      else if (seqItem[event].get('name') !== arg) {
+        this.match = NO;
+        return this;
+      }
+    }
+  
+    return this;
+  }
+  
+});