sproutcore 1.11.0.rc2 → 1.11.0.rc3

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/dataSourceCallbacks.js

@@ -3,14 +3,14 @@
 // Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*globals module ok equals same test MyApp */
+/*globals module, ok, equals, same, test */
 
-var store, storeKey, json;
+var store, json1, json2, json3, json4, json5, json6, json7, json8, json9, json10, json11, json12, json13, json14, json15, json16, storeKey1, storeKey2, storeKey3, storeKey4, storeKey5, storeKey6, storeKey7, storeKey8, storeKey9, storeKey10, storeKey11, storeKey12, storeKey13, storeKey14, storeKey15, storeKey16;
 module("SC.Store#dataSourceCallbacks", {
   setup: function() {
-    
+
     store = SC.Store.create();
-    
+
     json1 = {
       guid: "commitGUID1",
       string: "string",
@@ -123,19 +123,19 @@ module("SC.Store#dataSourceCallbacks", {
     store.writeDataHash(storeKey7, json7, SC.Record.BUSY_DESTROYING);
     storeKey8 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey8, json8, SC.Record.BUSY);
-  
+
     storeKey9 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey9, json9, SC.Record.READY_CLEAN);
     storeKey10 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey10, json10, SC.Record.BUSY_DESTROYING);
     storeKey11 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey11, json11, SC.Record.BUSY_CREATING);
-  
+
     storeKey12 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey12, json12, SC.Record.READY_CLEAN);
     storeKey13 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey13, json13, SC.Record.BUSY_CREATING);
-  
+
     storeKey14 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey14, json14, SC.Record.READY_CLEAN);
     storeKey15 = SC.Store.generateStoreKey();
@@ -143,11 +143,11 @@ module("SC.Store#dataSourceCallbacks", {
 
     storeKey16 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey16, json16, SC.Record.BUSY_LOADING);
-  
+
     SC.RunLoop.begin();
-  
+
   },
-  
+
   teardown: function() {
     SC.RunLoop.end();
   }
@@ -157,46 +157,46 @@ test("Confirm that dataSourceDidCancel switched the records to the right states"
   var msg='', status;
   try{
     store.dataSourceDidCancel(storeKey1);
-    msg='';  
+    msg='';
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg, 
+  equals(SC.Record.BAD_STATE_ERROR.message, msg,
     "should throw the following error ");
-  
+
   store.dataSourceDidCancel(storeKey2);
   status = store.readStatus( storeKey2);
   equals(status, SC.Record.EMPTY, "the status should have changed to EMPTY");
-  
+
   store.dataSourceDidCancel(storeKey3);
   status = store.readStatus( storeKey3);
   equals(status, SC.Record.READY_NEW, "the status should have changed to READY_NEW");
-  
+
   store.dataSourceDidCancel(storeKey4);
   status = store.readStatus( storeKey4);
   equals(status, SC.Record.READY_DIRTY, "the status should have changed to READY_DIRTY");
-  
+
   store.dataSourceDidCancel(storeKey5);
   status = store.readStatus( storeKey5);
   equals(status, SC.Record.READY_CLEAN, "the status should have changed to READY_CLEAN");
-  
+
   store.dataSourceDidCancel(storeKey6);
   status = store.readStatus( storeKey6);
   equals(status, SC.Record.READY_DIRTY, "the status should have changed to READY_DIRTY");
-  
+
   store.dataSourceDidCancel(storeKey7);
   status = store.readStatus( storeKey7);
   equals(status, SC.Record.DESTROYED_DIRTY, "the status should have changed to DESTROYED_DIRTY");
-  
+
   try{
-    store.dataSourceDidCancel(storeKey8);  
+    store.dataSourceDidCancel(storeKey8);
     msg='';
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg, 
+  equals(SC.Record.BAD_STATE_ERROR.message, msg,
     "should throw the following error ");
-  
+
 });
 
 
@@ -204,61 +204,85 @@ test("Confirm that dataSourceDidComplete switched the records to the right state
   var msg='', status;
   try{
     store.dataSourceDidComplete(storeKey9);
-    msg='';  
+    msg='';
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg, 
+  equals(SC.Record.BAD_STATE_ERROR.message, msg,
     "should throw the following error ");
 
   try{
-    store.dataSourceDidComplete(storeKey10);  
+    store.dataSourceDidComplete(storeKey10);
     msg='';
   }catch(error){
     msg=error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg, 
+  equals(SC.Record.BAD_STATE_ERROR.message, msg,
     "should throw the following error ");
-  
+
   store.dataSourceDidComplete(storeKey11);
   status = store.readStatus( storeKey11);
   equals(status, SC.Record.READY_CLEAN, "the status should have changed to READY_CLEAN.");
-  
+
 });
 
+/**
+  There was a situation that when the id of the record was accessed it would remain cached even if
+  dataSourceDidComplete() was called with a new id.
+*/
+test("Confirm that passing a new id to dataSourceDidComplete clears the cached id on the record", function () {
+  var MyRecordType = SC.Record.extend({});
+
+  // Assign the store key to a record type so we can materialize the record.
+  SC.Store.replaceRecordTypeFor(storeKey11, MyRecordType);
+  SC.Store.idsByStoreKey[storeKey11] = 'commitGUID11';
+
+  var record = store.materializeRecord(storeKey11),
+      tempId = record.get('id'),
+      body;
+
+  equals(tempId, 'commitGUID11', "The id should originally be");
+
+  // Went to the server, came back with actual id.
+  body = SC.copy(json11);
+  body.guid = 'actualID';
+  store.dataSourceDidComplete(storeKey11, body, body.guid);
+
+  equals(record.get('id'), 'actualID', "The id should update now to be");
+});
 
 test("Confirm that dataSourceDidDestroy switched the records to the right states", function() {
   var msg='', status;
   try{
-    store.dataSourceDidDestroy(storeKey12);  
+    store.dataSourceDidDestroy(storeKey12);
     msg='';
   }catch(error){
     msg=error.message;
-  }  
-  equals(SC.Record.BAD_STATE_ERROR.message, msg, 
+  }
+  equals(SC.Record.BAD_STATE_ERROR.message, msg,
     "should throw the following error ");
-  
+
   store.dataSourceDidDestroy(storeKey13);
   status = store.readStatus( storeKey13);
   equals(status, SC.Record.DESTROYED_CLEAN, "the status should have changed to DESTROYED_CLEAN.");
-  
+
 });
 
 
 test("Confirm that dataSourceDidError switched the records to the right states", function() {
   var msg='', status;
   try{
-    store.dataSourceDidError(storeKey14, SC.Record.BAD_STATE_ERROR);  
+    store.dataSourceDidError(storeKey14, SC.Record.BAD_STATE_ERROR);
     msg='';
   }catch(error){
     msg = error.message;
   }
-  equals(SC.Record.BAD_STATE_ERROR.message, msg, 
+  equals(SC.Record.BAD_STATE_ERROR.message, msg,
     "should throw the following error ");
 
   store.dataSourceDidError(storeKey15, SC.Record.BAD_STATE_ERROR);
   status = store.readStatus( storeKey15);
-  equals(status, SC.Record.ERROR, 
+  equals(status, SC.Record.ERROR,
     "the status shouldn't have changed.");
 });
 
@@ -272,7 +296,7 @@ test("Confirm that errors passed to dataSourceDidError make it into the recordEr
   } catch (error) {
     msg = error.message;
   }
- 
+
   equals(store.recordErrors[storeKey16], SC.Record.GENERIC_ERROR,
     "recordErrors[storeKey] should be the right error object");
 });

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/store/find.js

@@ -27,7 +27,7 @@ module("SC.Query querying find() on a store", {
         // used by tests to verify remote queries
         if (query.get('location') === SC.Query.REMOTE) {
           if (query.get('recordType') === MyApp.Foo) {
-            store.loadQueryResults(query, this.get('storeKeys'));
+            store.dataSourceDidFetchQuery(query, this.get('storeKeys'));
           }
         }
 
@@ -252,7 +252,7 @@ test("sending a new store key array from the data source should update record ar
 
   // .replace() will call .enumerableContentDidChange()
   SC.RunLoop.begin();
-  MyApp.store.loadQueryResults(q, newStoreKeys);
+  MyApp.store.dataSourceDidFetchQuery(q, newStoreKeys);
   SC.RunLoop.end();
 
   equals(records.get('length'), 4, 'record length should be 4');

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/core/system/datetime.js

@@ -238,20 +238,36 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
   isFrozen: YES,
 
   /**
-    Returns a new `SC.DateTime` object where one or more of the elements have been
-    changed according to the options parameter. The time options (hour,
-    minute, sec, usec) reset cascadingly, so if only the hour is passed, then
-    minute, sec, and usec is set to 0. If the hour and minute is passed, then
-    sec and usec is set to 0.
+    Returns a new `SC.DateTime` object where one or more of the elements have been adjusted
+    according to the `options` parameter. The possible options that can be adjusted are `timezone`,
+    `year`, `month`, `day`, `hour`, `minute`, `second` and `millisecond`.
 
-    If a time zone is passed in the options hash, all dates and times are assumed
-    to be local to it, and the returned `SC.DateTime` instance has that time zone. If
-    none is passed, it defaults to `SC.DateTime.timezone`.
+    This is particularly useful when we want to get to a certain date or time based on an existing
+    date or time without having to know all the elements of the existing date.
 
-    Note that passing only a time zone does not affect the actual milliseconds since
-    Jan 1, 1970, only the time zone in which it is expressed when displayed.
+    For example, say we needed a datetime for midnight on whatever day we are given. The easiest
+    way to do this is to take the datetime we are given and adjust it. For example,
 
-    @see SC.DateTime.create for the list of options you can pass
+        var midnight = someDate.adjust({ hour: 24 }); // Midnight on whatever day `someDate` is.
+
+    ### Adjusting Time
+
+    The time options, `hour`, `minute`, `second`, `millisecond`, are reset cascadingly by default.
+    So for example, if only the hour is passed, then the minute, second, and millisecond will be set
+    to 0. Or for another example, if the hour and minute are passed, then second and millisecond
+    would be set to 0. To disable this simply pass `false` as the second argument to `adjust`.
+
+    ### Adjusting Timezone
+
+    If a time zone is passed in the options hash, all dates and times are assumed to be local to it,
+    and the returned `SC.DateTime` instance has that time zone. If none is passed, it defaults to
+    the value of `SC.DateTime.timezone`.
+
+    Note that passing only a time zone does not affect the actual milliseconds since Jan 1, 1970,
+    only the time zone in which it is expressed when displayed.
+
+    @param {Object} options the amount of date/time to advance the receiver
+    @param {Boolean} [resetCascadingly] whether to reset the time elements cascadingly from hour down to millisecond. Default `true`.
     @returns {SC.DateTime} copy of receiver
   */
   adjust: function(options, resetCascadingly) {
@@ -264,11 +280,13 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
   },
 
   /**
-    Returns a new `SC.DateTime` object advanced according the the given parameters.
-    Don't use floating point values, it might give unpredictable results.
+    Returns a new `SC.DateTime` object where one or more of the elements have been advanced
+    according to the `options` parameter. The possible options that can be advanced are `year`,
+    `month`, `day`, `hour`, `minute`, `second` and `millisecond`.
 
-    @see SC.DateTime.create for the list of options you can pass
-    @param {Hash} options the amount of date/time to advance the receiver
+    Note, you should not use floating point values as it might give unpredictable results.
+
+    @param {Object} options the amount of date/time to advance the receiver
     @returns {DateTime} copy of the receiver
   */
   advance: function(options) {
@@ -668,7 +686,7 @@ SC.DateTime.mixin(SC.Comparable,
     @see SC.DateTime#unknownProperty
   */
   _get: function(key, start, timezone) {
-    var ms, tz, doy, m, y, firstDayOfWeek, dayOfWeek, dayOfYear, prefix, suffix;
+    var ms, doy, m, y, firstDayOfWeek, dayOfWeek, dayOfYear, prefix, suffix;
     var currentWeekday, targetWeekday;
     var d = this._date;
     var originalTime, v = null;
@@ -814,7 +832,6 @@ SC.DateTime.mixin(SC.Comparable,
     Sets the internal calculation state to something specified.
   */
   _adjust: function(options, start, timezone, resetCascadingly) {
-    var opts = options ? SC.clone(options) : {};
     var ms = this._toMilliseconds(options, start, timezone, resetCascadingly);
     this._setCalcState(ms, timezone);
     return this; // for chaining
@@ -876,12 +893,12 @@ SC.DateTime.mixin(SC.Comparable,
       if ( !SC.none(opts.hour) && SC.none(opts.minute)) {
         opts.minute = 0;
       }
-      if (!(SC.none(opts.hour) && SC.none(opts.minute))
-          && SC.none(opts.second)) {
+      if (!(SC.none(opts.hour) && SC.none(opts.minute)) &&
+          SC.none(opts.second)) {
         opts.second = 0;
       }
-      if (!(SC.none(opts.hour) && SC.none(opts.minute) && SC.none(opts.second))
-          && SC.none(opts.millisecond)) {
+      if (!(SC.none(opts.hour) && SC.none(opts.minute) && SC.none(opts.second)) &&
+          SC.none(opts.millisecond)) {
         opts.millisecond = 0;
       }
     }
@@ -1063,8 +1080,8 @@ SC.DateTime.mixin(SC.Comparable,
     }
 
     if (!SC.none(opts.meridian) && !SC.none(opts.hour)) {
-      if ((opts.meridian === 1 && opts.hour !== 12)
-          || (opts.meridian === 0 && opts.hour === 12)) {
+      if ((opts.meridian === 1 && opts.hour !== 12) ||
+          (opts.meridian === 0 && opts.hour === 12)) {
         opts.hour = (opts.hour + 12) % 24;
       }
       delete opts.meridian;
@@ -1145,10 +1162,10 @@ SC.DateTime.mixin(SC.Comparable,
       case 'Y': return this._get('year');
       case 'Z':
         offset = -1 * timezone;
-        return (offset >= 0 ? '+' : '-')
-               + this._pad(parseInt(Math.abs(offset)/60, 10))
-               + ':'
-               + this._pad(Math.abs(offset)%60);
+        return (offset >= 0 ? '+' : '-') +
+               this._pad(parseInt(Math.abs(offset)/60, 10)) +
+               ':' +
+               this._pad(Math.abs(offset)%60);
       case '%': return '%';
     }
   },
@@ -1159,7 +1176,6 @@ SC.DateTime.mixin(SC.Comparable,
   */
   _toFormattedString: function(format, start, timezone) {
     var that = this;
-    var tz = (timezone !== undefined) ? timezone : (this.timezone !== undefined) ? this.timezone : 0;
 
     // need to move into local time zone for these calculations
     this._setCalcState(start - (timezone * 60000), 0); // so simulate a shifted 'UTC' time
@@ -1236,15 +1252,28 @@ SC.DateTime.mixin(SC.Comparable,
         divider;
 
     switch(format) {
-      case 'd':
-      case 'D': divider = 864e5; break; // day: 1000 * 60 * 60 * 24
-      case 'h':
-      case 'H': divider = 36e5; break; // hour: 1000 * 60 * 60
-      case 'M': divider = 6e4; break; // minute: 1000 * 60
-      case 'S': divider = 1e3; break; // second: 1000
-      case 's': divider = 1; break;
-      case 'W': divider = 6048e5; break; // week: 1000 * 60 * 60 * 24 * 7
-      default: throw format+" is not supported"; break;
+    case 'd':
+    case 'D':
+      divider = 864e5;  // day: 1000 * 60 * 60 * 24
+      break;
+    case 'h':
+    case 'H':
+      divider = 36e5; // hour: 1000 * 60 * 60
+      break;
+    case 'M':
+      divider = 6e4; // minute: 1000 * 60
+      break;
+    case 'S':
+      divider = 1e3;  // second: 1000
+      break;
+    case 's':
+      divider = 1;
+      break;
+    case 'W':
+      divider = 6048e5; // week: 1000 * 60 * 60 * 24 * 7
+      break;
+    default:
+      throw format + " is not supported";
     }
 
     var ret = diff/divider;
@@ -1266,8 +1295,8 @@ SC.DateTime.mixin(SC.Comparable,
   @param {String} format format string
   @returns {SC.Binding} this
 */
-SC.Binding.dateTime = function(format) {
-  return this.transform(function(value, binding) {
+SC.Binding.dateTime = function (format) {
+  return this.transform(function (value) {
     return value ? value.toFormattedString(format) : null;
   });
 };

data/lib/frameworks/sproutcore/frameworks/designer/tests/coders/page.js

@@ -38,14 +38,13 @@ test('Verify basic page file encoding', function () {
 });
 
 test('Verify view in page encoding', function () {
-  baseTypes.awake();
+  baseTypes.get('mainView');
   design = SC.DesignCoder.encode(baseTypes);
   equals(design.trim(),'SC.Page.design({mainView: SC.View.design({s: "string",n: 12,b: false,a: [1,2,3],h: {"a": "b","c": "d"}})})', 'basic types encoded');  
 });
 
 test('Verify binding in page encoding', function () {
   SC.RunLoop.begin();
-  bindingPage.awake();
   bindingPage.get('mainView');
   SC.RunLoop.end();
 

data/lib/frameworks/sproutcore/frameworks/desktop/panes/panel.js

@@ -199,16 +199,18 @@ SC.PanelPane = SC.Pane.extend(
 
   /** @private - if isModal state changes, update pane state if needed. */
   _isModalDidChange: function() {
-    var pane, isModal = this.get('isModal');
+    var modalPane,
+        isModal = this.get('isModal');
+
     if (isModal) {
-      if (!this._isShowingModal && this.get('viewState') & SC.CoreView.IS_SHOWN && (pane = this._modalPane())) {
+      if (!this._isShowingModal && (modalPane = this._modalPane())) {
         this._isShowingModal = YES;
-        pane.paneWillAppend(this);
+        modalPane.paneWillAppend(this);
       }
     } else {
-      if (this._isShowingModal && (pane = this._modalPane())) {
-        this._isShowingModal = NO ;
-        pane.paneDidRemove(this);
+      if (this._isShowingModal && (modalPane = this._modalPane())) {
+        this._isShowingModal = NO;
+        modalPane.paneDidRemove(this);
       }
     }
   }.observes('isModal'),