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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f913820221dd7bdbea11e2b615eb7dbc021029c3
-  data.tar.gz: d457953c51f3d1e75672bfa257d5fdae5d2b6f49
+  metadata.gz: 24f7b5a3cd0a7ea7794bd2e33e276df9f9baf29d
+  data.tar.gz: 2e26ab524a5016db5414e7a46d407697c59d0229
 SHA512:
-  metadata.gz: d3aeb492bd3a9c0cca7b7ff0a38b75bdbc465a00801b31826e63be6fa721646b563f8716c8c770c7ca2ed9133368c244075b1dd7dd19675ad59eef682ac1a0e5
-  data.tar.gz: ef2f7b46d78c6d8862ebd1e072e1646ebce7158992b7a6d1b1de2ee71ea6d6d412d7f67edd9f73a984839968fe52a521da4c74d011bd29e599d8ec229075763c
+  metadata.gz: ef8e91d6d976a4f7b44563892d61afdaf0bd86611a06cc6ff2da443c0ce0c9efb31d7e34c5da7e648af2323f355a03c525a6c14ec9ea2d03d10a9b548e3bc95e
+  data.tar.gz: 3502263b7b8e722ed879f152adcb1bbfda1aac7f0f8f19fa342b175e683cfb000f7971e4898b3a57f486e96a6ae576697f719659deb059c7515204cf553b8bad

data/VERSION

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

data/dist/ember-runtime.js

@@ -6,7 +6,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   2.9.0-beta.4
+ * @version   2.9.0-beta.5
  */
 
 var enifed, requireModule, require, Ember;
@@ -9726,19 +9726,12 @@ enifed('ember-metal/set_properties', ['exports', 'ember-metal/property_events',
     return properties;
   }
 });
-enifed('ember-metal/tags', ['exports', 'ember-metal/meta', 'require'], function (exports, _emberMetalMeta, _require2) {
+enifed('ember-metal/tags', ['exports', 'glimmer-reference', 'ember-metal/meta', 'require'], function (exports, _glimmerReference, _emberMetalMeta, _require) {
   'use strict';
 
   exports.setHasViews = setHasViews;
   exports.tagFor = tagFor;
-
-  var hasGlimmer = _require2.has('glimmer-reference');
-
-  var CONSTANT_TAG = undefined,
-      CURRENT_TAG = undefined,
-      DirtyableTag = undefined,
-      makeTag = undefined,
-      run = undefined;
+  exports.markObjectAsDirty = markObjectAsDirty;
 
   var hasViews = function () {
     return false;
@@ -9748,56 +9741,41 @@ enifed('ember-metal/tags', ['exports', 'ember-metal/meta', 'require'], function
     hasViews = fn;
   }
 
-  var markObjectAsDirty = undefined;
-
-  exports.markObjectAsDirty = markObjectAsDirty;
+  function makeTag() {
+    return new _glimmerReference.DirtyableTag();
+  }
 
   function tagFor(object, _meta) {
-    if (!hasGlimmer) {
-      throw new Error('Cannot call tagFor without Glimmer');
-    }
-
     if (typeof object === 'object' && object) {
       var meta = _meta || _emberMetalMeta.meta(object);
       return meta.writableTag(makeTag);
     } else {
-      return CONSTANT_TAG;
+      return _glimmerReference.CONSTANT_TAG;
     }
   }
 
+  function markObjectAsDirty(meta) {
+    var tag = meta && meta.readableTag();
+
+    if (tag) {
+      ensureRunloop();
+      tag.dirty();
+    }
+  }
+
+  var run = undefined;
+
   function K() {}
+
   function ensureRunloop() {
     if (!run) {
-      run = _require2.default('ember-metal/run_loop').default;
+      run = _require.default('ember-metal/run_loop').default;
     }
 
     if (hasViews() && !run.backburner.currentInstance) {
       run.schedule('actions', K);
     }
   }
-
-  if (hasGlimmer) {
-    var _require = _require2.default('glimmer-reference');
-
-    DirtyableTag = _require.DirtyableTag;
-    CONSTANT_TAG = _require.CONSTANT_TAG;
-    CURRENT_TAG = _require.CURRENT_TAG;
-
-    makeTag = function () {
-      return new DirtyableTag();
-    };
-
-    exports.markObjectAsDirty = markObjectAsDirty = function (meta) {
-      var tag = meta && meta.readableTag();
-
-      if (tag) {
-        ensureRunloop();
-        tag.dirty();
-      }
-    };
-  } else {
-    exports.markObjectAsDirty = markObjectAsDirty = function () {};
-  }
 });
 enifed("ember-metal/testing", ["exports"], function (exports) {
   "use strict";
@@ -9887,7 +9865,7 @@ enifed('ember-metal/transaction', ['exports', 'ember-metal/meta', 'ember-metal/d
               label = 'the same value';
             }
 
-            return 'You modified ' + parts.join('.') + ' twice in a single render. This was unreliable and slow in Ember 1.x and ' + implication;
+            return 'You modified ' + parts.join('.') + ' twice on ' + object + ' in a single render. This was unreliable and slow in Ember 1.x and ' + implication;
           })(), false);
 
           shouldReflush = true;
@@ -12457,6 +12435,7 @@ enifed('ember-runtime/index', ['exports', 'ember-runtime/ext/string', 'ember-run
   'use strict';
 
   exports.Object = _emberRuntimeSystemObject.default;
+  exports.FrameworkObject = _emberRuntimeSystemObject.FrameworkObject;
   exports.String = _emberRuntimeSystemString.default;
   exports.RegistryProxyMixin = _emberRuntimeMixinsRegistry_proxy.default;
   exports.buildFakeRegistryWithDeprecations = _emberRuntimeMixinsRegistry_proxy.buildFakeRegistryWithDeprecations;
@@ -12477,7 +12456,6 @@ enifed('ember-runtime/index', ['exports', 'ember-runtime/ext/string', 'ember-run
   exports.ArrayProxy = _emberRuntimeSystemArray_proxy.default;
   exports.ObjectProxy = _emberRuntimeSystemObject_proxy.default;
   exports.CoreObject = _emberRuntimeSystemCore_object.default;
-  exports.POST_INIT = _emberRuntimeSystemCore_object.POST_INIT;
   exports.NativeArray = _emberRuntimeSystemNative_array.default;
   exports.A = _emberRuntimeSystemNative_array.A;
   exports.ActionHandler = _emberRuntimeMixinsAction_handler.default;
@@ -12675,7 +12653,7 @@ enifed('ember-runtime/is-equal', ['exports'], function (exports) {
     return a === b;
   }
 });
-enifed('ember-runtime/mixins/-proxy', ['exports', 'ember-utils', 'ember-metal', 'ember-runtime/computed/computed_macros', 'ember-runtime/system/core_object', 'require'], function (exports, _emberUtils, _emberMetal, _emberRuntimeComputedComputed_macros, _emberRuntimeSystemCore_object, _require2) {
+enifed('ember-runtime/mixins/-proxy', ['exports', 'glimmer-reference', 'ember-utils', 'ember-metal', 'ember-runtime/computed/computed_macros'], function (exports, _glimmerReference, _emberUtils, _emberMetal, _emberRuntimeComputedComputed_macros) {
   /**
   @module ember
   @submodule ember-runtime
@@ -12683,12 +12661,10 @@ enifed('ember-runtime/mixins/-proxy', ['exports', 'ember-utils', 'ember-metal',
 
   'use strict';
 
-  var _PROXY_MIXIN_PROPS;
+  var _Mixin$create;
 
   exports.isProxy = isProxy;
 
-  var hasGlimmer = _require2.has('glimmer-reference');
-
   var IS_PROXY = _emberUtils.symbol('IS_PROXY');
 
   function isProxy(value) {
@@ -12711,31 +12687,64 @@ enifed('ember-runtime/mixins/-proxy', ['exports', 'ember-utils', 'ember-metal',
     _emberMetal.propertyDidChange(this, key);
   }
 
-  /**
-    `Ember.ProxyMixin` forwards all properties not defined by the proxy itself
-    to a proxied `content` object.  See Ember.ObjectProxy for more details.
-  
-    @class ProxyMixin
-    @namespace Ember
-    @private
-  */
-  var PROXY_MIXIN_PROPS = (_PROXY_MIXIN_PROPS = {}, _PROXY_MIXIN_PROPS[IS_PROXY] = true, _PROXY_MIXIN_PROPS.content = null, _PROXY_MIXIN_PROPS._contentDidChange = _emberMetal.observer('content', function () {
+  var ProxyTag = (function (_CachedTag) {
+    babelHelpers.inherits(ProxyTag, _CachedTag);
+
+    function ProxyTag(proxy) {
+      _CachedTag.call(this);
+
+      var content = _emberMetal.get(proxy, 'content');
+
+      this.proxy = proxy;
+      this.proxyWrapperTag = new _glimmerReference.DirtyableTag();
+      this.proxyContentTag = new _glimmerReference.UpdatableTag(_emberMetal.tagFor(content));
+    }
+
+    /**
+      `Ember.ProxyMixin` forwards all properties not defined by the proxy itself
+      to a proxied `content` object.  See Ember.ObjectProxy for more details.
+    
+      @class ProxyMixin
+      @namespace Ember
+      @private
+    */
+
+    ProxyTag.prototype.compute = function compute() {
+      return Math.max(this.proxyWrapperTag.value(), this.proxyContentTag.value());
+    };
+
+    ProxyTag.prototype.dirty = function dirty() {
+      this.proxyWrapperTag.dirty();
+    };
+
+    ProxyTag.prototype.contentDidChange = function contentDidChange() {
+      var content = _emberMetal.get(this.proxy, 'content');
+      this.proxyContentTag.update(_emberMetal.tagFor(content));
+    };
+
+    return ProxyTag;
+  })(_glimmerReference.CachedTag);
+
+  exports.default = _emberMetal.Mixin.create((_Mixin$create = {}, _Mixin$create[IS_PROXY] = true, _Mixin$create.content = null, _Mixin$create._initializeTag = _emberMetal.on('init', function () {
+    _emberMetal.meta(this)._tag = new ProxyTag(this);
+  }), _Mixin$create._contentDidChange = _emberMetal.observer('content', function () {
     _emberMetal.assert('Can\'t set Proxy\'s content to itself', _emberMetal.get(this, 'content') !== this);
-  }), _PROXY_MIXIN_PROPS.isTruthy = _emberRuntimeComputedComputed_macros.bool('content'), _PROXY_MIXIN_PROPS._debugContainerKey = null, _PROXY_MIXIN_PROPS.willWatchProperty = function (key) {
+    _emberMetal.tagFor(this).contentDidChange();
+  }), _Mixin$create.isTruthy = _emberRuntimeComputedComputed_macros.bool('content'), _Mixin$create._debugContainerKey = null, _Mixin$create.willWatchProperty = function (key) {
     var contentKey = 'content.' + key;
     _emberMetal._addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
     _emberMetal.addObserver(this, contentKey, null, contentPropertyDidChange);
-  }, _PROXY_MIXIN_PROPS.didUnwatchProperty = function (key) {
+  }, _Mixin$create.didUnwatchProperty = function (key) {
     var contentKey = 'content.' + key;
     _emberMetal._removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
     _emberMetal.removeObserver(this, contentKey, null, contentPropertyDidChange);
-  }, _PROXY_MIXIN_PROPS.unknownProperty = function (key) {
+  }, _Mixin$create.unknownProperty = function (key) {
     var content = _emberMetal.get(this, 'content');
     if (content) {
       _emberMetal.deprecate('You attempted to access `' + key + '` from `' + this + '`, but object proxying is deprecated. Please use `model.' + key + '` instead.', !this.isController, { id: 'ember-runtime.controller-proxy', until: '3.0.0' });
       return _emberMetal.get(content, key);
     }
-  }, _PROXY_MIXIN_PROPS.setUnknownProperty = function (key, value) {
+  }, _Mixin$create.setUnknownProperty = function (key, value) {
     var m = _emberMetal.meta(this);
     if (m.proto === this) {
       // if marked as prototype then just defineProperty
@@ -12749,53 +12758,7 @@ enifed('ember-runtime/mixins/-proxy', ['exports', 'ember-utils', 'ember-metal',
 
     _emberMetal.deprecate('You attempted to set `' + key + '` from `' + this + '`, but object proxying is deprecated. Please use `model.' + key + '` instead.', !this.isController, { id: 'ember-runtime.controller-proxy', until: '3.0.0' });
     return _emberMetal.set(content, key, value);
-  }, _PROXY_MIXIN_PROPS);
-
-  if (hasGlimmer) {
-    (function () {
-      var _require = _require2.default('glimmer-reference');
-
-      var CachedTag = _require.CachedTag;
-      var DirtyableTag = _require.DirtyableTag;
-      var UpdatableTag = _require.UpdatableTag;
-
-      var ProxyTag = (function (_CachedTag) {
-        babelHelpers.inherits(ProxyTag, _CachedTag);
-
-        function ProxyTag(proxy, content) {
-          _CachedTag.call(this);
-          this.proxyWrapperTag = new DirtyableTag();
-          this.proxyContentTag = new UpdatableTag(_emberMetal.tagFor(content));
-        }
-
-        ProxyTag.prototype.compute = function compute() {
-          return Math.max(this.proxyWrapperTag.value(), this.proxyContentTag.value());
-        };
-
-        ProxyTag.prototype.dirty = function dirty() {
-          this.proxyWrapperTag.dirty();
-        };
-
-        ProxyTag.prototype.contentDidChange = function contentDidChange(content) {
-          this.proxyContentTag.update(_emberMetal.tagFor(content));
-        };
-
-        return ProxyTag;
-      })(CachedTag);
-
-      PROXY_MIXIN_PROPS[_emberRuntimeSystemCore_object.POST_INIT] = function postInit() {
-        this._super();
-        _emberMetal.meta(this)._tag = new ProxyTag(this, _emberMetal.get(this, 'content'));
-      };
-
-      PROXY_MIXIN_PROPS._contentDidChange = _emberMetal.observer('content', function () {
-        _emberMetal.assert('Can\'t set Proxy\'s content to itself', _emberMetal.get(this, 'content') !== this);
-        _emberMetal.meta(this)._tag.contentDidChange(_emberMetal.get(this, 'content'));
-      });
-    })();
-  }
-
-  exports.default = _emberMetal.Mixin.create(PROXY_MIXIN_PROPS);
+  }, _Mixin$create));
 });
 
 /**
@@ -17124,10 +17087,6 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
   // using ember-metal/lib/main here to ensure that ember-debug is setup
   // if present
 
-  var _Mixin$create;
-
-  var POST_INIT = _emberUtils.symbol('POST_INIT');
-  exports.POST_INIT = POST_INIT;
   var schedule = _emberMetal.run.schedule;
   var applyMixin = _emberMetal.Mixin._apply;
   var finishPartial = _emberMetal.Mixin.finishPartial;
@@ -17234,8 +17193,6 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
 
       this.init.apply(this, arguments);
 
-      this[POST_INIT]();
-
       m.proto = proto;
       _emberMetal.finishChains(this);
       _emberMetal.sendEvent(this, 'init');
@@ -17280,7 +17237,7 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
   CoreObject.toString = function () {
     return 'Ember.CoreObject';
   };
-  CoreObject.PrototypeMixin = _emberMetal.Mixin.create((_Mixin$create = {
+  CoreObject.PrototypeMixin = _emberMetal.Mixin.create({
     reopen: function () {
       for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
@@ -17313,39 +17270,244 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
        @method init
       @public
     */
-    init: function () {}
+    init: function () {},
 
-  }, _Mixin$create[POST_INIT] = function () {}, _Mixin$create.__defineNonEnumerable = function (property) {
-    Object.defineProperty(this, property.name, property.descriptor);
-    //this[property.name] = property.descriptor.value;
-  }, _Mixin$create.concatenatedProperties = null, _Mixin$create.mergedProperties = null, _Mixin$create.isDestroyed = false, _Mixin$create.isDestroying = false, _Mixin$create.destroy = function () {
-    if (this.isDestroying) {
-      return;
-    }
-    this.isDestroying = true;
+    __defineNonEnumerable: function (property) {
+      Object.defineProperty(this, property.name, property.descriptor);
+      //this[property.name] = property.descriptor.value;
+    },
 
-    schedule('actions', this, this.willDestroy);
-    schedule('destroy', this, this._scheduledDestroy);
-    return this;
-  }, _Mixin$create.willDestroy = function () {}, _Mixin$create._scheduledDestroy = function () {
-    if (this.isDestroyed) {
-      return;
-    }
-    _emberMetal.destroy(this);
-    this.isDestroyed = true;
-  }, _Mixin$create.bind = function (to, from) {
-    if (!(from instanceof _emberMetal.Binding)) {
-      from = _emberMetal.Binding.from(from);
-    }
-    from.to(to).connect(this);
-    return from;
-  }, _Mixin$create.toString = function () {
-    var hasToStringExtension = typeof this.toStringExtension === 'function';
-    var extension = hasToStringExtension ? ':' + this.toStringExtension() : '';
-    var ret = '<' + this.constructor.toString() + ':' + _emberUtils.guidFor(this) + extension + '>';
+    /**
+      Defines the properties that will be concatenated from the superclass
+      (instead of overridden).
+       By default, when you extend an Ember class a property defined in
+      the subclass overrides a property with the same name that is defined
+      in the superclass. However, there are some cases where it is preferable
+      to build up a property's value by combining the superclass' property
+      value with the subclass' value. An example of this in use within Ember
+      is the `classNames` property of `Ember.View`.
+       Here is some sample code showing the difference between a concatenated
+      property and a normal one:
+       ```javascript
+      const Bar = Ember.Object.extend({
+        // Configure which properties to concatenate
+        concatenatedProperties: ['concatenatedProperty'],
+         someNonConcatenatedProperty: ['bar'],
+        concatenatedProperty: ['bar']
+      });
+       const FooBar = Bar.extend({
+        someNonConcatenatedProperty: ['foo'],
+        concatenatedProperty: ['foo']
+      });
+       let fooBar = FooBar.create();
+      fooBar.get('someNonConcatenatedProperty'); // ['foo']
+      fooBar.get('concatenatedProperty'); // ['bar', 'foo']
+      ```
+       This behavior extends to object creation as well. Continuing the
+      above example:
+       ```javascript
+      let fooBar = FooBar.create({
+        someNonConcatenatedProperty: ['baz'],
+        concatenatedProperty: ['baz']
+      })
+      fooBar.get('someNonConcatenatedProperty'); // ['baz']
+      fooBar.get('concatenatedProperty'); // ['bar', 'foo', 'baz']
+      ```
+       Adding a single property that is not an array will just add it in the array:
+       ```javascript
+      let fooBar = FooBar.create({
+        concatenatedProperty: 'baz'
+      })
+      view.get('concatenatedProperty'); // ['bar', 'foo', 'baz']
+      ```
+       Using the `concatenatedProperties` property, we can tell Ember to mix the
+      content of the properties.
+       In `Ember.Component` the `classNames`, `classNameBindings` and
+      `attributeBindings` properties are concatenated.
+       This feature is available for you to use throughout the Ember object model,
+      although typical app developers are likely to use it infrequently. Since
+      it changes expectations about behavior of properties, you should properly
+      document its usage in each individual concatenated property (to not
+      mislead your users to think they can override the property in a subclass).
+       @property concatenatedProperties
+      @type Array
+      @default null
+      @public
+    */
+    concatenatedProperties: null,
 
-    return ret;
-  }, _Mixin$create));
+    /**
+      Defines the properties that will be merged from the superclass
+      (instead of overridden).
+       By default, when you extend an Ember class a property defined in
+      the subclass overrides a property with the same name that is defined
+      in the superclass. However, there are some cases where it is preferable
+      to build up a property's value by merging the superclass property value
+      with the subclass property's value. An example of this in use within Ember
+      is the `queryParams` property of routes.
+       Here is some sample code showing the difference between a merged
+      property and a normal one:
+       ```javascript
+      const Bar = Ember.Object.extend({
+        // Configure which properties are to be merged
+        mergedProperties: ['mergedProperty'],
+         someNonMergedProperty: {
+          nonMerged: 'superclass value of nonMerged'
+        },
+        mergedProperty: {
+          page: {replace: false},
+          limit: {replace: true}
+        }
+      });
+       const FooBar = Bar.extend({
+        someNonMergedProperty: {
+          completelyNonMerged: 'subclass value of nonMerged'
+        },
+        mergedProperty: {
+          limit: {replace: false}
+        }
+      });
+       let fooBar = FooBar.create();
+       fooBar.get('someNonMergedProperty');
+      // => { completelyNonMerged: 'subclass value of nonMerged' }
+      //
+      // Note the entire object, including the nonMerged property of
+      // the superclass object, has been replaced
+       fooBar.get('mergedProperty');
+      // => {
+      //   page: {replace: false},
+      //   limit: {replace: false}
+      // }
+      //
+      // Note the page remains from the superclass, and the
+      // `limit` property's value of `false` has been merged from
+      // the subclass.
+      ```
+       This behavior is not available during object `create` calls. It is only
+      available at `extend` time.
+       In `Ember.Route` the `queryParams` property is merged.
+       This feature is available for you to use throughout the Ember object model,
+      although typical app developers are likely to use it infrequently. Since
+      it changes expectations about behavior of properties, you should properly
+      document its usage in each individual merged property (to not
+      mislead your users to think they can override the property in a subclass).
+       @property mergedProperties
+      @type Array
+      @default null
+      @public
+    */
+    mergedProperties: null,
+
+    /**
+      Destroyed object property flag.
+       if this property is `true` the observers and bindings were already
+      removed by the effect of calling the `destroy()` method.
+       @property isDestroyed
+      @default false
+      @public
+    */
+    isDestroyed: false,
+
+    /**
+      Destruction scheduled flag. The `destroy()` method has been called.
+       The object stays intact until the end of the run loop at which point
+      the `isDestroyed` flag is set.
+       @property isDestroying
+      @default false
+      @public
+    */
+    isDestroying: false,
+
+    /**
+      Destroys an object by setting the `isDestroyed` flag and removing its
+      metadata, which effectively destroys observers and bindings.
+       If you try to set a property on a destroyed object, an exception will be
+      raised.
+       Note that destruction is scheduled for the end of the run loop and does not
+      happen immediately.  It will set an isDestroying flag immediately.
+       @method destroy
+      @return {Ember.Object} receiver
+      @public
+    */
+    destroy: function () {
+      if (this.isDestroying) {
+        return;
+      }
+      this.isDestroying = true;
+
+      schedule('actions', this, this.willDestroy);
+      schedule('destroy', this, this._scheduledDestroy);
+      return this;
+    },
+
+    /**
+      Override to implement teardown.
+       @method willDestroy
+      @public
+    */
+    willDestroy: function () {},
+
+    /**
+      Invoked by the run loop to actually destroy the object. This is
+      scheduled for execution by the `destroy` method.
+       @private
+      @method _scheduledDestroy
+    */
+    _scheduledDestroy: function () {
+      if (this.isDestroyed) {
+        return;
+      }
+      _emberMetal.destroy(this);
+      this.isDestroyed = true;
+    },
+
+    bind: function (to, from) {
+      if (!(from instanceof _emberMetal.Binding)) {
+        from = _emberMetal.Binding.from(from);
+      }
+      from.to(to).connect(this);
+      return from;
+    },
+
+    /**
+      Returns a string representation which attempts to provide more information
+      than Javascript's `toString` typically does, in a generic way for all Ember
+      objects.
+       ```javascript
+      const Person = Ember.Object.extend()
+      person = Person.create()
+      person.toString() //=> "<Person:ember1024>"
+      ```
+       If the object's class is not defined on an Ember namespace, it will
+      indicate it is a subclass of the registered superclass:
+      ```javascript
+      const Student = Person.extend()
+      let student = Student.create()
+      student.toString() //=> "<(subclass of Person):ember1025>"
+      ```
+       If the method `toStringExtension` is defined, its return value will be
+      included in the output.
+       ```javascript
+      const Teacher = Person.extend({
+        toStringExtension() {
+          return this.get('fullName');
+        }
+      });
+      teacher = Teacher.create()
+      teacher.toString(); //=> "<Teacher:ember1026:Tom Dale>"
+      ```
+       @method toString
+      @return {String} string representation
+      @public
+    */
+    toString: function () {
+      var hasToStringExtension = typeof this.toStringExtension === 'function';
+      var extension = hasToStringExtension ? ':' + this.toStringExtension() : '';
+      var ret = '<' + this.constructor.toString() + ':' + _emberUtils.guidFor(this) + extension + '>';
+
+      return ret;
+    }
+  });
 
   CoreObject.PrototypeMixin.ownerConstructor = CoreObject;
 
@@ -17726,200 +17888,6 @@ enifed('ember-runtime/system/core_object', ['exports', 'ember-utils', 'ember-met
 
   exports.default = CoreObject;
 });
-
-/**
-  Defines the properties that will be concatenated from the superclass
-  (instead of overridden).
-   By default, when you extend an Ember class a property defined in
-  the subclass overrides a property with the same name that is defined
-  in the superclass. However, there are some cases where it is preferable
-  to build up a property's value by combining the superclass' property
-  value with the subclass' value. An example of this in use within Ember
-  is the `classNames` property of `Ember.View`.
-   Here is some sample code showing the difference between a concatenated
-  property and a normal one:
-   ```javascript
-  const Bar = Ember.Object.extend({
-    // Configure which properties to concatenate
-    concatenatedProperties: ['concatenatedProperty'],
-     someNonConcatenatedProperty: ['bar'],
-    concatenatedProperty: ['bar']
-  });
-   const FooBar = Bar.extend({
-    someNonConcatenatedProperty: ['foo'],
-    concatenatedProperty: ['foo']
-  });
-   let fooBar = FooBar.create();
-  fooBar.get('someNonConcatenatedProperty'); // ['foo']
-  fooBar.get('concatenatedProperty'); // ['bar', 'foo']
-  ```
-   This behavior extends to object creation as well. Continuing the
-  above example:
-   ```javascript
-  let fooBar = FooBar.create({
-    someNonConcatenatedProperty: ['baz'],
-    concatenatedProperty: ['baz']
-  })
-  fooBar.get('someNonConcatenatedProperty'); // ['baz']
-  fooBar.get('concatenatedProperty'); // ['bar', 'foo', 'baz']
-  ```
-   Adding a single property that is not an array will just add it in the array:
-   ```javascript
-  let fooBar = FooBar.create({
-    concatenatedProperty: 'baz'
-  })
-  view.get('concatenatedProperty'); // ['bar', 'foo', 'baz']
-  ```
-   Using the `concatenatedProperties` property, we can tell Ember to mix the
-  content of the properties.
-   In `Ember.Component` the `classNames`, `classNameBindings` and
-  `attributeBindings` properties are concatenated.
-   This feature is available for you to use throughout the Ember object model,
-  although typical app developers are likely to use it infrequently. Since
-  it changes expectations about behavior of properties, you should properly
-  document its usage in each individual concatenated property (to not
-  mislead your users to think they can override the property in a subclass).
-   @property concatenatedProperties
-  @type Array
-  @default null
-  @public
-*/
-
-/**
-  Defines the properties that will be merged from the superclass
-  (instead of overridden).
-   By default, when you extend an Ember class a property defined in
-  the subclass overrides a property with the same name that is defined
-  in the superclass. However, there are some cases where it is preferable
-  to build up a property's value by merging the superclass property value
-  with the subclass property's value. An example of this in use within Ember
-  is the `queryParams` property of routes.
-   Here is some sample code showing the difference between a merged
-  property and a normal one:
-   ```javascript
-  const Bar = Ember.Object.extend({
-    // Configure which properties are to be merged
-    mergedProperties: ['mergedProperty'],
-     someNonMergedProperty: {
-      nonMerged: 'superclass value of nonMerged'
-    },
-    mergedProperty: {
-      page: {replace: false},
-      limit: {replace: true}
-    }
-  });
-   const FooBar = Bar.extend({
-    someNonMergedProperty: {
-      completelyNonMerged: 'subclass value of nonMerged'
-    },
-    mergedProperty: {
-      limit: {replace: false}
-    }
-  });
-   let fooBar = FooBar.create();
-   fooBar.get('someNonMergedProperty');
-  // => { completelyNonMerged: 'subclass value of nonMerged' }
-  //
-  // Note the entire object, including the nonMerged property of
-  // the superclass object, has been replaced
-   fooBar.get('mergedProperty');
-  // => {
-  //   page: {replace: false},
-  //   limit: {replace: false}
-  // }
-  //
-  // Note the page remains from the superclass, and the
-  // `limit` property's value of `false` has been merged from
-  // the subclass.
-  ```
-   This behavior is not available during object `create` calls. It is only
-  available at `extend` time.
-   In `Ember.Route` the `queryParams` property is merged.
-   This feature is available for you to use throughout the Ember object model,
-  although typical app developers are likely to use it infrequently. Since
-  it changes expectations about behavior of properties, you should properly
-  document its usage in each individual merged property (to not
-  mislead your users to think they can override the property in a subclass).
-   @property mergedProperties
-  @type Array
-  @default null
-  @public
-*/
-
-/**
-  Destroyed object property flag.
-   if this property is `true` the observers and bindings were already
-  removed by the effect of calling the `destroy()` method.
-   @property isDestroyed
-  @default false
-  @public
-*/
-
-/**
-  Destruction scheduled flag. The `destroy()` method has been called.
-   The object stays intact until the end of the run loop at which point
-  the `isDestroyed` flag is set.
-   @property isDestroying
-  @default false
-  @public
-*/
-
-/**
-  Destroys an object by setting the `isDestroyed` flag and removing its
-  metadata, which effectively destroys observers and bindings.
-   If you try to set a property on a destroyed object, an exception will be
-  raised.
-   Note that destruction is scheduled for the end of the run loop and does not
-  happen immediately.  It will set an isDestroying flag immediately.
-   @method destroy
-  @return {Ember.Object} receiver
-  @public
-*/
-
-/**
-  Override to implement teardown.
-   @method willDestroy
-  @public
-*/
-
-/**
-  Invoked by the run loop to actually destroy the object. This is
-  scheduled for execution by the `destroy` method.
-   @private
-  @method _scheduledDestroy
-*/
-
-/**
-  Returns a string representation which attempts to provide more information
-  than Javascript's `toString` typically does, in a generic way for all Ember
-  objects.
-   ```javascript
-  const Person = Ember.Object.extend()
-  person = Person.create()
-  person.toString() //=> "<Person:ember1024>"
-  ```
-   If the object's class is not defined on an Ember namespace, it will
-  indicate it is a subclass of the registered superclass:
-  ```javascript
-  const Student = Person.extend()
-  let student = Student.create()
-  student.toString() //=> "<(subclass of Person):ember1025>"
-  ```
-   If the method `toStringExtension` is defined, its return value will be
-  included in the output.
-   ```javascript
-  const Teacher = Person.extend({
-    toStringExtension() {
-      return this.get('fullName');
-    }
-  });
-  teacher = Teacher.create()
-  teacher.toString(); //=> "<Teacher:ember1026:Tom Dale>"
-  ```
-   @method toString
-  @return {String} string representation
-  @public
-*/
 enifed('ember-runtime/system/each_proxy', ['exports', 'ember-utils', 'ember-metal', 'ember-runtime/mixins/array'], function (exports, _emberUtils, _emberMetal, _emberRuntimeMixinsArray) {
   'use strict';
 
@@ -18503,7 +18471,7 @@ enifed('ember-runtime/system/native_array', ['exports', 'ember-metal', 'ember-en
   exports.default = NativeArray;
 });
 // Ember.A circular
-enifed('ember-runtime/system/object', ['exports', 'ember-runtime/system/core_object', 'ember-runtime/mixins/observable'], function (exports, _emberRuntimeSystemCore_object, _emberRuntimeMixinsObservable) {
+enifed('ember-runtime/system/object', ['exports', 'ember-utils', 'ember-metal', 'ember-runtime/system/core_object', 'ember-runtime/mixins/observable'], function (exports, _emberUtils, _emberMetal, _emberRuntimeSystemCore_object, _emberRuntimeMixinsObservable) {
   /**
   @module ember
   @submodule ember-runtime
@@ -18527,6 +18495,26 @@ enifed('ember-runtime/system/object', ['exports', 'ember-runtime/system/core_obj
     return 'Ember.Object';
   };
 
+  var FrameworkObject = EmberObject;
+
+  exports.FrameworkObject = FrameworkObject;
+  _emberMetal.runInDebug(function () {
+    var _EmberObject$extend;
+
+    var INIT_WAS_CALLED = _emberUtils.symbol('INIT_WAS_CALLED');
+    var ASSERT_INIT_WAS_CALLED = _emberUtils.symbol('ASSERT_INIT_WAS_CALLED');
+
+    exports.FrameworkObject = FrameworkObject = EmberObject.extend((_EmberObject$extend = {
+      init: function () {
+        this._super.apply(this, arguments);
+        this[INIT_WAS_CALLED] = true;
+      }
+
+    }, _EmberObject$extend[ASSERT_INIT_WAS_CALLED] = _emberMetal.on('init', function () {
+      _emberMetal.assert('You must call `this._super(...arguments);` when overriding `init` on a framework object. Please update ' + this + ' to call `this._super(...arguments);` from `init`.', this[INIT_WAS_CALLED]);
+    }), _EmberObject$extend));
+  });
+
   exports.default = EmberObject;
 });
 enifed('ember-runtime/system/object_proxy', ['exports', 'ember-runtime/system/object', 'ember-runtime/mixins/-proxy'], function (exports, _emberRuntimeSystemObject, _emberRuntimeMixinsProxy) {
@@ -19116,7 +19104,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.9.0-beta.4";
+  exports.default = "2.9.0-beta.5";
 });
 /*!
  * @overview RSVP - a tiny implementation of Promises/A+.