sproutcore 1.11.0.rc2 → 1.11.0.rc3

data/lib/frameworks/sproutcore/frameworks/runtime/system/object.js

@@ -653,12 +653,16 @@ SC.Object.prototype = {
     value is ignored.
   */
   init: function () {
+    //@if(debug)
+    // Provide some developer support for the deprecation of `awake`.
+    if (this.awake !== SC.Object.prototype.awake) SC.warn("Developer Warning: `awake` has been deprecated and will not be called. Override `init` and call sc_super(); instead.");
+    //@endif
     this.initObservable();
     return this;
   },
 
   /**
-    Set to YES once this object has been destroyed.
+    This is set to YES once this object has been destroyed.
 
     @type Boolean
   */
@@ -828,22 +832,12 @@ SC.Object.prototype = {
     return this._object_toString;
   },
 
-  /**
-    Activates any outlet connections in object and syncs any bindings.  This
-    method is called automatically for view classes but may be used for any
-    object.
-
-
-  */
+  /** @deprecated v1.11 - use init instead. */
+  //@if(debug)
   awake: function () {
-    var outlets = this.outlets,
-        i, len, outlet;
-    for (i = 0, len = outlets.length;  i < len;  ++i) {
-      outlet = outlets[i];
-      this.get(outlet);
-    }
-    this.bindings.invoke('sync');
+    SC.warn('Developer Warning: The `awake` method has been deprecated. Use `init` instead. (Be sure to call sc_super().)');
   },
+  //@endif
 
   /**
     Invokes the passed method or method name one time during the runloop.  You

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

@@ -12,13 +12,13 @@ sc_require('mixins/copyable');
 
 // IMPORTANT NOTE:  This file actually defines two classes:
 // SC.Set is a fully observable set class documented below.
-// SC._CoreSet is just like SC.Set but is not observable.  This is required
+// SC.CoreSet is just like SC.Set but is not observable.  This is required
 // because SC.Observable is built on using sets and requires sets without
 // observability.
 //
 // We use pointer swizzling below to swap around the actual definitions so
 // that the documentation will turn out right.  (The docs should only
-// define SC.Set - not SC._CoreSet)
+// define SC.Set - not SC.CoreSet)
 
 /**
   @class
@@ -197,7 +197,8 @@ SC.Set = SC.mixin({},
   clear: function() {
     if (this.isFrozen) throw SC.FROZEN_ERROR;
     this.length = 0;
-    return this ;
+
+    return this;
   },
 
   /**
@@ -374,6 +375,7 @@ SC.Set = SC.mixin({},
 
     if (this.isObservable) this.enumerableContentDidChange();
     if (this.setObservers) this.didRemoveItem(obj);
+
     return this ;
   },
 
@@ -431,8 +433,10 @@ SC.Set = SC.mixin({},
     @returns {SC.Set} receiver
   */
   destroy: function() {
-    this.isFrozen = NO ; // unfreeze to return to pool
+    this.isFrozen = NO; // unfreeze to return to pool
+
     if (!this.isObservable) SC.Set._pool.push(this.clear());
+
     return this;
   },
 
@@ -443,15 +447,16 @@ SC.Set = SC.mixin({},
   /** @private - optimized */
   forEach: function(iterator, target) {
     var len = this.length;
-    if (!target) target = this ;
-    for(var idx=0;idx<len;idx++) iterator.call(target, this[idx], idx, this);
+
+    if (!target) target = this;
+    for (var idx = 0; idx < len; idx++) iterator.call(target, this[idx], idx, this);
     return this ;
   },
 
   /** @private */
   toString: function() {
     var len = this.length, idx, ary = [];
-    for(idx=0;idx<len;idx++) ary[idx] = this[idx];
+    for (idx = 0; idx < len; idx++) ary[idx] = this[idx];
     return "SC.Set<%@>".fmt(ary.join(',')) ;
   },
 
@@ -487,31 +492,28 @@ SC.Set = SC.mixin({},
     for (idx = 0; idx < len; idx++) o[idx].didRemoveItem(this, item);
   },
 
-  // the pool used for non-observable sets
-  _pool: [],
-
   /** @private */
   isObservable: YES
 
-}) ;
+});
 
 SC.Set.constructor = SC.Set;
 
 // Make SC.Set look a bit more like other enumerables
 
 /** @private */
-SC.Set.clone = SC.Set.copy ;
+SC.Set.clone = SC.Set.copy;
 
 /** @private */
-SC.Set.push = SC.Set.unshift = SC.Set.add ;
+SC.Set.push = SC.Set.unshift = SC.Set.add;
 
 /** @private */
-SC.Set.shift = SC.Set.pop ;
+SC.Set.shift = SC.Set.pop;
 
 // add generic add/remove enumerable support
 
 /** @private */
-SC.Set.addObject = SC.Set.add ;
+SC.Set.addObject = SC.Set.add;
 
 /** @private */
 SC.Set.removeObject = SC.Set.remove;
@@ -524,7 +526,7 @@ SC.Set._pool = [];
 
 /** @class
 
-  CoreSet is just like set but not observable.  If you want to use the set
+  CoreSet is just like Set but not observable.  If you want to use the set
   as a simple data structure with no observing, CoreSet is slightly faster
   and more memory efficient.
 
@@ -534,7 +536,7 @@ SC.Set._pool = [];
 SC.CoreSet = SC.beget(SC.Set);
 
 /** @private */
-SC.CoreSet.isObservable = NO ;
+SC.CoreSet.isObservable = NO;
 
 /** @private */
 SC.CoreSet.constructor = SC.CoreSet;

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

@@ -7,7 +7,7 @@
 // ========================================================================
 // SC.Binding Tests
 // ========================================================================
-/*globals module, test, ok, isObj, equals, expects */
+/*globals module, test, ok, equals */
 
 var FromObject, fromObject, midObject, toObject, binding, Bon1, bon2, first, second, third, binding1, binding2;
 
@@ -366,6 +366,7 @@ test("two bindings to the same value should sync in the order they are initializ
 
 });
 
+var BindableObject;
 module("Binding transforms", {
   setup: function () {
     BindableObject = SC.Object.extend({
@@ -373,7 +374,8 @@ module("Binding transforms", {
       numericValue: 42,
       stringValue: 'forty-two',
       arrayValue: [4, 2],
-      undefinedValue: undefined
+      undefinedValue: undefined,
+      nullValue: null
     });
     // temporarily set up two source objects in the SC namespace so we can
     // use property paths to access them
@@ -407,9 +409,112 @@ test('Binding sync when only transformed value has changed', function () {
   equals(toObject.get('transformedValue'), 'VALUE IS UNDEFINED', 'value is undefined, so bound value should be');
 });
 
-test("ALL THE OTHER BINDING TRANSFORMS.");
+test("the integer transform", function() {
+  var toObject;
+
+  SC.run(function () {
+    toObject = SC.Object.create({
+      aNumber: null,
+      aNumberBinding: SC.Binding.oneWay('SC.testControllerA.nullValue').integer(10)
+    });
+  });
+
+  equals(toObject.get('aNumber'), 0, "Value is null, so bound value should should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', '123abc');
+  });
+
+  equals(toObject.get('aNumber'), window.parseInt('123abc', 10), "Value is String, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', 'abc123');
+  });
+
+  equals(toObject.get('aNumber'), 0, "Value is non-parseable String, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', NaN);
+  });
+
+  equals(toObject.get('aNumber'), 0, "Value is NaN, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', Infinity);
+  });
+
+  equals(toObject.get('aNumber'), Infinity, "Value is Infinity, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', true);
+  });
 
-test("equalTo", function() {
+  equals(toObject.get('aNumber'), 1, "Value is Boolean true, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', false);
+  });
+
+  equals(toObject.get('aNumber'), 0, "Value is Boolean false, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', {});
+  });
+
+  equals(toObject.get('aNumber'), 0, "Value is Object, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', SC.Object.create({}));
+  });
+
+  equals(toObject.get('aNumber'), 0, "Value is SC.Object instance, so bound value should be");
+});
+
+
+test("the string transform", function() {
+  var toObject;
+
+  SC.run(function () {
+    toObject = SC.Object.create({
+      aString: null,
+      aStringBinding: SC.Binding.oneWay('SC.testControllerA.nullValue').string()
+    });
+  });
+
+  equals(toObject.get('aString'), '', "Value is null, so bound value should should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', 1);
+  });
+
+  equals(toObject.get('aString'), '1', "Value is Number, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', true);
+  });
+
+  equals(toObject.get('aString'), 'true', "Value is Boolean true, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', false);
+  });
+
+  equals(toObject.get('aString'), 'false', "Value is Boolean false, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', {});
+  });
+
+  equals(toObject.get('aString'), {}.toString(), "Value is Object, so bound value should be");
+
+  SC.run(function () {
+    SC.testControllerA.set('nullValue', SC.Object.create({ toString: function () { return 'An SC.Object'; }}));
+  });
+
+  equals(toObject.get('aString'), 'An SC.Object', "Value is SC.Object instance, so bound value should be");
+});
+
+test("the equalTo transform", function() {
   SC.RunLoop.begin();
   var toObject = SC.Object.create({
     isFortyTwo: null,
@@ -433,14 +538,16 @@ module("Binding transform: `and`", {
     // use property paths to access them
     SC.testControllerA = SC.Object.create({ value: NO });
     SC.testControllerB = SC.Object.create({ value: NO });
+    SC.testControllerC = SC.Object.create({ value: NO });
 
     toObject = SC.Object.create({
       value: null,
-      valueBinding: SC.Binding.and('SC.testControllerA.value', 'SC.testControllerB.value'),
+      valueBinding: SC.Binding.and('SC.testControllerA.value', 'SC.testControllerB.value', 'SC.testControllerC.value'),
       localValue1: NO,
       localValue2: NO,
+      localValue3: NO,
       boundLocalValue: NO,
-      boundLocalValueBinding: SC.Binding.and('.localValue1', '.localValue2')
+      boundLocalValueBinding: SC.Binding.and('.localValue1', '.localValue2', '.localValue3')
     });
   },
 
@@ -449,13 +556,16 @@ module("Binding transform: `and`", {
     delete SC.testControllerA;
     SC.testControllerB.destroy();
     delete SC.testControllerB;
+    SC.testControllerC.destroy();
+    delete SC.testControllerC;
   }
 });
 
-test("bound value should be YES if both sources are YES", function () {
+test("bound value should be YES if all sources are YES", function () {
   SC.RunLoop.begin();
   SC.testControllerA.set('value', YES);
   SC.testControllerB.set('value', YES);
+  SC.testControllerC.set('value', YES);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
@@ -464,6 +574,7 @@ test("bound value should be YES if both sources are YES", function () {
   SC.RunLoop.begin();
   toObject.set('localValue1', YES);
   toObject.set('localValue2', YES);
+  toObject.set('localValue3', YES);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
@@ -474,50 +585,56 @@ test("toObject.value should be NO if either source is NO", function () {
   SC.RunLoop.begin();
   SC.testControllerA.set('value', YES);
   SC.testControllerB.set('value', NO);
+  SC.testControllerC.set('value', YES);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), NO, 'Bound value on YES/NO');
+  equals(toObject.get('value'), NO, 'Bound value on YES/NO/YES');
 
   SC.RunLoop.begin();
   SC.testControllerA.set('value', YES);
   SC.testControllerB.set('value', YES);
+  SC.testControllerC.set('value', YES);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), YES, 'Bound value on YES/YES');
+  equals(toObject.get('value'), YES, 'Bound value on YES/YES/YES');
 
   SC.RunLoop.begin();
   SC.testControllerA.set('value', NO);
   SC.testControllerB.set('value', YES);
+  SC.testControllerC.set('value', NO);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('value'), NO, 'Bound value on NO/YES');
+  equals(toObject.get('value'), NO, 'Bound value on NO/YES/NO');
 
   SC.RunLoop.begin();
   toObject.set('localValue1', YES);
   toObject.set('localValue2', NO);
+  toObject.set('localValue3', YES);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('boundLocalValue'), NO, 'Local bound value on YES/NO');
+  equals(toObject.get('boundLocalValue'), NO, 'Local bound value on YES/NO/YES');
 
   SC.RunLoop.begin();
   toObject.set('localValue1', YES);
   toObject.set('localValue2', YES);
+  toObject.set('localValue3', YES);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('boundLocalValue'), YES, 'Local bound value on YES/YES');
+  equals(toObject.get('boundLocalValue'), YES, 'Local bound value on YES/YES/YES');
 
   SC.RunLoop.begin();
   toObject.set('localValue1', NO);
   toObject.set('localValue2', YES);
+  toObject.set('localValue2', NO);
   SC.RunLoop.end();
 
   SC.Binding.flushPendingChanges();
-  equals(toObject.get('boundLocalValue'), NO, 'Local bound value on NO/YES');
+  equals(toObject.get('boundLocalValue'), NO, 'Local bound value on NO/YES/NO');
 });
 
 test("remote paths work when binding is defined on a class", function() {
@@ -718,6 +835,62 @@ test("local paths work when binding is defined on a class", function() {
 
 });
 
+module("Binding transform: `mix`", {
+
+  setup: function () {
+    // temporarily set up two source objects in the SC namespace so we can
+    // use property paths to access them
+    SC.testControllerA = SC.Object.create({ value: 0 });
+    SC.testControllerB = SC.Object.create({ value: 1 });
+    SC.testControllerC = SC.Object.create({ value: 2 });
+
+    toObject = SC.Object.create({
+      value: null,
+      valueBinding: SC.Binding.mix('SC.testControllerA.value', 'SC.testControllerB.value', 'SC.testControllerC.value',
+                                   function(v1,v2,v3) {
+                                     return v1+'-'+v2+'-'+v3;
+                                   } ),
+      localValue1: 1,
+      localValue2: 2,
+      localValue3: 3,
+      boundLocalValue: NO,
+      boundLocalValueBinding: SC.Binding.mix('.localValue1', '.localValue2', '.localValue3',
+                                             function(v1,v2,v3) {
+                                               return v1+'+'+v2+'+'+v3;
+                                             } )
+    });
+  },
+
+  teardown: function () {
+    SC.testControllerA.destroy();
+    delete SC.testControllerA;
+    SC.testControllerB.destroy();
+    delete SC.testControllerB;
+    SC.testControllerC.destroy();
+    delete SC.testControllerC;
+  }
+});
+
+test("bound value should be calculated correctly", function () {
+  SC.RunLoop.begin();
+  SC.testControllerA.set('value', 0);
+  SC.testControllerB.set('value', 10);
+  SC.testControllerC.set('value', 20);
+  SC.RunLoop.end();
+
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('value'), '0-10-20', 'Bound value');
+
+  SC.RunLoop.begin();
+  toObject.set('localValue1', 0);
+  toObject.set('localValue2', 10);
+  toObject.set('localValue3', 20);
+  SC.RunLoop.end();
+
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('boundLocalValue'), '0+10+20', 'Local bound value');
+});
+
 module("Binding with '[]'", {
   setup: function () {
     fromObject = SC.Object.create({ value: [] });
@@ -751,8 +924,7 @@ module("propertyNameBinding with longhand", {
   teardown: function () {
     TestNamespace.fromObject.destroy();
     TestNamespace.toObject.destroy();
-    delete TestNamespace.fromObject;
-    delete TestNamespace.toObject;
+    TestNamespace = null;
   }
 });
 
@@ -815,7 +987,7 @@ test("Bindings override in subclasses.", function() {
   });
   SC.RunLoop.end();
 
-  ok(fromObject._bindings.length === 1, "Duplicate bindings are not created.")
+  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");