ember-source 1.9.1 → 1.10.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83ee192c23c80bc7f965ca53c3ccc7db0c4904da
-  data.tar.gz: 07d2fca0d32dc20170ba591f488b298d52368f7e
+  metadata.gz: 5e4c5359d10304310ca5519bd49ea188fc61bc82
+  data.tar.gz: 44f6da92b4b1b287c252f4f36e8bca279890c7bf
 SHA512:
-  metadata.gz: b8b71dcc9d2667cf2c559dd70b44e8d7e59b7a9759bc0868e3a5dd19194d400b85c6abeb86ce9a4af54a1a43cc77352ea8b1fc70efa90951ca3fecb3b7e88f28
-  data.tar.gz: fc80c14a5c87b591c34323b0a22b44245acc2585ac2b311f25658e3cd089bb62c1aa606e2fdf2a918fcad0c6db274de1e0654ade335c9c677ab2eddfaa9b6d26
+  metadata.gz: c26640239bfd200a8375239c098658b6f4f05ac15265872097c3010ca92b7dac2a1b1b8ccb23a509fd8ef1627a8e6bcb6f42d6c75483c48e2630279c23b17aea
+  data.tar.gz: 032900a90d19d5df14476814357441a8d64017fd40f1385c6e7219c829dac96451663819cb11c1beb984d42ac73a55592c6e8c95dc9dec8688f042e6f35c43a0

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.10.0-beta.1

data/dist/ember-runtime.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.9.1
+ * @version   1.10.0-beta.1
  */
 
 (function() {
@@ -32,7 +32,7 @@ var define, requireModule, require, requirejs, Ember;
       seen[name] = {};
 
       if (!registry[name]) {
-        throw new Error("Could not find module " + name);
+        throw new Error('Could not find module ' + name);
       }
 
       var mod = registry[name];
@@ -56,9 +56,11 @@ var define, requireModule, require, requirejs, Ember;
     };
 
     function resolve(child, name) {
-      if (child.charAt(0) !== '.') { return child; }
-      var parts = child.split("/");
-      var parentBase = name.split("/").slice(0, -1);
+      if (child.charAt(0) !== '.') {
+        return child;
+      }
+      var parts = child.split('/');
+      var parentBase = name.split('/').slice(0, -1);
 
       for (var i=0, l=parts.length; i<l; i++) {
         var part = parts[i];
@@ -68,12 +70,16 @@ var define, requireModule, require, requirejs, Ember;
         else { parentBase.push(part); }
       }
 
-      return parentBase.join("/");
+      return parentBase.join('/');
     }
 
     requirejs._eak_seen = registry;
 
-    Ember.__loader = {define: define, require: require, registry: registry};
+    Ember.__loader = {
+      define: define,
+      require: require,
+      registry: registry
+    };
   } else {
     define = Ember.__loader.define;
     requirejs = require = requireModule = Ember.__loader.require;
@@ -1118,6 +1124,9 @@ define("container/container",
       this.typeInjections = dictionary(parent ? parent.typeInjections : null);
       this.injections     = dictionary(null);
       this.normalizeCache = dictionary(null);
+      
+        this.validationCache = dictionary(parent ? parent.validationCache : null);
+      
 
       this.factoryTypeInjections = dictionary(parent ? parent.factoryTypeInjections : null);
       this.factoryInjections     = dictionary(null);
@@ -1264,6 +1273,9 @@ define("container/container",
         delete this.factoryCache[normalizedName];
         delete this.resolveCache[normalizedName];
         delete this._options[normalizedName];
+        
+          delete this.validationCache[normalizedName];
+        
       },
 
       /**
@@ -1827,6 +1839,10 @@ define("container/container",
 
       var type = fullName.split(':')[0];
       if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
+        if (factory && typeof factory._onLookup === 'function') {
+          factory._onLookup(fullName);
+        }
+
         // TODO: think about a 'safe' merge style extension
         // for now just fallback to create time injection
         cache[fullName] = factory;
@@ -1840,6 +1856,10 @@ define("container/container",
         var injectedFactory = factory.extend(injections);
         injectedFactory.reopenClass(factoryInjections);
 
+        if (factory && typeof factory._onLookup === 'function') {
+          factory._onLookup(fullName);
+        }
+
         cache[fullName] = injectedFactory;
 
         return injectedFactory;
@@ -1891,7 +1911,7 @@ define("container/container",
 
     function instantiate(container, fullName) {
       var factory = factoryFor(container, fullName);
-      var lazyInjections;
+      var lazyInjections, validationCache;
 
       if (option(container, fullName, 'instantiate') === false) {
         return factory;
@@ -1904,6 +1924,18 @@ define("container/container",
         }
 
         
+          validationCache = container.validationCache;
+
+          // Ensure that all lazy injections are valid at instantiation time
+          if (!validationCache[fullName] && typeof factory._lazyInjections === 'function') {
+            lazyInjections = factory._lazyInjections();
+
+            validateInjections(container, normalizeInjectionsHash(lazyInjections));
+          }
+
+          validationCache[fullName] = true;
+        
+
         if (typeof factory.extend === 'function') {
           // assume the factory was extendable and is already injected
           return factory.create();
@@ -2029,11 +2061,10 @@ define("ember-metal",
     var getWithDefault = __dependency11__.getWithDefault;
     var normalizeTuple = __dependency11__.normalizeTuple;
 
+    var accumulateListeners = __dependency12__.accumulateListeners;
     var addListener = __dependency12__.addListener;
     var hasListeners = __dependency12__.hasListeners;
-    var listenersDiff = __dependency12__.listenersDiff;
     var listenersFor = __dependency12__.listenersFor;
-    var listenersUnion = __dependency12__.listenersUnion;
     var on = __dependency12__.on;
     var removeListener = __dependency12__.removeListener;
     var sendEvent = __dependency12__.sendEvent;
@@ -2103,7 +2134,7 @@ define("ember-metal",
     var isGlobalPath = __dependency29__.isGlobalPath;
     var oneWay = __dependency29__.oneWay;
     var run = __dependency30__["default"];
-    var libraries = __dependency31__["default"];
+    var Libraries = __dependency31__["default"];
     var isNone = __dependency32__["default"];
     var isEmpty = __dependency33__["default"];
     var isBlank = __dependency34__["default"];
@@ -2170,17 +2201,16 @@ define("ember-metal",
 
     Ember.EnumerableUtils = EnumerableUtils;
 
-    Ember.on                = on;
-    Ember.addListener       = addListener;
-    Ember.removeListener    = removeListener;
-    Ember._suspendListener  = suspendListener;
-    Ember._suspendListeners = suspendListeners;
-    Ember.sendEvent         = sendEvent;
-    Ember.hasListeners      = hasListeners;
-    Ember.watchedEvents     = watchedEvents;
-    Ember.listenersFor      = listenersFor;
-    Ember.listenersDiff     = listenersDiff;
-    Ember.listenersUnion    = listenersUnion;
+    Ember.on                  = on;
+    Ember.addListener         = addListener;
+    Ember.removeListener      = removeListener;
+    Ember._suspendListener    = suspendListener;
+    Ember._suspendListeners   = suspendListeners;
+    Ember.sendEvent           = sendEvent;
+    Ember.hasListeners        = hasListeners;
+    Ember.watchedEvents       = watchedEvents;
+    Ember.listenersFor        = listenersFor;
+    Ember.accumulateListeners = accumulateListeners;
 
     Ember._ObserverSet = ObserverSet;
 
@@ -2254,7 +2284,7 @@ define("ember-metal",
 
     Ember.run = run;
 
-    Ember.libraries = libraries;
+    Ember.libraries = new Libraries();
     Ember.libraries.registerCoreLibrary('Ember', Ember.VERSION);
 
     Ember.isNone = isNone;
@@ -3484,9 +3514,6 @@ define("ember-metal/computed",
     @module ember-metal
     */
 
-    Ember.warn("The CP_DEFAULT_CACHEABLE flag has been removed and computed properties" +
-               "are always cached by default. Use `volatile` if you don't want caching.", Ember.ENV.CP_DEFAULT_CACHEABLE !== false);
-
     var metaFor = meta;
     var a_slice = [].slice;
 
@@ -3585,9 +3612,11 @@ define("ember-metal/computed",
       this._suspended = undefined;
       this._meta = undefined;
 
-      this._cacheable = (opts && opts.cacheable !== undefined) ? opts.cacheable : true;
+      Ember.deprecate("Passing opts.cacheable to the CP constructor is deprecated. Invoke `volatile()` on the CP instead.", !opts || !opts.hasOwnProperty('cacheable'));
+      this._cacheable = (opts && opts.cacheable !== undefined) ? opts.cacheable : true;   // TODO: Set always to `true` once this deprecation is gone.
       this._dependentKeys = opts && opts.dependentKeys;
-      this._readOnly = opts && (opts.readOnly !== undefined || !!opts.readOnly) || false;
+      Ember.deprecate("Passing opts.readOnly to the CP constructor is deprecated. All CPs are writable by default. Yo can invoke `readOnly()` on the CP to change this.", !opts || !opts.hasOwnProperty('readOnly'));
+      this._readOnly = opts && (opts.readOnly !== undefined || !!opts.readOnly) || false; // TODO: Set always to `false` once this deprecation is gone.
     }
 
     ComputedProperty.prototype = new Descriptor();
@@ -3608,8 +3637,10 @@ define("ember-metal/computed",
       @param {Boolean} aFlag optional set to `false` to disable caching
       @return {Ember.ComputedProperty} this
       @chainable
+      @deprecated All computed properties are cacheble by default. Use `volatile()` instead to opt-out to caching.
     */
     ComputedPropertyPrototype.cacheable = function(aFlag) {
+      Ember.deprecate('ComputedProperty.cacheable() is deprecated. All computed properties are cacheable by default.');
       this._cacheable = aFlag !== false;
       return this;
     };
@@ -3631,7 +3662,8 @@ define("ember-metal/computed",
       @chainable
     */
     ComputedPropertyPrototype.volatile = function() {
-      return this.cacheable(false);
+      this._cacheable = false;
+      return this;
     };
 
     /**
@@ -3655,7 +3687,8 @@ define("ember-metal/computed",
       @chainable
     */
     ComputedPropertyPrototype.readOnly = function(readOnly) {
-      this._readOnly = readOnly === undefined || !!readOnly;
+      Ember.deprecate('Passing arguments to ComputedProperty.readOnly() is deprecated.', arguments.length === 0);
+      this._readOnly = readOnly === undefined || !!readOnly; // Force to true once this deprecation is gone
       return this;
     };
 
@@ -3967,7 +4000,7 @@ define("ember-metal/computed",
       The function should accept two parameters, key and value. If value is not
       undefined you should set the value first. In either case return the
       current value of the property.
-      
+
       A computed property defined in this way might look like this:
 
       ```js
@@ -3983,12 +4016,12 @@ define("ember-metal/computed",
       var client = Person.create();
 
       client.get('fullName'); // 'Betty Jones'
-      
+
       client.set('lastName', 'Fuller');
       client.get('fullName'); // 'Betty Fuller'
       ```
 
-      _Note: This is the prefered way to define computed properties when writing third-party
+      _Note: This is the preferred way to define computed properties when writing third-party
       libraries that depend on or use Ember, since there is no guarantee that the user
       will have prototype extensions enabled._
 
@@ -4133,16 +4166,16 @@ define("ember-metal/computed_macros",
 
       ```javascript
       var ToDoList = Ember.Object.extend({
-        done: Ember.computed.empty('todos')
+        isDone: Ember.computed.empty('todos')
       });
 
       var todoList = ToDoList.create({
         todos: ['Unit Test', 'Documentation', 'Release']
       });
 
-      todoList.get('done'); // false
+      todoList.get('isDone'); // false
       todoList.get('todos').clear();
-      todoList.get('done'); // true
+      todoList.get('isDone'); // true
       ```
 
       @since 1.6.0
@@ -4684,7 +4717,7 @@ define("ember-metal/computed_macros",
     /**
       Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
       a readOnly one way binding. Very often when using `computed.oneWay` one does
-      not also want changes to propogate back up, as they will replace the value.
+      not also want changes to propagate back up, as they will replace the value.
 
       This prevents the reverse flow, and also throws an exception when it occurs.
 
@@ -4811,7 +4844,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.9.1
+      @version 1.10.0-beta.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -4838,10 +4871,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.9.1'
+      @default '1.10.0-beta.1'
       @static
     */
-    Ember.VERSION = '1.9.1';
+    Ember.VERSION = '1.10.0-beta.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -4987,11 +5020,11 @@ define("ember-metal/core",
 
     // Stub out the methods defined by the ember-debug package in case it's not loaded
 
-    if ('undefined' === typeof Ember.assert) { Ember.assert = Ember.K; }
-    if ('undefined' === typeof Ember.warn) { Ember.warn = Ember.K; }
-    if ('undefined' === typeof Ember.debug) { Ember.debug = Ember.K; }
-    if ('undefined' === typeof Ember.runInDebug) { Ember.runInDebug = Ember.K; }
-    if ('undefined' === typeof Ember.deprecate) { Ember.deprecate = Ember.K; }
+    if ('undefined' === typeof Ember.assert) { Ember.assert = K; }
+    if ('undefined' === typeof Ember.warn) { Ember.warn = K; }
+    if ('undefined' === typeof Ember.debug) { Ember.debug = K; }
+    if ('undefined' === typeof Ember.runInDebug) { Ember.runInDebug = K; }
+    if ('undefined' === typeof Ember.deprecate) { Ember.deprecate = K; }
     if ('undefined' === typeof Ember.deprecateFunc) {
       Ember.deprecateFunc = function(_, func) { return func; };
     }
@@ -5520,11 +5553,14 @@ define("ember-metal/events",
       return actions;
     }
 
-    function listenersUnion(obj, eventName, otherActions) {
+    function accumulateListeners(obj, eventName, otherActions) {
       var meta = obj['__ember_meta__'];
       var actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return; }
+
+      var newActions = [];
+
       for (var i = actions.length - 3; i >= 0; i -= 3) {
         var target = actions[i];
         var method = actions[i+1];
@@ -5533,32 +5569,14 @@ define("ember-metal/events",
 
         if (actionIndex === -1) {
           otherActions.push(target, method, flags);
+          newActions.push(target, method, flags);
         }
       }
-    }
-
-    __exports__.listenersUnion = listenersUnion;function listenersDiff(obj, eventName, otherActions) {
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
-      var diffActions = [];
-
-      if (!actions) { return; }
-      for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i];
-        var method = actions[i+1];
-        var flags = actions[i+2];
-        var actionIndex = indexOf(otherActions, target, method);
-
-        if (actionIndex !== -1) { continue; }
-
-        otherActions.push(target, method, flags);
-        diffActions.push(target, method, flags);
-      }
 
-      return diffActions;
+      return newActions;
     }
 
-    __exports__.listenersDiff = listenersDiff;/**
+    __exports__.accumulateListeners = accumulateListeners;/**
       Add an event listener
 
       @method addListener
@@ -6015,6 +6033,7 @@ define("ember-metal/injected_property",
     var ComputedProperty = __dependency2__.ComputedProperty;
     var Descriptor = __dependency3__.Descriptor;
     var create = __dependency4__.create;
+    var meta = __dependency5__.meta;
     var inspect = __dependency5__.inspect;
     var EmberError = __dependency6__["default"];
 
@@ -6033,13 +6052,22 @@ define("ember-metal/injected_property",
       this.type = type;
       this.name = name;
 
-      this._super$Constructor(function(keyName) {
-        Ember.assert("Attempting to lookup an injected property on an object " +
-                     "without a container, ensure that the object was " +
-                     "instantiated via a container.", this.container);
+      this._super$Constructor(injectedPropertyGet);
+      this.readOnly();
+    }
+
+    function injectedPropertyGet(keyName) {
+      var desc = meta(this).descs[keyName];
+
+      Ember.assert("Attempting to lookup an injected property on an object " +
+                   "without a container, ensure that the object was " +
+                   "instantiated via a container.", this.container);
+
+      return this.container.lookup(desc.type + ':' + (desc.name || keyName));
+    }
 
-        return this.container.lookup(type + ':' + (name || keyName));
-      }, { readOnly: true });
+    function injectedPropertySet(obj, keyName) {
+      throw new EmberError("Cannot set injected property '" + keyName + "' on object: " + inspect(obj));
     }
 
     InjectedProperty.prototype = create(Descriptor.prototype);
@@ -6050,10 +6078,9 @@ define("ember-metal/injected_property",
     InjectedPropertyPrototype._super$Constructor = ComputedProperty;
 
     InjectedPropertyPrototype.get = ComputedPropertyPrototype.get;
+    InjectedPropertyPrototype.readOnly = ComputedPropertyPrototype.readOnly;
 
-    InjectedPropertyPrototype.set = function(obj, keyName) {
-      throw new EmberError("Cannot set injected property '" + keyName + "' on object: " + inspect(obj));
-    };
+    InjectedPropertyPrototype.set = injectedPropertySet;
 
     InjectedPropertyPrototype.teardown = ComputedPropertyPrototype.teardown;
 
@@ -6516,60 +6543,88 @@ define("ember-metal/keys",
     __exports__["default"] = keys;
   });
 define("ember-metal/libraries",
-  ["ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __exports__) {
+  ["ember-metal/core","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    // Provides a way to register library versions with ember.
-    var forEach = __dependency1__.forEach;
-    var indexOf = __dependency1__.indexOf;
+    var Ember = __dependency1__["default"];
+    var forEach = __dependency2__.forEach;
+    var indexOf = __dependency2__.indexOf;
+
+    /**
+      Helper class that allows you to register your library with Ember.
+
+      Singleton created at `Ember.libraries`.
 
-    var libraries = function() {
-      var _libraries   = [];
-      var coreLibIndex = 0;
+      @class Libraries
+      @constructor
+      @private
+    */
+    function Libraries() {
+      this._registry = [];
+      this._coreLibIndex = 0;
+    }
+
+    Libraries.prototype = {
+      constructor: Libraries,
 
-      var getLibrary = function(name) {
-        for (var i = 0; i < _libraries.length; i++) {
-          if (_libraries[i].name === name) {
-            return _libraries[i];
+      _getLibraryByName: function(name) {
+        var libs = this._registry;
+        var count = libs.length;
+
+        for (var i = 0; i < count; i++) {
+          if (libs[i].name === name) {
+            return libs[i];
           }
         }
-      };
+      },
 
-      _libraries.register = function(name, version) {
-        if (!getLibrary(name)) {
-          _libraries.push({name: name, version: version});
-        }
-      };
+      register: function(name, version, isCoreLibrary) {
+        var index = this._registry.length;
 
-      _libraries.registerCoreLibrary = function(name, version) {
-        if (!getLibrary(name)) {
-          _libraries.splice(coreLibIndex++, 0, {name: name, version: version});
+        if (!this._getLibraryByName(name)) {
+          if (isCoreLibrary) {
+            index = this._coreLibIndex++;
+          }
+          this._registry.splice(index, 0, { name: name, version: version });
+        } else {
+          Ember.warn('Library "' + name + '" is already registered with Ember.');
         }
-      };
+      },
 
-      _libraries.deRegister = function(name) {
-        var lib = getLibrary(name);
-        if (lib) _libraries.splice(indexOf(_libraries, lib), 1);
-      };
+      registerCoreLibrary: function(name, version) {
+        this.register(name, version, true);
+      },
+
+      deRegister: function(name) {
+        var lib = this._getLibraryByName(name);
+        var index;
+
+        if (lib) {
+          index = indexOf(this._registry, lib);
+          this._registry.splice(index, 1);
+        }
+      },
 
-      _libraries.each = function (callback) {
-        forEach(_libraries, function(lib) {
+      each: function(callback) {
+        Ember.deprecate('Using Ember.libraries.each() is deprecated. Access to a list of registered libraries is currently a private API. If you are not knowingly accessing this method, your out-of-date Ember Inspector may be doing so.');
+        forEach(this._registry, function(lib) {
           callback(lib.name, lib.version);
         });
-      };
-
-      return _libraries;
-    }();
+      }
+    };
 
-    __exports__["default"] = libraries;
+    __exports__["default"] = Libraries;
   });
 define("ember-metal/logger",
   ["ember-metal/core","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
+    // Ember.imports
     var EmberError = __dependency2__["default"];
 
+    function K() { return this; }
+
     function consoleMethod(name) {
       var consoleObj, logToConsole;
       if (Ember.imports.console) {
@@ -6636,7 +6691,7 @@ define("ember-metal/logger",
        @for Ember.Logger
        @param {*} arguments
       */
-      log:   consoleMethod('log')   || Ember.K,
+      log:   consoleMethod('log')   || K,
 
       /**
        Prints the arguments to the console with a warning icon.
@@ -6651,7 +6706,7 @@ define("ember-metal/logger",
        @for Ember.Logger
        @param {*} arguments
       */
-      warn:  consoleMethod('warn')  || Ember.K,
+      warn:  consoleMethod('warn')  || K,
 
       /**
        Prints the arguments to the console with an error icon, red text and a stack trace.
@@ -6666,7 +6721,7 @@ define("ember-metal/logger",
        @for Ember.Logger
        @param {*} arguments
       */
-      error: consoleMethod('error') || Ember.K,
+      error: consoleMethod('error') || K,
 
       /**
        Logs the arguments to the console.
@@ -6682,7 +6737,7 @@ define("ember-metal/logger",
        @for Ember.Logger
        @param {*} arguments
       */
-      info:  consoleMethod('info')  || Ember.K,
+      info:  consoleMethod('info')  || K,
 
       /**
        Logs the arguments to the console in blue text.
@@ -6698,7 +6753,7 @@ define("ember-metal/logger",
        @for Ember.Logger
        @param {*} arguments
       */
-      debug: consoleMethod('debug') || consoleMethod('info') || Ember.K,
+      debug: consoleMethod('debug') || consoleMethod('info') || K,
 
       /**
        If the value passed into `Ember.Logger.assert` is not truthy it will throw an error with a stack trace.
@@ -7290,7 +7345,6 @@ define("ember-metal/mixin",
     var metaFor = __dependency7__.meta;
     var wrap = __dependency7__.wrap;
     var makeArray = __dependency7__.makeArray;
-    var apply = __dependency7__.apply;
     var isArray = __dependency7__.isArray;
     var expandProperties = __dependency8__["default"];
     var Descriptor = __dependency9__.Descriptor;
@@ -7311,18 +7365,35 @@ define("ember-metal/mixin",
     function superFunction(){
       var func = this.__nextSuper;
       var ret;
+
       if (func) {
-        var args = new Array(arguments.length);
-        for (var i = 0, l = args.length; i < l; i++) {
-          args[i] = arguments[i];
-        }
+        var length = arguments.length;
         this.__nextSuper = null;
-        ret = apply(this, func, args);
+        if (length === 0) {
+          ret = func.call(this);
+        } else if (length === 1) {
+          ret = func.call(this, arguments[0]);
+        } else if (length === 2) {
+          ret = func.call(this, arguments[0], arguments[1]);
+        } else {
+          ret = func.apply(this, arguments);
+        }
         this.__nextSuper = func;
+        return ret;
       }
-      return ret;
     }
 
+    // ensure we prime superFunction to mitigate
+    // v8 bug potentially incorrectly deopts this function: https://code.google.com/p/v8/issues/detail?id=3709
+    var primer = {
+      __nextSuper: function(a,b,c,d ) { }
+    };
+
+    superFunction.call(primer);
+    superFunction.call(primer, 1);
+    superFunction.call(primer, 1, 2);
+    superFunction.call(primer, 1, 2, 3);
+
     function mixinsMeta(obj) {
       var m = metaFor(obj, true);
       var ret = m.mixins;
@@ -8867,8 +8938,7 @@ define("ember-metal/property_events",
     var guidFor = __dependency1__.guidFor;
     var tryFinally = __dependency1__.tryFinally;
     var sendEvent = __dependency2__.sendEvent;
-    var listenersUnion = __dependency2__.listenersUnion;
-    var listenersDiff = __dependency2__.listenersDiff;
+    var accumulateListeners = __dependency2__.accumulateListeners;
     var ObserverSet = __dependency3__["default"];
 
     var beforeObserverSet = new ObserverSet();
@@ -9125,20 +9195,20 @@ define("ember-metal/property_events",
       @param {Function} callback
       @param [binding]
     */
-    function changeProperties(cb, binding) {
+    function changeProperties(callback, binding) {
       beginPropertyChanges();
-      tryFinally(cb, endPropertyChanges, binding);
+      tryFinally(callback, endPropertyChanges, binding);
     }
 
     function notifyBeforeObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
       var eventName = keyName + ':before';
-      var listeners, diff;
+      var listeners, added;
       if (deferred) {
         listeners = beforeObserverSet.add(obj, keyName, eventName);
-        diff = listenersDiff(obj, eventName, listeners);
-        sendEvent(obj, eventName, [obj, keyName], diff);
+        added = accumulateListeners(obj, eventName, listeners);
+        sendEvent(obj, eventName, [obj, keyName], added);
       } else {
         sendEvent(obj, eventName, [obj, keyName]);
       }
@@ -9151,7 +9221,7 @@ define("ember-metal/property_events",
       var listeners;
       if (deferred) {
         listeners = observerSet.add(obj, keyName, eventName);
-        listenersUnion(obj, eventName, listeners);
+        accumulateListeners(obj, eventName, listeners);
       } else {
         sendEvent(obj, eventName, [obj, keyName]);
       }
@@ -9262,17 +9332,10 @@ define("ember-metal/property_get",
       }
     };
 
-    // Currently used only by Ember Data tests
-    if (Ember.config.overrideAccessors) {
-      Ember.get = get;
-      Ember.config.overrideAccessors();
-      get = Ember.get;
-    }
-
     /**
       Normalizes a target/path pair to reflect that actual target/path that should
       be observed, etc. This takes into account passing in global property
-      paths (i.e. a path beginning with a captial letter not defined on the
+      paths (i.e. a path beginning with a capital letter not defined on the
       target).
 
       @private
@@ -9448,14 +9511,6 @@ define("ember-metal/property_set",
       return value;
     };
 
-    // Currently used only by Ember Data tests
-    // ES6TODO: Verify still true
-    if (Ember.config.overrideAccessors) {
-      Ember.set = set;
-      Ember.config.overrideAccessors();
-      set = Ember.set;
-    }
-
     function setPath(root, path, value, tolerant) {
       var keyName;
 
@@ -10179,39 +10234,8 @@ define("ember-metal/set_properties",
       return obj;
     }
   });
-define("ember-metal/streams/read",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    function read(object) {
-      if (object && object.isStream) {
-        return object.value();
-      } else {
-        return object;
-      }
-    }
-
-    __exports__.read = read;function readArray(array) {
-      var length = array.length;
-      var ret = new Array(length);
-      for (var i = 0; i < length; i++) {
-        ret[i] = read(array[i]);
-      }
-      return ret;
-    }
-
-    __exports__.readArray = readArray;function readHash(object) {
-      var ret = {};
-      for (var key in object) {
-        ret[key] = read(object[key]);
-      }
-      return ret;
-    }
-
-    __exports__.readHash = readHash;
-  });
 define("ember-metal/streams/simple",
-  ["ember-metal/merge","ember-metal/streams/stream","ember-metal/platform","ember-metal/streams/read","exports"],
+  ["ember-metal/merge","ember-metal/streams/stream","ember-metal/platform","ember-metal/streams/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var merge = __dependency1__["default"];
@@ -10220,6 +10244,7 @@ define("ember-metal/streams/simple",
     var read = __dependency4__.read;
 
     function SimpleStream(source) {
+      this.init();
       this.source = source;
 
       if (source && source.isStream) {
@@ -10262,13 +10287,16 @@ define("ember-metal/streams/simple",
         this.notify();
       },
 
+      _super$destroy: Stream.prototype.destroy,
+
       destroy: function() {
-        if (this.source && this.source.isStream) {
-          this.source.unsubscribe(this._didChange, this);
+        if (this._super$destroy()) {
+          if (this.source && this.source.isStream) {
+            this.source.unsubscribe(this._didChange, this);
+          }
+          this.source = undefined;
+          return true;
         }
-
-        this.source = undefined;
-        Stream.prototype.destroy.call(this);
       }
     });
 
@@ -10282,20 +10310,21 @@ define("ember-metal/streams/stream",
     var getFirstKey = __dependency2__.getFirstKey;
     var getTailPath = __dependency2__.getTailPath;
 
-    var NIL = function NIL(){};
-
     function Stream(fn) {
+      this.init();
       this.valueFn = fn;
-      this.cache = NIL;
-      this.subscribers = undefined;
-      this.children = undefined;
-      this.destroyed = false;
     }
 
     Stream.prototype = {
       isStream: true,
 
-      cache: NIL,
+      init: function() {
+        this.state = 'dirty';
+        this.cache = undefined;
+        this.subscribers = undefined;
+        this.children = undefined;
+        this._label = undefined;
+      },
 
       get: function(path) {
         var firstKey = getFirstKey(path);
@@ -10320,11 +10349,20 @@ define("ember-metal/streams/stream",
       },
 
       value: function() {
-        if (this.cache !== NIL) {
+        if (this.state === 'clean') {
           return this.cache;
-        } else {
+        } else if (this.state === 'dirty') {
+          this.state = 'clean';
           return this.cache = this.valueFn();
         }
+        // TODO: Ensure value is never called on a destroyed stream
+        // so that we can uncomment this assertion.
+        //
+        // Ember.assert("Stream error: value was called in an invalid state: " + this.state);
+      },
+
+      valueFn: function() {
+        throw new Error("Stream error: valueFn not implemented");
       },
 
       setValue: function() {
@@ -10336,9 +10374,9 @@ define("ember-metal/streams/stream",
       },
 
       notifyExcept: function(callbackToSkip, contextToSkip) {
-        if (this.cache !== NIL) {
-          this.cache = NIL;
-          this.notifySubscribers(callbackToSkip, contextToSkip);
+        if (this.state === 'clean') {
+          this.state = 'dirty';
+          this._notifySubscribers(callbackToSkip, contextToSkip);
         }
       },
 
@@ -10363,7 +10401,7 @@ define("ember-metal/streams/stream",
         }
       },
 
-      notifySubscribers: function(callbackToSkip, contextToSkip) {
+      _notifySubscribers: function(callbackToSkip, contextToSkip) {
         var subscribers = this.subscribers;
 
         if (subscribers !== undefined) {
@@ -10385,12 +10423,15 @@ define("ember-metal/streams/stream",
       },
 
       destroy: function() {
-        if (this.destroyed) return;
-        this.destroyed = true;
+        if (this.state !== 'destroyed') {
+          this.state = 'destroyed';
 
-        var children = this.children;
-        for (var key in children) {
-          children[key].destroy();
+          var children = this.children;
+          for (var key in children) {
+            children[key].destroy();
+          }
+
+          return true;      
         }
       },
 
@@ -10419,11 +10460,11 @@ define("ember-metal/streams/stream_binding",
     function StreamBinding(stream) {
       Ember.assert("StreamBinding error: tried to bind to object that is not a stream", stream && stream.isStream);
 
+      this.init();
       this.stream = stream;
       this.senderCallback = undefined;
       this.senderContext = undefined;
       this.senderValue = undefined;
-      this.destroyed = false;
 
       stream.subscribe(this._onNotify, this);
     }
@@ -10457,7 +10498,7 @@ define("ember-metal/streams/stream_binding",
       },
 
       _sync: function() {
-        if (this.destroyed) {
+        if (this.state === 'destroyed') {
           return;
         }
 
@@ -10472,23 +10513,70 @@ define("ember-metal/streams/stream_binding",
         this.senderValue = undefined;
 
         // Force StreamBindings to always notify
-        this.cache = undefined;
+        this.state = 'clean';
 
         this.notifyExcept(senderCallback, senderContext);
       },
 
+      _super$destroy: Stream.prototype.destroy,
+
       destroy: function() {
-        if (this.destroyed) {
-          return;
+        if (this._super$destroy()) {
+          this.stream.unsubscribe(this._onNotify, this);
+          return true;
         }
-
-        this.destroyed = true;
-        this.stream.unsubscribe(this._onNotify, this);
       }
     });
 
     __exports__["default"] = StreamBinding;
   });
+define("ember-metal/streams/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function isStream(object) {
+      return object && object.isStream;
+    }
+
+    __exports__.isStream = isStream;function subscribe(object, callback, context) {
+      if (object && object.isStream) {
+        object.subscribe(callback, context);
+      }
+    }
+
+    __exports__.subscribe = subscribe;function unsubscribe(object, callback, context) {
+      if (object && object.isStream) {
+        object.unsubscribe(callback, context);
+      }
+    }
+
+    __exports__.unsubscribe = unsubscribe;function read(object) {
+      if (object && object.isStream) {
+        return object.value();
+      } else {
+        return object;
+      }
+    }
+
+    __exports__.read = read;function readArray(array) {
+      var length = array.length;
+      var ret = new Array(length);
+      for (var i = 0; i < length; i++) {
+        ret[i] = read(array[i]);
+      }
+      return ret;
+    }
+
+    __exports__.readArray = readArray;function readHash(object) {
+      var ret = {};
+      for (var key in object) {
+        ret[key] = read(object[key]);
+      }
+      return ret;
+    }
+
+    __exports__.readHash = readHash;
+  });
 define("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
@@ -10566,13 +10654,13 @@ define("ember-metal/utils",
       algorithims typically cost in proportion to the length of the string.
       Luckily, this is where the Symbols (interned strings) shine. As Symbols are
       unique by their string content, equality checks can be done by pointer
-      comparision.
+      comparison.
 
       How do I know if my string is a rope or symbol?
 
       Typically (warning general sweeping statement, but truthy in runtimes at
       present) static strings created as part of the JS source are interned.
-      Strings often used for comparisions can be interned at runtime if some
+      Strings often used for comparisons can be interned at runtime if some
       criteria are met.  One of these criteria can be the size of the entire rope.
       For example, in chrome 38 a rope longer then 12 characters will not
       intern, nor will segments of that rope.
@@ -10891,17 +10979,35 @@ define("ember-metal/utils",
       @param {Function} superFunc The super function.
       @return {Function} wrapped function.
     */
+
     function wrap(func, superFunc) {
       function superWrapper() {
         var ret;
         var sup  = this && this.__nextSuper;
-        var args = new Array(arguments.length);
-        for (var i = 0, l = args.length; i < l; i++) {
-          args[i] = arguments[i];
+        var length = arguments.length;
+
+        if (this) {
+          this.__nextSuper = superFunc;
         }
-        if(this) { this.__nextSuper = superFunc; }
-        ret = apply(this, func, args);
-        if(this) { this.__nextSuper = sup; }
+
+        if (length === 0) {
+          ret = func.call(this);
+        } else if (length === 1) {
+          ret = func.call(this, arguments[0]);
+        } else if (length === 2) {
+          ret = func.call(this, arguments[0], arguments[1]);
+        } else {
+          var args = new Array(length);
+          for (var i = 0; i < length; i++) {
+            args[i] = arguments[i];
+          }
+          ret = apply(this, func, args);
+        }
+
+        if (this) {
+          this.__nextSuper = sup;
+        }
+
         return ret;
       }
 
@@ -10991,7 +11097,7 @@ define("ember-metal/utils",
       Checks to see if the `methodName` exists on the `obj`.
 
       ```javascript
-      var foo = { bar: Ember.K, baz: null };
+      var foo = { bar: function() { return 'bar'; }, baz: null };
 
       Ember.canInvoke(foo, 'bar'); // true
       Ember.canInvoke(foo, 'baz'); // false
@@ -11710,6 +11816,9 @@ define("ember-runtime",
     Ember.isEqual = isEqual;
 
     
+      Ember.inject = inject;
+    
+
     Ember.Array = EmberArray;
 
     Ember.Comparable = Comparable;
@@ -11782,6 +11891,9 @@ define("ember-runtime",
     Ember.ControllerMixin = ControllerMixin;
 
     
+      Ember.Service = Service;
+    
+
     Ember._ProxyMixin = _ProxyMixin;
 
     Ember.RSVP = RSVP;
@@ -11850,16 +11962,17 @@ define("ember-runtime/compare",
       var type2 = typeOf(w);
 
       if (Comparable) {
-        if (type1 ==='instance' && Comparable.detect(v.constructor)) {
+        if (type1 === 'instance' && Comparable.detect(v) && v.constructor.compare) {
           return v.constructor.compare(v, w);
         }
 
-        if (type2 === 'instance' && Comparable.detect(w.constructor)) {
-          return 1 - w.constructor.compare(w, v);
+        if (type2 === 'instance' && Comparable.detect(w) && w.constructor.compare) {
+          return w.constructor.compare(w, v) * -1;
         }
       }
 
       var res = spaceship(TYPE_ORDER[type1], TYPE_ORDER[type2]);
+
       if (res !== 0) {
         return res;
       }
@@ -12571,13 +12684,13 @@ define("ember-runtime/computed/reduce_computed",
 
       this.options = options;
       this._dependentKeys = null;
+      this._cacheable = true;
       // A map of dependentKey -> [itemProperty, ...] that tracks what properties of
       // items in the array we must track to update this property.
       this._itemPropertyKeys = {};
       this._previousItemPropertyKeys = {};
 
       this.readOnly();
-      this.cacheable();
 
       this.recomputeOnce = function(propertyName) {
         // What we really want to do is coalesce by <cp, propertyName>.
@@ -14111,6 +14224,38 @@ define("ember-runtime/controllers/controller",
     }
 
     
+      /**
+        Creates a property that lazily looks up another controller in the container.
+        Can only be used when defining another controller.
+
+        Example:
+
+        ```javascript
+        App.PostController = Ember.Controller.extend({
+          posts: Ember.inject.controller()
+        });
+        ```
+
+        This example will create a `posts` property on the `post` controller that
+        looks up the `posts` controller in the container, making it easy to
+        reference other controllers. This is functionally equivalent to:
+
+        ```javascript
+        App.PostController = Ember.Controller.extend({
+          needs: 'posts',
+          posts: Ember.computed.alias('controllers.posts')
+        });
+        ```
+
+        @method inject.controller
+        @for Ember
+        @param {String} name (optional) name of the controller to inject, defaults
+               to the property's name
+        @return {Ember.InjectedProperty} injection descriptor instance
+        */
+      createInjectionHelper('controller', controllerInjectionHelper);
+    
+
     __exports__["default"] = Controller;
   });
 define("ember-runtime/controllers/object_controller",
@@ -14421,11 +14566,15 @@ define("ember-runtime/ext/function",
         @for Function
       */
       FunctionPrototype.observesImmediately = function () {
-        for (var i = 0, l = arguments.length; i < l; i++) {
-          var arg = arguments[i];
-          Ember.assert('Immediate observers must observe internal properties only, ' +
-            'not properties on other objects.', arg.indexOf('.') === -1);
-        }
+        Ember.assert('Immediate observers must observe internal properties only, ' +
+                     'not properties on other objects.', function checkIsInternalProperty() {
+          for(var i = 0, l = arguments.length; i < l; i++) {
+            if(arguments[i].indexOf('.') !== -1) {
+              return false;
+            }
+          }
+          return true;
+        });
 
         // observes handles property expansion
         return this.observes.apply(this, arguments);
@@ -14544,7 +14693,17 @@ define("ember-runtime/ext/rsvp",
       return this['catch'](callback, label);
     };
 
-    RSVP.onerrorDefault = function (error) {
+    RSVP.onerrorDefault = function (e) {
+      var error;
+
+      if (e && e.errorThrown) {
+        // jqXHR provides this
+        error = e.errorThrown;
+        error.__reason_with_error_thrown__ = e;
+      } else {
+        error = e;
+      }
+
       if (error && error.name !== 'TransitionAborted') {
         if (Ember.testing) {
           // ES6TODO: remove when possible
@@ -14688,14 +14847,15 @@ define("ember-runtime/ext/string",
     }
   });
 define("ember-runtime/inject",
-  ["ember-metal/core","ember-metal/enumerable_utils","ember-metal/injected_property","ember-metal/keys","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+  ["ember-metal/core","ember-metal/enumerable_utils","ember-metal/utils","ember-metal/injected_property","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
     var indexOf = __dependency2__.indexOf;
-    var InjectedProperty = __dependency3__["default"];
-    var keys = __dependency4__["default"];
+    var meta = __dependency3__.meta;
+    var InjectedProperty = __dependency4__["default"];
+    var keys = __dependency5__["default"];
 
     /**
       Namespace for injection helper methods.
@@ -14731,26 +14891,22 @@ define("ember-runtime/inject",
     }
 
     __exports__.createInjectionHelper = createInjectionHelper;/**
-      Validation function intended to be invoked at when extending a factory with
-      injected properties. Runs per-type validation functions once for each injected
-      type encountered.
-
-      Note that this currently modifies the mixin themselves, which is technically
-      dubious but is practically of little consequence. This may change in the
-      future.
+      Validation function that runs per-type validation functions once for each
+      injected type encountered.
 
       @private
       @method validatePropertyInjections
       @namespace Ember
-      @param {Object} factory The factory object being extended
-      @param {Object} props A hash of properties to be added to the factory
+      @param {Object} factory The factory object
     */
-    function validatePropertyInjections(factory, props) {
+    function validatePropertyInjections(factory) {
+      var proto = factory.proto();
+      var descs = meta(proto).descs;
       var types = [];
       var key, desc, validator, i, l;
 
-      for (key in props) {
-        desc = props[key];
+      for (key in descs) {
+        desc = descs[key];
         if (desc instanceof InjectedProperty && indexOf(types, desc.type) === -1) {
           types.push(desc.type);
         }
@@ -15029,7 +15185,6 @@ define("ember-runtime/mixins/action_handler",
         @method willMergeMixin
       */
       willMergeMixin: function(props) {
-        
         var hashName;
 
         if (!props._actions) {
@@ -15747,7 +15902,7 @@ define("ember-runtime/mixins/controller_content_model_alias_deprecation",
 
       This change reduces many caveats with model/content, and also sets a
       simple ground rule: Never set a controllers content, rather always set
-      it's model and ember will do the right thing.
+      its model and ember will do the right thing.
 
 
       `Ember.ControllerContentModelAliasDeprecation` is used internally by Ember in
@@ -17095,7 +17250,7 @@ define("ember-runtime/mixins/enumerable",
       sortBy: function() {
         var sortKeys = arguments;
 
-        return this.toArray().sort(function(a, b){
+        return this.toArray().sort(function(a, b) {
           for(var i = 0; i < sortKeys.length; i++) {
             var key = sortKeys[i];
             var propA = get(a, key);
@@ -18175,6 +18330,7 @@ define("ember-runtime/mixins/observable",
       },
 
       addBeforeObserver: function(key, target, method) {
+        Ember.deprecate('Before observers are deprecated and will be removed in a future release. If you want to keep track of previous values you have to implement it yourself. See http://emberjs.com/guides/deprecations#toc_deprecate-beforeobservers');
         addBeforeObserver(this, key, target, method);
       },
 
@@ -18315,7 +18471,7 @@ define("ember-runtime/mixins/observable",
       },
 
       /**
-        Set the value of a boolean property to the opposite of it's
+        Set the value of a boolean property to the opposite of its
         current value.
 
         ```javascript
@@ -19032,7 +19188,7 @@ define("ember-runtime/system/array_proxy",
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    // Ember.K, Ember.assert
+    // Ember.assert
     var get = __dependency2__.get;
     var isArray = __dependency3__.isArray;
     var apply = __dependency3__.apply;
@@ -19055,7 +19211,8 @@ define("ember-runtime/system/array_proxy",
 
     var OUT_OF_RANGE_EXCEPTION = "Index out of range";
     var EMPTY = [];
-    var K = Ember.K;
+
+    function K() { return this; }
 
     /**
       An ArrayProxy wraps any other object that implements `Ember.Array` and/or
@@ -19416,8 +19573,8 @@ define("ember-runtime/system/container",
     __exports__["default"] = Container;
   });
 define("ember-runtime/system/core_object",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/platform","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-metal/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/injected_property","ember-metal/run_loop","ember-metal/watching","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/platform","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-metal/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/injected_property","ember-metal/run_loop","ember-metal/watching","ember-runtime/inject","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
         // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
     //
@@ -19429,7 +19586,7 @@ define("ember-runtime/system/core_object",
     */
 
     var Ember = __dependency1__["default"];
-    // Ember.assert, Ember.K, Ember.config
+    // Ember.assert, Ember.config
 
     // NOTE: this object should never be included directly. Instead use `Ember.Object`.
     // We only define this separately so that `Ember.Set` can depend on it.
@@ -19460,6 +19617,7 @@ define("ember-runtime/system/core_object",
     var destroy = __dependency17__.destroy;
     var K = __dependency1__.K;
     var hasPropertyAccessors = __dependency4__.hasPropertyAccessors;
+    var validatePropertyInjections = __dependency18__.validatePropertyInjections;
 
     var schedule = run.schedule;
     var applyMixin = Mixin._apply;
@@ -19547,7 +19705,7 @@ define("ember-runtime/system/core_object",
                            "time, when Ember.ActionHandler is used (i.e. views, " +
                            "controllers & routes).", !((keyName === 'actions') && ActionHandler.detect(this)));
 
-              if (concatenatedProperties && 
+              if (concatenatedProperties &&
                   concatenatedProperties.length > 0 &&
                   indexOf(concatenatedProperties, keyName) >= 0) {
                 var baseValue = this[keyName];
@@ -19580,16 +19738,28 @@ define("ember-runtime/system/core_object",
             }
           }
         }
+
         finishPartial(this, m);
+
         var length = arguments.length;
-        var args = new Array(length);
-        for (var x = 0; x < length; x++) {
-          args[x] = arguments[x];
+
+        if (length === 0) {
+          this.init();
+        } else if (length === 1) {
+          this.init(arguments[0]);
+        } else {
+          // v8 bug potentially incorrectly deopts this function: https://code.google.com/p/v8/issues/detail?id=3709
+          // we may want to keep this around till this ages out on mobile
+          var args = new Array(length);
+          for (var x = 0; x < length; x++) {
+            args[x] = arguments[x];
+          }
+          this.init.apply(this, args);
         }
-        apply(this, this.init, args);
+
         m.proto = proto;
         finishChains(this);
-        sendEvent(this, "init");
+        sendEvent(this, 'init');
       };
 
       Class.toString = Mixin.prototype.toString;
@@ -19856,10 +20026,6 @@ define("ember-runtime/system/core_object",
       return function() { return ret; };
     }
 
-    if (Ember.config.overridePrototypeMixin) {
-      Ember.config.overridePrototypeMixin(CoreObject.PrototypeMixin);
-    }
-
     CoreObject.__super__ = null;
 
     var ClassMixinProps = {
@@ -20249,15 +20415,53 @@ define("ember-runtime/system/core_object",
       }
     };
 
+    function injectedPropertyAssertion() {
+      Ember.assert("Injected properties are invalid", validatePropertyInjections(this));
+    }
+
+    function addOnLookupHandler() {
+      Ember.runInDebug(function() {
+        /**
+          Provides lookup-time type validation for injected properties.
+
+          @private
+          @method _onLookup
+          */
+        ClassMixinProps._onLookup = injectedPropertyAssertion;
+      });
+    }
+
     
+      addOnLookupHandler();
+
+      /**
+        Returns a hash of property names and container names that injected
+        properties will lookup on the container lazily.
+
+        @method _lazyInjections
+        @return {Object} Hash of all lazy injected property keys to container names
+      */
+      ClassMixinProps._lazyInjections = function() {
+        var injections = {};
+        var proto = this.proto();
+        var descs = meta(proto).descs;
+        var key, desc;
+
+        for (key in descs) {
+          desc = descs[key];
+          if (desc instanceof InjectedProperty) {
+            injections[key] = desc.type + ':' + (desc.name || key);
+          }
+        }
+
+        return injections;
+      };
+    
+
     var ClassMixin = Mixin.create(ClassMixinProps);
 
     ClassMixin.ownerConstructor = CoreObject;
 
-    if (Ember.config.overrideClassMixin) {
-      Ember.config.overrideClassMixin(ClassMixin);
-    }
-
     CoreObject.ClassMixin = ClassMixin;
 
     ClassMixin.apply(CoreObject);
@@ -21010,19 +21214,16 @@ define("ember-runtime/system/native_array",
     __exports__["default"] = NativeArray;
   });
 define("ember-runtime/system/object",
-  ["ember-metal/core","ember-runtime/system/core_object","ember-runtime/mixins/observable","ember-runtime/inject","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+  ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-runtime
     */
 
-    var Ember = __dependency1__["default"];
-    // Ember.assert
-    var CoreObject = __dependency2__["default"];
-    var Observable = __dependency3__["default"];
-    var validatePropertyInjections = __dependency4__.validatePropertyInjections;
+    var CoreObject = __dependency1__["default"];
+    var Observable = __dependency2__["default"];
 
     /**
       `Ember.Object` is the main base class for all Ember objects. It is a subclass
@@ -21039,13 +21240,6 @@ define("ember-runtime/system/object",
       return "Ember.Object";
     };
 
-    function injectedPropertyAssertion(props) {
-      // Injection validations are a debugging aid only, so ensure that they are
-      // not performed in production builds by invoking from an assertion
-      Ember.assert("Injected properties are invalid", validatePropertyInjections(this.constructor, props));
-    }
-
-    
     __exports__["default"] = EmberObject;
   });
 define("ember-runtime/system/object_proxy",
@@ -21136,6 +21330,42 @@ define("ember-runtime/system/service",
     var Service;
 
     
+      /**
+        @class Service
+        @namespace Ember
+        @extends Ember.Object
+      */
+      Service = Object.extend();
+
+      /**
+        Creates a property that lazily looks up a service in the container. There
+        are no restrictions as to what objects a service can be injected into.
+
+        Example:
+
+        ```javascript
+        App.ApplicationRoute = Ember.Route.extend({
+          authManager: Ember.inject.service('auth'),
+
+          model: function() {
+            return this.get('authManager').findCurrentUser();
+          }
+        });
+        ```
+
+        This example will create an `authManager` property on the application route
+        that looks up the `auth` service in the container, making it easily
+        accessible in the `model` hook.
+
+        @method inject.service
+        @for Ember
+        @param {String} name (optional) name of the service to inject, defaults to
+               the property's name
+        @return {Ember.InjectedProperty} injection descriptor instance
+      */
+      createInjectionHelper('service');
+    
+
     __exports__["default"] = Service;
   });
 define("ember-runtime/system/set",