ember-source 2.13.0.beta.2 → 2.13.0

data/dist/ember-template-compiler.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.13.0-beta.2
+ * @version   2.13.0
  */
 
 var enifed, requireModule, Ember;
@@ -7246,22 +7246,16 @@ enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-meta
       }
   }
 
-  function finishChains(obj) {
-    // We only create meta if we really have to
-    var m = _emberMetalMeta.peekMeta(obj);
-    if (m !== undefined) {
-      m = _emberMetalMeta.meta(obj);
-
-      // finish any current chains node watchers that reference obj
-      var chainWatchers = m.readableChainWatchers();
-      if (chainWatchers !== undefined) {
-        chainWatchers.revalidateAll();
-      }
-      // ensure that if we have inherited any chains they have been
-      // copied onto our own meta.
-      if (m.readableChains() !== undefined) {
-        m.writableChains(_emberMetalWatch_path.makeChainNode);
-      }
+  function finishChains(meta) {
+    // finish any current chains node watchers that reference obj
+    var chainWatchers = meta.readableChainWatchers();
+    if (chainWatchers !== undefined) {
+      chainWatchers.revalidateAll();
+    }
+    // ensure that if we have inherited any chains they have been
+    // copied onto our own meta.
+    if (meta.readableChains() !== undefined) {
+      meta.writableChains(_emberMetalWatch_path.makeChainNode);
     }
   }
 
@@ -8029,7 +8023,7 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-debug'],
     var stack = error.stack;
     var message = error.message;
 
-    if (stack && !stack.includes(message)) {
+    if (stack && stack.indexOf(message) === -1) {
       stack = message + '\n' + stack;
     }
 
@@ -8622,6 +8616,7 @@ enifed('ember-metal/index', ['exports', 'ember-metal/core', 'ember-metal/compute
   exports.PROPERTY_DID_CHANGE = _emberMetalProperty_events.PROPERTY_DID_CHANGE;
   exports.defineProperty = _emberMetalProperties.defineProperty;
   exports.Descriptor = _emberMetalProperties.Descriptor;
+  exports._hasCachedComputedProperties = _emberMetalProperties._hasCachedComputedProperties;
   exports.watchKey = _emberMetalWatch_key.watchKey;
   exports.unwatchKey = _emberMetalWatch_key.unwatchKey;
   exports.ChainNode = _emberMetalChains.ChainNode;
@@ -9882,6 +9877,7 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/meta_listener
       this._chains = undefined;
       this._tag = undefined;
       this._tags = undefined;
+      this._factory = undefined;
 
       // initial value for all flags right now is false
       // see FLAGS const for detailed list of flags used
@@ -10130,6 +10126,15 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/meta_listener
       }
     };
 
+    babelHelpers.createClass(Meta, [{
+      key: 'factory',
+      set: function (factory) {
+        this._factory = factory;
+      },
+      get: function () {
+        return this._factory;
+      }
+    }]);
     return Meta;
   })();
 
@@ -11797,6 +11802,7 @@ enifed('ember-metal/properties', ['exports', 'ember-debug', 'ember-metal/meta',
   exports.DEFAULT_GETTER_FUNCTION = DEFAULT_GETTER_FUNCTION;
   exports.INHERITING_GETTER_FUNCTION = INHERITING_GETTER_FUNCTION;
   exports.defineProperty = defineProperty;
+  exports._hasCachedComputedProperties = _hasCachedComputedProperties;
 
   // ..........................................................
   // DESCRIPTOR
@@ -11919,24 +11925,20 @@ enifed('ember-metal/properties', ['exports', 'ember-debug', 'ember-metal/meta',
   */
 
   function defineProperty(obj, keyName, desc, data, meta) {
-    var possibleDesc = undefined,
-        existingDesc = undefined,
-        watching = undefined,
-        value = undefined;
-
     if (!meta) {
       meta = _emberMetalMeta.meta(obj);
     }
     var watchEntry = meta.peekWatching(keyName);
-    possibleDesc = obj[keyName];
-    existingDesc = possibleDesc !== null && typeof possibleDesc === 'object' && possibleDesc.isDescriptor ? possibleDesc : undefined;
+    var possibleDesc = obj[keyName];
+    var existingDesc = possibleDesc !== null && typeof possibleDesc === 'object' && possibleDesc.isDescriptor ? possibleDesc : undefined;
 
-    watching = watchEntry !== undefined && watchEntry > 0;
+    var watching = watchEntry !== undefined && watchEntry > 0;
 
     if (existingDesc) {
       existingDesc.teardown(obj, keyName);
     }
 
+    var value = undefined;
     if (desc instanceof Descriptor) {
       value = desc;
       if (true) {
@@ -11953,7 +11955,10 @@ enifed('ember-metal/properties', ['exports', 'ember-debug', 'ember-metal/meta',
       } else {
         obj[keyName] = value;
       }
-      if (desc.setup) {
+
+      didDefineComputedProperty(obj.constructor);
+
+      if (typeof desc.setup === 'function') {
         desc.setup(obj, keyName);
       }
     } else {
@@ -11998,13 +12003,30 @@ enifed('ember-metal/properties', ['exports', 'ember-debug', 'ember-metal/meta',
 
     // The `value` passed to the `didDefineProperty` hook is
     // either the descriptor or data, whichever was passed.
-    if (obj.didDefineProperty) {
+    if (typeof obj.didDefineProperty === 'function') {
       obj.didDefineProperty(obj, keyName, value);
     }
 
     return this;
   }
 
+  var hasCachedComputedProperties = false;
+
+  function _hasCachedComputedProperties() {
+    hasCachedComputedProperties = true;
+  }
+
+  function didDefineComputedProperty(constructor) {
+    if (hasCachedComputedProperties === false) {
+      return;
+    }
+    var cache = _emberMetalMeta.meta(constructor).readableCache();
+
+    if (cache && cache._computedProperties !== undefined) {
+      cache._computedProperties = undefined;
+    }
+  }
+
   function handleBrokenPhantomDefineProperty(obj, keyName, desc) {
     // https://github.com/ariya/phantomjs/issues/11856
     Object.defineProperty(obj, keyName, { configurable: true, writable: true, value: 'iCry' });
@@ -16113,13 +16135,40 @@ enifed('ember-utils/to-string', ['exports'], function (exports) {
   exports.default = toString;
   var objectToString = Object.prototype.toString;
 
+  function isNone(obj) {
+    return obj === null || obj === undefined;
+  }
+
   /*
    A `toString` util function that supports objects without a `toString`
    method, e.g. an object created with `Object.create(null)`.
   */
 
   function toString(obj) {
-    if (obj && typeof obj.toString === 'function') {
+    var type = typeof obj;
+    if (type === "string") {
+      return obj;
+    }
+
+    if (Array.isArray(obj)) {
+      // Reimplement Array.prototype.join according to spec (22.1.3.13)
+      // Changing ToString(element) with this safe version of ToString.
+      var len = obj.length;
+      var sep = ',';
+      var r = '';
+
+      for (var k = 0; k < len; k++) {
+        if (k > 0) {
+          r += ',';
+        }
+
+        if (!isNone(obj[k])) {
+          r += toString(obj[k]);
+        }
+      }
+
+      return r;
+    } else if (obj != null && typeof obj.toString === 'function') {
       return obj.toString();
     } else {
       return objectToString.call(obj);
@@ -16151,7 +16200,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.13.0-beta.2";
+  exports.default = "2.13.0";
 });
 enifed("handlebars", ["exports"], function (exports) {
   /* istanbul ignore next */

data/dist/ember-testing.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.13.0-beta.2
+ * @version   2.13.0
  */
 
 var enifed, requireModule, Ember;
@@ -1841,6 +1841,9 @@ enifed('ember-testing/test/waiters', ['exports', 'ember-debug'], function (expor
     return array;
   }
 });
-requireModule("ember-testing");
-
+var testing = requireModule('ember-testing');
+Ember.Test = testing.Test;
+Ember.Test.Adapter = testing.Adapter;
+Ember.Test.QUnitAdapter = testing.QUnitAdapter;
+Ember.setupForTesting = testing.setupForTesting;
 }());

data/dist/ember-tests.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.13.0-beta.2
+ * @version   2.13.0
  */
 
 var enifed, requireModule, Ember;
@@ -279,7 +279,7 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
     equal(PostFactory._debugContainerKey, 'controller:post', 'factory instance receives _debugContainerKey');
   });
 
-  QUnit.test('fallback for to create time injections if factory has no extend', function () {
+  QUnit.test('uses create time injections if factory has no extend', function () {
     var registry = new _containerIndex.Registry();
     var container = registry.container();
     var AppleController = _internalTestHelpers.factory();
@@ -293,7 +293,6 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
 
     var postController = container.lookup('controller:post');
 
-    equal(postController._debugContainerKey, 'controller:post', 'instance receives _debugContainerKey');
     ok(postController.apple instanceof AppleController, 'instance receives an apple of instance AppleController');
   });
 
@@ -365,9 +364,6 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
     var postController = container.lookup('controller:post');
     var store = container.lookup('store:main');
 
-    equal(store._debugContainerKey, 'store:main');
-
-    equal(postController._debugContainerKey, 'controller:post');
     equal(postController.store, store, 'has the correct store injected');
   });
 
@@ -766,8 +762,9 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
   });
 
   QUnit.test('A deprecated `container` property is appended to every object instantiated from an extendable factory', function () {
+    var owner = {};
     var registry = new _containerIndex.Registry();
-    var container = registry.container();
+    var container = owner.__container__ = registry.container({ owner: owner });
     var PostController = _internalTestHelpers.factory();
     registry.register('controller:post', PostController);
     var postController = container.lookup('controller:post');
@@ -1010,11 +1007,78 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
       registry.injection('component:foo-bar', 'ajax', 'util:ajax');
 
       var componentFactory = container.factoryFor('component:foo-bar');
-
       var instrance = componentFactory.create({ ajax: 'fetch' });
 
       assert.equal(instrance.ajax, 'fetch');
     });
+
+    QUnit.test('#factoryFor does not add properties to the object being instantiated when _initFactory is present', function (assert) {
+      var owner = {};
+      var registry = new _containerIndex.Registry();
+      var container = registry.container();
+
+      var factory = undefined;
+
+      var Component = (function () {
+        function Component() {
+          babelHelpers.classCallCheck(this, Component);
+        }
+
+        Component._initFactory = function _initFactory(_factory) {
+          factory = _factory;
+        };
+
+        Component.create = function create(options) {
+          var instance = new this();
+          _emberUtils.assign(instance, options);
+          return instance;
+        };
+
+        return Component;
+      })();
+
+      registry.register('component:foo-bar', Component);
+
+      var componentFactory = container.factoryFor('component:foo-bar');
+      var instance = componentFactory.create();
+
+      // note: _guid and isDestroyed are being set in the `factory` constructor
+      // not via registry/container shenanigans
+      assert.deepEqual(Object.keys(instance), []);
+    });
+
+    // this is skipped until templates and the glimmer environment do not require `OWNER` to be
+    // passed in as constructor args
+    QUnit.skip('#factoryFor does not add properties to the object being instantiated', function (assert) {
+      var owner = {};
+      var registry = new _containerIndex.Registry();
+      var container = registry.container();
+
+      var factory = undefined;
+
+      var Component = (function () {
+        function Component() {
+          babelHelpers.classCallCheck(this, Component);
+        }
+
+        Component.create = function create(options) {
+          var instance = new this();
+          _emberUtils.assign(instance, options);
+          return instance;
+        };
+
+        return Component;
+      })();
+
+      registry.register('component:foo-bar', Component);
+
+      var componentFactory = container.factoryFor('component:foo-bar');
+      var instance = componentFactory.create();
+
+      // note: _guid and isDestroyed are being set in the `factory` constructor
+      // not via registry/container shenanigans
+      assert.deepEqual(Object.keys(instance), []);
+    });
   }
 });
 enifed('container/tests/container_test.lint-test', ['exports'], function (exports) {
@@ -39627,8 +39691,13 @@ enifed('ember-metal/tests/chains_test', ['exports', 'ember-metal/observer', 'emb
     _emberMetalObserver.addObserver(obj, 'foo.bar', null, didChange);
 
     var childObj = Object.create(obj);
-    _emberMetalChains.finishChains(childObj);
-    ok(_emberMetalMeta.peekMeta(obj) !== _emberMetalMeta.peekMeta(childObj).readableChains(), 'The chains object is copied');
+
+    var parentMeta = _emberMetalMeta.meta(obj);
+    var childMeta = _emberMetalMeta.meta(childObj);
+
+    _emberMetalChains.finishChains(childMeta);
+
+    ok(parentMeta.readableChains() !== childMeta.readableChains(), 'The chains object is copied');
   });
 
   QUnit.test('does not observe primative values', function (assert) {
@@ -67782,6 +67851,13 @@ enifed('ember-utils/tests/to-string-test', ['exports', 'ember-utils/index'], fun
 
     strictEqual(_emberUtilsIndex.toString(obj), ({}).toString());
   });
+
+  QUnit.test('toString does not fail when called on Arrays with objects without toString method', function () {
+    var obj = Object.create(null);
+    var arr = [obj, 2];
+
+    strictEqual(_emberUtilsIndex.toString(arr), ({}).toString() + ',2');
+  });
 });
 enifed('ember-utils/tests/to-string-test.lint-test', ['exports'], function (exports) {
   'use strict';

data/dist/ember-tests.prod.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.13.0-beta.2
+ * @version   2.13.0
  */
 
 var enifed, requireModule, Ember;
@@ -268,7 +268,7 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
     equal(PostFactory._debugContainerKey, 'controller:post', 'factory instance receives _debugContainerKey');
   });
 
-  QUnit.test('fallback for to create time injections if factory has no extend', function () {
+  QUnit.test('uses create time injections if factory has no extend', function () {
     var registry = new _containerIndex.Registry();
     var container = registry.container();
     var AppleController = _internalTestHelpers.factory();
@@ -282,7 +282,6 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
 
     var postController = container.lookup('controller:post');
 
-    equal(postController._debugContainerKey, 'controller:post', 'instance receives _debugContainerKey');
     ok(postController.apple instanceof AppleController, 'instance receives an apple of instance AppleController');
   });
 
@@ -354,9 +353,6 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
     var postController = container.lookup('controller:post');
     var store = container.lookup('store:main');
 
-    equal(store._debugContainerKey, 'store:main');
-
-    equal(postController._debugContainerKey, 'controller:post');
     equal(postController.store, store, 'has the correct store injected');
   });
 
@@ -755,8 +751,9 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
   });
 
   QUnit.test('A deprecated `container` property is appended to every object instantiated from an extendable factory', function () {
+    var owner = {};
     var registry = new _containerIndex.Registry();
-    var container = registry.container();
+    var container = owner.__container__ = registry.container({ owner: owner });
     var PostController = _internalTestHelpers.factory();
     registry.register('controller:post', PostController);
     var postController = container.lookup('controller:post');
@@ -999,11 +996,74 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
       registry.injection('component:foo-bar', 'ajax', 'util:ajax');
 
       var componentFactory = container.factoryFor('component:foo-bar');
-
       var instrance = componentFactory.create({ ajax: 'fetch' });
 
       assert.equal(instrance.ajax, 'fetch');
     });
+
+    QUnit.test('#factoryFor does not add properties to the object being instantiated when _initFactory is present', function (assert) {
+      var owner = {};
+      var registry = new _containerIndex.Registry();
+      var container = registry.container();
+
+      var factory = undefined;
+
+      var Component = (function () {
+        function Component() {}
+
+        Component._initFactory = function _initFactory(_factory) {
+          factory = _factory;
+        };
+
+        Component.create = function create(options) {
+          var instance = new this();
+          _emberUtils.assign(instance, options);
+          return instance;
+        };
+
+        return Component;
+      })();
+
+      registry.register('component:foo-bar', Component);
+
+      var componentFactory = container.factoryFor('component:foo-bar');
+      var instance = componentFactory.create();
+
+      // note: _guid and isDestroyed are being set in the `factory` constructor
+      // not via registry/container shenanigans
+      assert.deepEqual(Object.keys(instance), []);
+    });
+
+    // this is skipped until templates and the glimmer environment do not require `OWNER` to be
+    // passed in as constructor args
+    QUnit.skip('#factoryFor does not add properties to the object being instantiated', function (assert) {
+      var owner = {};
+      var registry = new _containerIndex.Registry();
+      var container = registry.container();
+
+      var factory = undefined;
+
+      var Component = (function () {
+        function Component() {}
+
+        Component.create = function create(options) {
+          var instance = new this();
+          _emberUtils.assign(instance, options);
+          return instance;
+        };
+
+        return Component;
+      })();
+
+      registry.register('component:foo-bar', Component);
+
+      var componentFactory = container.factoryFor('component:foo-bar');
+      var instance = componentFactory.create();
+
+      // note: _guid and isDestroyed are being set in the `factory` constructor
+      // not via registry/container shenanigans
+      assert.deepEqual(Object.keys(instance), []);
+    });
   }
 });
 enifed('container/tests/container_test.lint-test', ['exports'], function (exports) {
@@ -39261,8 +39321,13 @@ enifed('ember-metal/tests/chains_test', ['exports', 'ember-metal/observer', 'emb
     _emberMetalObserver.addObserver(obj, 'foo.bar', null, didChange);
 
     var childObj = Object.create(obj);
-    _emberMetalChains.finishChains(childObj);
-    ok(_emberMetalMeta.peekMeta(obj) !== _emberMetalMeta.peekMeta(childObj).readableChains(), 'The chains object is copied');
+
+    var parentMeta = _emberMetalMeta.meta(obj);
+    var childMeta = _emberMetalMeta.meta(childObj);
+
+    _emberMetalChains.finishChains(childMeta);
+
+    ok(parentMeta.readableChains() !== childMeta.readableChains(), 'The chains object is copied');
   });
 
   QUnit.test('does not observe primative values', function (assert) {
@@ -67388,6 +67453,13 @@ enifed('ember-utils/tests/to-string-test', ['exports', 'ember-utils/index'], fun
 
     strictEqual(_emberUtilsIndex.toString(obj), ({}).toString());
   });
+
+  QUnit.test('toString does not fail when called on Arrays with objects without toString method', function () {
+    var obj = Object.create(null);
+    var arr = [obj, 2];
+
+    strictEqual(_emberUtilsIndex.toString(arr), ({}).toString() + ',2');
+  });
 });
 enifed('ember-utils/tests/to-string-test.lint-test', ['exports'], function (exports) {
   'use strict';