sproutcore 1.6.0.rc.2-x86-mingw32 → 1.6.0.1-x86-mingw32

data/lib/frameworks/sproutcore/frameworks/datastore/tests/data_sources/data_source.js

@@ -5,7 +5,7 @@
 // ==========================================================================
 /*globals JN module test ok equals same stop start */
 
-var MyApp, wasCalled;
+var MyApp, wasCalled, resetWasCalled;
 module("SC.DataSource", {
   setup: function () {
     MyApp = window.MyApp = {};
@@ -41,6 +41,11 @@ module("SC.DataSource", {
         wasCalled = true;
         equals(arguments.length, 3);
         return YES;
+      },
+
+      reset: function() {
+        resetWasCalled = true;
+        return this;
       }
     });
     SC.RunLoop.begin();
@@ -188,3 +193,11 @@ test("The dataSource will return NO when all records committed return NO", funct
   equals(MyApp.store.commitRecords(), NO,
          "commiting records for an 'update', 'create', and 'destroy' should return NO");
 });
+
+test("The store calls reset on the dataSource when reset", function(){
+  MyApp.store.set('dataSource', MyApp.DataSource.create());
+  resetWasCalled = NO; // Just to be sure
+
+  MyApp.store.reset();
+  ok(resetWasCalled, "should have called reset");
+});

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

@@ -9,7 +9,7 @@
 // 
 var NestedRecord, store, testParent, testParent2, childData1; 
 
-var initModels = function(){
+var initModels = function() {
   NestedRecord.ParentRecordTest = SC.Record.extend({
     /** Child Record Namespace */
     nestedRecordNamespace: NestedRecord,
@@ -34,6 +34,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
     NestedRecord = SC.Object.create({
       store: SC.Store.create()
     });
+    window.NestedRecord = NestedRecord;
     store = NestedRecord.store;
     initModels();
     SC.RunLoop.begin();
@@ -79,6 +80,7 @@ module("Basic SC.Record Functions w/ Parent > Child", {
     store = null;
     childData1 = null;
     NestedRecord = null;
+    delete(window.NestedRecord);
   }
 });
 

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

@@ -42,6 +42,7 @@ module("Complex SC.Record: Parent > Array of Children > Array of Children", {
     NestedRecord = SC.Object.create({
       store: SC.Store.create()
     });
+    window.NestedRecord = NestedRecord;
     store = NestedRecord.store;
     initModels();
     SC.RunLoop.begin();
@@ -117,6 +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;
     NestedRecord = null;
     testParent = null;
     peopleData1 = null;

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

@@ -42,6 +42,7 @@ module("Basic SC.Record Functions w/ a Parent > Child > Child", {
     NestedRecord = SC.Object.create({
       store: SC.Store.create()
     });
+    window.NestedRecord = NestedRecord;
     store = NestedRecord.store;
     initModels();
     SC.RunLoop.begin();
@@ -65,6 +66,7 @@ module("Basic SC.Record Functions w/ a Parent > Child > Child", {
     delete NestedRecord.ParentRecordTest;
     delete NestedRecord.Person;
     delete NestedRecord.Address;
+    delete window.NestedRecord;
     NestedRecord = null;
     testParent = null;
     store = null;

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

@@ -8,33 +8,33 @@
 var MyApp, dataSource;
 module("SC.Record core methods", {
   setup: function() {
-    dataSource = SC.DataSource.create({ 
-      
+    dataSource = SC.DataSource.create({
+
       gotParams: NO,
       wasCommitted: NO,
-      
+
       createRecord: function(store, storeKey, params) {
         this.wasCommitted = YES;
         this.gotParams = params && params['param1'] ? YES: NO;
       }});
-    
+
     MyApp = SC.Object.create({
       store: SC.Store.create().from(dataSource)
     })  ;
-  
+
     MyApp.Foo = SC.Record.extend({});
-    MyApp.json = { 
-      foo: "bar", 
+    MyApp.json = {
+      foo: "bar",
       number: 123,
       bool: YES,
       array: [1,2,3],
       guid: 1
     };
-    
+
     SC.RunLoop.begin();
     MyApp.foo = MyApp.store.createRecord(MyApp.Foo, MyApp.json);
     SC.RunLoop.end();
-    
+
   }
 });
 
@@ -43,13 +43,20 @@ test("statusString", function() {
 });
 
 test("Can commitRecord() specific SC.Record instance", function() {
-  
+
   MyApp.foo.set('foo', 'foobar');
-  
+
   // commit the new record
   MyApp.foo.commitRecord({ param1: 'value1' });
-  
+
   equals(dataSource.wasCommitted, YES, 'Record was committed');
   equals(dataSource.gotParams, YES, 'Params were properly passed through commitRecord');
-  
+
+});
+
+test("JSON encoding an SC.Record should encode the attributes", function(){
+  var str = SC.json.encode(MyApp.foo);
+  var result = SC.json.decode(str);
+
+  same(MyApp.json, result, "original = encoded record");
 });

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

@@ -14,72 +14,72 @@ module("SC.RecordAttribute core methods", {
     MyApp = SC.Object.create({
       store: SC.Store.create()
     });
-    
+
     // stick it to the window object so that objectForPropertyPath works
     window.MyApp = MyApp;
-    
+
     MyApp.Foo = SC.Record.extend({
-      
+
       // test simple reading of a pass-through prop
       firstName: SC.Record.attr(String),
 
       // test mapping to another internal key
       otherName: SC.Record.attr(String, { key: "firstName" }),
-      
+
       // test mapping Date
       date: SC.Record.attr(Date),
       nonIsoDate: SC.Record.attr(Date, { useIsoDate: false }),
 
       // test SC.DateTimes
       dateTime: SC.Record.attr(SC.DateTime),
-      
+
       // test Array
       anArray: SC.Record.attr(Array),
-      
+
       // test Object
       anObject: SC.Record.attr(Object),
-                                 
+
       // test Number
       aNumber: SC.Record.attr(Number),
-      
+
       // used to test default value
       defaultValue: SC.Record.attr(String, {
         defaultValue: "default"
       }),
-      
+
       // used to test default value
       defaultComputedValue: SC.Record.attr(Number, {
         defaultValue: function() {
           return Math.floor(Math.random()*3+1);
         }
       }),
-      
+
       // test toOne relationships
       relatedTo: SC.Record.toOne('MyApp.Foo'),
-      
+
       // 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;
       }),
-      
+
       // test readONly
       readOnly: SC.Record.attr(String, { isEditable: NO })
-      
+
     });
-    
+
     MyApp.Bar = SC.Record.extend({
       parent: SC.Record.toOne('MyApp.Foo', { aggregate: YES }),
       relatedMany: SC.Record.toMany('MyApp.Foo', { aggregate: YES })
     });
-    
+
     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",
         dateTime: new Date(1235939425000),
         anArray: ['one', 'two', 'three'],
@@ -87,11 +87,11 @@ module("SC.RecordAttribute core methods", {
         aNumber: '123',
         readOnly: 'foo1'
       },
-      
-      { 
-        guid: 'foo2', 
-        firstName: "Jane", 
-        lastName: "Doe", 
+
+      {
+        guid: 'foo2',
+        firstName: "Jane",
+        lastName: "Doe",
         relatedTo: 'foo1',
         relatedToAggregate: 'bar1',
         dateTime: "2009-03-01T20:30:25Z",
@@ -100,39 +100,39 @@ module("SC.RecordAttribute core methods", {
         aNumber: '123',
         nonIsoDate: "2009/06/10 8:55:50 +0000"
       },
-      
-      { 
-        guid: 'foo3', 
-        firstName: "Alex", 
-        lastName: "Doe", 
+
+      {
+        guid: 'foo3',
+        firstName: "Alex",
+        lastName: "Doe",
         relatedToComputed: 'bar1',
         dateTime: SC.DateTime.create(1235939425000),
         anArray: ['one', 'two', 'three'],
         anObject: { 'key1': 'value1', 'key2': 'value2' },
         aNumber: '123'
       }
-      
+
     ]);
-    
+
     MyApp.store.loadRecords(MyApp.Bar, [
       { guid: 'bar1', city: "Chicago", parent: 'foo2', relatedMany: ['foo1', 'foo2'] }
     ]);
-    
+
     SC.RunLoop.end();
-    
+
     rec = MyApp.store.find(MyApp.Foo, 'foo1');
     rec2 = MyApp.store.find(MyApp.Foo, 'foo2');
     rec3 = MyApp.store.find(MyApp.Foo, 'foo3');
-    
+
     bar = MyApp.store.find(MyApp.Bar, 'bar1');
     equals(rec.storeKey, storeKeys[0], 'should find record');
-    
+
   }
 });
 
 // ..........................................................
 // READING
-// 
+//
 
 test("pass-through should return builtin value" ,function() {
   equals(rec.get('firstName'), 'John', 'reading prop should get attr value');
@@ -190,7 +190,7 @@ test("reading computed default value", function() {
 
 // ..........................................................
 // WRITING
-// 
+//
 
 test("writing pass-through should simply set value", function() {
   rec.set("firstName", "Foo");
@@ -201,7 +201,7 @@ test("writing pass-through should simply set value", function() {
 
   rec.set("firstName", YES);
   equals(rec.readAttribute("firstName"), YES, "should write bool");
-  
+
 });
 
 test("writing when isEditable is NO should ignore", function() {
@@ -217,7 +217,7 @@ test("writing a value should override default value", function() {
 });
 
 test("writing a string to a number attribute should store a number" ,function() {
-     equals(rec.set('aNumber', "456"), rec, 'returns reciever');
+     equals(rec.set('aNumber', "456"), rec, 'returns receiver');
      equals(rec.get('aNumber'), 456, 'should have new value');
      equals(typeof rec.get('aNumber'), 'number', 'new value should be a number');
 });
@@ -229,27 +229,27 @@ test("writing a date should generate an ISO date" ,function() {
   var utcDate = new Date(Number(date) + (date.getTimezoneOffset() * 60000)); // Adjust for timezone offset
   utcDate.getTimezoneOffset = function(){ return 0; }; // Hack the offset to respond 0
 
-  equals(rec.set('date', utcDate), rec, 'returns reciever');
+  equals(rec.set('date', utcDate), rec, 'returns receiver');
   equals(rec.readAttribute('date'), '2009-04-02T05:28:03Z', 'should have time in ISO format');
 });
 
 test("writing an attribute should make relationship aggregate dirty" ,function() {
   equals(bar.get('status'), SC.Record.READY_CLEAN, "precond - bar should be READY_CLEAN");
   equals(rec2.get('status'), SC.Record.READY_CLEAN, "precond - rec2 should be READY_CLEAN");
-  
+
   bar.set('city', 'Oslo');
   bar.get('store').flush();
-  
+
   equals(rec2.get('status'), SC.Record.READY_DIRTY, "foo2 should be READY_DIRTY");
 });
 
 test("writing an attribute should make many relationship aggregate dirty" ,function() {
   equals(bar.get('status'), SC.Record.READY_CLEAN, "precond - bar should be READY_CLEAN");
   equals(rec2.get('status'), SC.Record.READY_CLEAN, "precond - rec2 should be READY_CLEAN");
-  
+
   bar.set('city', 'Oslo');
   bar.get('store').flush();
-  
+
   equals(rec.get('status'), SC.Record.READY_DIRTY, "foo1 should be READY_DIRTY");
   equals(rec2.get('status'), SC.Record.READY_DIRTY, "foo2 should be READY_DIRTY");
 });
@@ -257,10 +257,25 @@ test("writing an attribute should make many relationship aggregate dirty" ,funct
 test("writing an attribute should make many relationship aggregate dirty and add the aggregate to the store" ,function() {
   equals(bar.get('status'), SC.Record.READY_CLEAN, "precond - bar should be READY_CLEAN");
   equals(rec2.get('status'), SC.Record.READY_CLEAN, "precond - rec2 should be READY_CLEAN");
-  
+
   bar.set('city', 'Oslo');
 
   var store = bar.get('store');
   ok(store.changelog.contains(rec.get('storeKey')), "foo1 should be in the store's changelog");
   ok(store.changelog.contains(rec2.get('storeKey')), "foo2 should be in the store's changelog");
 });
+
+test("adding attribute with non existing class should throw error", function() {
+  MyApp.InvalidModel = SC.Record.extend({
+    foo: SC.Record.attr("SomethingSomethingSomething")
+  });
+
+  var message;
+  try {
+    MyApp.InvalidModel.prototype.foo.typeClass();
+  } catch (x) {
+    message = x;
+  }
+
+  same(message, 'SomethingSomethingSomething could not be found');
+});

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

@@ -11,13 +11,13 @@ module("SC.NestedStore#commitChangesFromNestedStore", {
     SC.RunLoop.begin();
 
     parent = SC.Store.create();
-    
+
     json = {
       string: "string",
       number: 23,
       bool:   YES
     };
-    
+
     storeKey = SC.Store.generateStoreKey();
 
     store = parent.chain();
@@ -34,22 +34,22 @@ module("SC.NestedStore#commitChangesFromNestedStore", {
 });
 
 test("copies changed data hashes, statuses, and revisions", function() {
-  
+
   SC.RunLoop.begin();
-  
+
   // verify preconditions
   equals(store.readDataHash(storeKey), null, 'precond - should not have data yet');
   ok(child.chainedChanges.contains(storeKey), 'precond - child changes should include storeKey');
-  
+
   // perform action
   equals(store.commitChangesFromNestedStore(child, child.chainedChanges, NO), store, 'should return receiver');
   SC.RunLoop.end();
-  
+
   // verify new status
   equals(store.readDataHash(storeKey), json, 'now should have json');
   equals(store.readStatus(storeKey), SC.Record.READY_DIRTY, 'now should have status');
-  equals(store.revisions[storeKey], child.revisions[storeKey], 'now shoulave have revision from child');  
-    
+  equals(store.revisions[storeKey], child.revisions[storeKey], 'now shoulave have revision from child');
+
 });
 
 test("adds lock on any items not already locked", function() {
@@ -58,40 +58,40 @@ test("adds lock on any items not already locked", function() {
 
   var storeKey2 = SC.Store.generateStoreKey();
   var json2 = { kind: "json2" };
-  
+
   // verify preconditions
   store.readDataHash(storeKey);
   ok(store.locks[storeKey], 'precond - storeKey should have lock');
   ok(!store.locks[storeKey2], 'precond - storeKey2 should not have lock');
-  
+
   // write another record into child store to commit changes.
   child.writeDataHash(storeKey2, json2, SC.Record.READY_DIRTY);
   child.dataHashDidChange(storeKey2);
-  
+
   var changes = child.chainedChanges ;
   ok(changes.contains(storeKey), 'precond - child.chainedChanges should contain storeKey');
   ok(changes.contains(storeKey2), 'precond - child.chainedChanges should contain storeKey2');
-  
+
   // now commit back to parent
-  equals(store.commitChangesFromNestedStore(child, changes, NO), store, 'should return reciever');
+  equals(store.commitChangesFromNestedStore(child, changes, NO), store, 'should return receiver');
   SC.RunLoop.end();
-  
+
   // and verify that both have locks
   ok(store.locks[storeKey], 'storeKey should have lock after commit (actual: %@)'.fmt(store.locks[storeKey]));
   ok(store.locks[storeKey2], 'storeKey2 should have lock after commit (actual: %@)'.fmt(store.locks[storeKey2]));
-  
+
 });
 
-test("adds items in chainedChanges to reciever chainedChanges", function() {
+test("adds items in chainedChanges to receiver chainedChanges", function() {
 
   SC.RunLoop.begin();
 
   var key1 = SC.Store.generateStoreKey();
 
   store.dataHashDidChange(key1);
-  
+
   ok(child.chainedChanges.contains(storeKey), 'precond - child.chainedChanges should contain store key');
-  
+
   equals(store.commitChangesFromNestedStore(child, child.chainedChanges, NO), store, 'should return receiver');
   SC.RunLoop.end();
 
@@ -101,36 +101,36 @@ test("adds items in chainedChanges to reciever chainedChanges", function() {
 });
 
 test("should set hasChanges to YES if has changes", function() {
-  
+
   SC.RunLoop.begin();
-  
+
   var changes = child.chainedChanges;
   ok(changes.length>0, 'precond - should have some changes in child');
   equals(store.get('hasChanges'), NO, 'precond - store should not have changes');
-  
+
   store.commitChangesFromNestedStore(child, changes, NO);
   equals(store.get('hasChanges'), YES, 'store should now have changes');
 });
 
 test("should set hasChanges to NO if no changes", function() {
-  
+
   SC.RunLoop.begin();
-  
+
   child = store.chain() ; // get a new child store
-  
+
   var changes = child.chainedChanges || SC.Set.create();
   ok(!changes || !changes.length, 'precond - should have not have changes in child');
   equals(store.get('hasChanges'), NO, 'precond - store should not have changes');
-  
+
   store.commitChangesFromNestedStore(child, changes, NO);
   SC.RunLoop.end();
-  
+
   equals(store.get('hasChanges'), NO, 'store should NOT now have changes');
 });
 
 // ..........................................................
 // SPECIAL CASES
-// 
+//
 
 test("committing changes should chain back each step", function() {
 
@@ -140,18 +140,18 @@ test("committing changes should chain back each step", function() {
   equals(child.readDataHash(storeKey), json, 'precond - child should have data');
   equals(store.readDataHash(storeKey), null, 'precond - store should not have data');
   equals(parent.readDataHash(storeKey), null, 'precond - parent should not have data');
-  
+
   // do commits
   child.commitChanges();
 
   equals(store.get('hasChanges'), YES, 'store should now have changes');
   equals(store.readDataHash(storeKey), json, 'store should now have json');
-  
+
   store.commitChanges();
   equals(store.get('hasChanges'), NO, 'store should no longer have changes');
   equals(parent.readDataHash(storeKey), json, 'parent should now have json');
   SC.RunLoop.end();
-  
+
 });