sproutcore 0.9.0 → 0.9.1

data/Manifest.txt

@@ -1,12 +1,7 @@
-History.txt
-License.txt
-Manifest.txt
-README.txt
-Rakefile
-app_generators/sproutcore/USAGE
 app_generators/sproutcore/sproutcore_generator.rb
 app_generators/sproutcore/templates/README
-app_generators/sproutcore/templates/environment.yml
+app_generators/sproutcore/templates/sc-config.rb
+app_generators/sproutcore/USAGE
 bin/sc-build
 bin/sc-gen
 bin/sc-server
@@ -53,14 +48,12 @@ clients/sc_test_runner/views/runner_frame.js
 clients/sc_test_runner/views/test_label.js
 config/hoe.rb
 config/requirements.rb
-environment.yml
 frameworks/prototype/prototype.js
-frameworks/sproutcore/Core.js
-frameworks/sproutcore/README
 frameworks/sproutcore/controllers/array.js
 frameworks/sproutcore/controllers/collection.js
 frameworks/sproutcore/controllers/controller.js
 frameworks/sproutcore/controllers/object.js
+frameworks/sproutcore/Core.js
 frameworks/sproutcore/drag/drag.js
 frameworks/sproutcore/drag/drag_data_source.js
 frameworks/sproutcore/drag/drag_source.js
@@ -68,6 +61,10 @@ frameworks/sproutcore/drag/drop_target.js
 frameworks/sproutcore/english.lproj/blank.gif
 frameworks/sproutcore/english.lproj/buttons.css
 frameworks/sproutcore/english.lproj/buttons.png
+frameworks/sproutcore/english.lproj/collections.css
+frameworks/sproutcore/english.lproj/images/buttons-sprite.png
+frameworks/sproutcore/english.lproj/images/sproutcore-logo.png
+frameworks/sproutcore/english.lproj/images/sticky-note.png
 frameworks/sproutcore/english.lproj/inline_text_editor.css
 frameworks/sproutcore/english.lproj/menu.css
 frameworks/sproutcore/english.lproj/panels/background-fat.jpg
@@ -125,6 +122,7 @@ frameworks/sproutcore/panes/overlay.js
 frameworks/sproutcore/panes/pane.js
 frameworks/sproutcore/panes/panel.js
 frameworks/sproutcore/panes/picker.js
+frameworks/sproutcore/README
 frameworks/sproutcore/tests/controllers/array.rhtml
 frameworks/sproutcore/tests/controllers/controller.rhtml
 frameworks/sproutcore/tests/controllers/object.rhtml
@@ -134,7 +132,10 @@ frameworks/sproutcore/tests/foundation/object.rhtml
 frameworks/sproutcore/tests/globals/window.rhtml
 frameworks/sproutcore/tests/panes/pane.rhtml
 frameworks/sproutcore/tests/views/collection.rhtml
+frameworks/sproutcore/tests/views/label_item.rhtml
+frameworks/sproutcore/tests/views/list.rhtml
 frameworks/sproutcore/tests/views/popup_button.rhtml
+frameworks/sproutcore/tests/views/scroll.rhtml
 frameworks/sproutcore/tests/views/text_field.rhtml
 frameworks/sproutcore/validators/credit_card.js
 frameworks/sproutcore/validators/date.js
@@ -145,6 +146,11 @@ frameworks/sproutcore/validators/password.js
 frameworks/sproutcore/validators/validator.js
 frameworks/sproutcore/views/button.js
 frameworks/sproutcore/views/checkbox_field.js
+frameworks/sproutcore/views/collection/collection_item.js
+frameworks/sproutcore/views/collection/grid.js
+frameworks/sproutcore/views/collection/image_cell.js
+frameworks/sproutcore/views/collection/list.js
+frameworks/sproutcore/views/collection/text_cell.js
 frameworks/sproutcore/views/collection.js
 frameworks/sproutcore/views/container.js
 frameworks/sproutcore/views/error_explanation.js
@@ -161,6 +167,7 @@ frameworks/sproutcore/views/popup_menu.js
 frameworks/sproutcore/views/progress.js
 frameworks/sproutcore/views/radio_field.js
 frameworks/sproutcore/views/radio_group.js
+frameworks/sproutcore/views/scroll.js
 frameworks/sproutcore/views/segmented.js
 frameworks/sproutcore/views/select_field.js
 frameworks/sproutcore/views/spinner.js
@@ -170,47 +177,48 @@ frameworks/sproutcore/views/textarea_field.js
 frameworks/sproutcore/views/toolbar.js
 frameworks/sproutcore/views/view.js
 frameworks/sproutcore/views/workspace.js
-generators/client/README
-generators/client/USAGE
 generators/client/client_generator.rb
+generators/client/README
 generators/client/templates/core.js
 generators/client/templates/english.lproj/body.css
 generators/client/templates/english.lproj/body.rhtml
 generators/client/templates/english.lproj/controls.css
 generators/client/templates/english.lproj/strings.js
 generators/client/templates/main.js
-generators/controller/USAGE
+generators/client/USAGE
 generators/controller/controller_generator.rb
 generators/controller/templates/controller.js
 generators/controller/templates/test.rhtml
-generators/framework/README
-generators/framework/USAGE
+generators/controller/USAGE
 generators/framework/framework_generator.rb
+generators/framework/README
 generators/framework/templates/core.js
 generators/framework/templates/english.lproj/body.css
 generators/framework/templates/english.lproj/body.rhtml
 generators/framework/templates/english.lproj/controls.css
 generators/framework/templates/english.lproj/strings.js
-generators/language/USAGE
+generators/framework/USAGE
 generators/language/language_generator.rb
 generators/language/templates/strings.js
-generators/model/USAGE
+generators/language/USAGE
 generators/model/model_generator.rb
 generators/model/templates/fixture.js
 generators/model/templates/model.js
 generators/model/templates/test.rhtml
-generators/test/USAGE
+generators/model/USAGE
 generators/test/templates/test.rhtml
 generators/test/test_generator.rb
-generators/view/USAGE
+generators/test/USAGE
 generators/view/templates/test.rhtml
 generators/view/templates/view.js
+generators/view/USAGE
 generators/view/view_generator.rb
-jsdoc/README.txt
+History.txt
 jsdoc/app/DocFile.js
-jsdoc/app/DocTag.js
 jsdoc/app/Doclet.js
+jsdoc/app/DocTag.js
 jsdoc/app/Dumper.js
+jsdoc/app/js.jar
 jsdoc/app/JsDoc.js
 jsdoc/app/JsHilite.js
 jsdoc/app/JsIO.js
@@ -218,13 +226,13 @@ jsdoc/app/JsParse.js
 jsdoc/app/JsPlate.js
 jsdoc/app/JsTestrun.js
 jsdoc/app/JsToke.js
+jsdoc/app/run.js
 jsdoc/app/Symbol.js
 jsdoc/app/Transformer.js
 jsdoc/app/Util.js
-jsdoc/app/js.jar
-jsdoc/app/run.js
 jsdoc/plugins/min.js
 jsdoc/plugins/strip.js
+jsdoc/README.txt
 jsdoc/templates/sproutcore/class.tmpl
 jsdoc/templates/sproutcore/default.css
 jsdoc/templates/sproutcore/index.html
@@ -232,30 +240,35 @@ jsdoc/templates/sproutcore/index.tmpl
 jsdoc/templates/sproutcore/prototype.js
 jsdoc/templates/sproutcore/publish.js
 jsdoc/templates/sproutcore/splash.html
-lib/sproutcore.rb
-lib/sproutcore/build_tools.rb
 lib/sproutcore/build_tools/html_builder.rb
 lib/sproutcore/build_tools/resource_builder.rb
+lib/sproutcore/build_tools.rb
 lib/sproutcore/bundle.rb
 lib/sproutcore/bundle_manifest.rb
 lib/sproutcore/generator_helper.rb
-lib/sproutcore/helpers.rb
 lib/sproutcore/helpers/capture_helper.rb
 lib/sproutcore/helpers/static_helper.rb
 lib/sproutcore/helpers/tag_helper.rb
 lib/sproutcore/helpers/text_helper.rb
+lib/sproutcore/helpers.rb
 lib/sproutcore/jsdoc.rb
 lib/sproutcore/jsmin.rb
 lib/sproutcore/library.rb
-lib/sproutcore/merb.rb
 lib/sproutcore/merb/bundle_controller.rb
 lib/sproutcore/merb/router.rb
+lib/sproutcore/merb.rb
 lib/sproutcore/version.rb
-lib/sproutcore/view_helpers.rb
 lib/sproutcore/view_helpers/button_views.rb
 lib/sproutcore/view_helpers/core_views.rb
 lib/sproutcore/view_helpers/form_views.rb
 lib/sproutcore/view_helpers/menu_views.rb
+lib/sproutcore/view_helpers.rb
+lib/sproutcore.rb
+License.txt
+Manifest.txt
+Rakefile
+README.txt
+sc-config.rb
 script/destroy
 script/generate
 script/txt2html
@@ -266,4 +279,4 @@ spec/sproutcore_spec.rb
 tasks/deployment.rake
 tasks/environment.rake
 tasks/rspec.rake
-tasks/website.rake
+tasks/website.rake

data/README.txt

@@ -8,7 +8,7 @@ This package includes both the raw SproutCore source as well as a complete build
 
 SproutCore comes loaded with a lot of features you would normally find in a full MVC desktop framework including:
 
-2. "Bindings" that can automatically relay changes in a property from your model objects to your views.
+1. "Bindings" that can automatically relay changes in a property from your model objects to your views.
 
 2. A simple in-memory database for storing your models.
 

data/Rakefile

@@ -1,4 +1,9 @@
 require 'config/requirements'
 require 'config/hoe' # setup Hoe + all gem configuration
 
+APP_ROOT = File.expand_path(File.dirname(__FILE__))
+
+# Set directories you want ignored in the manifest.
+IGNORE_DIRS = ['assets', 'pkg', 'samples', 'doc']
+
 Dir['tasks/**/*.rake'].each { |rake| load rake }

data/app_generators/sproutcore/sproutcore_generator.rb

@@ -22,12 +22,12 @@ class SproutcoreGenerator < RubiGen::Base
       BASEDIRS.each { |path| m.directory path }
       
       # Create stubs
-      m.template_copy_each %w(README environment.yml)
-      m.dependency "install_rubigen_scripts", [destination_root, 'sproutcore'], 
-        :shebang => options[:shebang], :collision => :force
+      m.template_copy_each %w(README sc-config.rb)
+      # m.dependency "install_rubigen_scripts", [destination_root, 'sproutcore'], 
+      #   :shebang => options[:shebang], :collision => :force
         
       # Create initial client
-      m.dependency "client", [destination_root, @name], 
+      m.dependency "client", [@name, "--library=#{@destination_root}"], 
         :shebang => options[:shebang], :collision => :force
         
     end

data/app_generators/sproutcore/templates/sc-config.rb

@@ -0,0 +1,72 @@
+# SPROUTCORE CONFIGURATION FILE
+# Use this file to customize the URLs, source and output paths and and other
+# options used by the SproutCore build system to create the output for your 
+# SproutCore applications.
+
+# If you want to use the libraries provided by other gems, require those gems
+# here.  SproutCore will automatically locate and load any bundles found in
+# your load path.  The sproutcore gem is automatically loaded for you.
+#
+# require 'sproutcore'
+
+# This configuration section will be applied to all bundles used by your 
+# application, even bundles that come from other gems.
+config :all do |c|
+  
+  # Name any other frameworks your bundles depend upon.  The stylesheets and
+  # JavaScript for required bundles will be loaded before your bundle on your
+  # page.
+  c[:required] = [:sproutcore]
+
+  # This string will be prepended before any URLs that reference JavaScript,
+  # CSS or images in your files.
+  c[:resources_at] = 'static'
+  
+  # This string will be prepended before any index.html urls that actually
+  # load your clients.  Setting this to an empty string will mount all
+  # of your clients at the root URL level.
+  c[:index_at] = ''
+  
+  # If you also need to load external stylesheets not managed by the bundle 
+  # system, name the URLs you want to reference here.
+  # c[:stylesheet_libs] = ['/stylesheets/public.css']
+  
+  # If you also need to load external javascripts not managed by the bundle
+  # system, name hte URLs you want to reference here.  These will be loaded 
+  # automatically.
+  # c[:javascript_libs] = ['/javascript/scriptaculous.js']
+
+  # This is the preferred language.  When the user visits the root URL of
+  # your client, this is the language they will get.  When looking for a 
+  # resources (such as an image or stylesheet), SproutCore will also try
+  # your preferred language .lproj if it cannot find the resource in the
+  # current language.
+  # c[:preferred_language] = :fr
+  
+  # If you want to use a default root layout template other than the default
+  # provided by SproutCore, you can specifiy the path name to the index.html 
+  # here.  If you provide a relative path, SproutCore will assume the file
+  # is relative to the root of this project.
+  # c[:layout] = 'lib/index.rhtml'
+  
+  # This is the fully qualified path to the directory you want all of your
+  # static files stored in.  You can place any files not managed by the build
+  # system here.  SproutCore will  also save its cached resources here.
+  # c[:public_root] = File.join(File.dirname(__FILE__), 'public')
+  
+  # The default build mode.  Normally you can specify this on the command
+  # line as well using the -e option, but you can override the default 
+  # using this config as well.
+  #c[:build_mode] = :production
+  
+end
+
+# Add configurations for specific bundles here as well.  Any options you
+# provide here will override the defaults provided by the bundles themselves
+# as well as any options you place in the :all category above.
+#
+# config :contacts do |c|
+#  c[:required] = [:sproutcore, :shared]
+# end
+#
+

data/bin/sc-build

@@ -98,6 +98,8 @@ library = SC.library_for(library_root, :public_root => build_root, :url_prefix =
 ## FIND BUNDLES TO BUILD
 ##
 
+puts "build_root = #{build_root}"
+
 # Find the bundles to build.
 if bundle_name
   # Get bundle

data/clients/sc_docs/controllers/docs.js

@@ -39,6 +39,7 @@ Docs.docsController = SC.Object.create({
     // current client.
     var clientName = this.get('clientName') ;
     var clientRoot = this.get('clientRoot') ;
+    clientRoot = clientRoot.replace(new RegExp("^%@/?".fmt(window.indexPrefix)), window.urlPrefix + '/');
     console.log('clientName: '+ clientRoot) ; 
     Docs.server.request(clientRoot, ['data','classes.js'].join('/'), null, {
       onSuccess: this._reloadSuccess.bind(this),

data/clients/sc_docs/english.lproj/body.rhtml

@@ -30,4 +30,9 @@
 <% end %>
 <% end %>
 
+<script>
+window.urlPrefix = "<%= bundle.url_prefix %>";
+window.indexPrefix = "<%= bundle.index_prefix %>";
+</script>
+
 <% end %>

data/clients/sc_docs/views/doc_frame.js

@@ -13,7 +13,7 @@ Docs.DocFrameView = SC.View.extend({
     var doc = this.get('doc') ;
     var url = (doc) ? doc.get('url') : '' ;
     if (url.length > 0) {
-      url = "/%@/%@/%@".fmt('sc_docs', Docs.docsController.get('clientName'), url) ;
+      url = "/%@/%@/-docs/data/%@".fmt(window.urlPrefix,Docs.docsController.get('clientName'), url) ;
     }
     
     // make sure we clear out the old document settings if needed.

data/clients/sc_test_runner/controllers/runner.js

@@ -61,8 +61,8 @@ TestRunner.runnerController = SC.Object.create({
     
     // Use Ajax to ask the server for the latest set of tests for the 
     // current client.
-    var ids = [this.get('clientName')] ;
-    TestRunner.server.request('sc_test_runner', 'list', ids, {
+    var urlRoot = this.get('urlRoot') ;
+    TestRunner.server.request(urlRoot, 'index.js', null, {
       onSuccess: this._reloadSuccess.bind(this),
       onFailure: this._reloadFailure.bind(this)
     }) ;

data/clients/sc_test_runner/english.lproj/body.rhtml

@@ -32,4 +32,9 @@
 
 <% end %>
 
+<script>
+window.urlPrefix = "<%= bundle.url_prefix %>";
+window.indexPrefix = "<%= bundle.index_prefix %>";
+</script>
+
 <% end %>

data/clients/sc_test_runner/main.js

@@ -6,21 +6,21 @@ function main() {
   //TestRunner.server.preload(TestRunner.FIXTURES) ;
   SC.page.awake() ;
   //TestRunner.runnerController.reloadTests() ;
+
+  console.log('main') ;
+  var indexRoot = window.location.pathname.toString().replace(/-tests\/.*/,'-tests').substr(1,window.location.pathname.length);
+  var clientName = indexRoot.match(/([^\/]+)\/-tests/)[1];
+  var urlRoot = indexRoot.replace(new RegExp("^%@/?".fmt(window.indexPrefix)), window.urlPrefix + '/');
+  console.log('indexRoot: %@ clientName: %@ urlRoot: %@'.fmt( indexRoot, clientName, urlRoot));
+  TestRunner.hidePanels() ;
+  TestRunner.runnerController.set('selection',[]) ;
+  TestRunner.runnerController.set('urlRoot', urlRoot) ;
+  TestRunner.runnerController.set('indexRoot', indexRoot) ;
+  TestRunner.runnerController.set('clientName', clientName) ;
+  TestRunner.runnerController.reloadTests() ;
 } ;
 
 TestRunner.hidePanels = function() {
   SC.page.get('warningPanel').set('isVisible', false) ;
   SC.page.get('noTestsPanel').set('isVisible',false) ;
 } ;
-
-SC.Routes.addRoute('', function() {
-  TestRunner.hidePanels() ;
-  SC.page.get('warningPanel').set('isVisible', true) ;
-}) ;
-
-SC.Routes.addRoute(':client', function(params) {
-  TestRunner.hidePanels() ;
-  TestRunner.runnerController.set('selection',[]) ;
-  TestRunner.runnerController.set('clientName', params.client) ;
-  TestRunner.runnerController.reloadTests() ;
-}) ;

data/clients/sc_test_runner/models/test.js

@@ -7,5 +7,8 @@ require('core');
 TestRunner.Test = SC.Record.extend({
   
   // TODO: Add your own code here.
+  title: function() {
+    return this.get('name').replace(/\.rhtml$/,'');
+  }.property('name')
   
 }) ;

data/clients/sc_test_runner/views/test_label.js

@@ -10,7 +10,7 @@ TestRunner.TestLabelView = SC.ButtonView.extend({
 
   contentObserver: function() {
     var c = this.get('content') ;
-    this.set('labelText', (c) ? c.get('name') : '(NONE)') ;
+    this.set('labelText', (c) ? c.get('title') : '(NONE)') ;
   }.observes('content'),
   
   labelSelector: 'span',

data/config/hoe.rb

@@ -8,6 +8,8 @@ RUBYFORGE_PROJECT = 'sproutcore' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 
+ENV['NODOT'] = "nodot" # avoid generating diagrams
+
 @config_file = "~/.rubyforge/user-config.yml"
 @config = nil
 RUBYFORGE_USERNAME = "okito"

data/frameworks/sproutcore/controllers/array.js

@@ -5,6 +5,7 @@
 
 require('controllers/controller') ;
 require('foundation/array') ;
+require('foundation/binding') ;
 
 /** @class
 
@@ -21,121 +22,102 @@ SC.ArrayController = SC.Controller.extend(SC.Array,
 /** @scope SC.ArrayController.prototype */
 {
   /**
-  * The array content that is being managed by the controller.
-  * @property
-  * @type {Array}
+    Provides compatibility with CollectionControllers.
+    @property
+    @type {SC.ArrayController}
   */
-  content: function( key, value )
-  {
-    if (!this._content) this._content = [];
-    if (value !== undefined) 
-    {
-      // only allow arrays... or array-like objects...
-      this._content = ($type(value) == T_ARRAY) || (value && value.objectAt) ? value : [];
-    }
-    return this._content;
-  }.property(),
-  
+  arrangedObjects: function() { return this; }.property(),
+
   /**
-  * Watches changes to the content property updates the contentClone.
-  * @private
-  * @observes content
-  **/
-  _contentObserver: function()
-  {
-    this.contentCloneReset();
-  }.observes('content'),
+    The array content that is being managed by the controller.
+    @property
+    @type {Array}
+  */
+  content: null,
+  contentBindingDefault: SC.Binding.Multiple,
   
-
   /**
-  * A log of calls to the replace method that will be played back to the content property on commit.
-  * @private
-  * @property
-  * @type {SC.Array}
+    Set to true if you want objects removed from the array to also be
+    deleted.  This is a convenient way to manage lists of items owned
+    by a parent record object.
+    
+    @property
+    @type {Boolean}
   */
-  changelog: function( key, value )
-  {
-    if (!this._changelog) this._changelog = [];
-    if (value !== undefined) this._changelog = value;
-    return this._changelog;
-  }.property(),
-
+  destroyOnRemoval: false,
+    
   /**
-  * A collection of all the objects that have been removed using removeObject.
-  * On commit, they are deleted.
-  * @private
-  * @property
-  * @type {SC.Array}
+    Watches changes to the content property updates the contentClone.
+    @private
+    @observes content
   */
-  deletions: function( key, value )
-  {
-    if (!this._deletions) this._deletions = [];
-    if (value !== undefined) this._deletions = value;
-    return this._deletions;
-  }.property(),
+  _contentObserver: function() {
+    this.contentCloneReset();
+    this.arrayContentDidChange() ;
+  }.observes('content'),
 
   /**
-  * The array content that (when committed) will be merged back into the content property.
-  * All array methods will take place on this object.
-  * @private
-  * @property
-  * @type {SC.Array}
+    The array content that (when committed) will be merged back into the content property.
+    All array methods will take place on this object.
+
+    @property
+    @type {SC.Array}
   */
-  contentClone: function( key, value )
-  {
-    if (value !== undefined)
-    {
-      this._contentClone = value;
-      this.arrayContentDidChange();
-    }
-    return this._contentClone;
-  }.property(),
+  contentClone: null,
 
   /**
   * Clones the content property into the contentClone property.
   * @private
   **/
-  contentCloneReset: function()
-  {
-    this.set('changelog', []);
-    this.set('deletions', []);
+  contentCloneReset: function() {
+    this._changelog = [];
     this.set('contentClone', null);
   },
 
   /**
-  * SC.Array interface implimentation.
-  * 
-  * @param {Number} idx 
-  *   Starting index in the array to replace.  If idx >= length, then append to 
-  *   the end of the array.
-  * 
-  * @param {Number} amt 
-  *   Number of elements that should be removed from the array, starting at 
-  *   *idx*.
-  * 
-  * @param {Array} objects 
-  *   An array of zero or more objects that should be inserted into the array at 
-  *   *idx* 
+   SC.Array interface implimentation.
+   
+   @param {Number} idx 
+     Starting index in the array to replace.  If idx >= length, then append to 
+     the end of the array.
+   
+   @param {Number} amt 
+     Number of elements that should be removed from the array, starting at 
+     *idx*.
+   
+   @param {Array} objects 
+     An array of zero or more objects that should be inserted into the array at 
+     *idx* 
   */
-  replace: function(idx, amt, objects)
-  {
-    if (this.get('contentClone') == undefined) this.set('contentClone', this.get('content').clone());
+  replace: function(idx, amt, objects) {
 
-    for (var i=0; i < amt; i++)
-    {
-      this.get('deletions').push( this._getSourceContent().objectAt(idx + i) );
-    }
+    var content = this.get('content') ;
 
-    this.get('changelog').push({ idx: idx, amt: amt, objects: objects });
-    this.get('contentClone').replace(idx, amt, objects);
+    // in case the passed objects are controllers, convert to source objects.
+    var copyIdx = objects.length ;
+    var sourceObjects = [] ;
+    while(--copyIdx >= 0) sourceObjects[copyIdx] = this._sourceObjectFor(objects[copyIdx]) ;
     
-    for (var i=idx, n=idx+amt; i < n; i++)
-    {
-      if ( this._objControllers && this._objControllers[i] ) 
-      {
-        this._objControllers[i] = null;
+    // create clone of content array if needed
+    var contentClone = this.get('contentClone') ;
+    if (!contentClone) {
+      contentClone = this.set('contentClone', content.clone());
+    }
+
+    // now, record the removed objects.  This may be used later.
+    if (this.get('destroyOnRemoval')) {
+      if (!this._deletions) this._deletions = [] ;
+      for (var i=0; i < amt; i++) {
+        this._deletions.push(content.objectAt(idx + i));
       }
     }
+
+    // and record additions
+    if (!this._changelog) this._changelog = []; 
+    this._changelog.push({ idx: idx, amt: amt, objects: objects });
+    
+    // then actually perform the edit on the contentClone
+    contentClone.replace(idx, amt, objects);
     
     this.editorDidChange() ;
     this.arrayContentDidChange();
@@ -149,36 +131,31 @@ SC.ArrayController = SC.Controller.extend(SC.Array,
   *   The index of the item to return.  If idx exceeds the current length, 
   *   return null.
   */
-  objectAt: function(idx)
-  {
+  objectAt: function(idx) {
     var obj = this._getSourceContent().objectAt(idx);
-    
-    if ( !this._objControllers ) this._objControllers = [];
-    if ( !this._objControllers[idx] ) this._objControllers[idx] = this.controllerForValue(obj);
-    
-    return this._objControllers[idx];
+    return this._objectControllerFor(obj) ;
   },
   /**
   * SC.Array interface implimentation.
   * @property
   * @type {integer}
   */
-  length: function( key, value )
-  {
+  length: function( key, value ) {
     return this._getSourceContent().get('length');
   }.property(),
 
-  indexOf: function( obj )
-  {
-    return this._getSourceContent().indexOf(obj);
+  /**
+    Returns the index in the array of the specified object.
+    
+    This can handle both controller wrapper objects and source content objects.
+  */
+  indexOf: function( obj ) {
+    return this._getSourceContent().indexOf(this._sourceObjectFor(obj)) ;
   },
-  _getSourceContent: function()
-  {
-    return this.get('contentClone') || this.get('content');
+  
+  _getSourceContent: function() {
+    return this.get('contentClone') || this.get('content') || [];
   },
-
-
-
   
   /** 
   * @private
@@ -189,8 +166,7 @@ SC.ArrayController = SC.Controller.extend(SC.Array,
     var ret     = true;
     
     // cannot commit changes to null content.  Return an error.
-    if (!content)
-    {
+    if (!content) {
       return $error("No Content");
     }
     
@@ -198,25 +174,33 @@ SC.ArrayController = SC.Controller.extend(SC.Array,
 
 
     // apply all the changes made to the clone
-    this.get('changelog').each(function(change)
-    {
-      content.replace( change.idx, change.amt, change.objects );
-    });
-    this.get('deletions').each(function(obj)
-    {
-      if (obj.instanceOf(SC.ObjectController)) obj = obj.get('content');
-      if (obj && obj.destroy) 
-      {
-        obj.destroy();
+    var changelog = this._changelog || [] ;
+    for(var idx=0;idx<changelog.length;idx++) {
+      var change = changelog[idx];
+      content.replace(change.idx, change.amt, change.objects) ;
+    }
+    
+    // done, flush the changelog
+    this._changelog = [] ;
+
+    // finally, destroy any removed objects if necessary.  Make 
+    // sure the objects have not been re-added before doing this.
+    if (this.get('destroyOnRemoval') && this._deletions && this._deletions.length>0) {
+      var idx = this._deletions.length;
+      while(--idx >= 0) {
+        var obj = this._deletions[idx] ;
+        if (obj && obj.destroy && (content.indexOf(obj) < 0)) {
+          obj.destroy() ; 
+        }
       }
-    });
-
-
+      this._deletions = [] ; // clear array
+    }
+    
+     // finish commiting changes.
     if (content.endPropertyChanges) content.endPropertyChanges();
     if (content.commitChanges) ret = content.commitChanges();
     
-    if ($ok(ret))
-    {
+    if ($ok(ret)) {
       this.contentCloneReset();
       this.editorDidClearChanges();
     }
@@ -231,6 +215,29 @@ SC.ArrayController = SC.Controller.extend(SC.Array,
     this.contentCloneReset();
     this.editorDidClearChanges();
     return true;
+  },
+  
+  /** @private
+    Returns the object controller for a source value.
+  */
+  _objectControllerFor: function(obj) {
+    var controllers = this._objControllers = this._objControllers || {} ;
+    var guid = SC.getGUID(obj) ;
+    var ret = controllers[guid] ;
+    if (!ret) {
+      ret = controllers[guid] = this.controllerForValue(obj) ;
+      if (ret) ret.__isArrayController = true ;
+    }
+    return ret ;
+  },
+  
+  /** @private
+    Returns the source object for the passed value.  If the passed value is a 
+    controller, this will map back to the sourceo object.  Otherwise the object itself
+    will be returned.
+  */
+  _sourceObjectFor: function(obj) {
+    return (obj && obj.__isArrayController) ? obj.get('content') : obj ;
   }
 
 });