sproutcore 1.7.1.beta → 1.8.0

data/lib/frameworks/sproutcore/frameworks/datastore/system/record_array.js

@@ -279,7 +279,7 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
   /**
     Adds the specified record to the record array if it is not already part
-    of the array.  Provided for compatibilty with `SC.Set`.
+    of the array.  Provided for compatibility with `SC.Set`.
 
     @param {SC.Record} record
     @returns {SC.RecordArray} receiver
@@ -551,7 +551,9 @@ SC.RecordArray = SC.Object.extend(SC.Enumerable, SC.Array,
       // otherwise, lookup all storeKeys for the named recordType...
       } else if (recordType = query.get('expandedRecordTypes')) {
         sourceKeys = SC.IndexSet.create();
-        sourceKeys.addEach(store.storeKeysFor(recordType));
+        recordType.forEach(function(cur) {
+          sourceKeys.addEach(store.storeKeysFor(cur));
+        });
       }
 
       // loop through storeKeys to determine if it belongs in this query or

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

@@ -487,7 +487,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
   dataHashDidChange: function(storeKeys, rev, statusOnly, key) {
 
     // update the revision for storeKey.  Use generateStoreKey() because that
-    // gaurantees a universally (to this store hierarchy anyway) unique
+    // guarantees a universally (to this store hierarchy anyway) unique
     // key value.
     if (!rev) rev = SC.Store.generateStoreKey();
     var isArray, len, idx, storeKey;
@@ -678,7 +678,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
 
   /** @private
     Called by a nested store on a parent store to commit any changes from the
-    store.  This will copy any changed dataHashes as well as any persistant
+    store.  This will copy any changed dataHashes as well as any persistent
     change logs.
 
     If the parentStore detects a conflict with the optimistic locking, it will
@@ -1120,7 +1120,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
 
     // add dataHash and setup initial status -- also save recordType
     this.writeDataHash(storeKey, (dataHash ? dataHash : {}), K.READY_NEW);
-
+    
     SC.Store.replaceRecordTypeFor(storeKey, recordType);
     this.dataHashDidChange(storeKey);
 
@@ -1136,7 +1136,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     }
 
     // Finally return materialized record, after we propagate the status to
-    // any aggregrate records.
+    // any aggregate records.
     ret = this.materializeRecord(storeKey);
     if (ret) ret.propagateToAggregates();
     return ret;
@@ -1416,7 +1416,9 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     var children = this.parentRecords[storeKey] || {};
     if (SC.none(func)) return;
     for (var key in children) {
-      if (children.hasOwnProperty(key)) func(key);
+      // for .. in makes the key a String, but be sure to pass a Number to the
+      // function.
+      if (children.hasOwnProperty(key)) func(parseInt(key, 10));
     }
   },
 
@@ -1714,7 +1716,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     @param {String} id to id of the record to load
     @param {SC.Record} recordType the expected record type
     @param {Number} storeKey (optional) optional store key
-    @param {Function} callback (optional) when refresh complets
+    @param {Function} callback (optional) when refresh completes
     @returns {Boolean} YES if the retrieval was a success.
   */
   refreshRecord: function(recordType, id, storeKey, callback) {
@@ -1729,7 +1731,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     @param {SC.Record|Array} recordTypes class or array of classes
     @param {Array} ids ids to destroy
     @param {Array} storeKeys (optional) store keys to destroy
-    @param {Function} callback (optional) when refresh complets
+    @param {Function} callback (optional) when refresh completes
     @returns {Boolean} YES if the retrieval was a success.
   */
   refreshRecords: function(recordTypes, ids, storeKeys, callback) {
@@ -1789,7 +1791,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
       // collect status and process
       status = this.readStatus(storeKey);
 
-      if ((status == K.EMPTY) || (status == K.ERROR)) {
+      if (status == K.ERROR) {
         throw K.NOT_FOUND_ERROR ;
       }
       else {
@@ -1811,7 +1813,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
         } else if (status==K.DESTROYED_CLEAN) {
           this.dataHashDidChange(storeKey, rev, YES);
         }
-        // ignore K.READY_CLEAN, K.BUSY_LOADING, K.BUSY_CREATING, K.BUSY_COMMITTING,
+        // ignore K.EMPTY, K.READY_CLEAN, K.BUSY_LOADING, K.BUSY_CREATING, K.BUSY_COMMITTING,
         // K.BUSY_REFRESH_CLEAN, K_BUSY_REFRESH_DIRTY, KBUSY_DESTROYING
       }
     }
@@ -1821,7 +1823,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
       ret = source.commitRecords.call(source, this, retCreate, retUpdate, retDestroy, params);
     }
 
-    //remove all commited changes from changelog
+    //remove all committed changes from changelog
     if (ret && !recordTypes && !ids) {
       if (storeKeys === this.changelog) {
         this.changelog = null;
@@ -1844,7 +1846,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     @param {SC.Record} recordType the expected record type
     @param {String} id the id of the record to commit
     @param {Number} storeKey the storeKey of the record to commit
-    @param {Hash} params optional additonal params that will passed down
+    @param {Hash} params optional additional params that will passed down
       to the data source
     @param {Function|Array} callback function or array of functions
     @returns {Boolean} if the action was successful.
@@ -2258,6 +2260,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
       if(dataHash===undefined) this.writeStatus(storeKey, status) ;
       else this.writeDataHash(storeKey, dataHash, status) ;
 
+      if (id && this.idFor(storeKey) !== id) SC.Store.replaceIdFor(storeKey, id);
       this.dataHashDidChange(storeKey);
 
       return storeKey;

data/lib/frameworks/sproutcore/frameworks/datastore/tests/integration/many_array.js

@@ -0,0 +1,63 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+var MyDataSource = SC.DataSource.extend({
+  retrieveRecordsArguments: [],
+
+  retrieveRecords: function(store, storeKeys) {
+    this.get('retrieveRecordsArguments').push(storeKeys);
+    sc_super();
+  }
+});
+
+var MyApp = {};
+
+MyApp.Todo = SC.Record.extend({
+  title: SC.Record.attr(String),
+  project: SC.Record.toOne("MyApp.Project", {
+    inverse: "todos", isMaster: NO
+  })
+});
+
+MyApp.Project = SC.Record.extend({
+  name: SC.Record.attr(String),
+  todos: SC.Record.toMany("MyApp.Todo", {
+    inverse: "project", isMaster: YES
+  })
+});
+
+module("SC.Record.toMany array with data source", {
+  setup: function() {
+    window.MyApp = MyApp;
+    window.MyDataSource = MyDataSource;
+  },
+  teardown: function() {
+    window.MyApp = null;
+    window.MyDataSource = null;
+  }
+});
+
+test("when retrieving records with toMany association, it should call retrieveRecords once instead of calling retrieveRecord multiple times", function() {
+  var store = SC.Store.create().from("MyDataSource");
+  SC.RunLoop.begin();
+  store.loadRecords(MyApp.Project, [
+    {
+      guid: 1,
+      name: 'SproutCore',
+      todos: [1, 2, 3]
+    }
+  ]);
+  SC.RunLoop.end();
+
+  SC.RunLoop.begin();
+  var todos = store.find(MyApp.Project, 1).get('todos').toArray();
+  SC.RunLoop.end();
+
+  same(todos.length, 3);
+  // retrieveRecords should be called only once
+  same(store.get('dataSource').get('retrieveRecordsArguments').length, 1);
+});

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/many_attribute.js

@@ -332,7 +332,7 @@ test("adding a record to a many-to-many; bar side", function() {
   
   bar3.get('fooToMany').pushObject(foo2);
 
-  // v-- since bar3 is added throught inverse, it should follow orderBy
+  // v-- since bar3 is added through inverse, it should follow orderBy
   equals(foo2.get('barToMany').indexOf(bar3), 1, 'foo1.barToMany should contain bar1');
   ok(bar3.get('fooToMany').indexOf(foo2) >= 0, 'bar1.fooToMany should contain foo1');
 

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

@@ -80,7 +80,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
     store = null;
     childData1 = null;
     NestedRecord = null;
-    delete(window.NestedRecord);
+    //delete(window.NestedRecord);
   }
 });
 
@@ -164,7 +164,7 @@ test("Basic Read", function() {
   ok(storeRef, 'checking that the store has the instance of the child record with proper primary key');
   equals(cr, storeRef, "checking the parent reference is the same as the direct store reference");
   
-  // Check to see if the attributes of a Child Record match the refrence of the parent
+  // Check to see if the attributes of a Child Record match the reference of the parent
   same(storeRef.get('attributes'), testParent.readAttribute('info'), "check that the ChildRecord's attributes are the same as the ParentRecord's readAttribute for the reference");
   
   // Duplication check
@@ -211,7 +211,7 @@ test("Basic Write As a Hash", function() {
   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(newCR, cr, "after a set('name', <new>) on child, checking to see that the parent has received 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");
 });
 
@@ -248,7 +248,7 @@ test("Basic Write As a Child Record", function() {
   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(newCR, cr, "after a set('name', <new>) on child, checking to see that the parent has received 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");
 
   // Make sure you can set the child to null.

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

@@ -10,13 +10,6 @@
 var NestedRecord, store, testParent, testParent2; 
 
 var initModels = function(){
-  NestedRecord.ParentRecordTest = SC.Record.extend({
-    /** Child Record Namespace */
-    nestedRecordNamespace: NestedRecord,
-
-    name: SC.Record.attr(String),
-    elements: SC.Record.toMany('SC.Record', { nested: true })
-  });
 
   NestedRecord.ChildRecordTest1 = SC.Record.extend({
     name: SC.Record.attr(String),
@@ -28,8 +21,39 @@ var initModels = function(){
      info: SC.Record.attr(String),
      value: SC.Record.attr(String)
    });
+  
+  NestedRecord.ParentRecordTest = SC.Record.extend({
+    /** Child Record Namespace */
+    nestedRecordNamespace: NestedRecord,
+
+    name: SC.Record.attr(String),
+    elements: SC.Record.toMany('SC.Record', { nested: true }),
+    
+    defaultElements: SC.Record.toMany(NestedRecord.ChildRecordTest1, {
+      isNested: true,
+      defaultValue: function(record, key) {
+        var array = [];
+        array.pushObject(record.createNestedRecord(NestedRecord.ChildRecordTest1));
+        return array;
+      }
+    }),
+    
+    defaultPolymorphicElements: SC.Record.toMany('SC.Record', {
+      isNested: true,
+      defaultValue: function(record, key) {
+        var array = [];
+        array.pushObject(record.createNestedRecord(SC.Record, {
+          type: 'ChildRecordTest1',
+          name: 'Default Child 1',
+          value: 'burninate'
+        }));
+        return array;
+      }
+    })
+  });
 };
 
+
 // ..........................................................
 // Basic SC.Record with an Array of Children
 // 
@@ -162,7 +186,23 @@ test("Basic Read", function() {
   var cr = arrayOfCRs.objectAt(0);
   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");
-  
+
+  // Test Default Child Record creation
+  var arrayOfDRs = testParent.get('defaultElements');
+  ok(SC.instanceOf(arrayOfDRs, SC.ChildArray), "check that get() creates an actual instance of a SC.ChildArray");
+  equals(arrayOfDRs.get('length'), 1, "check that the length of the array of default records is 1");
+  var dr = arrayOfDRs.objectAt(0);
+  ok(SC.kindOf(dr, SC.Record), "check that first default ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
+  ok(SC.instanceOf(dr, NestedRecord.ChildRecordTest1), "check that first default ChildRecord from the get() creates an actual instance of a ChildRecordTest1 Object");
+
+  // Test Default Polymorphic Child Record creation
+  var arrayOfDPRs = testParent.get('defaultPolymorphicElements');
+  ok(SC.instanceOf(arrayOfDPRs, SC.ChildArray), "check that get() creates an actual instance of a SC.ChildArray");
+  equals(arrayOfDPRs.get('length'), 1, "check that the length of the array of default records is 1");
+  var dpr = arrayOfDPRs.objectAt(0);
+  ok(SC.kindOf(dpr, SC.Record), "check that first default polymorphic ChildRecord from the get() creates an actual instance that is a kind of a SC.Record Object");
+  ok(SC.instanceOf(dpr, NestedRecord.ChildRecordTest1), "check that first default polymorphic ChildRecord from the get() creates an actual instance of a ChildRecordTest1 Object");
+
   // Check reference information
   var pm = cr.get('primaryKey');
   var key = cr.get(pm);
@@ -170,7 +210,7 @@ test("Basic Read", function() {
   ok(storeRef, 'check that first ChildRecord that the store has the instance of the child record with proper primary key');
   equals(cr, storeRef, "check the parent reference to the first child is the same as the direct store reference");
   
-  // Check to see if the attributes of a Child Record match the refrence of the parent
+  // Check to see if the attributes of a Child Record match the reference of the parent
   var parentArray = testParent.readAttribute('elements');
   ok(!SC.instanceOf(parentArray, SC.ChildArray), "check that get() creates an actual instance of a SC.ChildArray");
   same(parentArray[0], storeRef.get('attributes'), "check that the ChildRecord's attributes are the same as the ParentRecord's readAttribute for the reference");
@@ -234,7 +274,7 @@ test("Basic Write: reference tests", function() {
    ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty');
    newElems = testParent.get('elements');
    var newCR = newElems.objectAt(0);
-   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(newCR, cr, "after a set('name', <new>) on child, checking to see that the parent has received the changes from the child record");
    var readAttrsArray = testParent.readAttribute('elements');
    ok(readAttrsArray, "checks to make sure the readAttibute works with a change to the name in the first child.");
    equals(readAttrsArray.length, 4, "after set() on parent, check that the length of the attribute array of child records is 4");

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

@@ -118,7 +118,7 @@ module("Complex SC.Record: Parent > Array of Children > Array of Children", {
     delete NestedRecord.Group;
     delete NestedRecord.Person;
     delete NestedRecord.Address;
-    delete window.NestedRecord;
+    //delete window.NestedRecord;
     NestedRecord = null;
     testParent = null;
     peopleData1 = null;
@@ -196,7 +196,7 @@ test("Basic Read, Testing the First Child Array", function() {
   ok(pStore, 'check that first ChildRecord that the store has the instance of the child record with proper primary key');
   equals(p, pStore, "check the parent reference to the first child is the same as the direct store reference");
   
-  // Check to see if the attributes of a Child Record match the refrence of the parent
+  // Check to see if the attributes of a Child Record match the reference of the parent
   pplAttr = testParent.readAttribute('people');
   ok(!SC.instanceOf(pplAttr, SC.ChildArray), "check that readAttribute() does not create an actual instance of a SC.ChildArray");
   same(pplAttr[0], pStore.get('attributes'), "check that the ChildRecord's attributes are the same as the ParentRecord's readAttribute for the reference");
@@ -237,7 +237,7 @@ test("Basic Read, Testing the Second Child Array", function() {
   ok(aStore, 'check that first ChildRecord that the store has the instance of the child record with proper primary key');
   equals(a, aStore, "check the parent reference to the first child is the same as the direct store reference");
   
-  // Check to see if the attributes of a Child Record match the refrence of the parent
+  // Check to see if the attributes of a Child Record match the reference of the parent
   addrsAttr = p.readAttribute('addresses');
   ok(!SC.instanceOf(addrsAttr, SC.ChildArray), "check that readAttribute() does not create an actual instance of a SC.ChildArray");
   same(addrsAttr[0], aStore.get('attributes'), "check that the ChildRecord's attributes are the same as the ParentRecord's readAttribute for the reference");
@@ -274,7 +274,7 @@ test("Basic Write: Testing the First Child Array", function() {
    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
+   // TODO: [EG] Add test to make sure the number of ChildRecords in store is correct when we add store record clearing
    
    // Check reference information
    pm = p.get('primaryKey');

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

@@ -66,7 +66,7 @@ module("Basic SC.Record Functions w/ a Parent > Child > Child", {
     delete NestedRecord.ParentRecordTest;
     delete NestedRecord.Person;
     delete NestedRecord.Address;
-    delete window.NestedRecord;
+    //delete window.NestedRecord;
     NestedRecord = null;
     testParent = null;
     store = null;
@@ -278,14 +278,14 @@ function() {
   ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty');
   oldP = p;
   p = testParent.get('person');
-  same(p, oldP, "after a set('name', <new>) on child, checking to see that the parent has recieved the changes from the child record");
+  same(p, oldP, "after a set('name', <new>) on child, checking to see that the parent has received the changes from the child record");
   same(testParent.readAttribute('person'), p.get('attributes'), "after a set('name', <new>) on child, readAttribute on the parent should be correct for info child attributes");
   
   // Check changes on the address
   a = testParent.getPath('person.address');
   a.set('street', '321 Nutty Professor Lane');
   parentAttrs = testParent.readAttribute('person');
-  same(a.get('attributes'), parentAttrs.address, "after a set('street', <new>) on address child, checking to see that the parent has recieved the changes from the child record");
+  same(a.get('attributes'), parentAttrs.address, "after a set('street', <new>) on address child, checking to see that the parent has received the changes from the child record");
 });
 
 test("Basic normalize()", function() {

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

@@ -23,7 +23,7 @@ module("SC.Record#destroy", {
     
     MyApp.foo = MyApp.store.createRecord(MyApp.Foo, MyApp.json);
     
-    // modify store so that everytime refreshRecords() is called it updates 
+    // modify store so that every time refreshRecords() is called it updates 
     // callInfo
     callInfo = null ;
     MyApp.store.__orig = MyApp.store.destroyRecord;

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

@@ -23,7 +23,7 @@ module("SC.Record#refresh", {
     
     MyApp.foo = MyApp.store.createRecord(MyApp.Foo, MyApp.json);
     
-    // modify store so that everytime refreshRecords() is called it updates 
+    // modify store so that every time refreshRecords() is called it updates 
     // callInfo
     callInfo = null ;
     MyApp.store.refreshRecord = function(records) {

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record_attribute.js

@@ -138,7 +138,7 @@ test("pass-through should return builtin value" ,function() {
   equals(rec.get('firstName'), 'John', 'reading prop should get attr value');
 });
 
-test("returns default value if underyling value is empty", function() {
+test("returns default value if underlying value is empty", function() {
   equals(rec.get('defaultValue'), 'default', 'reading prop should return default value');
 });
 

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/single_attribute.js

@@ -14,9 +14,9 @@ module("SC.RecordAttribute core methods", {
     MyApp = SC.Object.create({
       store: SC.Store.create()
     });
-    
+
     MyApp.Foo = SC.Record.extend({
-      
+
       // test toOne relationships
       relatedTo: SC.Record.toOne('MyApp.Foo'),
 
@@ -24,93 +24,93 @@ module("SC.RecordAttribute core methods", {
       readOnlyRelatedTo: SC.Record.toOne('MyApp.Bar', {
         isEditable: NO
       }),
-      
+
       // test toOne relationship with computed type
       relatedToComputed: SC.Record.toOne(function() {
-        // not using .get() to avoid another transform which will 
+        // not using .get() to avoid another transform which will
         // trigger an infinite loop
         return (this.readAttribute('relatedToComputed').indexOf("foo")===0) ? MyApp.Foo : MyApp.Bar;
       }),
-      
+
       bar: SC.Record.toOne('MyApp.Bar', { inverse: 'foo' }),
-      
+
       barKeyed: SC.Record.toOne('MyApp.Bar', { key: 'barId' })
-      
+
     });
-    
+
     MyApp.Bar = SC.Record.extend({
       foo: SC.Record.toOne('MyApp.Foo', { inverse: 'bar', isMaster: NO })
     });
-    
+
     SC.RunLoop.begin();
     storeKeys = MyApp.store.loadRecords(MyApp.Foo, [
-      { 
-        guid: 'foo1', 
-        firstName: "John", 
-        lastName: "Doe", 
+      {
+        guid: 'foo1',
+        firstName: "John",
+        lastName: "Doe",
         date: "2009-03-01T20:30-08:00",
         anArray: ['one', 'two', 'three'],
         anObject: { 'key1': 'value1', 'key2': 'value2' },
         bar: "bar1"
       },
-      
-      { 
-        guid: 'foo2', 
-        firstName: "Jane", 
-        lastName: "Doe", 
+
+      {
+        guid: 'foo2',
+        firstName: "Jane",
+        lastName: "Doe",
         relatedTo: 'foo1',
         anArray: 'notAnArray',
         anObject: 'notAnObject',
         nonIsoDate: "2009/06/10 8:55:50 +0000"
       },
-      
-      { 
-        guid: 'foo3', 
-        firstName: "Alex", 
-        lastName: "Doe", 
+
+      {
+        guid: 'foo3',
+        firstName: "Alex",
+        lastName: "Doe",
         relatedToComputed: 'bar1',
         anArray: ['one', 'two', 'three'],
         anObject: { 'key1': 'value1', 'key2': 'value2' },
         bar: "bar2"
       },
-      
+
       {
         guid: 'foo4',
         firstName: 'Joe',
         lastName:  'Schmo',
         barId: 'bar1'
       },
-      
-      { 
-        guid: 'foo5', 
-        firstName: "Jane", 
-        lastName: "Doe", 
+
+      {
+        guid: 'foo5',
+        firstName: "Jane",
+        lastName: "Doe",
         readOnlyRelatedTo: 'bar1'
       }
-      
+
     ]);
-    
+
     MyApp.store.loadRecords(MyApp.Bar, [
       { guid: 'bar1', city: "Chicago", foo: "foo1" },
       { guid: "bar2", city: "New York", foo: 'foo3' }
     ]);
-    
+
     SC.RunLoop.end();
-    
+
     rec = MyApp.store.find(MyApp.Foo, 'foo1');
     rec2 = MyApp.store.find(MyApp.Foo, 'foo2');
-    
+
     bar = MyApp.store.find(MyApp.Bar, 'bar1');
     bar2 = MyApp.store.find(MyApp.Bar, 'bar2');
-    
+
     equals(rec.storeKey, storeKeys[0], 'should find record');
-    
+
   }
 });
 
 // ..........................................................
 // READING
-// 
+//
 
 test("getting toOne relationship should map guid to a real record", function() {
   var rec2 = MyApp.store.find(MyApp.Foo, 'foo2');
@@ -126,7 +126,7 @@ test("getting toOne relationship from computed attribute should map guid to a re
 
 test("reading an inverse relationship", function() {
   equals(rec.get('bar'), bar, 'foo1.bar should == bar');
-  equals(bar.get('foo'), rec, 'bar.foo should == foo1');  
+  equals(bar.get('foo'), rec, 'bar.foo should == foo1');
 });
 
 test("reading a keyed relationship", function(){
@@ -136,7 +136,7 @@ test("reading a keyed relationship", function(){
 
 // ..........................................................
 // WRITING
-// 
+//
 
 test("writing to a to-one relationship should update set guid", function() {
   var rec2 = MyApp.store.find(MyApp.Foo, 'foo2');
@@ -147,7 +147,7 @@ test("writing to a to-one relationship should update set guid", function() {
   rec2.set('relatedTo', rec2);
 
   equals(rec2.readAttribute('relatedTo'), 'foo2', 'should write ID for set record to relatedTo attribute');
-  
+
   equals(rec2.get('relatedTo'), rec2, 'should get foo record that was just set');
 
 });
@@ -156,14 +156,14 @@ test("writing to a to-one computed relationship should update set guid", functio
   var rec3 = MyApp.store.find(MyApp.Foo, 'foo3');
   equals(rec3.get('id'), 'foo3', 'precond - should find record 2');
   equals(rec3.get('relatedToComputed'), bar, 'precond - should get bar1 instance for rec3.relatedToComputed');
-  
+
   rec3.set('relatedToComputed', rec);
   equals(rec3.readAttribute('relatedToComputed'), 'foo1', 'should write ID for set record to relatedTo attribute');
 });
 
 test("clearing a toOne relationship", function() {
   ok(rec2.get('relatedTo') !== null, 'precond - rec.relatedTo should have a value');
-  
+
   rec2.set('relatedTo', null);
   equals(rec2.get('relatedTo'), null, 'rec.relatedTo should be null');
   equals(rec2.readAttribute('relatedTo'), null, 'rec.relatedTo attribute should be null');
@@ -175,69 +175,69 @@ test("clearing a toOne relationship with an inverse - foo isMaster", function()
 
   equals(rec.get('status'), SC.Record.READY_CLEAN, 'precond - foo1.status should be READY_CLEAN');
   equals(bar.get('status'), SC.Record.READY_CLEAN, 'precond - bar1.status should be READY_CLEAN');
-  
+
   rec.set('bar', null);
-  
+
   equals(rec.get('bar'), null, 'foo1.bar should be null after change');
   equals(bar.get('foo'), null, 'bar.foo should also be null after change');
-  
+
   equals(rec.get('status'), SC.Record.READY_DIRTY, 'foo1.status should be READY_DIRTY');
   equals(bar.get('status'), SC.Record.READY_CLEAN, 'bar1.status should be READY_CLEAN');
-  
+
 });
 
 test("modifying a toOne relationship with an inverse from null", function() {
   equals(rec.get('bar'), bar, 'precond - foo1.bar should eq bar');
   equals(bar.get('foo'), rec, 'precond - bar.foo should eq foo1');
   equals(rec2.get('bar'), null, 'precond - foo2.bar should eq null');
-  
+
   [rec, rec2, bar].forEach(function(r) {
     equals(r.get('status'), SC.Record.READY_CLEAN, 'precond - %@.status should be READY_CLEAN'.fmt(r.get('id')));
   }, this);
-  
+
   bar.set('foo', rec2);
-  
+
   equals(rec.get('bar'), null, 'foo1.bar should be null after change');
   equals(bar.get('foo'), rec2, 'bar.foo should eq foo2 after change');
   equals(rec2.get('bar'), bar, 'foo2.bar should eq bar after change');
-  
+
   equals(rec.get('status'), SC.Record.READY_DIRTY, 'foo1.status should be READY_DIRTY');
   equals(rec2.get('status'), SC.Record.READY_DIRTY, 'foo1.status should be READY_DIRTY');
   equals(bar.get('status'), SC.Record.READY_CLEAN, 'bar1.status should be READY_CLEAN');
-  
+
 });
 
 test("modifying a toOne relationship with an inverse from other", function() {
-  
-  var foo1 = rec, 
+
+  var foo1 = rec,
       foo3 = MyApp.store.find(MyApp.Foo, 'foo3'),
       bar1 = bar;
-  
+
   equals(foo1.get('bar'), bar1, 'precond - foo1.bar should eq bar1');
   equals(bar1.get('foo'), foo1, 'precond - bar.foo should eq foo1');
-  
+
   equals(foo3.get('bar'), bar2, 'precond - foo3.bar should eq null');
   equals(bar2.get('foo'), foo3, 'precond - bar2.foo should eq foo3');
-  
-  
+
+
   [foo1, foo3, bar1, bar2].forEach(function(r) {
     equals(r.get('status'), SC.Record.READY_CLEAN, 'precond - %@.status should be READY_CLEAN'.fmt(r.get('id')));
   }, this);
-  
+
   bar1.set('foo', foo3);
-  
+
   equals(foo1.get('bar'), null, 'foo1.bar should be null after change');
   equals(bar1.get('foo'), foo3, 'bar.foo should eq foo3 after change');
 
   equals(foo3.get('bar'), bar1, 'foo3.bar should be bar after change');
   equals(bar2.get('foo'), null, 'bar2.foo should eq null after change');
-  
+
   equals(foo1.get('status'), SC.Record.READY_DIRTY, 'foo1.status should be READY_DIRTY');
   equals(foo1.get('status'), SC.Record.READY_DIRTY, 'foo1.status should be READY_DIRTY');
 
   equals(bar1.get('status'), SC.Record.READY_CLEAN, 'bar1.status should be READY_CLEAN');
   equals(bar2.get('status'), SC.Record.READY_CLEAN, 'bar1.status should be READY_CLEAN');
-  
+
 });
 
 test("modifying a keyed toOne relationship", function(){
@@ -255,9 +255,9 @@ test("isEditable NO should not allow editing", function() {
 
   equals(rec5.get('readOnlyRelatedTo'), bar1, 'precond - should find bar1');
   equals(rec5.get('status'), SC.Record.READY_CLEAN, 'precond - foo5 should be READY_CLEAN');
-  
+
   rec5.set('readOnlyRelatedTo', bar2);
-  
+
   equals(rec5.get('readOnlyRelatedTo'), bar1, 'should still find bar1 after setting');
   equals(rec5.get('status'), SC.Record.READY_CLEAN, 'foo5 status is still READY_CLEAN');
 });
@@ -268,17 +268,17 @@ test("isEditable NO should not fire property change observer", function() {
   var rec5 = MyApp.store.find(MyApp.Foo, 'foo5');
 
   equals(rec5.get('readOnlyRelatedTo'), bar1, 'precond - should find bar1');
-  
+
   var readOnlyWasModified = NO;
   var modifierListener = function() {
     readOnlyWasModified = YES;
   };
   rec5.addObserver('readOnlyRelatedTo', modifierListener);
-  
+
   rec5.set('readOnlyRelatedTo', bar2);
-  
+
   equals(readOnlyWasModified, NO, 'property change observer should not have fired');
-  
+
   rec5.removeObserver('readOnlyRelatedTo', modifierListener);
 });
 
@@ -308,3 +308,50 @@ test("adding toMany pointing to non existing class should throw error", function
   same(message, 'Attempted to create toMany attribute with undefined recordType. Did you forget to sc_require a dependency?');
 });
 
+module("modifying a keyed toOne relationship via the inverse", {
+  setup: function() {
+    MyApp = SC.Object.create({ store: SC.Store.create() });
+
+    MyApp.Foo = SC.Record.extend({
+      bar: SC.Record.toOne('MyApp.Bar', {
+        isMaster: YES, inverse: 'foo'
+      })
+    });
+
+    MyApp.Bar = SC.Record.extend({
+      foo: SC.Record.toOne('MyApp.Foo', {
+        isMaster: NO, key: 'foo_id', inverse: 'bar'
+      })
+    });
+  }
+});
+
+test("creating an association", function() {
+  var foo1, bar1;
+
+  MyApp.store.loadRecords(MyApp.Foo, [{guid: 'foo1', bar: null}]);
+
+  foo1 = MyApp.store.find(MyApp.Foo, 'foo1');
+  bar1 = MyApp.store.createRecord(MyApp.Bar, {guid: 'bar1'});
+
+  foo1.set('bar', bar1);
+
+  equals(bar1.get('foo'), foo1, 'bar1.foo relationship should be established');
+  equals(bar1.get('attributes').foo_id, 'foo1', 'correct key should be set in attributes');
+});
+
+test("destroying an association", function() {
+  var foo1, bar1;
+
+  MyApp.store.loadRecords(MyApp.Foo, [{guid: 'foo1', bar: 'bar1'}]);
+  MyApp.store.loadRecords(MyApp.Bar, [{guid: 'bar1', foo_id: 'foo1'}]);
+
+  foo1 = MyApp.store.find(MyApp.Foo, 'foo1');
+  bar1 = MyApp.store.find(MyApp.Bar, 'bar1');
+
+  equals(foo1.get('bar'), bar1, 'foo1.bar relationship should be established');
+  foo1.set('bar', null);
+  equals(bar1.get('foo'), null, 'bar.foo relationship should be destroyed');
+  equals(bar1.get('attributes').foo_id, null, 'correct key should be set in attributes');
+});
+