sproutcore 1.5.0.pre.4.1 → 1.5.0.pre.5

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/commitChangesFromNestedStore.js

@@ -8,6 +8,8 @@
 var parent, store, child, storeKey, json;
 module("SC.NestedStore#commitChangesFromNestedStore", {
   setup: function() {
+    SC.RunLoop.begin();
+
     parent = SC.Store.create();
     
     json = {
@@ -26,6 +28,8 @@ module("SC.NestedStore#commitChangesFromNestedStore", {
     child.dataHashDidChange(storeKey);
     child.changelog = SC.Set.create();
     child.changelog.add(storeKey);
+
+    SC.RunLoop.end();
   }
 });
 

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/nested_store/discardChanges.js

@@ -11,6 +11,8 @@
 var parent, store, child, storeKey, json, args;
 module("SC.NestedStore#discardChanges", {
   setup: function() {
+    SC.RunLoop.begin();
+
     parent = SC.Store.create();
     
     json = {
@@ -41,7 +43,8 @@ module("SC.NestedStore#discardChanges", {
         force: force 
       });
     };
-    
+
+    SC.RunLoop.end();
   }
 });
 

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/record_type_is.js

@@ -9,6 +9,8 @@
 var rec, q;
 module("SC.Query comparison of record types", {
   setup: function() {
+    SC.RunLoop.begin();
+
     // setup dummy app and store
     window.MyApp = SC.Object.create({
       store: SC.Store.create()
@@ -25,6 +27,8 @@ module("SC.Query comparison of record types", {
     rec = window.MyApp.store.find(window.MyApp.Foo,1);
     
     q = SC.Query.create();
+
+    SC.RunLoop.end();
   }
 });
 

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/registered_comparisons.js

@@ -10,6 +10,8 @@ var store, storeKey, rec1, rec2, rec3, rec4, rec5, MyApp, q;
 
 module("SC.Query comparison of records", {
   setup: function() {
+    SC.RunLoop.begin();
+
     // setup dummy app and store
     MyApp = SC.Object.create({
       store: SC.Store.create()
@@ -35,6 +37,8 @@ module("SC.Query comparison of records", {
     
     
     q = SC.Query.create();
+
+    SC.RunLoop.end();
   },
   
   teardown: function() {

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/query/registered_query_extensions.js

@@ -8,6 +8,8 @@
 var store, storeKey, rec1, rec2, rec3, rec4, rec5, MyApp, q;
 module("SC.Query registered query extensions", {
   setup: function() {
+    SC.RunLoop.begin();
+
     // setup dummy app and store
     MyApp = SC.Object.create({
       store: SC.Store.create()
@@ -33,6 +35,8 @@ module("SC.Query registered query extensions", {
     
     
     q = SC.Query.create();
+
+    SC.RunLoop.end();
   }
 });
  

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

@@ -8,6 +8,8 @@
 var store, child, storeKey, json;
 module("SC.Store#commitChangesFromNestedStore", {
   setup: function() {
+    SC.RunLoop.begin();
+
     store = SC.Store.create();
     
     json = {
@@ -25,6 +27,8 @@ module("SC.Store#commitChangesFromNestedStore", {
     child.dataHashDidChange(storeKey);
     child.changelog = SC.Set.create();
     child.changelog.add(storeKey);
+
+    SC.RunLoop.end();
   }
 });
 

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

@@ -15,7 +15,9 @@ module("SC.Store#createRecord", {
       number: SC.Record.attr(Number, { defaultValue: 5 }),
       bool: SC.Record.attr(Boolean, { defaultValue: YES })
     });
-    
+
+    SC.RunLoop.begin();
+
     store = SC.Store.create();
     
     json = {
@@ -27,6 +29,8 @@ module("SC.Store#createRecord", {
     storeKey = SC.Store.generateStoreKey();
 
     store.writeDataHash(storeKey, json, SC.Record.READY_CLEAN);
+
+    SC.RunLoop.end();
   }
 });
 

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

@@ -10,7 +10,9 @@ var json1, json2, json3, json4, json5, json6;
 
 module("SC.Store#destroyRecord", {
   setup: function() {
-    
+
+    SC.RunLoop.begin();
+
     store = SC.Store.create();
     
     json1 = {
@@ -62,6 +64,8 @@ module("SC.Store#destroyRecord", {
     store.writeDataHash(storeKey5, json5, SC.Record.READY_NEW);
     storeKey6 = SC.Store.generateStoreKey();
     store.writeDataHash(storeKey6, json6, SC.Record.READY_CLEAN);
+
+    SC.RunLoop.end();
   }
 });
 

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

@@ -0,0 +1,64 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*globals module ok equals same test MyApp */
+
+var store, dataHashes;
+var Person;
+
+
+module("SC.Store#loadRecord", {
+  setup: function() {
+  
+    Person = SC.Record.extend({
+      first: SC.Record.attr(String, { isRequired: YES}),
+      last: SC.Record.attr(String),
+      age: SC.Record.attr(Number),
+      isAlive: SC.Record.attr(Boolean)
+    });
+    
+    SC.RunLoop.begin();
+
+    store = SC.Store.create();
+    
+    dataHashes = [ 
+    
+    Person.create({ 
+      guid: 1,
+      first: "John",
+      last: "Sproutish",
+      age: 35,
+      isAlive: YES}),
+      
+    Person.create({
+      guid: 2,
+      first: "Sarah",
+      last: "Coop",
+      age: 28,
+      isAlive: YES })];
+
+    SC.RunLoop.end();
+  }
+});
+
+test("loadRecord loads new / update existing record in store", function() {
+  var aDataHash = dataHashes[0];  
+  var storeKey = store.loadRecord(Person, aDataHash);
+  ok(storeKey, "A store key is generated for a new record.");
+  
+  var doesStoreKeyResolveToPK = aDataHash.get('guid') === store.idFor(storeKey);
+  ok(doesStoreKeyResolveToPK, "The storeKey resolves to the correct Primary Key");
+  
+  var isStatusCorrect = store.peekStatus(storeKey) & SC.Record.READY_CLEAN;
+  ok(isStatusCorrect, "Record is in SC.Record.READY_CLEAN state after loading into store.");
+  
+  // Change the record
+  aDataHash['age'] = 40;
+  var storeKeyAfterUpdate = store.loadRecord(Person, aDataHash);
+  ok(storeKey === storeKeyAfterUpdate, "When the same record is loaded a second time its store key remains unchanged.");
+  
+  var record = store.materializeRecord(storeKey);
+  ok(record.get('age') === 40, "Record in store is updated with new values from data hash.");  
+});

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

@@ -8,44 +8,47 @@
 var store, storeKey, json;
 module("SC.Store#recordDidChange", {
   setup: function() {
+    SC.RunLoop.begin();
+
+    store = SC.Store.create();
+
+    json1 = {
+      guid: "commitGUID1",
+      string: "string",
+      number: 23,
+      bool:   YES
+    };
+    json2 = {
+      guid: "commitGUID2",
+      string: "string",
+      number: 23,
+      bool:   YES
+    };
+    json3 = {
+      guid: "commitGUID3",
+      string: "string",
+      number: 23,
+      bool:   YES
+    };
+    json4 = {
+      guid: "commitGUID4",
+      string: "string",
+      number: 23,
+      bool:   YES
+    };
     
-      store = SC.Store.create();
 
-      json1 = {
-        guid: "commitGUID1",
-        string: "string",
-        number: 23,
-        bool:   YES
-      };
-      json2 = {
-        guid: "commitGUID2",
-        string: "string",
-        number: 23,
-        bool:   YES
-      };
-      json3 = {
-        guid: "commitGUID3",
-        string: "string",
-        number: 23,
-        bool:   YES
-      };
-      json4 = {
-        guid: "commitGUID4",
-        string: "string",
-        number: 23,
-        bool:   YES
-      };
-      
+    storeKey1 = SC.Store.generateStoreKey();
+    store.writeDataHash(storeKey1, json1, SC.Record.BUSY_LOADING);
+    storeKey2 = SC.Store.generateStoreKey();
+    store.writeDataHash(storeKey2, json2, SC.Record.EMPTY);
+    storeKey3 = SC.Store.generateStoreKey();
+    store.writeDataHash(storeKey3, json3, SC.Record.READY_NEW);
+    storeKey4 = SC.Store.generateStoreKey();
+    store.writeDataHash(storeKey4, json4, SC.Record.READY_CLEAN);
 
-      storeKey1 = SC.Store.generateStoreKey();
-      store.writeDataHash(storeKey1, json1, SC.Record.BUSY_LOADING);
-      storeKey2 = SC.Store.generateStoreKey();
-      store.writeDataHash(storeKey2, json2, SC.Record.EMPTY);
-      storeKey3 = SC.Store.generateStoreKey();
-      store.writeDataHash(storeKey3, json3, SC.Record.READY_NEW);
-      storeKey4 = SC.Store.generateStoreKey();
-      store.writeDataHash(storeKey4, json4, SC.Record.READY_CLEAN);
-    }
+    SC.RunLoop.end();
+  }
 });
 
 test("recordDidChange", function() {

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

@@ -12,6 +12,8 @@ module("SC.Store#unloadRecords", {
       name: SC.Record.attr(String)
     });
 
+    SC.RunLoop.begin();
+
     store = SC.Store.create();
 
     store.createRecord(TestRecord, {
@@ -25,6 +27,8 @@ module("SC.Store#unloadRecords", {
     store.createRecord(TestRecord, {
       name: 'Baz'
     });
+
+    SC.RunLoop.end();
   }
 });
 

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

@@ -301,6 +301,7 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
       - %B - The full month name (``January'')
       - %c - The preferred local date and time representation
       - %d - Day of the month (01..31)
+      - %D - Day of the month (0..31)
       - %h - Hour of the day, 24-hour clock (0..23)
       - %H - Hour of the day, 24-hour clock (00..23)
       - %i - Hour of the day, 12-hour clock (1..12)
@@ -902,7 +903,7 @@ SC.DateTime.mixin(SC.Comparable,
   parse: function(str, fmt) {
     // Declared as an object not a literal since in some browsers the literal
     // retains state across function calls
-    var re = new RegExp('(?:%([aAbBcdHIjmMpsSUWwxXyYZ%])|(.))', "g");
+    var re = new RegExp('(?:%([aAbBcdDhHIjmMpsSUWwxXyYZ%])|(.))', "g");
     var d, parts, opts = {}, check = {}, scanner = SC.Scanner.create({string: str});
     
     if (SC.none(fmt)) fmt = SC.DATETIME_ISO8601;
@@ -915,7 +916,9 @@ SC.DateTime.mixin(SC.Comparable,
           case 'b': opts.month = scanner.scanArray(this.abbreviatedMonthNames) + 1; break;
           case 'B': opts.month = scanner.scanArray(this.monthNames) + 1; break;
           case 'c': throw "%c is not implemented";
-          case 'd': opts.day = scanner.scanInt(1, 2); break;
+          case 'd':
+          case 'D': opts.day = scanner.scanInt(1, 2); break;
+          case 'h':
           case 'H': opts.hour = scanner.scanInt(1, 2); break;
           case 'I': opts.hour = scanner.scanInt(1, 2); break;
           case 'j': throw "%j is not implemented";
@@ -947,7 +950,7 @@ SC.DateTime.mixin(SC.Comparable,
         }
       }
     } catch (e) {
-      console.log('SC.DateTime.createFromString ' + e.toString());
+      SC.Logger.log('SC.DateTime.createFromString ' + e.toString());
       return null;
     }
     
@@ -1044,7 +1047,7 @@ SC.DateTime.mixin(SC.Comparable,
     // need to move into local time zone for these calculations
     this._setCalcState(start - (timezone * 60000), 0); // so simulate a shifted 'UTC' time
 
-    return format.replace(/\%([aAbBcdDHiIjmMpsSUWwxXyYZ\%])/g, function() {
+    return format.replace(/\%([aAbBcdDhHiIjmMpsSUWwxXyYZ\%])/g, function() {
       var v = that.__toFormattedString.call(that, arguments, start, timezone);
       return v;
     });

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

@@ -229,8 +229,8 @@ test('compare', function() {
 
 test('Format', function() {
   equals(
-    dt.toFormattedString('%a %A %b %B %d %H %I %j %m %M %p %S %w %y %Y %%a'),
-    'Sat Saturday Jun June 08 04 04 159 06 00 AM 22 6 85 1985 %a');
+    dt.toFormattedString('%a %A %b %B %d %D %h %H %I %j %m %M %p %S %w %y %Y %%a'),
+    'Sat Saturday Jun June 08 8 4 04 04 159 06 00 AM 22 6 85 1985 %a');
   
   equals(dt.toFormattedString('%Z'), formatTimezone(dt.get('timezone')));
   equals(dt.adjust({ timezone:    0 }).toFormattedString('%Y-%m-%d %H:%M:%S %Z'), '1985-06-08 05:00:22 +00:00');

data/lib/frameworks/sproutcore/frameworks/debug/core.js

@@ -6,7 +6,7 @@
 // ==========================================================================
 
 // test
-var SC = SC || {} ;
+window.SC = window.SC || {};
 
 // Note:  We won't use SC.T_* here because those constants might not yet be
 //        defined.

data/lib/frameworks/sproutcore/frameworks/debug/invoke_once_last_debugging.js

@@ -9,7 +9,7 @@
 // invokeOnce and invokeLast) to record which code scheduled the
 // invokeOnce/invokeLast targets/methods.
 
-var SC = SC || {} ;
+window.SC = window.SC || {};
 
 
 // Declaring the variable will make it easier for people who want to enter it
@@ -100,7 +100,7 @@ SC.addInvokeOnceLastDebuggingInfo = function() {
               // If we didn't capture information for this invocation, just
               // report what we can.  (We assume we'll always have all three
               // hashes or none.)
-              console.log("Invoking runloop-scheduled method %@ on %@, but we didn’t capture information about who scheduled it…".fmt(mName, target));
+              SC.Logger.log("Invoking runloop-scheduled method %@ on %@, but we didn’t capture information about who scheduled it…".fmt(mName, target));
             }
             else {
               originatingTargets = originatingTargets[originatingKey];             // Could be one target or an array of them
@@ -111,7 +111,7 @@ SC.addInvokeOnceLastDebuggingInfo = function() {
               // scheduled this target/method?  If so, display them all nicely.
               // Otherwise, optimize our output for only one.
               if (originatingMethods  &&  SC.typeOf(originatingMethods) === SC.T_ARRAY) {
-                console.log("Invoking runloop-scheduled method %@ on %@, which was scheduled by multiple target/method pairs:".fmt(mName, target));
+                SC.Logger.log("Invoking runloop-scheduled method %@ on %@, which was scheduled by multiple target/method pairs:".fmt(mName, target));
               
                 var i, len,
                   originatingTarget,
@@ -123,13 +123,13 @@ SC.addInvokeOnceLastDebuggingInfo = function() {
                   originatingMethod = originatingMethod.displayName || originatingMethod;
                   originatingStack  = originatingStacks[i];
   
-                  console.log("[%@]  originated by target %@,  method %@,  stack:".fmt(i, originatingTarget, originatingMethod), originatingStack);
+                  SC.Logger.log("[%@]  originated by target %@,  method %@,  stack:".fmt(i, originatingTarget, originatingMethod), originatingStack);
                 }
               }
               else {
                 var originatingMethodName = originatingMethods.displayName || originatingMethods;
 
-                console.log("Invoking runloop-scheduled method %@ on %@.  Originated by target %@,  method %@,  stack: ".fmt(mName, target, originatingTargets, originatingMethodName), originatingStacks);
+                SC.Logger.log("Invoking runloop-scheduled method %@ on %@.  Originated by target %@,  method %@,  stack: ".fmt(mName, target, originatingTargets, originatingMethodName), originatingStacks);
               }
             }
           }

data/lib/frameworks/sproutcore/frameworks/designer/coders/object.js

@@ -135,7 +135,7 @@ SC.ObjectCoder = SC.Object.extend({
     @returns {SC.ObjectCoder} receiver
   */
   bool: function(key, val) {
-    return this.js(key, val, function(x) { return x ? "YES" : "NO"; });
+    return this.js(key, val, function(x) { return x ? "true" : "false"; });
   },
 
   /**

data/lib/frameworks/sproutcore/frameworks/designer/designers/view_designer.js

@@ -316,8 +316,15 @@ SC.ViewDesigner = SC.Object.extend(
     var view = this.get('view'), proto = this.get('viewClass').prototype ;
     props.forEach(function(prop) {
       var val = view[prop] ; // avoid get() since we don't want to exec props
-      if (val !== undefined && (val !== proto[prop])) {
-        coder.encode(prop, val) ;
+      
+      //handle bindings
+      if (prop.length > 7 && prop.slice(-7) === "Binding" && val !== undefined){
+        coder.js(prop,val.encodeDesign());
+      }
+      else{
+        if (val !== undefined && (val !== proto[prop])) {
+          coder.encode(prop, val) ;
+        }
       }
     }, this);
   },
@@ -377,7 +384,8 @@ SC.ViewDesigner = SC.Object.extend(
   */
   encodeDesign: function(coder) {
     coder.set('className', SC._object_className(this.get('viewClass')));
-    this.encodeDesignProperties(coder);    
+    this.encodeDesignProperties(coder);
+    this.encodeDesignAttributeProperties(coder);
     this.encodeChildViewsDesign(coder);
     return YES ;
   },