sproutit-sproutcore 1.0.0.20090416161445 → 1.0.0.20090720093355

data/frameworks/sproutcore/frameworks/foundation/system/user_defaults.js

@@ -84,8 +84,15 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
       localStorage = window.globalStorage[window.location.hostname];
     }
     if (localStorage) {
-      //console.log('userKeyName = %@ local=%@'.fmt(userKeyName, localStorage));
       ret = localStorage[["SC.UserDefaults",userKeyName].join('@')];
+      if (!SC.none(ret)) {
+        try {
+          ret = SC.json.decode(ret);
+        } 
+        catch(e) {
+          ret = null;
+        }
+      }
     }
     
     // if not found in localStorage, try to notify delegate
@@ -131,7 +138,7 @@ SC.UserDefaults = SC.Object.extend(/** @scope SC.UserDefaults.prototype */ {
       localStorage = window.globalStorage[window.location.hostname];
     }
     if (localStorage) {
-      localStorage[["SC.UserDefaults",userKeyName].join('@')] = value;
+      localStorage[["SC.UserDefaults",userKeyName].join('@')] = SC.json.encode(value);
     }
     
     // also notify delegate

data/frameworks/sproutcore/frameworks/foundation/system/utils.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 // These are helpful utility functions for calculating range and rect values
-require('system/browser');
+sc_require('system/browser');
 
 SC.mixin( /** @scope SC */ {
 
@@ -77,32 +77,32 @@ SC.mixin( /** @scope SC */ {
   
   /** Return the left edge of the frame */
   minX: function(frame) { 
-    return frame.x; 
+    return frame.x || 0; 
   },
   
   /** Return the right edge of the frame. */
   maxX: function(frame) { 
-    return frame.x + frame.width; 
+    return (frame.x || 0) + (frame.width || 0); 
   },
   
   /** Return the midpoint of the frame. */
   midX: function(frame) {
-    return frame.x + (frame.width / 2) ;
+    return (frame.x || 0) + ((frame.width || 0) / 2) ;
   },
   
   /** Return the top edge of the frame */
   minY: function(frame) {
-    return frame.y ;
+    return frame.y || 0 ;
   },
   
   /** Return the bottom edge of the frame */
   maxY: function(frame) {
-    return frame.y + frame.height ;
+    return (frame.y || 0) + (frame.height || 0) ;
   },
   
   /** Return the midpoint of the frame */
   midY: function(frame) {
-    return frame.y + (frame.height / 2) ;
+    return (frame.y || 0) + ((frame.height || 0) / 2) ;
   },
   
   /** Returns the point that will center the frame X within the passed frame. */
@@ -112,7 +112,7 @@ SC.mixin( /** @scope SC */ {
   
   /** Return the point that will center the frame Y within the passed frame. */
   centerY: function(innerFrame, outerFrame) {
-    return (outerFrame.width - innerFrame.width) /2  ;
+    return (outerFrame.height - innerFrame.height) /2  ;
   },
   
   /** Check if the given point is inside the rect. */
@@ -325,6 +325,101 @@ SC.mixin( /** @scope SC */ {
     if (r1 == null) return r2.length < 0 ;
     if (r2 == null) return r1.length < 0 ;
     return (r1.start == r2.start) && (r1.length == r2.length) ;
-  }
+  },
+
+  /** Returns hex color from hsv value */
+  convertHsvToHex: function (h, s, v) {
+    var r = 0;
+    var g = 0;
+    var b = 0;
+
+    if (v > 0) {
+      var i = (h == 1) ? 0 : Math.floor(h * 6);
+      var f = (h == 1) ? 0 : (h * 6) - i;
+      var p = v * (1 - s);
+      var q = v * (1 - (s * f));
+      var t = v * (1 - (s * (1 - f)));
+      var rgb = [[v,t,p],[q,v,p],[p,v,t],[p,q,v],[t,p,v],[v,p,q]];
+      r = Math.round(255 * rgb[i][0]);
+      g = Math.round(255 * rgb[i][1]);
+      b = Math.round(255 * rgb[i][2]);
+    }
+    return this.parseColor('rgb(' + r + ',' + g + ',' + b + ')');
+  },  
+
+  /** Returns hsv color from hex value */
+  convertHexToHsv: function (hex) {
+    var rgb = this.expandColor(hex);
+    var max = Math.max(Math.max(rgb[0], rgb[1]), rgb[2]);
+    var min = Math.min(Math.min(rgb[0], rgb[1]), rgb[2]);
+
+    var h = (max == min) ? 0 : ((max == rgb[0]) ? ((rgb[1]-rgb[2])/(max-min)/6) : ((max == rgb[1]) ? ((rgb[2]-rgb[0])/(max-min)/6+1/3) : ((rgb[0]-rgb[1])/(max-min)/6+2/3)));
+    var s = (max == 0) ? 0 : (1 - min/max);
+    var v = max/255;
+    return [h, s, v];
+  },
+
+  /** regular expression for parsing color: rgb, hex */
+  PARSE_COLOR_RGBRE: /^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i,
+  PARSE_COLOR_HEXRE: /^\#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$/,
+
+  // return an array of r,g,b colour
+  expandColor: function(color) {
+    var hexColor, red, green, blue;
+    hexColor = this.parseColor(color);
+    if (hexColor) {
+      red = parseInt(hexColor.slice(1, 3), 16);
+      green = parseInt(hexColor.slice(3, 5), 16);
+      blue = parseInt(hexColor.slice(5, 7), 16);
+      return [red,green,blue];
+    }
+  },
+
+  // parse rgb color or 3-digit hex color to return a properly formatted 6-digit hex colour spec, or false
+  parseColor: function(string) {
+    var color = '#', match;
+    if(match = this.PARSE_COLOR_RGBRE.exec(string)) {
+      var part;
+      for (var i=1; i<=3; i++) {
+        part = Math.max(0, Math.min(255, parseInt(match[i],0)));
+        color += this.toColorPart(part);
+      }
+      return color;
+    }
+    if (match = this.PARSE_COLOR_HEXRE.exec(string)) {
+      if(match[1].length == 3) {
+        for (var i=0; i<3; i++) {
+          color += match[1].charAt(i) + match[1].charAt(i);
+        }
+        return color;
+      }
+      return '#' + match[1];
+    }
+    return false;
+  },
+
+  // convert one r,g,b number to a 2 digit hex string
+  toColorPart: function(number) {
+    if (number > 255) number = 255;
+    var digits = number.toString(16);
+    if (number < 16) return '0' + digits;
+    return digits;
+  },
   
+  
+  // Get the computed style from specific element. Useful for cloning styles
+  getStyle: function(oElm, strCssRule){
+  	var strValue = "";
+  	if(document.defaultView && document.defaultView.getComputedStyle){
+  		strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule);
+  	}
+  	else if(oElm.currentStyle){
+  		strCssRule = strCssRule.replace(/\-(\w)/g, function (strMatch, p1){
+  			return p1.toUpperCase();
+  		});
+  		strValue = oElm.currentStyle[strCssRule];
+  	}
+  	return strValue;
+  }
+
 }) ;

data/frameworks/sproutcore/frameworks/foundation/tests/controllers/array/array_case.js

@@ -0,0 +1,182 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2009 Apple, Inc. All rights reserved.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+/*globals throws */
+
+var content, controller, extra;
+
+var TestObject = SC.Object.extend({
+  title: "test",  
+  toString: function() { return "TestObject(%@)".fmt(this.get("title")); }
+});
+
+
+// ..........................................................
+// EMPTY
+// 
+
+module("SC.ArrayController - array_case - EMPTY", {
+  setup: function() {
+    content = [];
+    controller = SC.ArrayController.create({ content: content });
+    extra = TestObject.create({ title: "FOO" });
+  },
+  
+  teardown: function() {
+    controller.destroy();
+  }
+});
+
+test("state properties", function() {
+  equals(controller.get("hasContent"), YES, 'c.hasContent');
+  equals(controller.get("canRemoveContent"), YES, "c.canRemoveContent");
+  equals(controller.get("canReorderContent"), YES, "c.canReorderContent");
+  equals(controller.get("canAddContent"), YES, "c.canAddContent");
+});
+
+// addObject should append to end of array + notify observers on Array itself
+test("addObject", function() {
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  SC.run(function() { controller.addObject(extra); });
+  
+  same(content, [extra], 'addObject(extra) should work');
+  equals(callCount, 1, 'should notify observer that content has changed');
+  equals(content.get('length'), 1, 'should update length of controller');
+});
+
+test("removeObject", function() {
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  SC.run(function() { controller.removeObject(extra); });
+  
+  same(content, [], 'removeObject(extra) should have no effect');
+  equals(callCount, 0, 'should not notify observer since content did not change');
+});
+
+test("basic array READ operations", function() {
+  equals(controller.get("length"), 0, 'length should be empty');
+  equals(controller.objectAt(0), undefined, "objectAt() should return undefined");
+});
+
+test("basic array WRITE operations", function() {
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  controller.replace(0,1,[extra]);
+  
+  same(content, [extra], 'should modify content');
+  equals(callCount, 1, 'should notify observer that content has changed');
+  equals(content.get('length'), 1, 'should update length of controller');
+});
+
+test("arrangedObjects", function() {
+  equals(controller.get("arrangedObjects"), controller, 'c.arrangedObjects should return receiver');
+});
+
+
+// ..........................................................
+// NON-EMPTY ARRAY
+// 
+
+module("SC.ArrayController - array_case - NON-EMPTY", {
+  setup: function() {
+    content = "1 2 3 4 5".w().map(function(x) {
+      return TestObject.create({ title: x });
+    });
+    
+    controller = SC.ArrayController.create({ content: content });
+    extra = TestObject.create({ title: "FOO" });
+  },
+  
+  teardown: function() {
+    controller.destroy();
+  }
+});
+
+test("state properties", function() {
+  equals(controller.get("hasContent"), YES, 'c.hasContent');
+  equals(controller.get("canRemoveContent"), YES, "c.canRemoveContent");
+  equals(controller.get("canReorderContent"), YES, "c.canReorderContent");
+  equals(controller.get("canAddContent"), YES, "c.canAddContent");
+});
+
+// addObject should append to end of array + notify observers on Array itself
+test("addObject", function() {
+  var expected = content.slice();
+  expected.push(extra);
+  
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  SC.run(function() { controller.addObject(extra); });
+  
+  same(content, expected, 'addObject(extra) should work');
+  equals(callCount, 1, 'should notify observer that content has changed');
+  equals(content.get('length'), expected.length, 'should update length of controller');
+});
+
+test("removeObject", function() {
+  var expected = content.slice(), obj = expected[3];
+  expected.removeObject(obj);
+  
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  SC.run(function() { controller.removeObject(obj); });
+  
+  same(content, expected, 'removeObject(extra) should remove object');
+  equals(callCount, 1, 'should notify observer that content has changed');
+  equals(content.get('length'), expected.length, 'should update length of controller');
+});
+
+test("basic array READ operations", function() {
+  equals(controller.get("length"), content.length, 'length should be empty');
+  
+  var loc = content.length+1; // verify 1 past end as well
+  while(--loc>=0) {
+    equals(controller.objectAt(loc), content[loc], "objectAt(%@) should return same value at content[%@]".fmt(loc, loc));
+  }
+});
+
+test("basic array WRITE operations", function() {
+  var expected = content.slice();
+  expected.replace(3,1,[extra]);
+  
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  controller.replace(3,1,[extra]);
+  
+  same(content, expected, 'should modify content');
+  equals(callCount, 1, 'should notify observer that content has changed');
+  equals(content.get('length'), expected.length, 'should update length of controller');
+});
+
+test("arrangedObjects", function() {
+  equals(controller.get("arrangedObjects"), controller, 'c.arrangedObjects should return receiver');
+});
+
+// ..........................................................
+// ADD SPECIAL CASES HERE
+// 
+
+
+// ..........................................................
+// VERIFY SC.ARRAY COMPLIANCE
+// 
+
+SC.ArraySuite.generate("SC.ArrayController", {
+  newObject: function(amt) {
+    if (amt === undefined || typeof amt === SC.T_NUMBER) {
+      amt = this.expected(amt);
+    }
+    return SC.ArrayController.create({ content: amt });
+  }
+});

data/frameworks/sproutcore/frameworks/foundation/tests/controllers/array/enum_case.js

@@ -0,0 +1,193 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Sprout Systems, Inc. and contributors.
+//            Portions ©2008-2009 Apple, Inc. All rights reserved.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+
+/*globals throws */
+
+var content, controller, extra;
+
+var TestObject = SC.Object.extend({
+  title: "test",  
+  toString: function() { return "TestObject(%@)".fmt(this.get("title")); }
+});
+
+
+// ..........................................................
+// EMPTY SET
+// 
+
+module("SC.ArrayController - enum_case - EMPTY SET", {
+  setup: function() {
+    content = SC.Set.create();
+    controller = SC.ArrayController.create({ 
+      content: content, orderBy: "title" 
+    });
+    extra = TestObject.create({ title: "FOO" });
+  },
+  
+  teardown: function() {
+    controller.destroy();
+  }
+});
+
+test("state properties", function() {
+  equals(controller.get("hasContent"), YES, 'c.hasContent');
+  equals(controller.get("canRemoveContent"), YES, "c.canRemoveContent");
+  equals(controller.get("canReorderContent"), NO, "c.canReorderContent");
+  equals(controller.get("canAddContent"), YES, "c.canAddContent");
+});
+
+// addObject should append to end of array + notify observers on Array itself
+test("addObject", function() {
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  SC.run(function() { controller.addObject(extra); });
+  
+  var expected = SC.Set.create().add(extra);
+  same(content, expected, 'addObject(extra) should work');
+  equals(callCount, 1, 'should notify observer that content has changed');
+  equals(content.get('length'), 1, 'should update length of controller');
+});
+
+test("removeObject", function() {
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  SC.run(function() { controller.removeObject(extra); });
+  
+  same(content, SC.Set.create(), 'removeObject(extra) should have no effect');
+  equals(callCount, 0, 'should not notify observer since content did not change');
+});
+
+test("basic array READ operations", function() {
+  equals(controller.get("length"), 0, 'length should be empty');
+  equals(controller.objectAt(0), undefined, "objectAt() should return undefined");
+});
+
+test("basic array WRITE operations", function() {
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+
+  should_throw(function() {
+    controller.replace(0,1,[extra]);
+  }, Error, "calling replace on an enumerable should throw");
+});
+
+test("arrangedObjects", function() {
+  equals(controller.get("arrangedObjects"), controller, 'c.arrangedObjects should return receiver');
+});
+
+
+// ..........................................................
+// NON-EMPTY SET
+// 
+
+module("SC.ArrayController - enum_case - NON-EMPTY SET", {
+  setup: function() {
+    content = SC.Set.create();
+    "1 2 3 4 5".w().forEach(function(x) {
+      content.add(TestObject.create({ title: x }));
+    });
+    
+    controller = SC.ArrayController.create({ 
+      content: content, orderBy: "title" 
+    });
+    extra = TestObject.create({ title: "FOO" });
+  },
+  
+  teardown: function() {
+    controller.destroy();
+  }
+});
+
+test("state properties", function() {
+  equals(controller.get("hasContent"), YES, 'c.hasContent');
+  equals(controller.get("canRemoveContent"), YES, "c.canRemoveContent");
+  equals(controller.get("canReorderContent"), NO, "c.canReorderContent");
+  equals(controller.get("canAddContent"), YES, "c.canAddContent");
+});
+
+// addObject should regenerate ordered + notify observers on Array itself
+test("addObject", function() {
+  var expected = content.copy();
+  expected.add(extra);
+  
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  SC.run(function() { controller.addObject(extra); });
+  
+  same(content, expected, 'addObject(extra) should work');
+  equals(callCount, 1, 'should notify observer that content has changed');
+  equals(content.get('length'), expected.length, 'should update length of controller');
+  
+  var idx, len = controller.get('length');
+  expected = SC.A(expected).sort(function(a,b) { 
+    return SC.compare(a.get('title'), b.get('title')); 
+  });
+
+  for(idx=0;idx<len;idx++) {
+    equals(controller.objectAt(idx), expected[idx], "controller.objectAt(%@) should be match ordered array %@".fmt(idx,idx));
+  }
+  
+});
+
+test("removeObject", function() {
+  var expected = content.copy(), obj = expected.pop();
+  
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+  
+  equals(controller.get('length'), content.get('length'), 'precond - controller should have same length as content to start');
+  
+  SC.run(function() { controller.removeObject(obj); });
+  
+  same(content, expected, 'removeObject(extra) should remove object');
+  equals(callCount, 1, 'should notify observer that content has changed');
+  equals(content.get('length'), expected.length, 'should update length of content');
+  equals(controller.get('length'), expected.length, 'should update length of controller as well');
+  
+  var idx, len = controller.get('length');
+  expected = SC.A(expected).sort(function(a,b) { 
+    return SC.compare(a.get('title'), b.get('title')); 
+  });
+
+  for(idx=0;idx<len;idx++) {
+    equals(controller.objectAt(idx), expected[idx], "controller.objectAt(%@) should be match ordered array %@".fmt(idx,idx));
+  }
+});
+
+test("basic array READ operations", function() {
+  equals(controller.get("length"), content.length, 'length should be empty');
+  
+  var expected = SC.A(content).sort(function(a,b) { 
+    return SC.compare(a.get('title'), b.get('title')); 
+  });
+  var loc = expected.length+1; // verify 1 past end as well
+
+  while(--loc>=0) {
+    equals(controller.objectAt(loc), expected[loc], "objectAt(%@) should return same value at content[%@]".fmt(loc, loc));
+  }
+});
+
+test("basic array WRITE operations", function() {
+  var callCount = 0;
+  controller.addObserver('[]', function() { callCount++; });
+
+  should_throw(function() {
+    controller.replace(0,1,[extra]);
+  }, Error, "calling replace on an enumerable should throw");
+});
+
+test("arrangedObjects", function() {
+  equals(controller.get("arrangedObjects"), controller, 'c.arrangedObjects should return receiver');
+});
+
+// ..........................................................
+// ADD SPECIAL CASES HERE
+// 
+