ember-source 1.6.0.beta.4 → 1.6.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d372d67468996a9cd7b3696151dd9ee8f7cacf52
-  data.tar.gz: e0acfd4f6e8a44b2840bc3bce3aa738b74c22ba3
+  metadata.gz: fc25ccb888bf671697975c7fc440e3c473204493
+  data.tar.gz: 40f151ad28c789001b907fbd183742339ef81ec5
 SHA512:
-  metadata.gz: 35dca42e97a48c28dc3c1c427bc4382140d68811aa2e86dd91312f828d2c0d41d86c46893f326f71e8e61550af9c1afbaa1aa44ad5bc4878372c1a7fe6e5658d
-  data.tar.gz: 2f9cd4f33b31ad5986a21b0e94c2a6044066b637a28440d1c2e9f110945fc83269c7a475b30282e3d57e0f1f80cee5e0a23837b78a39fc93b35a40ab1fa63ade
+  metadata.gz: 7dd6c4a7d33bb9f2381a9ca3be370f252f6b3c809d8396fc93fe48e86d0c1bf579f87782522762298c3f39ed849038a8780220062388502c9e13ff577f6ad368
+  data.tar.gz: 43fc0f5e4b01d8c07bf5586e03d1984f9123a456cd6f744b54482e1790ef465cdb5e86aea85f0b9af88a0d2ed669f0683330aa25c079cdf4e451379a3b71dc38

data/VERSION

@@ -1 +1 @@
-1.6.0-beta.4
+1.6.0-beta.5

data/dist/ember-data-deps.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.6.0-beta.4
+ * @version   1.6.0-beta.5
  */
 
 
@@ -1681,6 +1681,7 @@ define("ember-metal/computed",
         todoList.get('done'); // true
         ```
 
+        @since 1.6.0
         @method computed.empty
         @for Ember
         @param {String} dependentKey
@@ -2172,7 +2173,7 @@ define("ember-metal/computed",
       return computed(dependentKey, function(key, value) {
         if (arguments.length > 1) {
           set(this, dependentKey, value);
-          return value;
+          return get(this, dependentKey);
         } else {
           return get(this, dependentKey);
         }
@@ -2325,7 +2326,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.6.0-beta.4
+      @version 1.6.0-beta.5
     */
 
     if ('undefined' === typeof Ember) {
@@ -2352,10 +2353,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.6.0-beta.4'
+      @default '1.6.0-beta.5'
       @static
     */
-    Ember.VERSION = '1.6.0-beta.4';
+    Ember.VERSION = '1.6.0-beta.5';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -2440,7 +2441,7 @@ define("ember-metal/core",
     //
 
     /**
-      Determines whether Ember should enhances some built-in object prototypes to
+      Determines whether Ember should enhance some built-in object prototypes to
       provide a more friendly API. If enabled, a few methods will be added to
       `Function`, `String`, and `Array`. `Object.prototype` will not be enhanced,
       which is the one that causes most trouble for people.
@@ -3216,24 +3217,25 @@ define("ember-metal/events",
     __exports__.listenersUnion = listenersUnion;
   });
 define("ember-metal/expand_properties",
-  ["ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __exports__) {
+  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var EnumerableUtils = __dependency1__["default"];
+    var EmberError = __dependency1__["default"];
+    var EnumerableUtils = __dependency2__["default"];
 
     /**
       @module ember-metal
       */
 
     var forEach = EnumerableUtils.forEach,
-    BRACE_EXPANSION = /^((?:[^\.]*\.)*)\{(.*)\}$/;
+      BRACE_EXPANSION = /^((?:[^\.]*\.)*)\{(.*)\}$/;
 
     /**
       Expands `pattern`, invoking `callback` for each expansion.
 
       The only pattern supported is brace-expansion, anything else will be passed
       once to `callback` directly. Brace expansion can only appear at the end of a
-      pattern, for example as the last item in a chain.
+      pattern, for an example see the last call below.
 
       Example
       ```js
@@ -3254,12 +3256,17 @@ define("ember-metal/expand_properties",
     function expandProperties(pattern, callback) {
       var match, prefix, list;
 
+      if (pattern.indexOf(' ') > -1) {
+        throw new EmberError('Brace expanded properties cannot contain spaces, ' + 
+          'e.g. `user.{firstName, lastName}` should be `user.{firstName,lastName}`');
+      }
+
       if (match = BRACE_EXPANSION.exec(pattern)) {
         prefix = match[1];
         list = match[2];
 
         forEach(list.split(','), function (suffix) {
-          callback(prefix + suffix);
+            callback(prefix + suffix);
         });
       } else {
         callback(pattern);
@@ -6922,7 +6929,7 @@ define("ember-metal/run_loop",
 
     /**
       Ensure that the target method is never called more frequently than
-      the specified spacing period.
+      the specified spacing period. The target method is called immediately.
 
       ```javascript
         var myFunc = function() { console.log(this.name + ' ran.'); };
@@ -6930,6 +6937,7 @@ define("ember-metal/run_loop",
 
         run.throttle(myContext, myFunc, 150);
         // myFunc is invoked with context myContext
+        // console logs 'throttle ran.'
 
         // 50ms passes
         run.throttle(myContext, myFunc, 150);
@@ -6940,7 +6948,7 @@ define("ember-metal/run_loop",
         // 150ms passes
         run.throttle(myContext, myFunc, 150);
         // myFunc is invoked with context myContext
-        // console logs 'throttle ran.' twice, 250ms apart.
+        // console logs 'throttle ran.'
       ```
 
       @method throttle
@@ -6950,6 +6958,8 @@ define("ember-metal/run_loop",
         then it will be looked up on the passed target.
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @param {Number} spacing Number of milliseconds to space out requests.
+      @param {Boolean} immediate Trigger the function on the leading instead
+        of the trailing edge of the wait interval. Defaults to true.
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.throttle = function() {
@@ -7400,7 +7410,7 @@ define("ember-metal/utils",
     */
     // ES6TODO: Move up to runtime? This is only use in ember-metal by concatenatedProperties
     function isArray(obj) {
-      var modulePath;
+      var modulePath, type;
 
       if (typeof EmberArray === "undefined") {
         modulePath = 'ember-runtime/mixins/array';
@@ -7412,7 +7422,10 @@ define("ember-metal/utils",
       if (!obj || obj.setInterval) { return false; }
       if (Array.isArray && Array.isArray(obj)) { return true; }
       if (EmberArray && EmberArray.detect(obj)) { return true; }
-      if ((obj.length !== undefined) && 'object'=== typeOf(obj)) { return true; }
+
+      type = typeOf(obj);
+      if ('array' === type) { return true; }
+      if ((obj.length !== undefined) && 'object' === type) { return true; }
       return false;
     };
 
@@ -7817,18 +7830,20 @@ define("ember-metal/utils",
     __exports__.applyStr = applyStr;
     __exports__.apply = apply;
   });
-define("backburner", 
-  ["backburner/deferred_action_queues","exports"],
-  function(__dependency1__, __exports__) {
+define("backburner",
+  ["backburner/utils","backburner/deferred_action_queues","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var DeferredActionQueues = __dependency1__.DeferredActionQueues;
+    var Utils = __dependency1__["default"];
+    var DeferredActionQueues = __dependency2__.DeferredActionQueues;
 
     var slice = [].slice,
         pop = [].pop,
-        throttlers = [],
-        debouncees = [],
+        each = Utils.each,
+        isString = Utils.isString,
+        isFunction = Utils.isFunction,
+        isNumber = Utils.isNumber,
         timers = [],
-        autorun, laterTimer, laterTimerExpiresAt,
         global = this,
         NUMBER = /\d+/;
 
@@ -7842,7 +7857,7 @@ define("backburner",
     })();
 
     function isCoercableNumber(number) {
-      return typeof number === 'number' || NUMBER.test(number);
+      return isNumber(number) || NUMBER.test(number);
     }
 
     function Backburner(queueNames, options) {
@@ -7852,6 +7867,8 @@ define("backburner",
         this.options.defaultQueue = queueNames[0];
       }
       this.instanceStack = [];
+      this._debouncees = [];
+      this._throttlers = [];
     }
 
     Backburner.prototype = {
@@ -7905,8 +7922,7 @@ define("backburner",
       },
 
       run: function(target, method /*, args */) {
-        var options = this.options,
-            ret, length = arguments.length;
+        var onError = getOnError(this.options);
 
         this.begin();
 
@@ -7915,11 +7931,10 @@ define("backburner",
           target = null;
         }
 
-        if (typeof method === 'string') {
+        if (isString(method)) {
           method = target[method];
         }
 
-        var onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
         var args = slice.call(arguments, 2);
 
         // guard against Safari 6's double-finally bug
@@ -7954,7 +7969,7 @@ define("backburner",
           target = null;
         }
 
-        if (typeof method === 'string') {
+        if (isString(method)) {
           method = target[method];
         }
 
@@ -7970,7 +7985,7 @@ define("backburner",
           target = null;
         }
 
-        if (typeof method === 'string') {
+        if (isString(method)) {
           method = target[method];
         }
 
@@ -7981,12 +7996,10 @@ define("backburner",
       },
 
       setTimeout: function() {
-        var args = slice.call(arguments);
-        var length = args.length;
-        var method, wait, target;
-        var self = this;
-        var methodOrTarget, methodOrWait, methodOrArgs;
-        var options = this.options;
+        var args = slice.call(arguments),
+            length = args.length,
+            method, wait, target,
+            methodOrTarget, methodOrWait, methodOrArgs;
 
         if (length === 0) {
           return;
@@ -7997,7 +8010,7 @@ define("backburner",
           methodOrTarget = args[0];
           methodOrWait = args[1];
 
-          if (typeof methodOrWait === 'function' || typeof  methodOrTarget[methodOrWait] === 'function') {
+          if (isFunction(methodOrWait) || isFunction(methodOrTarget[methodOrWait])) {
             target = args.shift();
             method = args.shift();
             wait = 0;
@@ -8020,9 +8033,9 @@ define("backburner",
           methodOrTarget = args[0];
           methodOrArgs = args[1];
 
-          if (typeof methodOrArgs === 'function' || (typeof methodOrArgs === 'string' &&
-                                                     methodOrTarget !== null &&
-                                                     methodOrArgs in methodOrTarget)) {
+          if (isFunction(methodOrArgs) || (isString(methodOrArgs) &&
+                                          methodOrTarget !== null &&
+                                          methodOrArgs in methodOrTarget)) {
             target = args.shift();
             method = args.shift();
           } else {
@@ -8032,11 +8045,11 @@ define("backburner",
 
         var executeAt = (+new Date()) + parseInt(wait, 10);
 
-        if (typeof method === 'string') {
+        if (isString(method)) {
           method = target[method];
         }
 
-        var onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
+        var onError = getOnError(this.options);
 
         function fn() {
           if (onError) {
@@ -8055,7 +8068,7 @@ define("backburner",
 
         timers.splice(i, 0, executeAt, fn);
 
-        updateLaterTimer(self, executeAt, wait);
+        updateLaterTimer(this, executeAt, wait);
 
         return fn;
       },
@@ -8069,7 +8082,7 @@ define("backburner",
             index,
             timer;
 
-        if (typeof immediate === "number" || typeof immediate === "string") {
+        if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
           immediate = true;
         } else {
@@ -8078,15 +8091,17 @@ define("backburner",
 
         wait = parseInt(wait, 10);
 
-        index = findThrottler(target, method);
-        if (index > -1) { return throttlers[index]; } // throttled
+        index = findThrottler(target, method, this._throttlers);
+        if (index > -1) { return this._throttlers[index]; } // throttled
 
         timer = global.setTimeout(function() {
           if (!immediate) {
             self.run.apply(self, args);
           }
-          var index = findThrottler(target, method);
-          if (index > -1) { throttlers.splice(index, 1); }
+          var index = findThrottler(target, method, self._throttlers);
+          if (index > -1) {
+            self._throttlers.splice(index, 1);
+          }
         }, wait);
 
         if (immediate) {
@@ -8095,7 +8110,7 @@ define("backburner",
 
         throttler = [target, method, timer];
 
-        throttlers.push(throttler);
+        this._throttlers.push(throttler);
 
         return throttler;
       },
@@ -8109,7 +8124,7 @@ define("backburner",
             debouncee,
             timer;
 
-        if (typeof immediate === "number" || typeof immediate === "string") {
+        if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
           immediate = false;
         } else {
@@ -8118,11 +8133,11 @@ define("backburner",
 
         wait = parseInt(wait, 10);
         // Remove debouncee
-        index = findDebouncee(target, method);
+        index = findDebouncee(target, method, this._debouncees);
 
         if (index > -1) {
-          debouncee = debouncees[index];
-          debouncees.splice(index, 1);
+          debouncee = this._debouncees[index];
+          this._debouncees.splice(index, 1);
           clearTimeout(debouncee[2]);
         }
 
@@ -8130,9 +8145,9 @@ define("backburner",
           if (!immediate) {
             self.run.apply(self, args);
           }
-          var index = findDebouncee(target, method);
+          var index = findDebouncee(target, method, self._debouncees);
           if (index > -1) {
-            debouncees.splice(index, 1);
+            self._debouncees.splice(index, 1);
           }
         }, wait);
 
@@ -8142,38 +8157,36 @@ define("backburner",
 
         debouncee = [target, method, timer];
 
-        debouncees.push(debouncee);
+        self._debouncees.push(debouncee);
 
         return debouncee;
       },
 
       cancelTimers: function() {
-        var i, len;
+        var clearItems = function(item) {
+          clearTimeout(item[2]);
+        };
 
-        for (i = 0, len = throttlers.length; i < len; i++) {
-          clearTimeout(throttlers[i][2]);
-        }
-        throttlers = [];
+        each(this._throttlers, clearItems);
+        this._throttlers = [];
 
-        for (i = 0, len = debouncees.length; i < len; i++) {
-          clearTimeout(debouncees[i][2]);
-        }
-        debouncees = [];
+        each(this._debouncees, clearItems);
+        this._debouncees = [];
 
-        if (laterTimer) {
-          clearTimeout(laterTimer);
-          laterTimer = null;
+        if (this._laterTimer) {
+          clearTimeout(this._laterTimer);
+          this._laterTimer = null;
         }
         timers = [];
 
-        if (autorun) {
-          clearTimeout(autorun);
-          autorun = null;
+        if (this._autorun) {
+          clearTimeout(this._autorun);
+          this._autorun = null;
         }
       },
 
       hasTimers: function() {
-        return !!timers.length || !!debouncees.length || !!throttlers.length || autorun;
+        return !!timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
       },
 
       cancel: function(timer) {
@@ -8189,8 +8202,8 @@ define("backburner",
             }
           }
         } else if (Object.prototype.toString.call(timer) === "[object Array]"){ // we're cancelling a throttle or debounce
-          return this._cancelItem(findThrottler, throttlers, timer) ||
-                   this._cancelItem(findDebouncee, debouncees, timer);
+          return this._cancelItem(findThrottler, this._throttlers, timer) ||
+                   this._cancelItem(findDebouncee, this._debouncees, timer);
         } else {
           return; // timer was null or not a timer
         }
@@ -8202,7 +8215,7 @@ define("backburner",
 
         if (timer.length < 3) { return false; }
 
-        index = findMethod(timer[0], timer[1]);
+        index = findMethod(timer[0], timer[1], array);
 
         if(index > -1) {
 
@@ -8225,44 +8238,43 @@ define("backburner",
 
     if (needsIETryCatchFix) {
       var originalRun = Backburner.prototype.run;
-      Backburner.prototype.run = function() {
-        try {
-          originalRun.apply(this, arguments);
-        } catch (e) {
-          throw e;
-        }
-      };
+      Backburner.prototype.run = wrapInTryCatch(originalRun);
 
       var originalEnd = Backburner.prototype.end;
-      Backburner.prototype.end = function() {
+      Backburner.prototype.end = wrapInTryCatch(originalEnd);
+    }
+
+    function wrapInTryCatch(func) {
+      return function () {
         try {
-          originalEnd.apply(this, arguments);
+          return func.apply(this, arguments);
         } catch (e) {
           throw e;
         }
       };
     }
 
+    function getOnError(options) {
+      return options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
+    }
+
 
     function createAutorun(backburner) {
       backburner.begin();
-      autorun = global.setTimeout(function() {
-        autorun = null;
+      backburner._autorun = global.setTimeout(function() {
+        backburner._autorun = null;
         backburner.end();
       });
     }
 
     function updateLaterTimer(self, executeAt, wait) {
-      if (!laterTimer || executeAt < laterTimerExpiresAt) {
-        if (laterTimer) {
-          clearTimeout(laterTimer);
-        }
-        laterTimer = global.setTimeout(function() {
-          laterTimer = null;
-          laterTimerExpiresAt = null;
+      if (!self._laterTimer || executeAt < self._laterTimerExpiresAt) {
+        self._laterTimer = global.setTimeout(function() {
+          self._laterTimer = null;
+          self._laterTimerExpiresAt = null;
           executeTimers(self);
         }, wait);
-        laterTimerExpiresAt = executeAt;
+        self._laterTimerExpiresAt = executeAt;
       }
     }
 
@@ -8285,28 +8297,21 @@ define("backburner",
       }
     }
 
-    function findDebouncee(target, method) {
-      var debouncee,
-          index = -1;
-
-      for (var i = 0, l = debouncees.length; i < l; i++) {
-        debouncee = debouncees[i];
-        if (debouncee[0] === target && debouncee[1] === method) {
-          index = i;
-          break;
-        }
-      }
+    function findDebouncee(target, method, debouncees) {
+      return findItem(target, method, debouncees);
+    }
 
-      return index;
+    function findThrottler(target, method, throttlers) {
+      return findItem(target, method, throttlers);
     }
 
-    function findThrottler(target, method) {
-      var throttler,
+    function findItem(target, method, collection) {
+      var item,
           index = -1;
 
-      for (var i = 0, l = throttlers.length; i < l; i++) {
-        throttler = throttlers[i];
-        if (throttler[0] === target && throttler[1] === method) {
+      for (var i = 0, l = collection.length; i < l; i++) {
+        item = collection[i];
+        if (item[0] === target && item[1] === method) {
           index = i;
           break;
         }
@@ -8341,11 +8346,15 @@ define("backburner",
 
     __exports__.Backburner = Backburner;
   });
-define("backburner/deferred_action_queues", 
-  ["backburner/queue","exports"],
-  function(__dependency1__, __exports__) {
+define("backburner/deferred_action_queues",
+  ["backburner/utils","backburner/queue","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Queue = __dependency1__.Queue;
+    var Utils = __dependency1__["default"];
+    var Queue = __dependency2__.Queue;
+
+    var each = Utils.each,
+        isString = Utils.isString;
 
     function DeferredActionQueues(queueNames, options) {
       var queues = this.queues = {};
@@ -8353,11 +8362,9 @@ define("backburner/deferred_action_queues",
 
       this.options = options;
 
-      var queueName;
-      for (var i = 0, l = queueNames.length; i < l; i++) {
-        queueName = queueNames[i];
-        queues[queueName] = new Queue(this, queueName, this.options);
-      }
+      each(queueNames, function(queueName) {
+        queues[queueName] = new Queue(this, queueName, options);
+      });
     }
 
     DeferredActionQueues.prototype = {
@@ -8428,7 +8435,7 @@ define("backburner/deferred_action_queues",
             args   = queueItems[queueIndex+2];
             stack  = queueItems[queueIndex+3]; // Debugging assistance
 
-            if (typeof method === 'string') { method = target[method]; }
+            if (isString(method)) { method = target[method]; }
 
             // method could have been nullified / canceled during flush
             if (method) {
@@ -8465,7 +8472,7 @@ define("backburner/deferred_action_queues",
 
     __exports__.DeferredActionQueues = DeferredActionQueues;
   });
-define("backburner/queue", 
+define("backburner/queue",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -8504,7 +8511,7 @@ define("backburner/queue",
           }
         }
 
-        this._queue.push(target, method, args, stack);
+        queue.push(target, method, args, stack);
         return {queue: this, target: target, method: method};
       },
 
@@ -8594,6 +8601,31 @@ define("backburner/queue",
 
     __exports__.Queue = Queue;
   });
+define("backburner/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    __exports__["default"] = {
+      each: function(collection, callback) {
+        for (var i = 0; i < collection.length; i++) {
+          callback(collection[i]);
+        }
+      },
+
+      isString: function(suspect) {
+        return typeof suspect === 'string';
+      },
+
+      isFunction: function(suspect) {
+        return typeof suspect === 'function';
+      },
+
+      isNumber: function(suspect) {
+        return typeof suspect === 'number';
+      }
+    };
+  });
+
 define("ember-metal/watch_key",
   ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
@@ -14133,7 +14165,7 @@ define("ember-runtime/controllers/array_controller",
       init: function() {
         this._super();
 
-        this.set('_subControllers', Ember.A());
+        this.set('_subControllers', [ ]);
       },
 
       content: computed(function () {
@@ -14183,13 +14215,23 @@ define("ember-runtime/controllers/array_controller",
 
       _resetSubControllers: function() {
         var subControllers = get(this, '_subControllers');
-        if (subControllers) {
-          forEach(subControllers, function(subController) {
-            if (subController) { subController.destroy(); }
-          });
+        var controller;
+
+        if (subControllers.length) {
+          for (var i = 0, length = subControllers.length; length > i; i++) {
+            controller = subControllers[i];
+            if (controller) {
+              controller.destroy();
+            }
+          }
+
+          subControllers.length = 0;
         }
+      },
 
-        this.set('_subControllers', Ember.A());
+      willDestroy: function() {
+        this._resetSubControllers();
+        this._super();
       }
     });
 
@@ -17649,7 +17691,9 @@ define("ember-runtime/mixins/mutable_enumerable",
       */
       removeObjects: function(objects) {
         beginPropertyChanges(this);
-        forEach(objects, function(obj) { this.removeObject(obj); }, this);
+        for (var i = objects.length - 1; i >= 0; i--) {
+          this.removeObject(objects[i]);
+        }
         endPropertyChanges(this);
         return this;
       }