sproutcore 1.5.0.pre.3 → 1.5.0.pre.4

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record.js

@@ -1,5 +1,5 @@
 /**
- * Nested Records (SC.ChildRecord) Unit Test
+ * Nested Records (SC.Record) Unit Test
  *
  * @author Evin Grano
  */
@@ -12,13 +12,13 @@ var NestedRecord, store, testParent, testParent2, childData1;
 var initModels = function(){
   NestedRecord.ParentRecordTest = SC.Record.extend({
     /** Child Record Namespace */
-    childRecordNamespace: NestedRecord,
+    nestedRecordNamespace: NestedRecord,
 
     name: SC.Record.attr(String),
     info: SC.Record.toOne('NestedRecord.ChildRecordTest', { nested: true })
   });
 
-  NestedRecord.ChildRecordTest = SC.ChildRecord.extend({
+  NestedRecord.ChildRecordTest = SC.Record.extend({
     id: SC.Record.attr(String),
     name: SC.Record.attr(String),
     value: SC.Record.attr(String)
@@ -44,7 +44,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
         type: 'ChildRecordTest',
         name: 'Child Name',
         value: 'Blue Goo',
-        id: '5001'
+        guid: '5001'
       }
     });
     // Test parent 2
@@ -54,7 +54,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
         type: 'ChildRecordTest',
         name: 'Child Name 2',
         value: 'Purple Goo',
-        id: '5002'
+        guid: '5002'
       }
     });
     SC.RunLoop.end();
@@ -67,7 +67,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
       type: 'ChildRecordTest',
       name: 'Child Name',
       value: 'Green Goo',
-      id: '5002'
+      guid: '5002'
     };
   },
 
@@ -92,7 +92,7 @@ test("Function: readAttribute()", function() {
       type: 'ChildRecordTest',
       name: 'Child Name',
       value: 'Blue Goo',
-      id: '5001'
+      guid: '5001'
     },
     "readAttribute should be correct for info child attribute");
   
@@ -105,7 +105,7 @@ test("Support Multiple Parent Records With Different Child Records", function()
       type: 'ChildRecordTest',
       name: 'Child Name 2',
       value: 'Purple Goo',
-      id: '5002'
+      guid: '5002'
     },
     "readAttribute should be correct for info child attribute on new record");
   equals(testParent2.get('info').get('value'), 'Purple Goo', "get should retrieve the proper value on new record");
@@ -115,7 +115,7 @@ test("Support Multiple Parent Records With Different Child Records", function()
       type: 'ChildRecordTest',
       name: 'Child Name',
       value: 'Blue Goo',
-      id: '5001'
+      guid: '5001'
     },
     "readAttribute should be correct for info child attribute on first record");
   equals(testParent.get('info').get('value'), 'Blue Goo', "get should retrieve the proper value on first record");
@@ -152,7 +152,7 @@ test("Basic Read", function() {
   // Test Child Record creation
   var cr = testParent.get('info');
   // Check Model Class information
-  ok(SC.kindOf(cr, SC.ChildRecord), "get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest), "get() creates an actual instance of a ChildRecordTest Object");
   
   // Check reference information
@@ -171,13 +171,9 @@ test("Basic Read", function() {
   var oldKey = cr.get(pm), newKey = sameCR.get(pm);
   equals(oldKey, newKey, "check to see if the Primary Key are the same");
   same(sameCR, cr, "check to see that it is the same child record as before");
-  
-  // ID check
-  id = sameCR.get('id');
-  ok((id !== oldKey), "if there is an id param, it should be different from the Primary Key: %@ != %@".fmt(id, oldKey));
 });
 
-test("Basic Write", function() {
+test("Basic Write As a Hash", function() {
   
   // Test general gets
   testParent.set('name', 'New Parent Name');
@@ -190,11 +186,12 @@ test("Basic Write", function() {
   testParent.set('info', {
     type: 'ChildRecordTest',
     name: 'New Child Name',
-    value: 'Red Goo'
+    value: 'Red Goo',
+    guid: '6001'
   });
   var cr = testParent.get('info');
   // Check Model Class information
-  ok(SC.kindOf(cr, SC.ChildRecord), "set() with an object creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "set() with an object creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest), "set() with an object creates an actual instance of a ChildRecordTest Object");
   
   // Check reference information
@@ -216,6 +213,43 @@ test("Basic Write", function() {
   same(testParent.readAttribute('info'), cr.get('attributes'), "after a set('name', <new>) on child, readAttribute on the parent should be correct for info child attributes");
 });
 
+test("Basic Write As a Child Record", function() {
+  
+  // Test general gets
+  testParent.set('name', 'New Parent Name');
+  equals(testParent.get('name'), 'New Parent Name', "set() should change name attribute");
+  testParent.set('nothing', 'nothing');
+  equals(testParent.get('nothing'), 'nothing', "set should change non-existent property to a new property");
+  
+  // Test Child Record creation
+  var store = testParent.get('store');
+  var cr = store.createRecord(NestedRecord.ChildRecordTest, {type: 'ChildRecordTest', name: 'New Child Name', value: 'Red Goo', guid: '6001'});
+  // Check Model Class information
+  ok(SC.kindOf(cr, SC.Record), "before the set(), check for actual instance that is a kind of a SC.Record Object");
+  ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest), "before the set(), check for actual instance of a ChildRecordTest Object");
+  testParent.set('info', cr);
+  cr = testParent.get('info');
+  // Check Model Class information
+  ok(SC.kindOf(cr, SC.Record), "set() with an object creates an actual instance that is a kind of a SC.Record Object");
+  ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest), "set() with an object creates an actual instance of a ChildRecordTest Object");
+  
+  // Check reference information
+  var pm = cr.get('primaryKey');
+  var key = cr.get(pm);
+  var storeRef = store.find(NestedRecord.ChildRecordTest, key);
+  ok(storeRef, 'after a set() with an object, checking that the store has the instance of the child record with proper primary key');
+  equals(cr, storeRef, "after a set with an object, checking the parent reference is the same as the direct store reference");
+  
+  // Check for changes on the child bubble to the parent.
+  cr.set('name', 'Child Name Change');
+  equals(cr.get('name'), 'Child Name Change', "after a set('name', <new>) on child, checking that the value is updated");
+  ok(cr.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');
+  ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty');
+  var newCR = testParent.get('info');
+  same(newCR, cr, "after a set('name', <new>) on child, checking to see that the parent has recieved the changes from the child record");
+  same(testParent.readAttribute('info'), cr.get('attributes'), "after a set('name', <new>) on child, readAttribute on the parent should be correct for info child attributes");
+});
+
 test("Child Status Changed", function() {
   var cr;
   cr = testParent.get('info');

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array.js

@@ -1,5 +1,5 @@
 /**
- * Nested Record Array of SC.ChildRecords Unit Test
+ * Nested Record Array of SC.Records Unit Test
  *
  * @author Evin Grano
  */
@@ -12,18 +12,18 @@ var NestedRecord, store, testParent, testParent2;
 var initModels = function(){
   NestedRecord.ParentRecordTest = SC.Record.extend({
     /** Child Record Namespace */
-    childRecordNamespace: NestedRecord,
+    nestedRecordNamespace: NestedRecord,
 
     name: SC.Record.attr(String),
-    elements: SC.Record.toMany('SC.ChildRecord', { nested: true })
+    elements: SC.Record.toMany('SC.Record', { nested: true })
   });
 
-  NestedRecord.ChildRecordTest1 = SC.ChildRecord.extend({
+  NestedRecord.ChildRecordTest1 = SC.Record.extend({
     name: SC.Record.attr(String),
     value: SC.Record.attr(String)
   });
   
-  NestedRecord.ChildRecordTest2 = SC.ChildRecord.extend({
+  NestedRecord.ChildRecordTest2 = SC.Record.extend({
      name: SC.Record.attr(String),
      info: SC.Record.attr(String),
      value: SC.Record.attr(String)
@@ -160,7 +160,7 @@ test("Basic Read", function() {
   ok(SC.instanceOf(arrayOfCRs, SC.ChildArray), "check that get() creates an actual instance of a SC.ChildArray");
   equals(arrayOfCRs.get('length'), 4, "check that the length of the array of child records is 4");
   var cr = arrayOfCRs.objectAt(0);
-  ok(SC.kindOf(cr, SC.ChildRecord), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that first ChildRecord from the get() creates an actual instance of a ChildRecordTest1 Object");
   
   // Check reference information
@@ -209,7 +209,7 @@ test("Basic Write", function() {
   equals(newArray.get('length'), 3, "after set() on parent, check that the length of the array of child records is 3");
   var cr = newArray.objectAt(0);
 
-  ok(SC.kindOf(cr, SC.ChildRecord), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that first ChildRecord from the get() creates an actual instance of a ChildRecordTest1 Object");
 });
 
@@ -241,7 +241,7 @@ test("Basic Write: reference tests", function() {
    same(readAttrsArray[0], newCR.get('attributes'), "after a set('name', <new>) on child, readAttribute on the parent should be correct for info child attributes");
 });
 
-test("Basic Array Functionality: pushObject", function() {   
+test("Basic Array Functionality: pushObject w/ HASH", function() {   
   var elements, elementsAttrs, cr, crFirst, crLast;
   // Add something to the array
   elements = testParent.get('elements');
@@ -250,7 +250,7 @@ test("Basic Array Functionality: pushObject", function() {
   elements = testParent.get('elements');
   equals(elements.get('length'), 5, "after pushObject() on parent, check that the length of the array of child records is 5");
   cr = elements.objectAt(4);
-  ok(SC.kindOf(cr, SC.ChildRecord), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that newly added ChildRecord creates an actual instance of a ChildRecordTest1 Object");
   equals(cr.get('name'), 'Testikles', "after a pushObject on parent, check to see if it has all the right values for the attributes");
   ok(cr.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');
@@ -265,6 +265,32 @@ test("Basic Array Functionality: pushObject", function() {
   same(elementsAttrs[4], crLast, "verify that parent attributes are the same as the last individual child attributes");  
 });
 
+test("Basic Array Functionality: pushObject w/ ChildRecord", function() {   
+  var elements, elementsAttrs, cr, crFirst, crLast;
+  // Add something to the array
+  elements = testParent.get('elements');
+  // PushObject Tests
+  cr = store.createRecord(NestedRecord.ChildRecordTest1, { type: 'ChildRecordTest1', name: 'Testikles', value: 'God Of Fertility'});
+  elements.pushObject(cr);
+  elements = testParent.get('elements');
+  equals(elements.get('length'), 5, "after pushObject() on parent, check that the length of the array of child records is 5");
+  cr = elements.objectAt(4);
+  ok(SC.kindOf(cr, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
+  ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that newly added ChildRecord creates an actual instance of a ChildRecordTest1 Object");
+  equals(cr.get('name'), 'Testikles', "after a pushObject on parent, check to see if it has all the right values for the attributes");
+  ok(cr.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');
+  ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty'); 
+  
+  // Verify the Attrs
+  elementsAttrs = testParent.readAttribute('elements');
+  equals(elementsAttrs.length, 5, "after pushObject() on parent, check that the length of the attribute array of child records is 5");
+  crFirst = elements.objectAt(0).get('attributes');
+  crLast = elements.objectAt(4).get('attributes');
+  same(elementsAttrs[0], crFirst, "verify that parent attributes are the same as the first individual child attributes");
+  same(elementsAttrs[4], crLast, "verify that parent attributes are the same as the last individual child attributes");  
+});
+
+
 test("Basic Array Functionality: popObject", function() {   
   var elements, elementsAttrs, cr, crFirst, crLast;
   // Add something to the array
@@ -304,7 +330,7 @@ test("Basic Array Functionality: unshiftObject", function() {
   elements = testParent.get('elements');
   equals(elements.get('length'), 5, "after pushObject() on parent, check that the length of the array of child records is 5");
   cr = elements.objectAt(0);
-  ok(SC.kindOf(cr, SC.ChildRecord), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(cr, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(cr, NestedRecord.ChildRecordTest1), "check that newly added ChildRecord creates an actual instance of a ChildRecordTest1 Object");
   equals(cr.get('name'), 'Testikles', "after a pushObject on parent, check to see if it has all the right values for the attributes");
   ok(cr.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array_complex.js

@@ -12,21 +12,21 @@ var NestedRecord, store, testParent, peopleData1, peopleData2, personData1, addr
 var initModels = function(){
   NestedRecord.Group = SC.Record.extend({
     /** Child Record Namespace */
-    childRecordNamespace: NestedRecord,
+    nestedRecordNamespace: NestedRecord,
 
     name: SC.Record.attr(String),
     people: SC.Record.toMany('NestedRecord.Person', { nested: true })
   });
 
-  NestedRecord.Person = SC.ChildRecord.extend({
+  NestedRecord.Person = SC.Record.extend({
     /** Child Record Namespace */
-    childRecordNamespace: NestedRecord,
+    nestedRecordNamespace: NestedRecord,
     
     name: SC.Record.attr(String),
     addresses: SC.Record.toMany('NestedRecord.Address', { nested: true })
   });
   
-  NestedRecord.Address = SC.ChildRecord.extend({
+  NestedRecord.Address = SC.Record.extend({
     street: SC.Record.attr(String),
     city: SC.Record.attr(String),
     state: SC.Record.attr(String, {defaultValue: "VA"})
@@ -36,7 +36,7 @@ var initModels = function(){
 // ..........................................................
 // Basic SC.ParentRecord with an Array of Children
 // 
-module("Complex SC.ChildRecord: Parent > Array of Children > Array of Children", {
+module("Complex SC.Record: Parent > Array of Children > Array of Children", {
 
   setup: function() {
     NestedRecord = SC.Object.create({
@@ -184,7 +184,7 @@ test("Basic Read, Testing the First Child Array", function() {
   ok(SC.instanceOf(ppl, SC.ChildArray), "check that get() creates an actual instance of a SC.ChildArray");
   equals(ppl.get('length'), 3, "check that the length of the array of child records is 3");
   p = ppl.objectAt(0);
-  ok(SC.kindOf(p, SC.ChildRecord), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(p, SC.Record), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(p, NestedRecord.Person), "check that first ChildRecord from the get() creates an actual instance of a Person Object");
   
   // Check reference information
@@ -225,7 +225,7 @@ test("Basic Read, Testing the Second Child Array", function() {
   ok(SC.instanceOf(addrs, SC.ChildArray), "check that get() creates an actual instance of a SC.ChildArray");
   equals(addrs.get('length'), 2, "check that the length of the array of child records is 2");
   a = addrs.objectAt(0);
-  ok(SC.kindOf(a, SC.ChildRecord), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(a, SC.Record), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(a, NestedRecord.Address), "check that first ChildRecord from the get() creates an actual instance of a Address Object");
   
   // Check reference information
@@ -269,7 +269,7 @@ test("Basic Write: Testing the First Child Array", function() {
    ok(SC.instanceOf(ppl, SC.ChildArray), "check that get() creates an actual instance of a SC.ChildArray");
    equals(ppl.get('length'), 2, "after set() on parent, check that the length of the array of child records is 2");
    p = ppl.objectAt(0);
-   ok(SC.kindOf(p, SC.ChildRecord), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+   ok(SC.kindOf(p, SC.Record), "check that first ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
    ok(SC.instanceOf(p, NestedRecord.Person), "check that first ChildRecord from the get() creates an actual instance of a Person Object");
    
    // TODO: [EG] Add test to make sure the number of ChildRecords in store is correct when we add store recored clearing
@@ -329,7 +329,7 @@ test("Basic Array Functionality: pushObject", function() {
   ppl = testParent.get('people');
   equals(ppl.get('length'), 4, "after pushObject() on parent, check that the length of the array of child records is 4");
   p = ppl.objectAt(3);
-  ok(SC.kindOf(p, SC.ChildRecord), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(p, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(p, NestedRecord.Person), "check that newly added ChildRecord creates an actual instance of a Person Object");
   equals(p.get('name'), 'Testikles, God Of Fertility', "after a pushObject on parent, check to see if it has all the right values for the attributes");
   ok(p.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');
@@ -353,7 +353,7 @@ test("Basic Array Functionality: popObject", function() {
   ppl = testParent.get('people');
   equals(ppl.get('length'), 2, "after popObject() on parent, check that the length of the array of child records is 2");
   p = ppl.objectAt(0);
-  ok(SC.kindOf(p, SC.ChildRecord), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(p, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(p, NestedRecord.Person), "check that newly added ChildRecord creates an actual instance of a Person Object");
   equals(p.get('name'), 'Barack Obama', "after a pushObject on parent, check to see if it has all the right values for the attributes");
   ok(p.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');
@@ -390,7 +390,7 @@ test("Basic Array Functionality: unshiftObject", function() {
   ppl = testParent.get('people');
   equals(ppl.get('length'), 4, "after unshiftObject() on parent, check that the length of the array of child records is 4");
   p = ppl.objectAt(0);
-  ok(SC.kindOf(p, SC.ChildRecord), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(p, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(p, NestedRecord.Person), "check that newly added ChildRecord creates an actual instance of a Person Object");
   equals(p.get('name'), 'Testikles, God Of Fertility', "after a pushObject on parent, check to see if it has all the right values for the attributes");
   ok(p.get('status') & SC.Record.DIRTY, 'check that the child record is dirty');

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_complex.js

@@ -1,5 +1,5 @@
 /**
- * Complex Nested Records (SC.ChildRecord) Unit Test
+ * Complex Nested Records (SC.Record) Unit Test
  *
  * @author Evin Grano
  */
@@ -10,15 +10,15 @@
 var NestedRecord, store, testParent; 
 
 var initModels = function(){
-  NestedRecord.Address = SC.ChildRecord.extend({
+  NestedRecord.Address = SC.Record.extend({
     street: SC.Record.attr(String),
     city: SC.Record.attr(String),
     state: SC.Record.attr(String, {defaultValue: 'VA'})
   });
   
-  NestedRecord.Person = SC.ChildRecord.extend({
+  NestedRecord.Person = SC.Record.extend({
     /** Child Record Namespace */
-    childRecordNamespace: NestedRecord,
+    nestedRecordNamespace: NestedRecord,
     
     name: SC.Record.attr(String),
     address: SC.Record.toOne('NestedRecord.Address', { nested: true })
@@ -26,7 +26,7 @@ var initModels = function(){
   
   NestedRecord.ParentRecordTest = SC.Record.extend({
     /** Child Record Namespace */
-    childRecordNamespace: NestedRecord,
+    nestedRecordNamespace: NestedRecord,
 
     name: SC.Record.attr(String),
     person: SC.Record.toOne('NestedRecord.Person', { nested: true })
@@ -209,7 +209,7 @@ function() {
   // Test Child Record creation
   var p = testParent.get('person');
   // Check Model Class information
-  ok(SC.kindOf(p, SC.ChildRecord), "(parent > child).get() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(p, SC.Record), "(parent > child).get() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(p, NestedRecord.Person), "(parent > child).get() creates an actual instance of a Person Object");
   
   // Check reference information
@@ -222,7 +222,7 @@ function() {
   
   var a = testParent.getPath('person.address');
   // Check Model Class information
-  ok(SC.kindOf(a, SC.ChildRecord), "(parent > child > child) w/ getPath() creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(a, SC.Record), "(parent > child > child) w/ getPath() creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(a, NestedRecord.Address), "(parent > child > child) w/ getPath() creates an actual instance of an Address Object");
   
   // Check reference information
@@ -257,7 +257,7 @@ function() {
   });
   p = testParent.get('person');
   // Check Model Class information
-  ok(SC.kindOf(p, SC.ChildRecord), "set() with an object creates an actual instance that is a kind of a SC.ChildRecord Object");
+  ok(SC.kindOf(p, SC.Record), "set() with an object creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(p, NestedRecord.Person), "set() with an object creates an actual instance of a ChildRecordTest Object");
   
   // Check reference information

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/normalize.js

@@ -57,12 +57,12 @@ module("SC.Record normalize method", {
 
     // A parent record
     MyApp.FooParent = SC.Record.extend({
-      childRecordNamespace: MyApp,
+      nestedRecordNamespace: MyApp,
       myChild: SC.ChildAttribute.attr('MyApp.FooChild')
     });
 
     // A child record
-    MyApp.FooChild = SC.ChildRecord.extend({
+    MyApp.FooChild = SC.Record.extend({
     });
     
     MyApp.Bar = SC.Record.extend({

data/lib/frameworks/sproutcore/frameworks/{foundation/english.lproj → datetime/resources}/strings.js

@@ -11,3 +11,4 @@ SC.stringsFor('English', {
   '_SC.DateTime.monthNames': 'January February March April May June July August September October November December',
   '_SC.DateTime.abbreviatedMonthNames': 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'
 }) ;
+

data/lib/frameworks/sproutcore/frameworks/{foundation → datetime}/system/datetime.js

@@ -310,6 +310,7 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
       - %M - Minute of the hour (00..59)
       - %p - Meridian indicator (``AM'' or ``PM'')
       - %S - Second of the minute (00..60)
+      - %s - Milliseconds of the second (000..999)
       - %U - Week number of the current year,
           starting with the first Sunday as the first
           day of the first week (00..53)
@@ -901,7 +902,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('(?:%([aAbBcdHIjmMpSUWwxXyYZ%])|(.))', "g");
+    var re = new RegExp('(?:%([aAbBcdHIjmMpsSUWwxXyYZ%])|(.))', "g");
     var d, parts, opts = {}, check = {}, scanner = SC.Scanner.create({string: str});
     
     if (SC.none(fmt)) fmt = SC.DATETIME_ISO8601;
@@ -922,6 +923,7 @@ SC.DateTime.mixin(SC.Comparable,
           case 'M': opts.minute = scanner.scanInt(1, 2); break;
           case 'p': opts.meridian = scanner.scanArray(['AM', 'PM']); break;
           case 'S': opts.second = scanner.scanInt(1, 2); break;
+          case 's': opts.millisecond = scanner.scanInt(1, 3); break;
           case 'U': throw "%U is not implemented";
           case 'W': throw "%W is not implemented";
           case 'w': throw "%w is not implemented";
@@ -1013,6 +1015,7 @@ SC.DateTime.mixin(SC.Comparable,
       case 'M': return this._pad(this._get('minute'));
       case 'p': return this._get('hour') > 11 ? 'PM' : 'AM';
       case 'S': return this._pad(this._get('second'));
+      case 's': return this._pad(this._get('millisecond'), 3);
       case 'u': return this._pad(this._get('utc')); //utc
       case 'U': return this._pad(this._get('week0'));
       case 'W': return this._pad(this._get('week1'));
@@ -1041,7 +1044,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(/\%([aAbBcdDHiIjmMpSUWwxXyYZ\%])/g, function() {
+    return format.replace(/\%([aAbBcdDHiIjmMpsSUWwxXyYZ\%])/g, function() {
       var v = that.__toFormattedString.call(that, arguments, start, timezone);
       return v;
     });
@@ -1103,38 +1106,3 @@ SC.Binding.dateTime = function(format) {
     return value ? value.toFormattedString(format) : null;
   });
 };
-
-if (SC.RecordAttribute && !SC.RecordAttribute.transforms[SC.guidFor(SC.DateTime)]) {
-
-  /**
-    Registers a transform to allow SC.DateTime to be used as a record attribute,
-    ie SC.Record.attr(SC.DateTime);
-
-    Because SC.RecordAttribute is in the datastore framework and SC.DateTime in
-    the foundation framework, and we don't know which framework is being loaded
-    first, this chunck of code is duplicated in both frameworks.
-
-    IF YOU EDIT THIS CODE MAKE SURE YOU COPY YOUR CHANGES to record_attribute.js. 
-  */
-  SC.RecordAttribute.registerTransform(SC.DateTime, {
-  
-    /** @private
-      Convert a String to a DateTime
-    */
-    to: function(str, attr) {
-      if (SC.none(str) || SC.instanceOf(str, SC.DateTime)) return str;
-      var format = attr.get('format');
-      return SC.DateTime.parse(str, format ? format : SC.DateTime.recordFormat);
-    },
-  
-    /** @private
-      Convert a DateTime to a String
-    */
-    from: function(dt, attr) {
-      if (SC.none(dt)) return dt;
-      var format = attr.get('format');
-      return dt.toFormattedString(format ? format : SC.DateTime.recordFormat);
-    }
-  });
-  
-}

data/lib/frameworks/sproutcore/frameworks/{foundation → datetime}/tests/system/datetime.js

@@ -2,6 +2,7 @@
 // Project:   DateTime Unit Test
 // Copyright: ©2010 Martin Ottenwaelter
 // ==========================================================================
+
 /*globals module test ok equals same stop start */
 
 module('Time');

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

@@ -14,7 +14,7 @@ SC._mapDisplayNamesUseHashForSeenTypes = ['object', 'number', 'boolean', 'array'
 
 
 SC.mapDisplayNames = function(obj, level, path, seenHash, seenArray) {
-  if (!SC.browser.safari) return ;
+  if (!SC.browser.webkit) return ;
 
   // Lazily instantiate the hash of types we'll use a hash for the "have we
   // seen this before?" structure.  (Some types are not safe to put in a hash

data/lib/frameworks/sproutcore/frameworks/designer/controllers/designs.js

@@ -20,8 +20,7 @@ SC.designsController = SC.ArrayController.create(SC.CollectionViewDelegate,
     
     for(var v in page){
       if(page.hasOwnProperty(v)){
-        if(page[v] && page[v].kindOf){
-          
+        if(v !== '__sc_super__' && page[v] && page[v].kindOf){
           if(page[v].kindOf(iframe.SC.Pane)){
             designs.push(SC.Object.create({type: 'pane', view: page.get(v), name: v}));
           }

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

@@ -252,7 +252,7 @@ SC.ObjectDesigner.mixin({
   didLoadDesign: function(designedObject, sourceObject, attrs) {
     designedObject.isDesign = YES ; // indicates that we need a designer.
     designedObject.designAttrs = attrs;
-    designedObject.sourceObject = sourceObject;
+    //designedObject.sourceObject = sourceObject; TODO: don't need this..
   },
 
   /**
@@ -287,8 +287,8 @@ SC.ObjectDesigner.mixin({
       object.designer = DesignerClass.create({
         object: object,
         objectClass: design,
-        designAttrs: origDesign.designAttrs,
-        sourceObject: origDesign.sourceObject
+        designAttrs: origDesign.designAttrs
+        //sourceObject: origDesign.sourceObject TODO: don't need this
       });
     }
   }

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

@@ -1135,7 +1135,7 @@ SC.ViewDesigner.mixin({
   didLoadDesign: function(designedView, sourceView, attrs) {
     designedView.isDesign = YES ; // indicates that we need a designer.
     designedView.designAttrs = attrs;
-    designedView.sourceView = sourceView;
+    //designedView.sourceView = sourceView; TODO: not sure we need this...
   },
 
   /**
@@ -1170,8 +1170,8 @@ SC.ViewDesigner.mixin({
       view.designer = DesignerClass.create({
         view: view,
         viewClass: design,
-        designAttrs: origDesign.designAttrs,
-        sourceView: origDesign.sourceView
+        designAttrs: origDesign.designAttrs
+        //sourceView: origDesign.sourceView TODO: not sure we need this...
       });
     }
   }

data/lib/frameworks/sproutcore/frameworks/designer/views/designer_drop_target.js

@@ -14,6 +14,8 @@
 SC.DesignerDropTarget = SC.ContainerView.extend(
   /** @scope SC.DesignerDropTarget.prototype */ {
   
+  inGlobalOffset: YES,
+  
   // ..........................................................
   // Key Events
   // 
@@ -106,7 +108,7 @@ SC.DesignerDropTarget = SC.ContainerView.extend(
     var data = drag.dataForType('SC.Object'),
         cv = this.get('contentView'),
         loc = drag.get('location'),
-        frame = drag.iframeFrame,
+        iframeOffset = drag.globalTargetOffset,
         design, size, newView, defaults, layout;
     var page = cv.get('page');
     var designController = page.get('designController'),
@@ -115,13 +117,17 @@ SC.DesignerDropTarget = SC.ContainerView.extend(
     //TODO: [MB] should we move most of this into the designer's addView?
     //size and location
     size = data.get('size');
-    loc.x = loc.x - frame.x - rootDesignerFrame.x;
-    loc.y = loc.y - frame.y - rootDesignerFrame.y;
+    loc.x = loc.x - iframeOffset.x - rootDesignerFrame.x;
+    loc.y = loc.y - iframeOffset.y - rootDesignerFrame.y;
     //setup design (use eval to make sure code comes from iframe)
+    //TODO use new Function("return "+data.get('scClass))() ?...
     design = eval(data.get('scClass'));
     defaults = data.get('defaults') || {};
     layout = defaults.layout || {};
     layout = SC.merge(layout, {top: loc.y, left: loc.x});
+    //pull width and height from ghost if none exists form defaults
+    if(!layout.width) layout.width = drag.getPath('ghostView.layout').width;
+    if(!layout.height) layout.height = drag.getPath('ghostView.layout').height;
     defaults.layout = layout;
     design = design.design(defaults);
     //drop it in the root designer