sproutcore 1.4.4-java → 1.4.5-java

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/frameworks/bootstrap/setup_body_class_names.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/loader.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/frameworks/core_tools/data_source.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/frameworks/datastore/data_sources/cascade.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
@@ -94,7 +94,7 @@ SC.CascadeDataSource = SC.DataSource.extend(
     
     for(idx=0; (ret !== YES) && idx<len; idx++) {
       source = sources.objectAt(idx);
-      cur = source.fetch ? source.fetch.call(source, store, query) : NO;
+      cur = source.fetch ? source.fetch.apply(source, arguments) : NO;
       ret = this._handleResponse(ret, cur);
     }
     
@@ -103,7 +103,7 @@ SC.CascadeDataSource = SC.DataSource.extend(
   
   
   /** @private - just cascades */
-  retrieveRecords: function(store, storeKeys) {
+  retrieveRecords: function(store, storeKeys, ids) {
     var sources = this.get('dataSources'), 
         len     = sources ? sources.length : 0,
         ret     = NO,
@@ -111,7 +111,7 @@ SC.CascadeDataSource = SC.DataSource.extend(
     
     for(idx=0; (ret !== YES) && idx<len; idx++) {
       source = sources.objectAt(idx);
-      cur = source.retrieveRecords.call(source, store, storeKeys);
+      cur = source.retrieveRecords.apply(source, arguments);
       ret = this._handleResponse(ret, cur);
     }
     
@@ -127,7 +127,7 @@ SC.CascadeDataSource = SC.DataSource.extend(
     
     for(idx=0; (ret !== YES) && idx<len; idx++) {
       source = sources.objectAt(idx);
-      cur = source.commitRecords.call(source, store, createStoreKeys, updateStoreKeys, destroyStoreKeys);
+      cur = source.commitRecords.apply(source, arguments);
       ret = this._handleResponse(ret, cur);
     }
     
@@ -143,7 +143,7 @@ SC.CascadeDataSource = SC.DataSource.extend(
     
     for(idx=0; (ret !== YES) && idx<len; idx++) {
       source = sources.objectAt(idx);
-      cur = source.cancel.call(source, store, storeKeys);
+      cur = source.cancel.apply(source, arguments);
       ret = this._handleResponse(ret, cur);
     }
     

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/frameworks/datastore/data_sources/fixtures.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

data/lib/frameworks/sproutcore/frameworks/datastore/models/fetched_attribute.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
@@ -513,7 +513,7 @@ SC.Record = SC.Object.extend(
               attrValue.normalize();
             }
           } else if (isRecord) {
-            attrValue = recHash[key];
+            attrValue = recHash[keyForDataHash];
             if (attrValue !== undefined) {
               // write value already there
               dataHash[keyForDataHash] = attrValue;

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
@@ -755,20 +755,19 @@ SC.Query = SC.Object.extend(SC.Copyable, SC.Freezable,
         evaluate:       function (r,w) {
                           var all    = this.leftSide.evaluate(r,w) || [];
                           var value = this.rightSide.evaluate(r,w);
-                          switch(SC.typeOf(all)) {
-                            case SC.T_STRING:
-                              return (all.indexOf(value) !== -1); 
-                            case SC.T_ARRAY:
-                              var found  = false;
-                              var i      = 0;
-                              while ( found===false && i<all.length ) {
-                                if ( value == all[i] ) found = true;
-                                i++;
-                              }
-                              return found;
-                            default:
-                              //do nothing
-                              break;
+
+                          var allType = SC.typeOf(all);
+                          if (allType === SC.T_STRING) {
+                            return (all.indexOf(value) !== -1);
+                          } else if (allType === SC.T_ARRAY || all.toArray) {
+                            if (allType !== SC.T_ARRAY) all = all.toArray();
+                            var found  = false;
+                            var i      = 0;
+                            while ( found===false && i<all.length ) {
+                              if ( value == all[i] ) found = true;
+                              i++;
+                            }
+                            return found;
                           }
                         }
     },

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================

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

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Sprout Systems, Inc. and contributors.
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
 //            Portions ©2008-2010 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
@@ -1185,7 +1185,7 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     Unloads a group of records.  If you have a set of record ids, unloading
     them this way can be faster than retrieving each record and unloading 
     it individually.
-    
+
     You can pass either a single recordType or an array of recordTypes.  If
     you pass a single recordType, then the record type will be used for each
     record.  If you pass an array, then each id must have a matching record 
@@ -1195,33 +1195,44 @@ SC.Store = SC.Object.extend( /** @scope SC.Store.prototype */ {
     and ids.  In this case the first two parameters will be ignored.  This
     is usually only used by low-level internal methods.  You will not usually
     unload records this way.
-    
+
     @param {SC.Record|Array} recordTypes class or array of classes
-    @param {Array} ids ids to unload
+    @param {Array} ids (optional) ids to unload
     @param {Array} storeKeys (optional) store keys to unload
     @returns {SC.Store} receiver
   */
   unloadRecords: function(recordTypes, ids, storeKeys, newStatus) {
     var len, isArray, idx, id, recordType, storeKey;
-    if(storeKeys===undefined){
-      len = ids.length;
+
+    if (storeKeys === undefined) {
       isArray = SC.typeOf(recordTypes) === SC.T_ARRAY;
       if (!isArray) recordType = recordTypes;
-      for(idx=0;idx<len;idx++) {
-        if (isArray) recordType = recordTypes[idx] || SC.Record;
-        id = ids ? ids[idx] : undefined ;
-        this.unloadRecord(recordType, id, undefined, newStatus);
+      if (ids === undefined) {
+        len = isArray ? recordTypes.length : 1;
+        for (idx = 0; idx < len; idx++) {
+          if (isArray) recordType = recordTypes[idx];
+          storeKeys = this.storeKeysFor(recordType);
+          this.unloadRecords(undefined, undefined, storeKeys, newStatus);
+        }
+      } else {
+        len = ids.length;
+        for (idx = 0; idx < len; idx++) {
+          if (isArray) recordType = recordTypes[idx] || SC.Record;
+          id = ids ? ids[idx] : undefined;
+          this.unloadRecord(recordType, id, undefined, newStatus);
+        }
       }
-    }else{
+    } else {
       len = storeKeys.length;
-      for(idx=0;idx<len;idx++) {
-        storeKey = storeKeys ? storeKeys[idx] : undefined ;
+      for (idx = 0; idx < len; idx++) {
+        storeKey = storeKeys ? storeKeys[idx] : undefined;
         this.unloadRecord(undefined, undefined, storeKey, newStatus);
       }
     }
-    return this ;
+
+    return this;
   },
-  
+
   /**
     Destroys a record, removing the data hash from the store and adding the
     record to the destroyed changelog.  If you try to destroy a record that is 

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

@@ -0,0 +1,133 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*globals module ok equals same test Sample */
+
+var store;
+
+module("SC.CascadeDataSource", {
+  setup: function () {
+    SC.RunLoop.begin();
+
+    var Sample = (window.Sample = SC.Object.create());
+
+    Sample.FooDataSource = SC.DataSource.extend({
+      commitRecords: function (st, createStoreKeys, updateStoreKeys, destroyStoreKeys, params) {
+        equals(store, st, "should equal store");
+        equals(0, createStoreKeys[0], "should equal [0]");
+        equals(1, updateStoreKeys[0], "should equal [1]");
+        equals(2, destroyStoreKeys[0], "should equal [2]");
+        equals('world', params.hello, 'should equal { hello: "world" }');
+        return YES;
+      },
+
+      retriveRecords: function () {
+        ok(true, "retriveRecords should be handled by baz");
+        return NO;
+      },
+
+      fetch: function (store, query) {
+        ok(true, "fetch should be handled by bar");
+        return NO;
+      },
+
+      cancel: function (st, storeKeys) {
+        equals(store, st, "should equal store");
+        equals(1, storeKeys[0], "should equal [1]");
+        return NO;
+      }
+    });
+    Sample.fooDataSource = Sample.FooDataSource.create();
+
+    Sample.BarDataSource = SC.DataSource.extend({
+      commitRecords: function () {
+        ok(false, "should never be called, since foo handles commitRecords first");
+        return NO;
+      },
+
+      retriveRecords: function () {
+        ok(true, "retriveRecords should be handled by baz");
+        return NO;
+      },
+
+      fetch: function (st, query) {
+        equals(store, st, "should equal store");
+        equals('query', query, "should equal 'query'");
+        return YES;
+      }
+    });
+    Sample.barDataSource = Sample.BarDataSource.create();
+
+    Sample.BazDataSource = SC.DataSource.extend({
+      commitRecords: function () {
+        ok(false, "should never be called, since foo handles commitRecords first");
+        return NO;
+      },
+
+      retrieveRecords: function (st, storeKeys, ids) {
+        equals(store, st, "should equal store");
+        equals(0, storeKeys[0], "should equal [0]");
+        equals("id", ids[0], 'should equal ["id"]');
+        return YES;
+      },
+
+      fetch: function () {
+        ok(false, "should never be called, since bar handles fetch first");
+        return NO;
+      }
+    });
+    Sample.bazDataSource = Sample.BazDataSource.create();
+
+    Sample.dataSource = SC.CascadeDataSource.create({
+      dataSources: "foo bar baz".w(),
+
+      foo: Sample.fooDataSource,
+      bar: Sample.barDataSource,
+      baz: Sample.bazDataSource
+    });
+
+    store = SC.Store.create({ dataSource: Sample.dataSource });
+  },
+
+  teardown: function () {
+    SC.RunLoop.end();
+  }
+});
+
+test("Verify dataSources points to the actual dataSource", function () {
+  var dataSource = Sample.dataSource;
+  equals(dataSource.dataSources[0], dataSource.foo, 'should equal data source foo');
+  equals(dataSource.dataSources[1], dataSource.bar, 'should equal data source bar');
+  equals(dataSource.dataSources[2], dataSource.baz, 'should equal data source baz');
+});
+
+test("Verify dataSources added using 'from' are appended in order", function () {
+  Sample.dataSource = SC.CascadeDataSource.create()
+       .from(Sample.fooDataSource)
+       .from(Sample.barDataSource)
+       .from(Sample.bazDataSource);
+
+  var dataSource = Sample.dataSource;
+  equals(dataSource.dataSources[0], Sample.fooDataSource, 'should equal data source foo');
+  equals(dataSource.dataSources[1], Sample.barDataSource, 'should equal data source bar');
+  equals(dataSource.dataSources[2], Sample.bazDataSource, 'should equal data source baz');
+});
+
+test("Verify dataSource returns 'YES' when handled by a child dataSource for commitRecords", function () {
+  ok(Sample.dataSource.commitRecords(store, [0], [1], [2], { hello: "world" }),
+     "commitRecords should be handled by foo");
+});
+
+test("Verify dataSource returns 'YES' when handled by a child dataSource for fetch", function () {
+  ok(Sample.dataSource.fetch(store, 'query'), "fetch should be handled by bar");
+});
+
+test("Verify dataSource returns 'YES' when handled by a child dataSource for retriveRecords", function () {
+  ok(Sample.dataSource.retrieveRecords(store, [0], ['id']), "retrieveRecords should be handled by baz");
+});
+
+test("Verify dataSource returns 'NO' when not handled by a child dataSource", function () {
+  ok(!Sample.dataSource.cancel(store, [1]), "cancel should be handled by no data source");
+});