sproutcore 0.9.17 → 0.9.18

data/frameworks/sproutcore/models/record.js

@@ -216,6 +216,7 @@ SC.Record = SC.Object.extend(
     if (ret === undefined) {
       var attr = this._attributes ;
       ret = (attr) ? attr[key] : undefined ;
+      ret = ret || this[key] ; // also check properties...
       if (ret !== undefined) {
         var recordType = this._getRecordType(key+'Type') ;
         ret = this._propertyFromAttribute(ret, recordType) ;
@@ -248,7 +249,6 @@ SC.Record = SC.Object.extend(
   */
   recordDidChange: function() {
     this.incrementProperty('changeCount') ;
-    if (SC.Store) SC.Store.recordDidChange(this) ;
   },
   
   /**
@@ -500,7 +500,7 @@ SC.Record = SC.Object.extend(
 
   _matchValue: function(recValue,value) {
     // if we get here with recValue as a record, we must compare by guid, so grab it
-    if (recValue && recValue.primaryKey) recValue = recValue.get(recValue.primaryKey) ;
+    if (recValue && recValue.primaryKey) recValue = recValue.get(recValue.get('primaryKey')) ;
     var stringify = (value instanceof RegExp);
     if (stringify)  {
       if (recValue == null) return false ;
@@ -648,7 +648,7 @@ SC.Record = SC.Object.extend(
   _convertValueOut: function(value,typeConverter,recordType) {
     if (typeConverter) return typeConverter(value,'out') ;
     if (recordType) {
-      return (value) ? value.get(recordType.primaryKey) : null ;
+      return (value) ? value.get(recordType.primaryKey()) : null ;
     } else return value ;
   },
   
@@ -742,7 +742,7 @@ SC.Record.mixin(
     var conditions = opts.conditions || {} ;
     opts.conditions = conditions ;
 
-    var privateKey = '_' + conditionKey ;
+    var privateKey = '_' + conditionKey + SC.generateGuid() ;
     return function() {
       if (!this[privateKey]) {
         var recordType = eval(recordTypeString);
@@ -781,7 +781,8 @@ SC.Record.Date = function(value,direction) {
   } else if (typeof(value) == "string") {
     // try to parse date. trim any decimal numbers at end since Rails sends
     // this sometimes.
-    var ret = Date.parse(value.replace(/\.\d+$/,'')) ;
+    var ret = Date.parseDate(value.replace(/\.\d+$/,'')) ;
+    if (!ret) ret = new Date(value);
     if (ret) value = ret ;
   }
   return value ;

data/frameworks/sproutcore/models/store.js

@@ -291,9 +291,9 @@ SC.Store = SC.Object.create(
   */  
   recordDidChange: function(rec) {
     // add to changed records.  This will eventually notify collections.
-    var guid = rec._storeKey() ;
-    changed = this.get('_changedRecords') || {};
-    records = changed[guid] || {} ;
+    var guid    = rec._storeKey(),
+        changed = this.get('_changedRecords') || {},
+        records = changed[guid] || {} ;
     records[rec._guid] = rec ;
 
     changed[guid] = records ;    

data/frameworks/sproutcore/panes/picker.js

@@ -33,6 +33,7 @@ SC.PickerPaneView = SC.OverlayPaneView.extend({
     } else {
       var wsize = SC.window.get('size') ;
       var psize = picker.get('size') ;
+      origin = {};
       origin.x = (wsize.width - psize.width) / 2 ;
       origin.y = (wsize.height - psize.height) / 2 ;
     }

data/frameworks/sproutcore/server/rails_server.js

@@ -53,14 +53,11 @@ require('server/rest_server') ;
     map.connect 'auth-token.js', :controller => 'application', :action => 'auth_token'
   }}}
 
-  Copy-and-paste the default index template of SproutCore into your own
-  client app. Refer to your new default index template by modifying the
-  :layout option in your sc-config file. Lastly, within this default
-  index template add a line to call auth-token.js on your rails server.
-  For example:
-
+  Lastly, add a reference to the script to the :javascript_libs property
+  in your sc-config file, for example:
+  
   {{{
-    <script src="/sc/auth-token.js" type="text/javascript"></script>
+    c[:javascript_libs] = ['/sc/auth-token.js']
   }}}
 
 

data/frameworks/sproutcore/server/server.js

@@ -288,7 +288,7 @@ SC.Server = SC.Object.extend({
         var key = r.get(primaryKey);
         if (key) { ids.push(key); context[key] = r; }
       });
-      context._recordType = curRecords[0].recordType ; // default rec type.
+      context._recordType = this._instantiateRecordType(curRecords[0].get('type'), this.prefix, null) ; // default rec type.
       
       params = {
         requestContext: context, 
@@ -503,6 +503,50 @@ SC.Server = SC.Object.extend({
   // ................................
   // PRIVATE METHODS
   
+  _prepareDataForRecords: function(data, server, defaultType) {
+    if (data === null) {
+        return null;
+    } else if ($type(data) == T_ARRAY) {
+      var that = this;
+      return data.map( function(d) {
+        return that._prepareDataForRecords(d, server, defaultType) ;
+      }) ;
+    } else if ($type(data) == T_HASH) { 
+      data = server._camelizeData(data) ; // camelize the keys received back.
+      if (data.id) {
+        // convert the 'id' property to 'guid'
+        data.guid = data.id;
+        delete data.id;
+      }
+      data.recordType = server._instantiateRecordType(data.type, server.prefix, defaultType);
+      if (data.recordType) {
+        return data;
+      } else {
+        console.log("Data RecordType could not be instantiated!: "+data.type) ;
+        return null; // could not process.
+      }
+    } else {
+      console.log("Unknown data type in SC.Server#_prepareDataForRecords. Should be array or hash.") ;
+      return null; // could not process.
+    }
+  },
+  
+  _instantiateRecordType: function(recordType, prefix, defaultType) {
+    if (recordType) {
+      var recordName = recordType.capitalize() ;
+      if (prefix) {
+        for (var prefixLoc = 0; prefixLoc < prefix.length; prefixLoc++) {
+          var prefixParts = prefix[prefixLoc].split('.');
+          var namespace = window;
+          for (var prefixPartsLoc = 0; prefixPartsLoc < prefixParts.length; prefixPartsLoc++) {
+            var namespace = namespace[prefixParts[prefixPartsLoc]] ;
+          }
+          if (namespace !== window) return namespace[recordName] ;
+        }
+      } else return window[recordName] ;
+    } else return defaultType; 
+  },
+  
   // places records from array into hash, sorted by resourceURL.
   _recordsByResource: function(records) {
     var ret = {} ;
@@ -590,6 +634,19 @@ SC.Server = SC.Object.extend({
       
     // handle other values
     } else return [rootKey,params].join('=') ;
+  },
+  
+  init: function() {
+    sc_super();
+    SC.Server.addServer(this);
   }
     
 }) ;
+
+SC.Server.servers = [];
+
+SC.Server.addServer = function(server) {
+  var ary = SC.Server.servers;
+  ary.push(server);
+  SC.Server.servers = ary;
+};

data/frameworks/sproutcore/tests/controllers/object.rhtml

@@ -250,7 +250,7 @@ Test.context("SC.ObjectController", {
       var rcrds = Contact.collection();
       cc.set('content', rcrds);
       rcrds.refresh();
-      var single = Contact.create({'test' : 'NAME1', 'value' : 0});
+      var single = Contact.newRecord({'test' : 'NAME1', 'value' : 0});
       
       rcrds.count().shouldEqual(1);
       

data/frameworks/sproutcore/tests/models/collection.rhtml

@@ -0,0 +1,160 @@
+<% # ========================================================================
+   # Collection Unit Test
+   # ========================================================================
+%>
+<% content_for('final') do %>
+
+<script>
+
+
+//
+//  core.js stub
+//
+CollectionTest = SC.Object.create({
+
+  server: SC.Server.create({ prefix: ['CollectionTest'] }),
+
+  FIXTURES: []
+  
+}) ;
+
+//
+//  fixtures stub
+//
+CollectionTest.FIXTURES = CollectionTest.FIXTURES.concat([
+  
+  { guid: '1', 
+    type: 'Employee', 
+    name: "Anne",
+    sex:  "Female"
+  },
+
+  { guid: '2', 
+    type: 'Employee', 
+    name: "Bob",
+    sex:  "Male"
+  },
+
+  { guid: '3', 
+    type: 'Employee', 
+    name: "Alice",
+    sex:  "Female"
+  },
+
+  { guid: '4', 
+    type: 'Employee', 
+    name: "Rachel",
+    sex:  "Female"
+  },
+
+  { guid: '5', 
+    type: 'Employee', 
+    name: "Michael",
+    sex:  "Male"
+  },
+
+  { guid: '6', 
+    type: 'Employee', 
+    name: "Barbara",
+    sex:  "Female"
+  },
+
+  { guid: '7', 
+    type: 'Employee', 
+    name: "Richard",
+    sex:  "Male"
+  }
+
+]);
+
+//
+// model classes
+//
+CollectionTest.Employee = SC.Record.extend({
+  
+}) ;
+
+//
+// main.js stub
+//
+CollectionTest.server.preload(CollectionTest.FIXTURES) ;
+
+Test.context("Test basic functions of a collection", {
+  
+  setup: function()
+  {
+    this.employees = CollectionTest.Employee.collection()
+  
+    this.anne = CollectionTest.Employee.find('1');
+    this.bob = CollectionTest.Employee.find('2');
+    this.alice = CollectionTest.Employee.find('3');
+    this.rachel = CollectionTest.Employee.find('4');
+    this.michael = CollectionTest.Employee.find('5');
+    this.barbara = CollectionTest.Employee.find('6');
+    this.richard = CollectionTest.Employee.find('7');
+  },
+  
+  teardown: function()
+  {
+    delete this.employees;
+    delete this.anne;
+    delete this.bob;
+    delete this.alice;
+    delete this.rachel;
+    delete this.michael;
+    delete this.barbara;
+    delete this.richard;
+  },
+
+  "Collection should initially be empty": function() {
+    assertNull(this.employees.get('records'));
+  },
+  
+  "Collection should have 7 records upon refresh": function() {
+    this.employees.refresh();
+    this.employees.get('records').length.shouldEqual(7);
+  },
+  
+  "Collections should NOT contain records that have NOT been added to the store": function() {
+    this.employees.refresh();
+    var originalLength = this.employees.get('records').length;
+    var newEmployee = CollectionTest.Employee.create({name: "Joe"});
+    this.employees.get('records').length.shouldEqual(originalLength);
+  },
+  
+  "Collections should contain records that have been added to the store": function() {
+    this.employees.refresh();
+    var originalLength = this.employees.get('records').length;
+    var newEmployee = CollectionTest.Employee.newRecord({name: "Joe"});
+    this.employees.get('records').length.shouldEqual(originalLength + 1);
+    newEmployee.destroy();
+  },
+  
+  "Collections should be properly ordered": function() {
+    var employeesByName = CollectionTest.Employee.collection({orderBy: ['name']});
+    employeesByName.refresh();
+    var names = employeesByName.get('records').map(function(e) { return e.get('name') });
+    assertIdentical(["Alice", "Anne", "Barbara", "Bob", "Michael", "Rachel", "Richard"].join(""), names.join(""));
+    
+    var employeesBySex = CollectionTest.Employee.collection({orderBy: ['sex']});
+    employeesBySex.refresh();
+    var sexes = employeesBySex.get('records').map(function(e) { return e.get('sex') });
+    assertIdentical(["Female", "Female", "Female", "Female", "Male", "Male", "Male"].join(""), sexes.join(""));
+  },
+  
+  "Collections should remain unchanged if a record is changed in a way that does not affect the order": function() {
+    var employeesBySex = CollectionTest.Employee.collection({orderBy: ['sex']});
+    employeesBySex.refresh();
+    var employeesOriginal = employeesBySex.get('records').map(function(e) { return e.get('guid') }).join(", ");
+
+    this.bob.set('name', 'Robert');
+    var employees = employeesBySex.get('records').map(function(e) { return e.get('guid') }).join(", ");
+
+    assertIdentical(employeesOriginal, employees);
+  }
+
+});
+
+</script>
+
+<% end %>

data/frameworks/sproutcore/tests/models/model.rhtml

@@ -89,12 +89,14 @@ Test.context("Test model comparisons with numeric guids", {
   
   teardown: function()
   {
-    delete this.todoList;
+    delete this.todoList1;
+    delete this.todoList2;
     delete this.todo1;
     delete this.todo2;
+    delete this.todo3;
   },
 
-  "Objects should exist in Store": function()
+  "Records should exist in Store": function()
   {
     assertNotNull(this.todoList1);
     assertNotNull(this.todoList2);
@@ -103,6 +105,15 @@ Test.context("Test model comparisons with numeric guids", {
     assertNotNull(this.todo3);
   },
   
+  "Records should have correct guid": function()
+  {
+    assertEqual(1, this.todoList1.get('guid'));
+    assertEqual(2, this.todoList2.get('guid'));
+    assertEqual(1, this.todo1.get('guid'));
+    assertEqual(2, this.todo2.get('guid'));
+    assertEqual(3, this.todo3.get('guid'));
+  },
+  
   "Todo 1 and 2 should be related to TodoList 1": function()
   {
     assertIdentical(this.todoList1, this.todo1.get('todoList'));
@@ -175,7 +186,8 @@ Test.context("Test model comparisons with numeric guids", {
   "toString() should show model class name": function()
   {
     var re = /^ModelTest.Todo/;
-    assert( this.todo1.toString().match(re), "Todo 1 toString() should start with ModelTest.Todo" );
+    var str = this.todo1.toString();
+    assert( str.match(re), "Todo 1 toString() should start with ModelTest.Todo, actually starts with " + str);
   }
 
 });

data/frameworks/sproutcore/tests/views/collection/base.rhtml

@@ -1,34 +1,67 @@
 <% content_for('final') do %>
 <script>
 
-Test.context("A SC.CollectionView with it's content set to a SC.CollectionController", {
+// create some item data...
+[
+ { guid: '1001', name: 'item one' },
+ { guid: '1002', name: 'item two' },
+ { guid: '1003', name: 'item three' },
+ { guid: '1004', name: 'item four' },
+ { guid: '1005', name: 'item five' },
+ { guid: '1006', name: 'item six' }
+].each(function(o){ SC.Store.addRecord(SC.Record.create(o)); });
+
+// a collection to hold the items...
+testCollection = SC.Record.collection();
+testCollection.refresh();
+
+// a controller for the collection...
+testController = SC.CollectionController.create();
+
+Test.context("A SC.CollectionView with it's content set to a SC.CollectionController 1", {
   
-  "Should contain the same number of visible item views": function()
+  "Should scroll to the selected item": function()
   {
-    testCollectionView.get('itemViews').length.shouldEqual(2);
+    testCollectionView.get('rootElement').scrollTop.shouldEqual(0);
+    testCollectionView.scrollToContent( testCollection.get('records').last() );
+    testCollectionView.get('itemViews').length.shouldEqual(3);
+    scrollView.get('rootElement').scrollTop.shouldEqual(30);
   },
   
-  "Should update it's item views as it's controller is updated": function()
+  setup: function()
   {
-    var valueOfFirstItemView = function() {
-      var itemView = testCollectionView.get('itemViews').first() ;
-      return (itemView) ? itemView.get('content').get('guid') : null ;
-    } ;
+    // add a scroll view wrapper.
+    scrollView = SC.ScrollView.create() ;
+    scrollView.set('frame', { x: 10, y: 10, width: 100, height: 30 }) ;
+    SC.window.appendChild(scrollView) ;
     
-    valueOfFirstItemView().shouldEqual('1001') ;
+    // create the view...
+    testCollectionView = SC.ListView.create({
+      contentValueKey: 'name',
+      contentBinding: 'testController.arrangedObjects',
+      selectionBinding: 'testController.selection'
+    }) ;
+    scrollView.set('content', testCollectionView) ;
 
-    SC.Store.addRecord( SC.Record.create({ guid: '0999', name: 'item zero' }) );
-    
-    valueOfFirstItemView().shouldEqual('0999') ;
+    testController.set('content', testCollection) ;
   },
-
-  "Should scroll to the selected item": function()
+  
+  teardown: function()
   {
-    testCollectionView.get('rootElement').scrollTop.shouldEqual(0);
-    testCollectionView.scrollToContent( testCollection.get('records').last() );
-    scrollView.get('rootElement').scrollTop.shouldEqual(30);
-  },
+    // remove the view from SC.window
+    testCollectionView.removeFromParent() ;
+    scrollView.removeFromParent() ;
+    
+    delete testCollectionView ;
+    delete scrollView ;
+    
+    testController.set('content', null) ;
+  }
+  
+});
 
+Test.context("A SC.CollectionView with it's content set to a SC.CollectionController 2", {
+  
   "Should not scroll to the selected item if it's already fully visible": function()
   {
     scrollView.get('rootElement').scrollTop.shouldEqual(0);
@@ -40,50 +73,89 @@ Test.context("A SC.CollectionView with it's content set to a SC.CollectionContro
   {
     // add a scroll view wrapper.
     scrollView = SC.ScrollView.create() ;
-    scrollView.set('frame', { x: 10, y: 10, width: 100, height: 30 });
-    SC.window.appendChild(scrollView);
+    scrollView.set('frame', { x: 10, y: 10, width: 100, height: 30 }) ;
+    SC.window.appendChild(scrollView) ;
     
     // create the view...
-    testCollectionView = SC.ListView.extend({
+    testCollectionView = SC.ListView.create({
       contentValueKey: 'name',
       contentBinding: 'testController.arrangedObjects',
       selectionBinding: 'testController.selection'
-    }).create();
+    }) ;
     scrollView.set('content', testCollectionView) ;
+
+    testController.set('content', testCollection) ;
+  },
+  
+  teardown: function()
+  {
+    // remove the view from SC.window
+    testCollectionView.removeFromParent() ;
+    scrollView.removeFromParent() ;
     
-    // create some item data...
-    [
-      { guid: '1001', name: 'item one' },
-      { guid: '1002', name: 'item two' },
-      { guid: '1003', name: 'item three' },
-      { guid: '1004', name: 'item four' },
-      { guid: '1005', name: 'item five' },
-      { guid: '1006', name: 'item six' }
-    ].each(function(o){ SC.Store.addRecord(SC.Record.create(o)); });
+    delete testCollectionView ;
+    delete scrollView ;
     
-    // a collection to hold the items...
-    testCollection = SC.Record.collection();
-    testCollection.refresh();
+    testController.set('content', null) ;
+  }
+  
+});
 
-    // a controller for the collection...
-    testController = SC.CollectionController.create();
-    testController.set('content', testCollection);
+Test.context("A SC.CollectionView with it's content set to a SC.CollectionController 3", {
+  
+  "Should contain the same number of visible item views as it's controller has records": function()
+  {
+    testCollectionView.get('itemViews').length.shouldEqual(2);
+  },
+  
+  "Should update it's item views as it's controller is updated": function()
+   {
+     var valueOfFirstItemView = function() {
+       var itemView = testCollectionView.get('itemViews').first() ;
+       return (itemView) ? itemView.get('content').get('guid') : null ;
+     } ;
+     
+     valueOfFirstItemView().shouldEqual('1001') ;
+     
+     var rec = SC.Record.create({ guid: '0999', name: 'item zero' });
+     SC.Store.addRecord( rec );
+     
+     valueOfFirstItemView().shouldEqual('0999') ;
+     testCollectionView.get('itemViews').length.shouldEqual(2);
+     
+     rec.destroy();
+     SC.Store.removeRecord(rec);
+     delete rec;
+   },
+   
+  setup: function()
+  {
+    // add a scroll view wrapper.
+    scrollView = SC.ScrollView.create() ;
+    scrollView.set('frame', { x: 10, y: 10, width: 100, height: 30 }) ;
+    SC.window.appendChild(scrollView) ;
     
+    // create the view...
+    testCollectionView = SC.ListView.create({
+      contentValueKey: 'name',
+      contentBinding: 'testController.arrangedObjects',
+      selectionBinding: 'testController.selection'
+    }) ;
+    scrollView.set('content', testCollectionView) ;
+
+    testController.set('content', testCollection) ;
   },
+  
   teardown: function()
   {
-    // tell SC.Store to dump all the records... 
-    // otherwise, since SC.Store is shared across all tests (yuk!) we'll get shared fixtues
-    testCollection.get('records').each(function(r){ SC.Store.removeRecord(r); });
-  
-    // remove the view from SC.window... again, no shared fixtures...
-    testCollectionView.removeFromParent();
+    // remove the view from SC.window
+    testCollectionView.removeFromParent() ;
     scrollView.removeFromParent() ;
-  
-    delete testCollectionView;
-    delete testCollection;
-    delete testController;
+    
+    delete testCollectionView ;
     delete scrollView ;
+    
+    testController.set('content', null) ;
   }
   
 });
@@ -135,4 +207,5 @@ Test.context("A SC.CollectionView with it's content set to a SC.ArrayController"
 });
 
 </script>
+
 <% end %>