sproutcore 1.10.3.1 → 1.11.0.rc1

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

@@ -9,7 +9,7 @@
 // ========================================================================
 /*globals module, test, ok, isObj, equals, expects */
 
-var fromObject, midObject, toObject, binding, Bon1, bon2, first, second, third, binding1, binding2;
+var FromObject, fromObject, midObject, toObject, binding, Bon1, bon2, first, second, third, binding1, binding2;
 
 module("basic object binding", {
 
@@ -366,7 +366,67 @@ test("two bindings to the same value should sync in the order they are initializ
 
 });
 
-module("AND binding", {
+module("Binding transforms", {
+  setup: function () {
+    BindableObject = SC.Object.extend({
+      booleanValue: NO,
+      numericValue: 42,
+      stringValue: 'forty-two',
+      arrayValue: [4, 2],
+      undefinedValue: undefined
+    });
+    // temporarily set up two source objects in the SC namespace so we can
+    // use property paths to access them
+    SC.testControllerA = BindableObject.create();
+    SC.testControllerB = BindableObject.create();
+  },
+
+  teardown: function () {
+    SC.testControllerA.destroy();
+    delete SC.testControllerA;
+    SC.testControllerB.destroy();
+    delete SC.testControllerB;
+  }
+});
+
+test('Binding sync when only transformed value has changed', function () {
+  var toObject;
+  SC.run(function () {
+    toObject = SC.Object.create({
+      transformedValue: null,
+      transformedValueBinding: SC.Binding.oneWay('SC.testControllerA.undefinedValue').transform(function (value, binding) {
+        if (value === undefined) {
+          return 'VALUE IS UNDEFINED';
+        } else {
+          return value;
+        }
+      })
+    });
+  });
+
+  equals(toObject.get('transformedValue'), 'VALUE IS UNDEFINED', 'value is undefined, so bound value should be');
+});
+
+test("ALL THE OTHER BINDING TRANSFORMS.");
+
+test("equalTo", function() {
+  SC.RunLoop.begin();
+  var toObject = SC.Object.create({
+    isFortyTwo: null,
+    isFortyTwoBinding: SC.Binding.oneWay('SC.testControllerA.numericValue').equalTo(42)
+  });
+  SC.RunLoop.end();
+
+  equals(toObject.get('isFortyTwo'), true, "Value is equal to 42, so bound value should should be");
+
+  SC.RunLoop.begin();
+  SC.testControllerA.set('numericValue', 45);
+  SC.RunLoop.end();
+
+  equals(toObject.get('isFortyTwo'), false, "Value is no longer 42, so bound value should be");
+});
+
+module("Binding transform: `and`", {
 
   setup: function () {
     // temporarily set up two source objects in the SC namespace so we can
@@ -386,9 +446,10 @@ module("AND binding", {
 
   teardown: function () {
     SC.testControllerA.destroy();
+    delete SC.testControllerA;
     SC.testControllerB.destroy();
+    delete SC.testControllerB;
   }
-
 });
 
 test("bound value should be YES if both sources are YES", function () {
@@ -722,3 +783,43 @@ test("works with local path", function () {
 
   equals(TestNamespace.toObject.get('relative'), "newerValue");
 });
+
+module("Overriding binding in subclass", {
+  setup: function() {
+    FromObject = SC.Object.extend({
+      localValue1: 'hello',
+      localValue2: 'world',
+      value: null,
+      valueBinding: SC.Binding.oneWay('.localValue1')
+    });
+  },
+  teardown: function() {
+    FromObject = null;
+  }
+});
+
+test("Bindings override in subclasses.", function() {
+  SC.LOG_DUPLICATE_BINDINGS = NO; // clean consoles
+
+  SC.RunLoop.begin();
+  fromObject = FromObject.create();
+  SC.RunLoop.end();
+
+  equals(fromObject.get('value'), 'hello', "PRELIM: Superclass binding gives value of");
+
+  fromObject.destroy();
+
+  SC.RunLoop.begin();
+  fromObject = FromObject.create({
+    valueBinding: SC.Binding.oneWay('.localValue2')
+  });
+  SC.RunLoop.end();
+
+  ok(fromObject._bindings.length === 1, "Duplicate bindings are not created.")
+
+  equals(fromObject.get('value'), 'world', "Superclass binding should have been overridden in the subclass, giving value a value of");
+
+  fromObject.destroy();
+
+  SC.LOG_DUPLICATE_BINDINGS = YES;
+});

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

@@ -6,7 +6,7 @@
 // ==========================================================================
 // Author: Richard Klancer <rpk@pobox.com>
 
-/*globals module test ok equals same stop start */
+/*globals module, test, ok, equals, expect */
 
 module("Problematic SC.ObserverSet.getMethods() removal", {
   setup: function () {
@@ -116,3 +116,16 @@ test("Removing all the methods on a target should clear the internal tracking of
   equals(observerSet.members.length, 0, "The ObserverSet should have a members length of");
   ok(!observerSet._members[targetGuid], "The ObserverSet should not be tracking methods for the target: %@".fmt(targetGuid));
 });
+
+test("Observers should pass the context along to their method", function () {
+  var target = {},
+    method = function (passedContext) {
+      equals(passedContext, originalContext, "The observer function should receive the context");
+    },
+    observerSet,
+    originalContext = "ABCD";
+
+  observerSet = SC.ObserverSet.create();
+  observerSet.add(target, method, originalContext);
+  observerSet.invokeMethods();
+});

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

@@ -27,6 +27,19 @@ test("Passing named arguments", function() {
   ]), "Hello, World!");
 });
 
+test("Passing named arguments with a SC.Object instance", function() {
+  var t = SC.Object.create({
+    prop: 'Hello',
+    computedProp: function () {
+      return 'World';
+    }.property().cacheable(),
+    unknownProperty: function (key, value) {
+      if (key === "unknownProp") return "!";
+    }
+  });
+  equals(SC.String.fmt("%{prop}, %{computedProp}%{unknownProp}", [t]), "Hello, World!");
+});
+
 test("Passing incomplete named arguments", function() {
   equals( SC.String.fmt("%{first}, %{last}%{punctuation}", [{first: 'Hello', punctuation: '!'}]), "Hello, %{last}!", "Formatting a string with an incomplete set of named arguments should leave unspecified named arguments in place." );
 })
@@ -35,7 +48,7 @@ test("Passing arguments with formatters", function() {
   var F = function(value) {
     return "$" + value;
   };
-  
+
   equals(SC.String.fmt("%{number}", [{ number: 12, numberFormatter: F }]), "$12", "Formatter was applied");
 });
 
@@ -43,6 +56,6 @@ test("Passing formatting strings with formatters", function() {
   var F = function(value, arg) {
     return "$" + value + ";" + arg;
   };
-  
+
   equals(SC.String.fmt("%{number:blah}", [{ number: 12, numberFormatter: F }]), "$12;blah", "Formatter was applied with argument");
 });

data/lib/frameworks/sproutcore/frameworks/statechart/system/state.js

@@ -7,6 +7,19 @@
 
 /*globals SC */
 
+//@if(debug)
+SC.TRACE_STATECHART_STYLE = {
+  init: 'font-style: italic; font-weight: bold;', // Initialization
+  action: 'color: #5922ab; font-style: italic; font-weight: bold;', // Actions and events
+  actionInfo: 'color: #5922ab; font-style: italic;', // Actions and events
+  route: 'color: #a67000; font-style: italic;', // Routing
+  gotoState: 'color: #479a48; font-style: italic; font-weight: bold;', // Goto state
+  gotoStateInfo: 'color: #479a48; font-style: italic;', // Goto state
+  enter: 'color: #479a48; font-style: italic; font-weight: bold;', // Entering
+  exit: 'color: #479a48; font-style: italic; font-weight: bold;' // Exiting
+};
+//@endif
+
 /**
   @class
 
@@ -50,9 +63,9 @@ SC.State = SC.Object.extend(
   /**
     Used to log a state trace message
   */
-  stateLogTrace: function(msg) {
+  stateLogTrace: function(msg, style) {
     var sc = this.get('statechart');
-    sc.statechartLogTrace("%@: %@".fmt(this, msg));
+    sc.statechartLogTrace("  %@: %@".fmt(this, msg), style);
   },
 
   /* END DEBUG ONLY PROPERTIES AND METHODS */
@@ -454,7 +467,7 @@ SC.State = SC.Object.extend(
     if (del.statechartShouldStateHandleTriggeredRoute(sc, this, context)) {
       //@if(debug)
       if (this.get('trace') && loc) {
-        this.stateLogTrace("will handle route '%@'".fmt(loc));
+        this.stateLogTrace("will handle route '%@'".fmt(loc), SC.TRACE_STATECHART_STYLE.route);
       }
       //@endif
       this.handleTriggeredRoute(context);
@@ -721,7 +734,7 @@ SC.State = SC.Object.extend(
     a substate of this state, otherwise null is returned.
 
     If the given value is a string, then the string is assumed to be a path expression
-    to a substate. The value is then parsed to find the closes match. For path expression
+    to a substate. The value is then parsed to find the closest match. For path expression
     syntax, refer to the {@link SC.StatePathMatcher} class.
 
     If there is no match then null is returned. If there is more than one match then null
@@ -1114,7 +1127,7 @@ SC.State = SC.Object.extend(
     // Now begin by trying a basic method on the state to respond to the event
     if (SC.typeOf(this[event]) === SC.T_FUNCTION) {
       //@if(debug)
-      if (trace) this.stateLogTrace("will handle event '%@'".fmt(event));
+      if (trace) this.stateLogTrace("will handle event '%@'".fmt(event), SC.TRACE_STATECHART_STYLE.actionInfo);
       //@endif
       sc.stateWillTryToHandleEvent(this, event, event);
       ret = (this[event](arg1, arg2) !== NO);
@@ -1126,7 +1139,7 @@ SC.State = SC.Object.extend(
     var handler = this._registeredStringEventHandlers[event];
     if (handler) {
       //@if(debug)
-      if (trace) this.stateLogTrace("%@ will handle event '%@'".fmt(handler.name, event));
+      if (trace) this.stateLogTrace("%@ will handle event '%@'".fmt(handler.name, event), SC.TRACE_STATECHART_STYLE.actionInfo);
       //@endif
       sc.stateWillTryToHandleEvent(this, event, handler.name);
       ret = (handler.handler.call(this, event, arg1, arg2) !== NO);
@@ -1143,7 +1156,7 @@ SC.State = SC.Object.extend(
       handler = this._registeredRegExpEventHandlers[i];
       if (event.match(handler.regexp)) {
         //@if(debug)
-        if (trace) this.stateLogTrace("%@ will handle event '%@'".fmt(handler.name, event));
+        if (trace) this.stateLogTrace("%@ will handle event '%@'".fmt(handler.name, event), SC.TRACE_STATECHART_STYLE.actionInfo);
         //@endif
         sc.stateWillTryToHandleEvent(this, event, handler.name);
         ret = (handler.handler.call(this, event, arg1, arg2) !== NO);
@@ -1156,7 +1169,7 @@ SC.State = SC.Object.extend(
     // handle the event
     if (SC.typeOf(this['unknownEvent']) === SC.T_FUNCTION) {
       //@if(debug)
-      if (trace) this.stateLogTrace("unknownEvent will handle event '%@'".fmt(event));
+      if (trace) this.stateLogTrace("unknownEvent will handle event '%@'".fmt(event), SC.TRACE_STATECHART_STYLE.actionInfo);
       //@endif
       sc.stateWillTryToHandleEvent(this, event, 'unknownEvent');
       ret = (this.unknownEvent(event, arg1, arg2) !== NO);
@@ -1403,16 +1416,6 @@ SC.State = SC.Object.extend(
     return this.get('fullPath');
   },
 
-  /** @private */
-  _enteredSubstatesDidChange: function() {
-    this.notifyPropertyChange('enteredSubstates');
-  }.observes('*enteredSubstates.[]'),
-
-  /** @private */
-  _currentSubstatesDidChange: function() {
-    this.notifyPropertyChange('currentSubstates');
-  }.observes('*currentSubstates.[]'),
-
   /** @private */
   _statechartOwnerDidChange: function() {
     this.notifyPropertyChange('owner');

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

@@ -362,8 +362,12 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
 
     NOTE: This is only available in debug mode!
   */
-  statechartLogTrace: function (msg) {
-    SC.Logger.info("%@: %@".fmt(this.get('statechartLogPrefix'), msg));
+  statechartLogTrace: function (msg, style) {
+    if (style) {
+      SC.Logger.log("%c%@: %@".fmt(this.get('statechartLogPrefix'), msg), style);
+    } else {
+      SC.Logger.info("%@: %@".fmt(this.get('statechartLogPrefix'), msg));
+    }
   },
 
   /* END DEBUG ONLY PROPERTIES AND METHODS */
@@ -548,7 +552,7 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
     this.addObserver(traceKey, this, '_statechartTraceDidChange');
     this._statechartTraceDidChange();
 
-    if (trace) this.statechartLogTrace("BEGIN initialize statechart");
+    if (trace) this.statechartLogTrace("BEGIN initialize statechart", SC.TRACE_STATECHART_STYLE.init);
     //@endif
 
     var rootState = this.get('rootState'),
@@ -592,7 +596,7 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
     this.gotoState(rootState);
 
     //@if(debug)
-    if (trace) this.statechartLogTrace("END initialize statechart");
+    if (trace) this.statechartLogTrace("END initialize statechart", SC.TRACE_STATECHART_STYLE.init);
     //@endif
   },
 
@@ -797,13 +801,27 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
     //@if(debug)
     var trace = this.get('allowStatechartTracing');
     if (trace) {
-      this.statechartLogTrace("BEGIN gotoState: %@".fmt(state));
-      msg = "starting from current state: %@";
-      msg = msg.fmt(fromCurrentState ? fromCurrentState : '---');
-      this.statechartLogTrace(msg);
-      msg = "current states before: %@";
-      msg = msg.fmt(this.getPath('currentStates.length') > 0 ? this.get('currentStates') : '---');
-      this.statechartLogTrace(msg);
+      this.statechartLogTrace("BEGIN gotoState: %@".fmt(state), SC.TRACE_STATECHART_STYLE.gotoState);
+      msg = "  starting from current state: %@";
+      msg = msg.fmt(fromCurrentState ? fromCurrentState : '-- none --');
+      this.statechartLogTrace(msg, SC.TRACE_STATECHART_STYLE.gotoStateInfo);
+
+      var len = this.getPath('currentStates.length');
+      // For many states, we list each on its own line.
+      if (len > 2) {
+        msg = "current states before:\n%@";
+        msg = msg.fmt(this.get('currentStates').getEach('fullPath').join('\n'));
+      }
+      // For a few states, all on one line.
+      else if (len > 0) {
+        msg = "  current states before: %@";
+        msg = msg.fmt(this.get('currentStates').getEach('fullPath').join(', '));
+      }
+      // For no states, no states.
+      else {
+        msg = "  current states before: --none--";
+      }
+      this.statechartLogTrace(msg, SC.TRACE_STATECHART_STYLE.gotoStateInfo);
     }
     //@endif
 
@@ -821,7 +839,7 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
 
     if (pivotState) {
       //@if(debug)
-      if (trace) this.statechartLogTrace("pivot state = %@".fmt(pivotState));
+      if (trace) this.statechartLogTrace("  pivot state = %@".fmt(pivotState), SC.TRACE_STATECHART_STYLE.gotoStateInfo);
       //@endif
       if (pivotState.get('substatesAreConcurrent') && pivotState !== state) {
         this.statechartLogError("Can not go to state %@ from %@. Pivot state %@ has concurrent substates.".fmt(state, fromCurrentState, pivotState));
@@ -926,8 +944,12 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
 
     //@if(debug)
     if (this.get('allowStatechartTracing')) {
-      this.statechartLogTrace("current states after: %@".fmt(this.get('currentStates')));
-      this.statechartLogTrace("END gotoState: %@".fmt(gotoState));
+      if (this.getPath('currentStates.length') > 2) {
+        this.statechartLogTrace("  current states after:\n%@".fmt(this.get('currentStates').getEach('fullPath').join('  \n')), SC.TRACE_STATECHART_STYLE.gotoStateInfo);
+      } else {
+        this.statechartLogTrace("  current states after: %@".fmt(this.get('currentStates').getEach('fullPath').join(', ')), SC.TRACE_STATECHART_STYLE.gotoStateInfo);
+      }
+      this.statechartLogTrace("END gotoState: %@".fmt(gotoState), SC.TRACE_STATECHART_STYLE.gotoState);
     }
     //@endif
 
@@ -953,6 +975,7 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
       parentState = state.get('parentState');
       while (parentState) {
         parentState.get('currentSubstates').removeObject(state);
+        parentState.notifyPropertyChange('currentSubstates');
         parentState = parentState.get('parentState');
       }
     }
@@ -960,16 +983,18 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
     parentState = state;
     while (parentState) {
       parentState.get('enteredSubstates').removeObject(state);
+      parentState.notifyPropertyChange('enteredSubstates');
       parentState = parentState.get('parentState');
     }
 
     //@if(debug)
     if (this.get('allowStatechartTracing')) {
-      this.statechartLogTrace("<-- exiting state: %@".fmt(state));
+      this.statechartLogTrace("<-- exiting state: %@".fmt(state), SC.TRACE_STATECHART_STYLE.exit);
     }
     //@endif
 
     state.set('currentSubstates', []);
+    state.notifyPropertyChange('currentSubstates');
 
     state.stateWillBecomeExited(context);
     var result = this.exitState(state, context);
@@ -1006,6 +1031,7 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
       parentState = state;
       while (parentState) {
         parentState.get('currentSubstates').pushObject(state);
+        parentState.notifyPropertyChange('currentSubstates');
         parentState = parentState.get('parentState');
       }
     }
@@ -1013,11 +1039,18 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
     parentState = state;
     while (parentState) {
       parentState.get('enteredSubstates').pushObject(state);
+      parentState.notifyPropertyChange('enteredSubstates');
       parentState = parentState.get('parentState');
     }
 
     //@if(debug)
-    if (this.get('allowStatechartTracing')) this.statechartLogTrace("--> entering state: %@".fmt(state));
+    if (this.get('allowStatechartTracing')) {
+      if (state.enterStateByRoute && SC.kindOf(context, SC.StateRouteHandlerContext)) {
+        this.statechartLogTrace("--> entering state (by route): %@".fmt(state), SC.TRACE_STATECHART_STYLE.enter);
+      } else {
+        this.statechartLogTrace("--> entering state: %@".fmt(state), SC.TRACE_STATECHART_STYLE.enter);
+      }
+    }
     //@endif
 
     state.stateWillBecomeEntered(context);
@@ -1176,7 +1209,7 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
     //@if(debug)
     var trace = this.get('allowStatechartTracing');
     if (trace) {
-      this.statechartLogTrace("BEGIN sendEvent: '%@'".fmt(event));
+      this.statechartLogTrace("BEGIN sendEvent: '%@'".fmt(event), SC.TRACE_STATECHART_STYLE.action);
     }
     //@endif
 
@@ -1201,8 +1234,8 @@ SC.StatechartManager = /** @scope SC.StatechartManager.prototype */{
 
     //@if(debug)
     if (trace) {
-      if (!statechartHandledEvent) this.statechartLogTrace("No state was able handle event %@".fmt(event));
-      this.statechartLogTrace("END sendEvent: '%@'".fmt(event));
+      if (!statechartHandledEvent) this.statechartLogTrace("No state was able to handle event %@".fmt(event), SC.TRACE_STATECHART_STYLE.action);
+      this.statechartLogTrace("END sendEvent: '%@'".fmt(event), SC.TRACE_STATECHART_STYLE.action);
     }
     //@endif