sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/helpers_attr.js

@@ -13,38 +13,38 @@ var context = null;
 
 // ..........................................................
 // attr
-// 
+//
 module("SC.RenderContext#attr", {
   setup: function() {
-    context = SC.RenderContext().attr({ foo: 'foo' }) ;
+    context = SC.RenderContext().setAttr({ foo: 'foo' }) ;
   }
 });
 
 test("should add passed name to value", function() {
-  context.attr('bar', 'bar');
+  context.setAttr('bar', 'bar');
   equals(context._attrs.bar, 'bar', 'verify attr name');
 });
 
 test("should replace passed name  value in attrs", function() {
-  context.attr('foo', 'bar');
+  context.setAttr('foo', 'bar');
   equals(context._attrs.foo, 'bar', 'verify attr name');
 });
 
 test("should return receiver", function() {
-  equals(context, context.attr('foo', 'bar'));
+  equals(context, context.setAttr('foo', 'bar'));
 });
 
 test("should create attrs hash if needed", function() {
   context = SC.RenderContext().begin();
   equals(context._attrs, null, 'precondition - has no attrs');
-  
-  context.attr('foo', 'bar');
+
+  context.setAttr('foo', 'bar');
   equals(context._attrs.foo, 'bar', 'has styles');
 });
 
 test("should assign all attrs if a hash is passed", function() {
-  context.attr({ foo: 'bar', bar: 'bar' });
+  context.setAttr({ foo: 'bar', bar: 'bar' });
   same(context._attrs, { foo: 'bar', bar: 'bar' }, 'has same styles');
 });
- 
+
 

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/helpers_className.js

@@ -10,55 +10,55 @@
 var context = null;
 
 // ..........................................................
-// classNames()
-// 
-module("SC.RenderContext#classNames", {
+// classes()
+//
+module("SC.RenderContext#classes", {
   setup: function() {
     context = SC.RenderContext() ;
   }
 });
 
 test("returns empty array if no current class names", function() {
-  same(context.classNames(), [], 'classNames') ;
+  same(context.classes(), [], 'classes') ;
 });
 
-test("classNames(array) updates class names", function() {
+test("addClass(array) updates class names", function() {
   var cl = 'bar baz'.w();
-  equals(context.classNames(cl), context, "returns receiver");
-  same(context.classNames(), cl, 'class names');
+  equals(context.addClass(cl), context, "returns receiver");
+  same(context.classes(), cl, 'class names');
 });
 
-test("returns classNames if set", function() {
-  context.classNames('bar'.w());
-  same(context.classNames(), ['bar'], 'classNames');
+test("returns classes if set", function() {
+  context.addClass('bar');
+  same(context.classes(), ['bar'], 'classNames');
 });
 
-test("clone on next retrieval if classNames(foo) set with cloneOnModify=YES", function() {
+test("clone on retrieval if addClass(array) set", function() {
   var cl = 'foo bar'.w();
-  context.classNames(cl, YES);
-  
-  var result = context.classNames();
+  context.addClass(cl);
+
+  var result = context.classes();
   ok(result !== cl, "class name is NOT same instance");
   same(result, cl, "but arrays are equivalent");
-  
-  equals(result, context.classNames(), "2nd retrieval is same instance");
+
+  equals(result, context.classes(), "2nd retrieval is same instance");
 });
 
 test("extracts class names from element on first retrieval", function() {
   var elem = document.createElement('div');
   SC.$(elem).attr('class', 'foo bar');
   context = SC.RenderContext(elem);
-  
-  var result = context.classNames();
+
+  var result = context.classes();
   same(result, ['foo', 'bar'], 'extracted class names');
 });
 
 // ..........................................................
 // hasClass()
-// 
+//
 module("SC.RenderContext#hasClass", {
   setup: function() {
-    context = SC.RenderContext().classNames('foo bar'.w()) ;
+    context = SC.RenderContext().addClass('foo bar'.w()) ;
   }
 });
 
@@ -72,7 +72,7 @@ test("should return false if context classNames does not have class name", funct
 
 test("should return false if context has no classNames", function() {
   context = context.begin('div');
-  ok(context.classNames().length===0, 'precondition - context has no classNames');
+  ok(context.classes().length === 0, 'precondition - context has no classNames');
   equals(NO, context.hasClass('foo'), 'should not have foo');
 });
 
@@ -81,7 +81,7 @@ test("should return false if context has no classNames", function() {
 //
 module("SC.RenderContext#addClass", {
   setup: function() {
-    context = SC.RenderContext().classNames(['foo']) ;
+    context = SC.RenderContext().addClass('foo') ;
   }
 });
 
@@ -91,33 +91,33 @@ test("should return receiver", function() {
 
 test("should add class name to existing classNames array on currentTag", function() {
   context.addClass('bar');
-  same(context.classNames(), ['foo', 'bar'], 'has classes');
-  equals(context._classNamesDidChange, YES, "note did change");
+  same(context.classes(), ['foo', 'bar'], 'has classes');
+  equals(context._classesDidChange, YES, "note did change");
 });
 
 test("should only add class name once - does nothing if name already in array", function() {
-  same(context.classNames(), ['foo'], 'precondition - has foo classname');
-  context._classNamesDidChange = NO; // reset  to pretend once not modified
-  
+  same(context.classes(), ['foo'], 'precondition - has foo classname');
+  context._classesDidChange = NO; // reset  to pretend once not modified
+
   context.addClass('foo');
-  same(context.classNames(), ['foo'], 'no change');
-  equals(context._classNamesDidChange, NO, "note did not change");
+  same(context.classes(), ['foo'], 'no change');
+  equals(context._classesDidChange, NO, "note did not change");
 });
 
 // ..........................................................
 // removeClass()
-// 
+//
 module("SC.RenderContext#removeClass", {
   setup: function() {
-    context = SC.RenderContext().classNames(['foo', 'bar']) ;
+    context = SC.RenderContext().addClass(['foo', 'bar']) ;
   }
 });
 
 test("should remove class if already in classNames array", function() {
-  ok(context.classNames().indexOf('foo')>=0, "precondition - has foo");
-  
+  ok(context.classes().indexOf('foo')>=0, "precondition - has foo");
+
   context.removeClass('foo');
-  ok(context.classNames().indexOf('foo')<0, "does not have foo");
+  ok(context.classes().indexOf('foo')<0, "does not have foo");
 });
 
 test('should return receiver', function() {
@@ -125,25 +125,25 @@ test('should return receiver', function() {
 });
 
 test("should do nothing if class name not in array", function() {
-  context._classNamesDidChange = NO; // reset to pretend not modified
+  context._classesDidChange = NO; // reset to pretend not modified
   context.removeClass('imaginary');
-  same(context.classNames(), 'foo bar'.w(), 'did not change');
-  equals(context._classNamesDidChange, NO, "note did not change");
+  same(context.classes(), 'foo bar'.w(), 'did not change');
+  equals(context._classesDidChange, NO, "note did not change");
 });
 
 test("should do nothing if there are no class names", function() {
   context = context.begin();
-  same(context.classNames(), [], 'precondition - no class names');
-  context._classNamesDidChange = NO; // reset to pretend not modified
-  
+  same(context.classes(), [], 'precondition - no class names');
+  context._classesDidChange = NO; // reset to pretend not modified
+
   context.removeClass('foo');
-  same(context.classNames(), [], 'still no class names -- and no errors');
-  equals(context._classNamesDidChange, NO, "note did not change");
+  same(context.classes(), [], 'still no class names -- and no errors');
+  equals(context._classesDidChange, NO, "note did not change");
 });
 
 // ..........................................................
 // setClass
-// 
+//
 module("SC.RenderContext#setClass", {
   setup: function() {
     context = SC.RenderContext().addClass('foo') ;

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/helpers_style.js

@@ -24,19 +24,13 @@ test("returns empty hash if no current styles", function() {
 
 test("styles(hash) replaces styles", function() {
   var styles = { foo: 'bar' };
-  equals(context.styles(styles), context, "returns receiver");
+  equals(context.setStyle(styles), context, "returns receiver");
   same(context.styles(), styles, 'Styles');
 });
 
-test("returns styles if set", function() {
-  var styles = { foo: 'bar' };
-  context.styles(styles);
-  equals(context.styles(), styles, 'styles');
-});
-
 test("clone on next retrieval if styles(foo) set with cloneOnModify=YES", function() {
   var styles = { foo: 'bar' };
-  context.styles(styles, YES);
+  context.setStyle(styles);
 
   var result = context.styles();
   ok(result !== styles, "styles is NOT same instance");
@@ -65,7 +59,7 @@ test("extracts styles from element on first retrieval", function() {
 //
 module("SC.RenderContext#addStyle", {
   setup: function() {
-    context = SC.RenderContext().styles({ foo: 'foo' }) ;
+    context = SC.RenderContext().setStyle({ foo: 'foo' }) ;
   }
 });
 
@@ -96,13 +90,9 @@ test("should assign all styles if a hash is passed", function() {
   same(context.styles(), { foo: 'bar', bar: 'bar' }, 'has same styles');
 });
 
-test("css() should be an alias for addStyle()", function() {
-  equals(SC.RenderContext.fn.css, SC.RenderContext.fn.addStyle, 'methods');
-});
-
 test("addStyle should remove properties that are part of combo properties", function(){
   SC.COMBO_STYLES = { foo: 'fooSub'.w() };
-  context.styles({ foo: 'foo', fooSub: 'bar' });
+  context.setStyle({ foo: 'foo', fooSub: 'bar' });
   equals(context.styles().fooSub, 'bar', 'proper starting values');
   context.addStyle('foo', 'bar');
   equals(context.styles().foo, 'bar', 'foo has new value');

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/render_context/update.js

@@ -68,19 +68,19 @@ test("does not change attributes if attrs were not actually changed", function()
 });
 
 test("updates attribute if attrs changed", function() {
-  context.attr('foo', 'changed');
+  context.setAttr('foo', 'changed');
   context.update();
   equals(elem.getAttribute("foo"), "changed", "attribute");
 });
 
 test("adds attribute if new", function() {
-  context.attr('bar', 'baz');
+  context.setAttr('bar', 'baz');
   context.update();
   equals(elem.getAttribute("bar"), "baz", "attribute");
 });
 
 test("removes attribute if value is null", function() {
-  context.attr('foo', null);
+  context.setAttr('foo', null);
   context.update();
   equals(elem.getAttribute("foo"), null, "attribute");
 });
@@ -113,7 +113,7 @@ test("replaces id if edited", function() {
 });
 
 test("set id overrides attr", function() {
-  context.attr("id", "bar");
+  context.setAttr("id", "bar");
   context.id('baz');
   context.update();
   equals(elem.getAttribute("id"), "baz", "should use id");
@@ -135,23 +135,11 @@ module("SC.RenderContext#update - className", {
 });
 
 test("does not change class names if retrieved but not edited", function() {
-  context.classNames();
+  context.classes();
   context.update();
   equals(SC.$(elem).attr("class"), "foo bar", "class");
 });
 
-test("replaces class name if classNames edited", function() {
-  context.classNames('bar baz'.w());
-  context.update();
-  equals(SC.$(elem).attr("class"), "bar baz", "attribute");
-});
-
-test("set class names override class attr", function() {
-  context.attr("class", "bar");
-  context.classNames('baz'.w());
-  context.update();
-  equals(SC.$(elem).attr("class"), "baz", "should use classNames");
-});
 
 // ..........................................................
 // Style Editing
@@ -171,50 +159,50 @@ module("SC.RenderContext#update - style", {
 test("does not change styles if retrieved but not edited", function() {
   context.styles();
   context.update();
-  var style = SC.$(elem).attr("style");
+  var style = SC.$(elem).attr("style").trim();
   if (!style.match(/;$/)) style += ';' ;
 
   equals(style.toLowerCase(), "color: red;", "style");
 });
 
 test("replaces style name if styles edited", function() {
-  context.styles({ color: "black" });
+  context.setStyle({ color: "black" });
   context.update();
 
   // Browsers return single attribute styles differently, sometimes with a trailing ';'
   // sometimes, without one. Normalize it here.
-  var style = SC.$(elem).attr("style");
-  if (!style.match(/;$/)) style += ';' ;
+  var style = SC.$(elem).attr("style").trim();
+  if (!style.match(/;\s{0,1}$/)) style += ';' ;
 
   equals(style.toLowerCase(), "color: black;", "attribute");
 });
 
 
 test("set styles override style attr", function() {
-  context.attr("style", "color: green");
-  context.styles({ color: "black" });
+  context.setAttr("style", "color: green");
+  context.setStyle({ color: "black" });
   context.update();
 
   // Browsers return single attribute styles differently, sometimes with a trailing ';'
   // sometimes, without one. Normalize it here.
-  var style = SC.$(elem).attr("style");
+  var style = SC.$(elem).attr("style").trim();
   if (!style.match(/;$/)) style += ';' ;
 
   equals(style.toLowerCase(), "color: black;", "attribute");
 });
 
 test("set styles handle custom browser attributes", function() {
-  context.styles({ mozColumnCount: '3', webkitColumnCount: '3', oColumnCount: '3', msColumnCount: '3' });
+  context.resetStyles();
+  context.setStyle({ columnCount: '3', mozColumnCount: '3', webkitColumnCount: '3', oColumnCount: '3', msColumnCount: '3' });
   context.update();
 
   // Browsers return single attribute styles differently, sometimes with a trailing ';'
   // sometimes, without one. Normalize it here.
-  var style = SC.$(elem).attr("style");
+  var style = SC.$(elem).attr("style").trim();
   if (!style.match(/;$/)) style += ';' ;
 
   // Older Gecko completely ignores css attributes that it doesn't understand.
-  if(SC.browser.isMozilla &&
-      SC.browser.compare(SC.browser.engineVersion, '2.0') < 0) equals(style, "-moz-column-count: 3;");
-  else if (SC.browser.isIE) equals(style, "-webkit-column-count: 3; -moz-column-count: 3; -o-column-count: 3; -ms-column-count: 3;");
-  else equals(style, "-moz-column-count: 3; -webkit-column-count: 3; -o-column-count: 3; -ms-column-count: 3;");
+  if(SC.browser.isMozilla) equals(style, "-moz-column-count: 3;");
+  else if (SC.browser.isIE) equals(style, "-ms-column-count: 3;");
+  else if (SC.browser.engine === SC.ENGINE.webkit) equals(style, "-webkit-column-count: 3;");
 });

data/lib/frameworks/sproutcore/frameworks/core_foundation/tests/system/sparse_array.js

@@ -45,6 +45,32 @@ test("objectAt() should get the object at the specified index",function() {
 	equals(arr[3],spArray.objectAt(3),'fourth object');
 });
 
+test("objectAt() beyond the length should return undefined and not attempt to retrieve the index.", function () {
+  var delegateObject = {
+        count: 0,
+
+        sparseArrayDidRequestIndex: function(sparseArray, idx) {
+          this.count++;
+          sparseArray.provideObjectAtIndex(idx, "foo");
+        }
+
+      },
+    sparseArray = SC.SparseArray.create({
+      delegate: delegateObject
+    });
+
+  equals(sparseArray.objectAt(0), undefined, "There should not be an item beyond the length of the sparse array.");
+  equals(delegateObject.count, 0, "The index beyond the length should not be requested on the delegate.");
+
+  // Update the length.
+  sparseArray.provideLength(100);
+  equals(sparseArray.objectAt(0), 'foo', "There should be an item within the length of the sparse array.");
+  equals(delegateObject.count, 1, "The index within the length should be requested on the delegate.");
+
+  equals(sparseArray.objectAt(100), undefined, "There should not be an item beyond the length of the sparse array.");
+  equals(delegateObject.count, 1, "The index beyond the length should not be requested on the delegate.");
+});
+
 module("SC.replace",{
 	setup: function() {
 		// create objects...
@@ -77,66 +103,75 @@ test("element to be added is at idx < length of array ", function() {
 	equals(5, ary.get('length'), "length") ;
 });
 
-test("should work with @each dependent keys", function() {
-  var array = SC.SparseArray.create();
+test("should work with @each dependent keys");
+// Reduced this test to a warning, because we are not going to support using
+// @each with SC.SparseArray at this time.  It likely doesn't work as an observer
+// and certainly not as a property chain.
+// There is some code that will support this, but it would need to be refactored
+// to avoid loading every item in the sparse array in order to add observers
+// to them.
+// Checkout the team/publickeating/enumerable-property-chains-support branch for the relevant code.
 
-  array.pushObject(SC.Object.create({
-    value: 5
-  }));
-  array.provideLength(1);
+// , function() {
+//   var array = SC.SparseArray.create();
 
-  var obj = SC.Object.create({
-    total: function() {
-      return this.get('content').reduce(function(prev, item) {
-        return prev + item.get('value');
-      }, 0);
-    }.property('content.@each.value'),
+//   array.pushObject(SC.Object.create({
+//     value: 5
+//   }));
+//   array.provideLength(1);
 
-    content: array
-  });
+//   var obj = SC.Object.create({
+//     total: function() {
+//       return this.get('content').reduce(function(prev, item) {
+//         return prev + item.get('value');
+//       }, 0);
+//     }.property('content.@each.value').cacheable(),
 
-  equals(obj.get('total'), 5, "precond - computes total of all objects");
+//     content: array
+//   });
 
-  array.pushObject(SC.Object.create({
-    value: 10
-  }));
+//   equals(obj.get('total'), 5, "precond - computes total of all objects");
 
-  equals(obj.get('total'), 15, "recomputes when a new object is added");
+//   array.pushObject(SC.Object.create({
+//     value: 10
+//   }));
 
-  array.objectAt(1).set('value', 15);
+//   equals(obj.get('total'), 15, "recomputes when a new object is added");
 
-  equals(obj.get('total'), 20, "recomputes when value property on child object changes");
+//   array.objectAt(1).set('value', 15);
 
-});
+//   equals(obj.get('total'), 20, "recomputes when value property on child object changes");
+
+// });
 
 
 test("modifying a range should not require the rest of the array to refetch", function() {
   var del = {
     cnt: 0,
-    
+
     sparseArrayDidRequestIndex: function(sparseArray, idx) {
       this.cnt++;
       sparseArray.provideObjectAtIndex(idx, "foo");
     },
-    
+
     sparseArrayDidRequestLength: function(sparseArray) {
       sparseArray.provideLength(100);
     },
-    
+
     // make editable
     sparseArrayShouldReplace: function() { return YES; }
-    
+
   };
-  
+
   var ary = SC.SparseArray.create({
     delegate: del
   });
-  
+
   equals(ary.objectAt(10), 'foo', 'precond - should provide foo');
   equals(del.cnt, 1, 'precond - should invoke sparseArrayDidRequestIndex() one time');
-  
+
   del.cnt = 0;
-  
+
   ary.removeAt(5); // delete an item before 10
   equals(ary.objectAt(9), 'foo', 'should provide foo at index after delete');
   equals(del.cnt, 0, 'should NOT invoke sparseArrayRequestIndex() since it was provided already');
@@ -145,7 +180,7 @@ test("modifying a range should not require the rest of the array to refetch", fu
 test("Check that requestIndex works with a rangeWindowSize larger than 1", function() {
 	var ary = SC.SparseArray.array(10) ;
 	var didRequestRange=NO;
-	
+
 	var DummyDelegate = SC.Object.extend({
     content: [], // source array
 
@@ -158,7 +193,7 @@ test("Check that requestIndex works with a rangeWindowSize larger than 1", funct
     },
 
     sparseArrayDidRequestIndexOf: function(sparseArray, object) {
-      return this.content.indexOf(object);    
+      return this.content.indexOf(object);
     },
 
     sparseArrayShouldReplace: function(sparseArray, idx, amt, objects) {
@@ -180,24 +215,24 @@ test("Check that requestIndex works with a rangeWindowSize larger than 1", funct
 
 // ..........................................................
 // definedIndexes
-// 
+//
 
 test("definedIndexes", function() {
   var ary = SC.SparseArray.array(10);
   ary.provideObjectAtIndex(5, "foo");
-  
+
   var expected = SC.IndexSet.create().add(5);
   same(ary.definedIndexes(), expected, 'definedIndexes() should return all defined indexes');
-  
+
   same(ary.definedIndexes(SC.IndexSet.create().add(2, 10)), expected, 'definedIndexes([2..11]) should return indexes within');
-  
+
   same(ary.definedIndexes(SC.IndexSet.create().add(2)), SC.IndexSet.EMPTY, 'definedIndexes([2]) should return empty set (since does not overlap with defined index)');
-  
+
 });
 
 // ..........................................................
 // TEST SC.ARRAY COMPLIANCE
-// 
+//
 
 var DummyDelegate = SC.Object.extend({
   content: [], // source array
@@ -205,20 +240,20 @@ var DummyDelegate = SC.Object.extend({
   sparseArrayDidRequestLength: function(sparseArray) {
     sparseArray.provideLength(this.content.length);
   },
-  
+
   sparseArrayDidRequestIndex: function(sparseArray, index) {
     sparseArray.provideObjectAtIndex(index, this.content[index]);
   },
-  
+
   sparseArrayDidRequestIndexOf: function(sparseArray, object) {
-    return this.content.indexOf(object);    
+    return this.content.indexOf(object);
   },
-  
+
   sparseArrayShouldReplace: function(sparseArray, idx, amt, objects) {
     this.content.replace(idx, amt, objects) ; // keep internal up-to-date
     return YES ; // allow anything
   }
-  
+
 });
 
 SC.ArraySuite.generate("SC.SparseArray", {