sproutcore 1.10.3.1 → 1.11.0.rc1

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

@@ -26,7 +26,7 @@ var Rec = SC.Record.extend({
 
 // ..........................................................
 // SC.Store#chain - init
-// 
+//
 module("SC.Store#chain - init");
 
 test("initial setup for chained store", function() {
@@ -87,9 +87,9 @@ test("allow for custom subclasses of SC.NestedStore", function() {
 
 
 // ..........................................................
-// SPECIAL CASES
+// SC.Store#chain - use & propagation
 // 
-
+module("SC.Store#chain - use & propagation");
 test("chained store changes should propagate reliably", function() {
   var parent = SC.Store.create(), rec, store, rec2;
 
@@ -153,7 +153,7 @@ test("chained store changes should propagate reliably", function() {
   equals(rec.fired, YES, 'original rec.title should have notified');  
   
 
-  // trial 1
+  // trial 3
   SC.RunLoop.begin();
   store = parent.chain();
   rec2  = store.find(Rec, 1);
@@ -176,5 +176,31 @@ test("chained store changes should propagate reliably", function() {
 
   equals(rec.get('title'), 'FOO2', 'original rec.title should change');
   equals(rec.fired, YES, 'original rec.title should have notified');  
-  
+});
+
+test("record retrievals triggered from a chained store and returned to the parent store should be reflected in the chained store", function() {
+  var parent = SC.Store.create().from(SC.DataSource.create({
+    retrieveRecords: function(store, storeKeys, ids) {
+      this.invokeLast(function() {
+        storeKeys.forEach(function(key, i) {
+          store.dataSourceDidComplete(key, { title: 'Stupendous! AB-solutely corking.' });
+        });
+      })
+      return YES;
+    }
+  }));
+
+  var chained = parent.chain(),
+      chainedRec, storeKey;
+
+  SC.run(function() {
+    chainedRec = chained.find(Rec, 1);
+    storeKey = chainedRec.get('storeKey');
+    equals(chained.peekStatus(storeKey), SC.Record.BUSY_LOADING, "While retrieving, the record's status should be BUSY_LOADING");
+  });
+
+  // This immediate status update is sensitive to the data source's use of invokeNext to load the record.
+  equals(chained.peekStatus(storeKey), SC.Record.READY_CLEAN, "After retrieving, the record's status should be READY_CLEAN");
+
+
 });

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

@@ -3,7 +3,7 @@
 // Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*globals module ok equals same test MyApp */
+/*global module, ok, equals, warn, test */
 
 // test parsing of query string
 var q;
@@ -216,9 +216,23 @@ test("token tree should build", function() {
   q.conditions = "(firstName MATCHES {firstName} OR lastName BEGINS_WITH 'Lone') AND is_a_beauty = true";
   q.parse();
   ok(q._tokenList.length == 13, 'list should have 13 tokens');
-  ok(!q._tokenTree.error, 'there should be no errors');
+  ok(!q._tokenTree.isError, 'there should be no errors');
   ok(q._tokenTree.tokenValue == 'AND', 'tree root should be AND');
   
 });
 
+test("token tree should error", function() {
+  q.conditions = "(firstName MATCHES {firstName} OR lastName BEGINS_WITH 'Lone') AND is_a_beauty =";
+  try {
+    q.parse();
+  } catch(e) {}
+  ok(q._tokenTree.isError, "Parsing an unparsable query results in an error.");
 
+  warn('Parsing "(firstName =)" should result in an error but does not.');
+  // // This should be an error case but is not. I don't have time to track it down at the moment.
+  // q.conditions = "(firstName =)";
+  // try {
+  //   q.parse();
+  // } catch(e) {}
+  // ok(q._tokenTree.isError, "Parsing an unparsable query results in an error.");
+});

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

@@ -9,33 +9,33 @@ var store, Application, dataSource;
 
 module("SC.Store Core Methods", {
   setup: function() {
-    dataSource = SC.DataSource.create({ 
-      
+    dataSource = SC.DataSource.create({
+
       gotParams: NO,
-      
+
       updateRecord: function(store, storeKey, params) {
         this.gotParams = params && params['param1'] ? YES: NO;
       }
     });
-    
+
     Application = {};
     Application._nameDidChange = 0;
-    
-    Application.File = SC.Record.extend({ 
-      
+
+    Application.File = SC.Record.extend({
+
       nameDidChange: function(object, key) {
         Application._nameDidChange++;
       }.observes('name', 'url', 'isDirectory')
-      
+
     });
     Application.FileDisk = SC.Record.extend({ });
-    
+
     Application.Data = {
-      
+
       "FileDisk": [
         { guid: '14', name: 'Main Drive', parent: null, children: null }
       ],
-    
+
       "File": [
         { guid: '10', name: 'Home', url: '/emily_parker', isDirectory: true, parent: null, children: 'Collection'},
         { guid: '11', name: 'Documents', fileType: 'documents', url: '/emily_parker/Documents', isDirectory: true, parent: '10', children: 'Collection', createdAt: 'June 15, 2007', modifiedAt: 'October 21, 2007', filetype: 'directory', isShared: false},
@@ -48,50 +48,50 @@ module("SC.Store Core Methods", {
         { guid: '136', name: 'Software', fileType: 'software', url: '/emily_parker/Software', isDirectory: true, parent: '10', children: 'Collection', createdAt: 'June 15, 2007', modifiedAt: 'June 15, 2007', filetype: 'directory', isShared: true, sharedAt: 'October 15, 2007', sharedUntil: 'March 31, 2008', sharedUrl: '2fhty', isPasswordRequired: true}
       ]
     };
-    
+
     SC.RunLoop.begin();
     store = SC.Store.create({ name: 'Test store'} ).from(dataSource);
     for(var i in Application.Data) {
       store.loadRecords(Application[i], Application.Data[i]);
     }
     SC.RunLoop.end();
-    
+
     // make sure RecordType by String can map
     window.Application = Application;
-  }    
+  }
 });
 
 test("Verify that SC.Store's toString() includes the store's name, if it was specified", function() {
-  
+
   var description = store.toString();
   ok(description.indexOf('Test store') !== -1, 'should contain "Test store"');
-  
+
 });
 
 test("Verify loadRecords() loads data", function() {
-  
+
   equals(store.find(Application.File, '14').get('name'), 'Birthday Invitation.pdf', 'should return File 14');
   equals(store.find(Application.FileDisk, '14').get('name'), 'Main Drive', 'should return FileDisk 14');
-  
+
 });
 
 test("Verify storeKeys() gets all store keys", function() {
-  
+
   var storeKey;
-  
+
   equals(store.storeKeys().length, 10, 'Length should be 10');
-  
+
   storeKey = store.storeKeyFor(Application.File, '10');
   store.writeStatus(storeKey, SC.Record.EMPTY);
   equals(store.storeKeys().length, 9, 'Length should be one less now');
-  
+
 });
 
 test("find() should take both SC.Record object and SC.Record string as recordtype argument", function() {
-  
+
   equals(store.find('Application.File', '14').get('name'), 'Birthday Invitation.pdf', 'should return File 14');
   equals(store.find(Application.File, '14').get('name'), 'Birthday Invitation.pdf', 'should return FileDisk 14');
-  
+
 });
 
 test("loading more records should not sending _flushRecordChanges() until the end of the runloop", function() {
@@ -101,56 +101,76 @@ test("loading more records should not sending _flushRecordChanges() until the en
       { guid: '56', name: 'Documents', fileType: 'documents', url: '/emily_parker/Documents', isDirectory: true, parent: '10', children: 'Collection', createdAt: 'June 15, 2007', modifiedAt: 'October 21, 2007', filetype: 'directory', isShared: false},
       { guid: '57',name: 'Library', fileType: 'library', url: '/emily_parker/Library', isDirectory: true, parent: '10', children: 'Collection', createdAt: 'June 15, 2007', modifiedAt: 'October 21, 2007', filetype: 'directory', isShared: false}
   ];
-  
+
   SC.RunLoop.begin();
-  
+
   var storeKeys = store.loadRecords(Application.File, moreData);
   equals(storeKeys.length, 3, 'precon - should have loaded three records');
   equals(store.recordPropertyChanges.storeKeys.length, 3, 'should be three storeKeys in changelog');
-  
+
   SC.RunLoop.end();
-  
+
   // recordPropertyChanges may not exist after notifications have gone out.
   // treat that like having len=0
   var changes = store.recordPropertyChanges;
   var len = (changes && changes.storeKeys) ? changes.storeKeys.length : 0;
   equals(len, 0, 'should be zero storeKeys in changelog');
-  
+
 });
 
 test("Passing params through commitRecords()", function() {
-  
+
   var file = store.find(Application.File, '14');
   file.set('name', 'My Great New Name');
-  
+
   store.commitRecords(null, null, null, { param1: 'value1' });
-  
+
   equals(dataSource.gotParams, YES, 'params should have travelled through to dataSource updateRecord() call');
-  
+
 });
 
 test("Make sure that setting an attribute on a record will only notify respective observers once", function() {
-  
+
   var file = store.find(Application.File, '14');
   Application._nameDidChange = 0 ;
-  
+
   SC.RunLoop.begin();
   file.writeAttribute('name', 'My Great New Name');
   SC.RunLoop.end();
-  
+
   equals(Application._nameDidChange, 1, 'observer should have been fired only once');
 
 });
 
+test("Test that reset() clears out the store for re-use", function () {
+  var isEmptyObject = function ( obj ) {
+    var name;
+
+    for (name in obj) {
+      return false;
+    }
+    return true;
+  };
+
+  ok(!isEmptyObject(store.dataHashes), "We expect there to be values in store.dataHashes");
+  ok(!isEmptyObject(store.revisions), "We expect there to be values in store.revisions");
+  ok(!isEmptyObject(store.statuses), "We expect there to be values in store.statuses");
+
+  store.reset();
+
+  ok(isEmptyObject(store.dataHashes), "We expect there to no longer be any values in store.dataHashes");
+  ok(isEmptyObject(store.revisions), "We expect there to no longer be any values in store.revisions");
+  ok(isEmptyObject(store.statuses), "We expect there to no longer be any values in store.statuses");
+});
 
 // test("Calling replaceIdFor() should notify the record that its id has changed", function() {
-//   
+//
 //   var file = store.find(Application.File, '14');
-// 
+//
 //   file.get('id'); // Just getting the id, so it gets cached.
-// 
+//
 //   SC.Store.replaceIdFor(file.get('storeKey'), 999);
 //   equals(file.get('id'), 999, 'the record should have the new id');
-// 
+//
 // });
 

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

@@ -0,0 +1,78 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*globals module ok equals same test MyApp */
+
+var store, dataHash;
+var Person, Person2;
+
+module("SC.Store#materializeRecord", {
+  setup: function() {
+
+    Person = SC.Record.extend({
+      first: SC.Record.attr(String, { isRequired: YES}),
+      last: SC.Record.attr(String),
+      age: SC.Record.attr(Number),
+      isAlive: SC.Record.attr(Boolean)
+    });
+    Person2 = SC.Record.extend({
+      first: SC.Record.attr(String, { isRequired: YES}),
+      last: SC.Record.attr(String),
+      age: SC.Record.attr(Number),
+      isAlive: SC.Record.attr(Boolean),
+      init: function() {
+        sc_super();
+        return this.get('store').materializeRecord(this.get('storeKey'));
+      }
+    });
+
+    dataHash = {
+      guid: 1,
+      first: "John",
+      last: "Sproutish",
+      age: 35,
+      isAlive: YES
+    };
+
+    SC.RunLoop.begin();
+
+    store = SC.Store.create();
+
+    SC.RunLoop.end();
+  }
+});
+
+test("Returns the same record when called twice.", function() {
+  var storeKey = store.loadRecord(Person, dataHash);
+  ok(storeKey, "PRELIM: A store key is generated for a new record.");
+
+  var rec1 = store.materializeRecord(storeKey),
+      rec2 = store.materializeRecord(storeKey);
+  ok(rec1 === rec2, "The same record object is returned from two calls to materializeRecord.");
+});
+
+// Tests a bug where records which trigger self-reference during initialization (usually through observers, often
+// many layers deep) would cause two or more identical copies of the record object to be created, resulting in
+// a stack overflow at best and a set of subtle, impossible-to-debug errors at worst. See GitHub issue #1160.
+test("Returns the correct record instance, without error, when called for a record which materializes itself during initialization.", function() {
+
+  var storeKey = store.loadRecord(Person2, dataHash);
+  ok(storeKey, "PRELIM: A store key is generated for a new record.");
+
+  var rec1, hasError = NO;
+  try {
+    rec1 = store.materializeRecord(storeKey);
+  } catch (e) {
+    hasError = YES;
+  }
+  ok(!hasError, "The store successfully materialized a record which self-materializes during initialization.");
+
+  var rec2 = store.materializeRecord(storeKey);
+
+  ok(rec1 === rec2, "The same record object is returned from two calls to materializeRecord for a record which self-materializes during initialization.");
+
+
+
+});

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

@@ -331,6 +331,7 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
       - `%j` -- Day of the year (001..366)
       - `%m` -- Month of the year (01..12)
       - `%M` -- Minute of the hour (00..59)
+      - `%o` -- The day's ordinal abbreviation ('st', 'nd', 'rd', etc.)
       - `%p` -- Meridian indicator ("AM" or "PM")
       - `%S` -- Second of the minute (00..60)
       - `%s` -- Milliseconds of the second (000..999)
@@ -421,6 +422,16 @@ SC.DateTime = SC.Object.extend(SC.Freezable, SC.Copyable,
     return this.constructor._toFormattedString(SC.DATETIME_ISO8601, this._ms, this.timezone);
   },
 
+   /**
+     Returns the suffix of the date for use in english eg 21st 22nd 22rd
+    speech.
+
+    @return {String}
+   */
+  dayOrdinal: function(){
+     return this.get('day').ordinal();
+   }.property(),
+
   /**
     @private
 
@@ -1120,6 +1131,7 @@ SC.DateTime.mixin(SC.Comparable,
       case 'j': return this._pad(this._get('dayOfYear'), 3);
       case 'm': return this._pad(this._get('month'));
       case 'M': return this._pad(this._get('minute'));
+      case 'o': return this._get('day').ordinal();
       case 'p': return this._get('hour') > 11 ? this.AMPMNames[1] : this.AMPMNames[0];
       case 'S': return this._pad(this._get('second'));
       case 's': return this._pad(this._get('millisecond'), 3);
@@ -1152,7 +1164,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(/\%([aAbBcdeEDhHiIjmMpsSUWwxXyYZ\%])/g, function() {
+    return format.replace(/\%([aAbBcdeEDhHiIjmMopsSUWwxXyYZ\%])/g, function() {
       var v = that.__toFormattedString.call(that, arguments, start, timezone);
       return v;
     });

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

@@ -238,6 +238,26 @@ test('Format', function() {
   equals(dt.adjust({ timezone:  420 }).toFormattedString('%Y-%m-%d %H:%M:%S %Z'), '1985-06-07 22:00:22 -07:00'); // the previous day
 });
 
+/**
+ * This test only tests english (the default) because Locale is not loaded as
+ * part of this test (bummer)
+ */
+test('Properly Computes day ordinal in toFormattedString', function(){
+  [1, 21, 31].forEach(function(day){
+    equals(SC.DateTime.create({month: 3, day: day}).toFormattedString('%o'), 'st');
+  });
+  [2, 22].forEach(function(day){
+    equals(SC.DateTime.create({month: 3, day: day}).toFormattedString('%o'), 'nd');
+  });
+  [3, 23].forEach(function(day){
+    equals(SC.DateTime.create({month: 3, day: day}).toFormattedString('%o'), 'rd');
+  });
+
+  [4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,24,25,26,27,28,29,30].forEach(function(day){
+    equals(SC.DateTime.create({month: 3, day: day}).toFormattedString('%o'), 'th');
+  });
+});
+
 test('fancy getters', function() {
   equals(dt.get('isLeapYear'), NO);
 

data/lib/frameworks/sproutcore/frameworks/datetime/frameworks/localized/french.lproj/strings.js

@@ -0,0 +1,45 @@
+// ==========================================================================
+// 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)
+// ==========================================================================
+
+SC.stringsFor('fr', {
+  '_SC.DateTime.dayNames': 'Dimanche Lundi Mardi Mercredi Jeudi Vendredi Samedi',
+  '_SC.DateTime.abbreviatedDayNames': 'Dim Lun Mar Mer Jeu Ven Sam',
+  '_SC.DateTime.monthNames': 'Janvier Février Mars Avril Mai Juin Juillet Août Septembre Octobre Novembre Decembre',
+  '_SC.DateTime.abbreviatedMonthNames': 'Janv Févr Mars Avr Mai Juin Juil Août Sept Oct Nov Déc',
+  '_SC.DateTime.AMPMNames':'AM PM',
+
+  '_SC.DateTime.now' : 'Maintenant',
+  '_SC.DateTime.secondIn' : 'Dans un instant',
+  '_SC.DateTime.secondsIn' : 'Dans %e secondes',
+  '_SC.DateTime.minuteIn' : 'Dans une minute',
+  '_SC.DateTime.minutesIn' : 'Dans %e minutes',
+  '_SC.DateTime.hourIn' : 'Dans une heure',
+  '_SC.DateTime.hoursIn' : 'Dans environ %e heures',
+  '_SC.DateTime.dayIn' : 'Demain à %H:%M',
+  '_SC.DateTime.daysIn' : '%A à %H:%M',
+  '_SC.DateTime.weekIn' : 'La semaine prochaine',
+  '_SC.DateTime.weeksIn' : 'Dans %e semaines',
+  '_SC.DateTime.monthIn' : 'Le mois prochain',
+  '_SC.DateTime.monthsIn' : 'Dans %e mois',
+  '_SC.DateTime.yearIn' : 'L\'an prochain',
+  '_SC.DateTime.yearsIn' : 'Dans %e ans',
+
+  '_SC.DateTime.secondAgo' : 'Il y a un instant',
+  '_SC.DateTime.secondsAgo' : 'Il y a %e secondes',
+  '_SC.DateTime.minuteAgo' : 'Il y a une minute',
+  '_SC.DateTime.minutesAgo' : 'Il y a %e minutes',
+  '_SC.DateTime.hourAgo' : 'Il y a une heure',
+  '_SC.DateTime.hoursAgo' : 'Il y a %e heures',
+  '_SC.DateTime.dayAgo' : 'Hier à %H:%M',
+  '_SC.DateTime.daysAgo' : '%A à %H:%M',
+  '_SC.DateTime.weekAgo' : 'Il y a une semaine',
+  '_SC.DateTime.weeksAgo' : 'Il y a %e semaines',
+  '_SC.DateTime.monthAgo' : 'Il y a un mois',
+  '_SC.DateTime.monthsAgo' : 'Il y a %e mois',
+  '_SC.DateTime.yearAgo' : 'L\'an dernier',
+  '_SC.DateTime.yearsAgo' : 'Il y a %e ans'
+});