sproutcore 1.4.5-java → 1.5.0-java

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -39,10 +39,10 @@ SC.FixturesDataSource = SC.DataSource.extend(
     here.  You should tune this to simulate latency based on the expected 
     performance of your server network.  Here are some good guidelines:
     
-    - 500: Simulates a basic server written in PHP, Ruby, or Python (not twisted) without a CDN in front for caching.
-    - 250: (Default) simulates the average latency needed to go back to your origin server from anywhere in the world.  assumes your servers itself will respond to requests < 50 msec
-    - 100: simulates the latency to a "nearby" server (i.e. same part of the world).  Suitable for simulating locally hosted servers or servers with multiple data centers around the world.
-    - 50: simulates the latency to an edge cache node when using a CDN.  Life is really good if you can afford this kind of setup.
+     - 500: Simulates a basic server written in PHP, Ruby, or Python (not twisted) without a CDN in front for caching.
+     - 250: (Default) simulates the average latency needed to go back to your origin server from anywhere in the world.  assumes your servers itself will respond to requests < 50 msec
+     - 100: simulates the latency to a "nearby" server (i.e. same part of the world).  Suitable for simulating locally hosted servers or servers with multiple data centers around the world.
+     - 50: simulates the latency to an edge cache node when using a CDN.  Life is really good if you can afford this kind of setup.
     
     @property {Number}
   */

data/lib/frameworks/sproutcore/frameworks/datastore/debug/json.js

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

data/lib/frameworks/sproutcore/frameworks/datastore/debug/standard_setup.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2010 Apple Inc. and contributors.
+// Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 /*globals module ok equals same test json0_9 json10_19 json20_29 json30_39 json40_49 */

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

@@ -1,6 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2010 Evin Grano
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -9,17 +10,15 @@ sc_require('models/record_attribute');
 
 /** @class
   
-  ChildAttribute is a subclass of RecordAttribute and handles to-one 
-  relationship for child record
+  ChildAttribute is a subclass of `RecordAttribute` and handles to-one 
+  relationships for child records.
   
-  When setting ( .set() ) the value of a toMany attribute, make sure
-  to pass in an array of SC.Record objects.
+  When setting ( `.set()` ) the value of a toMany attribute, make sure
+  to pass in an array of `SC.Record` objects.
   
   There are many ways you can configure a ManyAttribute:
   
-  {{{
-    contacts: SC.ChildAttribute.attr('SC.Child');
-  }}}
+      contacts: SC.ChildAttribute.attr('SC.Child');
   
   @extends SC.RecordAttribute
   @since SproutCore 1.0
@@ -27,66 +26,67 @@ sc_require('models/record_attribute');
 SC.ChildAttribute = SC.RecordAttribute.extend(
   /** @scope SC.ChildAttribute.prototype */ {
     
-  isChildRecordTransform: YES,
+  isNestedRecordTransform: YES,
       
   // ..........................................................
   // LOW-LEVEL METHODS
   //
   
-  /**  @private - adapted for to many relationship */
-  toType: function(parentRecord, key, hash) {
-    var ret   = null,
-        cacheKey  = SC.keyFor('__kid__', SC.guidFor(this)),
+  /**  @private - adapted for to one relationship */
+  toType: function(record, key, value) {
+    var ret   = null, rel,
         recordType  = this.get('typeClass');
-    
-    if (parentRecord[cacheKey]) return parentRecord[cacheKey];
-    
-    if (!parentRecord) {
+            
+    if (!record) {
       throw 'SC.Child: Error during transform: Unable to retrieve parent record.';
     }
+    if (!SC.none(value)) ret = record.registerNestedRecord(value, key);
+        
+    return ret;
+  },
+  
+  // Default fromType is just returning itself
+  fromType: function(record, key, value) {
+    var sk, store, ret;
 
-    // If no hash, return null.
-    if (hash){
-      // Get the record type.
-      var childNS = parentRecord.get('childRecordNamespace');
-      if (hash.type && !SC.none(childNS)) {
-        recordType = childNS[hash.type];
-      }
+    if (record) {
+      if (SC.none(value)) {
+        // Handle null value.
+        record.writeAttribute(key, value);
+        ret = value;
+      } else {
+        // Register the nested record with this record (the parent).
+        ret = record.registerNestedRecord(value, key);
 
-      if (!recordType || SC.typeOf(recordType) !== SC.T_CLASS) {
-        throw 'SC.Child: Error during transform: Invalid record type.';
+        if (ret) {
+          // Write the data hash of the nested record to the store.
+          sk = ret.get('storeKey');
+          store = ret.get('store');
+          record.writeAttribute(key, store.readDataHash(sk));
+        } else if (value) {
+          // If registration failed, just write the value.
+          record.writeAttribute(key, value);
+        }
       }
-      // Create an instance of the record by registering it with the parent and return.
-      ret = parentRecord[cacheKey] = parentRecord.registerChildRecord(recordType, hash);
     }
+
     return ret;
   },
-  
-  // Default fromType is just returning itself
-  fromType: function(record, key, value){
-    return value;
-  },
-    
+ 
   /**
     The core handler.  Called from the property.
-    
     @param {SC.Record} record the record instance
     @param {String} key the key used to access this attribute on the record
     @param {Object} value the property value if called as a setter
     @returns {Object} property value
   */
   call: function(record, key, value) {
-    var attrKey = this.get('key') || key,
-        cacheKey = SC.keyFor('__kid__', SC.guidFor(this)), 
-        nvalue;
+    var attrKey = this.get('key') || key, cRef,
+        cacheKey = SC.keyFor('__kid__', SC.guidFor(this));
     if (value !== undefined) {
-      // careful: don't overwrite value here.  we want the return value to 
-      // cache.
-      this.orphan(record);
-      nvalue = this.fromType(record, key, value) ; // convert to attribute.
-      record[cacheKey] = null;
-      record.writeAttribute(attrKey, nvalue);
-      value = this.toType(record, key, value); // need to convert to the child record for caching
+      // this.orphan(record, cacheKey, value);
+      value = this.fromType(record, key, value) ; // convert to attribute.
+      // record[cacheKey] = value;
     } else {
       value = record.readAttribute(attrKey);
       if (SC.none(value) && (value = this.get('defaultValue'))) {
@@ -99,23 +99,6 @@ SC.ChildAttribute = SC.RecordAttribute.extend(
     }
 
     return value ;
-  },
-  
-  orphan: function(parentRecord){
-    var cacheKey = SC.keyFor('__kid__', SC.guidFor(this)),
-        store, storeKey, attrs, key, param, cRef;
-    cRef = parentRecord ? parentRecord[cacheKey] : null;
-    if (cRef) {
-      attrs = cRef.get('readOnlyAttributes');
-      for(key in attrs) {
-        param = cRef[key];
-        // Orphan all the child record and child records in a tree to clean up the store
-        if(param && param.isChildRecordTransform) param.orphan(parentRecord);
-      }
-      store = cRef.get('store');
-      if(store) storeKey = cRef.storeKey;
-      if(storeKey) store.unloadRecord(undefined, undefined, storeKey);
-    }
   }
 });
 

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

@@ -1,105 +1,21 @@
-// ..........................................................
-// SC.ChildRecord
-// 
+// ==========================================================================
+// 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_require('core');
 sc_require('models/record');
-sc_require('system/query'); // FIXME: [EG] some wonky build order crap here...
 
 /**
- * An extension of SC.Record. We use this as the superclass for child record types 
- *
- * @extends SC.Record
- * @author Evin Grano
- * @author Sean Eidemiller
- *
- * @version Sproutcore 1.0
- * @since Sproutcore 1.0
- */
- 
-SC.ChildRecord = SC.Record.extend(
-  /** @scope SC.ChildRecord.prototype */ {
-  
-  /**
-   * This is a check to see if this is a ChildRecord
-   */
-  isChildRecord: YES,
-  
-  /**
-   * The type of the child record.
-   *
-   * This will be set by subclasses that require a type attribute.
-   */
-  type: null,
-  
-  /**
-   *
-   */
-  primaryKey: 'childRecordKey',
-  
-  /**
-   * The immediate parent of the child record.
-   */
-  _parentRecord: null,
-  
-  /**
-    All child records will have a life cycle that mirrors as they are created or 
-    loaded into memory, modified, committed and finally destroyed.  This life 
-    cycle is managed by the status property on your record. 
+  @class
+  @deprecated
+*/
+SC.ChildRecord = SC.Record.extend({});
 
-    The status of a record is modelled as a finite state machine.  Based on the 
-    current state of the record, you can determine which operations are 
-    currently allowed on the record and which are not.
-    
-    In general, a record can be in one of five primary states; SC.Record.EMPTY,
-    SC.Record.BUSY, SC.Record.READY, SC.Record.DESTROYED, SC.Record.ERROR. 
-    These are all described in more detail in the class mixin (in record.js) where 
-    they are defined.
-    
-    @property {Number}
-  */
-  status: function() {
-    var pStatus = SC.Record.EMPTY;
-    if (this._parentRecord) {
-      pStatus = this._parentRecord.get('status');
-      this.store.writeStatus(this.storeKey, pStatus);
-      this.store.dataHashDidChange(this.storeKey);
-    } else {
-      pStatus = this.store.readStatus(this.storeKey);
-    }
-    return pStatus;
-  }.property('storeKey').cacheable(),
-  
-  
-  /**
-   * Marks the record as dirty.
-   *
-   * Invokes the parent's recordDidChange() function until it gets to an SC.Record instance, at
-   * which point the record is marked as dirty in the store.
-   */
-  recordDidChange: function() {
-    if (this._parentRecord && this._parentRecord.recordDidChange) {
-      this._parentRecord.recordDidChange();
-    }
-    else{
-      sc_super();
-    }
-  },
-  
-  /**
-   * Creates a new child record using the parent of *this* child record.
-   * all the way up to the base parent record.  This is to give access to 
-   * all the children in a root parent tree  
-   */
-  createChildRecord: function(recordType, hash) {
-    var ret, myParent = this._parentRecord;
-  
-    if (myParent) {
-      ret = myParent.createChildRecord(recordType, hash);
-    } else {
-      ret = sc_super();
-    }
-  
-    return ret;
-  }  
-});
+SC.ChildRecord.extend = function() {
+  //@ if (debug)
+  console.log("SC.ChildRecord is deprecated. Please extend SC.Record instead.");
+  //@ endif
+  return SC.Record.extend.apply(this, arguments);
+};

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

@@ -1,26 +1,26 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2010 Evin Grano
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
 sc_require('models/record');
 sc_require('models/record_attribute');
 sc_require('models/child_attribute');
+sc_require('system/child_array');
 
 /** @class
   
   ChildrenAttribute is a subclass of ChildAttribute and handles to-many 
-  relationships for child records
+  relationships for child records.
   
-  When setting ( .set() ) the value of a toMany attribute, make sure
+  When setting ( `.set()` ) the value of a toMany attribute, make sure
   to pass in an array of SC.Record objects.
   
   There are many ways you can configure a ChildrenAttribute:
   
-  {{{
-    contacts: SC.ChildrenAttribute.attr('SC.Child');
-  }}}
+      contacts: SC.ChildrenAttribute.attr('SC.Child');
   
   @extends SC.RecordAttribute
   @since SproutCore 1.0
@@ -48,7 +48,7 @@ SC.ChildrenAttribute = SC.ChildAttribute.extend(
         defaultRecordType: recordType
       });
 
-      record[arrayKey] = this._cachedRef = ret ; // save on record
+      record[arrayKey] = ret ; // save on record
       rel = record.get('relationships');
       if (!rel) record.set('relationships', rel = []);
       rel.push(ret); // make sure we get notified of changes...
@@ -56,25 +56,18 @@ SC.ChildrenAttribute = SC.ChildAttribute.extend(
 
     return ret;
   },
-      
-  orphan: function(parentRecord){
-    var cArray = this._cachedRef,
-        store, storeKey, attrs, key, 
-        len, param, cr;
-    
-    if (cArray) {
-      cArray.forEach( function(cr){
-        attrs = cr.get('readOnlyAttributes');
-        for(key in attrs) {
-          param = cr[key];
-          // Orphan all the child record and child records in a tree to clean up the store
-          if(param && param.isChildRecordTransform) param.orphan(parentRecord);
-        }
-        store = cr.get('store');
-        if(store) storeKey = cr.storeKey;
-        if(storeKey) store.unloadRecord(undefined, undefined, storeKey);
-      }, this);
+  
+  // Default fromType is just returning itself
+  fromType: function(record, key, value){
+    var sk, store, 
+        arrayKey = SC.keyFor('__kidsArray__', SC.guidFor(this)),
+        ret = record[arrayKey];
+    if (record) {
+      record.writeAttribute(key, value);
+      if (ret) ret = ret.recordPropertyDidChange();
     }
+    
+    return ret;
   }
 });
 

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

@@ -1,7 +1,7 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
 // Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2010 Apple Inc. All rights reserved.
+//            Portions ©2008-2011 Apple Inc. All rights reserved.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -12,14 +12,14 @@ sc_require('models/record_attribute');
 
   Describes a single attribute that is fetched dynamically from the server
   when you request it.  Normally getting a property value with this attribute
-  applied will cause call the find() method on the record store passing
+  applied will cause call the `find()` method on the record store passing
   the attribute record type as the query key along with the property value,
   owner record, and property key name as parameters. 
   
   The DataSource you hook up to your store must know how to load this kind 
   of relationship for this fetched property to work properly.
   
-  The return value is usually an SC.RecordArray that will populate with the
+  The return value is usually an `SC.RecordArray` that will populate with the
   record data so that you can display it.
   
   @extends SC.RecordAttribute
@@ -29,16 +29,16 @@ SC.FetchedAttribute = SC.RecordAttribute.extend(
   /** @scope SC.FetchedAttribute.prototype */ {
 
   /**
-    Define the param key that will be passed to the findAll method on the
-    store.  If null, the param will not be send.  Defaults to 'link'
+    Define the param key that will be passed to the `findAll` method on the
+    store.  If `null`, the param will not be sent.  Defaults to `'link'`
     
     @property {String}
   */
   paramValueKey: 'link',
 
   /**
-    Define the param key used to send the parent record.  If null the param
-    will not be sent.  Defaults to 'owner'.
+    Define the param key used to send the parent record.  If `null`, the param
+    will not be sent.  Defaults to '`owner'`.
     
     @property {String}
   */
@@ -46,7 +46,7 @@ SC.FetchedAttribute = SC.RecordAttribute.extend(
   
   /**
     Define the param key used to send the key name used to reference this 
-    attribute.  If null, the param will not be sent.  Defaults to "rel"
+    attribute.  If `null`, the param will not be sent.  Defaults to `"rel"`
     
     @property {String}
   */