ember-source 2.12.0.beta.3 → 2.12.0

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.12.0-beta.3
+ * @version   2.12.0
  */
 
 var enifed, requireModule, Ember;

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.12.0-beta.3
+ * @version   2.12.0
  */
 
 var enifed, requireModule, Ember;
@@ -911,11 +911,11 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
     var Component = _internalTestHelpers.factory();
     registry.register('component:foo-bar', Component);
 
-    var factoryCreator = container[_container.FACTORY_FOR]('component:foo-bar');
+    var factoryManager = container[_container.FACTORY_FOR]('component:foo-bar');
     if (false) {
-      assert.deepEqual(factoryCreator.class, Component, 'No double extend');
+      assert.deepEqual(factoryManager.class, Component, 'No double extend');
     } else {
-      assert.deepEqual(factoryCreator.class, lookupFactory('component:foo-bar', container), 'Double extended class');
+      assert.deepEqual(factoryManager.class, lookupFactory('component:foo-bar', container), 'Double extended class');
     }
   });
 
@@ -928,16 +928,32 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
       }, /Invalid Fullname, expected: 'type:name' got: chad-bar/);
     });
 
-    QUnit.test('#factoryFor returns a factory creator', function (assert) {
+    QUnit.test('#factoryFor returns a factory manager', function (assert) {
       var registry = new _containerIndex.Registry();
       var container = registry.container();
 
       var Component = _internalTestHelpers.factory();
       registry.register('component:foo-bar', Component);
 
-      var factoryCreator = container.factoryFor('component:foo-bar');
-      assert.ok(factoryCreator.create);
-      assert.ok(factoryCreator.class);
+      var factoryManager = container.factoryFor('component:foo-bar');
+      assert.ok(factoryManager.create);
+      assert.ok(factoryManager.class);
+    });
+
+    QUnit.test('#factoryFor returns a cached factory manager for the same type', function (assert) {
+      var registry = new _containerIndex.Registry();
+      var container = registry.container();
+
+      var Component = _internalTestHelpers.factory();
+      registry.register('component:foo-bar', Component);
+      registry.register('component:baz-bar', Component);
+
+      var factoryManager1 = container.factoryFor('component:foo-bar');
+      var factoryManager2 = container.factoryFor('component:foo-bar');
+      var factoryManager3 = container.factoryFor('component:baz-bar');
+
+      assert.equal(factoryManager1, factoryManager2, 'cache hit');
+      assert.notEqual(factoryManager1, factoryManager3, 'cache miss');
     });
 
     QUnit.test('#factoryFor class returns the factory function', function (assert) {
@@ -947,8 +963,8 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
       var Component = _internalTestHelpers.factory();
       registry.register('component:foo-bar', Component);
 
-      var factoryCreator = container.factoryFor('component:foo-bar');
-      assert.deepEqual(factoryCreator.class, Component, 'No double extend');
+      var factoryManager = container.factoryFor('component:foo-bar');
+      assert.deepEqual(factoryManager.class, Component, 'No double extend');
     });
 
     QUnit.test('#factoryFor instance have a common parent', function (assert) {
@@ -958,10 +974,10 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
       var Component = _internalTestHelpers.factory();
       registry.register('component:foo-bar', Component);
 
-      var factoryCreator1 = container.factoryFor('component:foo-bar');
-      var factoryCreator2 = container.factoryFor('component:foo-bar');
-      var instance1 = factoryCreator1.create({ foo: 'foo' });
-      var instance2 = factoryCreator2.create({ bar: 'bar' });
+      var factoryManager1 = container.factoryFor('component:foo-bar');
+      var factoryManager2 = container.factoryFor('component:foo-bar');
+      var instance1 = factoryManager1.create({ foo: 'foo' });
+      var instance2 = factoryManager2.create({ bar: 'bar' });
 
       assert.deepEqual(instance1.constructor, instance2.constructor);
     });
@@ -16721,7 +16737,7 @@ enifed('ember-glimmer/tests/integration/components/destroy-test', ['exports', 'e
 
       this.assertText('');
 
-      assert.equal(this.env.destroyedComponents.length, 0, 'enviroment.destroyedComponents should be empty');
+      assert.equal(this.env.destroyedComponents.length, 0, 'environment.destroyedComponents should be empty');
     };
 
     return _class;
@@ -35802,7 +35818,7 @@ enifed('ember-glimmer/tests/integration/syntax/with-test.lint-test', ['exports']
     assert.ok(true, 'ember-glimmer/tests/integration/syntax/with-test.js should pass ESLint\n\n');
   });
 });
-enifed('ember-glimmer/tests/unit/layout-cache-test', ['exports', 'ember-utils', 'ember-glimmer/tests/utils/test-case', 'glimmer-runtime'], function (exports, _emberUtils, _emberGlimmerTestsUtilsTestCase, _glimmerRuntime) {
+enifed('ember-glimmer/tests/unit/layout-cache-test', ['exports', 'ember-glimmer/tests/utils/test-case', 'glimmer-runtime', 'ember-utils'], function (exports, _emberGlimmerTestsUtilsTestCase, _glimmerRuntime, _emberUtils) {
   'use strict';
 
   var Counter = (function () {
@@ -35823,7 +35839,7 @@ enifed('ember-glimmer/tests/unit/layout-cache-test', ['exports', 'ember-utils',
 
     Counter.prototype.reset = function reset() {
       this.total = 0;
-      this.counts = new _emberUtils.EmptyObject();
+      this.counts = Object.create(null);
     };
 
     return Counter;
@@ -67030,15 +67046,6 @@ enifed('ember-utils/dictionary.lint-test', ['exports'], function (exports) {
     assert.ok(true, 'ember-utils/dictionary.js should pass ESLint\n\n');
   });
 });
-enifed('ember-utils/empty-object.lint-test', ['exports'], function (exports) {
-  'use strict';
-
-  QUnit.module('ESLint | ember-utils/empty-object.js');
-  QUnit.test('should pass ESLint', function (assert) {
-    assert.expect(1);
-    assert.ok(true, 'ember-utils/empty-object.js should pass ESLint\n\n');
-  });
-});
 enifed('ember-utils/guid.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.12.0-beta.3
+ * @version   2.12.0
  */
 
 var enifed, requireModule, Ember;
@@ -900,11 +900,11 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
     var Component = _internalTestHelpers.factory();
     registry.register('component:foo-bar', Component);
 
-    var factoryCreator = container[_container.FACTORY_FOR]('component:foo-bar');
+    var factoryManager = container[_container.FACTORY_FOR]('component:foo-bar');
     if (false) {
-      assert.deepEqual(factoryCreator.class, Component, 'No double extend');
+      assert.deepEqual(factoryManager.class, Component, 'No double extend');
     } else {
-      assert.deepEqual(factoryCreator.class, lookupFactory('component:foo-bar', container), 'Double extended class');
+      assert.deepEqual(factoryManager.class, lookupFactory('component:foo-bar', container), 'Double extended class');
     }
   });
 
@@ -917,16 +917,32 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
       }, /Invalid Fullname, expected: 'type:name' got: chad-bar/);
     });
 
-    QUnit.test('#factoryFor returns a factory creator', function (assert) {
+    QUnit.test('#factoryFor returns a factory manager', function (assert) {
       var registry = new _containerIndex.Registry();
       var container = registry.container();
 
       var Component = _internalTestHelpers.factory();
       registry.register('component:foo-bar', Component);
 
-      var factoryCreator = container.factoryFor('component:foo-bar');
-      assert.ok(factoryCreator.create);
-      assert.ok(factoryCreator.class);
+      var factoryManager = container.factoryFor('component:foo-bar');
+      assert.ok(factoryManager.create);
+      assert.ok(factoryManager.class);
+    });
+
+    QUnit.test('#factoryFor returns a cached factory manager for the same type', function (assert) {
+      var registry = new _containerIndex.Registry();
+      var container = registry.container();
+
+      var Component = _internalTestHelpers.factory();
+      registry.register('component:foo-bar', Component);
+      registry.register('component:baz-bar', Component);
+
+      var factoryManager1 = container.factoryFor('component:foo-bar');
+      var factoryManager2 = container.factoryFor('component:foo-bar');
+      var factoryManager3 = container.factoryFor('component:baz-bar');
+
+      assert.equal(factoryManager1, factoryManager2, 'cache hit');
+      assert.notEqual(factoryManager1, factoryManager3, 'cache miss');
     });
 
     QUnit.test('#factoryFor class returns the factory function', function (assert) {
@@ -936,8 +952,8 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
       var Component = _internalTestHelpers.factory();
       registry.register('component:foo-bar', Component);
 
-      var factoryCreator = container.factoryFor('component:foo-bar');
-      assert.deepEqual(factoryCreator.class, Component, 'No double extend');
+      var factoryManager = container.factoryFor('component:foo-bar');
+      assert.deepEqual(factoryManager.class, Component, 'No double extend');
     });
 
     QUnit.test('#factoryFor instance have a common parent', function (assert) {
@@ -947,10 +963,10 @@ enifed('container/tests/container_test', ['exports', 'ember-utils', 'ember-envir
       var Component = _internalTestHelpers.factory();
       registry.register('component:foo-bar', Component);
 
-      var factoryCreator1 = container.factoryFor('component:foo-bar');
-      var factoryCreator2 = container.factoryFor('component:foo-bar');
-      var instance1 = factoryCreator1.create({ foo: 'foo' });
-      var instance2 = factoryCreator2.create({ bar: 'bar' });
+      var factoryManager1 = container.factoryFor('component:foo-bar');
+      var factoryManager2 = container.factoryFor('component:foo-bar');
+      var instance1 = factoryManager1.create({ foo: 'foo' });
+      var instance2 = factoryManager2.create({ bar: 'bar' });
 
       assert.deepEqual(instance1.constructor, instance2.constructor);
     });
@@ -16597,7 +16613,7 @@ enifed('ember-glimmer/tests/integration/components/destroy-test', ['exports', 'e
 
       this.assertText('');
 
-      assert.equal(this.env.destroyedComponents.length, 0, 'enviroment.destroyedComponents should be empty');
+      assert.equal(this.env.destroyedComponents.length, 0, 'environment.destroyedComponents should be empty');
     };
 
     return _class;
@@ -35437,7 +35453,7 @@ enifed('ember-glimmer/tests/integration/syntax/with-test.lint-test', ['exports']
     assert.ok(true, 'ember-glimmer/tests/integration/syntax/with-test.js should pass ESLint\n\n');
   });
 });
-enifed('ember-glimmer/tests/unit/layout-cache-test', ['exports', 'ember-utils', 'ember-glimmer/tests/utils/test-case', 'glimmer-runtime'], function (exports, _emberUtils, _emberGlimmerTestsUtilsTestCase, _glimmerRuntime) {
+enifed('ember-glimmer/tests/unit/layout-cache-test', ['exports', 'ember-glimmer/tests/utils/test-case', 'glimmer-runtime', 'ember-utils'], function (exports, _emberGlimmerTestsUtilsTestCase, _glimmerRuntime, _emberUtils) {
   'use strict';
 
   var Counter = (function () {
@@ -35456,7 +35472,7 @@ enifed('ember-glimmer/tests/unit/layout-cache-test', ['exports', 'ember-utils',
 
     Counter.prototype.reset = function reset() {
       this.total = 0;
-      this.counts = new _emberUtils.EmptyObject();
+      this.counts = Object.create(null);
     };
 
     return Counter;
@@ -66565,15 +66581,6 @@ enifed('ember-utils/dictionary.lint-test', ['exports'], function (exports) {
     assert.ok(true, 'ember-utils/dictionary.js should pass ESLint\n\n');
   });
 });
-enifed('ember-utils/empty-object.lint-test', ['exports'], function (exports) {
-  'use strict';
-
-  QUnit.module('ESLint | ember-utils/empty-object.js');
-  QUnit.test('should pass ESLint', function (assert) {
-    assert.expect(1);
-    assert.ok(true, 'ember-utils/empty-object.js should pass ESLint\n\n');
-  });
-});
 enifed('ember-utils/guid.lint-test', ['exports'], function (exports) {
   'use strict';
 

data/dist/ember.debug.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.12.0-beta.3
+ * @version   2.12.0
  */
 
 var enifed, requireModule, Ember;
@@ -1232,6 +1232,7 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
     this.owner = options && options.owner ? options.owner : null;
     this.cache = _emberUtils.dictionary(options && options.cache ? options.cache : null);
     this.factoryCache = _emberUtils.dictionary(options && options.factoryCache ? options.factoryCache : null);
+    this.factoryManagerCache = _emberUtils.dictionary(options && options.factoryManagerCache ? options.factoryManagerCache : null);
     this.validationCache = _emberUtils.dictionary(options && options.validationCache ? options.validationCache : null);
     this._fakeContainerToInject = buildFakeContainerWithDeprecations(this);
     this[CONTAINER_OVERRIDE] = undefined;
@@ -1433,6 +1434,7 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
       var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
       var normalizedName = this.registry.normalize(fullName);
+
       _emberMetal.assert('fullName must be a proper full name', this.registry.validateFullName(normalizedName));
 
       if (options.source) {
@@ -1443,6 +1445,12 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
         }
       }
 
+      var cached = this.factoryManagerCache[normalizedName];
+
+      if (cached) {
+        return cached;
+      }
+
       var factory = this.registry.resolve(normalizedName);
 
       if (factory === undefined) {
@@ -1455,6 +1463,7 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
         manager = wrapManagerInDeprecationProxy(manager);
       });
 
+      this.factoryManagerCache[normalizedName] = manager;
       return manager;
     };
   }
@@ -1709,7 +1718,7 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
         obj = factory.create(_emberUtils.assign({}, injections, props));
 
         // TODO - remove when Ember reaches v3.0.0
-        if (!Object.isFrozen(obj) && 'container' in obj) {
+        if (!Object.isFrozen(obj)) {
           injectDeprecatedContainer(obj, container);
         }
       }
@@ -1731,6 +1740,9 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
 
   // TODO - remove when Ember reaches v3.0.0
   function injectDeprecatedContainer(object, container) {
+    if ('container' in object) {
+      return;
+    }
     Object.defineProperty(object, 'container', {
       configurable: true,
       enumerable: false,
@@ -1838,6 +1850,7 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
       this.class = factory;
       this.fullName = fullName;
       this.normalizedName = normalizedName;
+      this.madeToString = undefined;
     }
 
     FactoryManager.prototype.create = function create() {
@@ -1848,7 +1861,7 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
       var injections = injectionsFor(this.container, this.normalizedName);
       var props = _emberUtils.assign({}, injections, options);
 
-      props[_emberUtils.NAME_KEY] = this.container.registry.makeToString(this.class, this.fullName);
+      props[_emberUtils.NAME_KEY] = this.madeToString || (this.madeToString = this.container.registry.makeToString(this.class, this.fullName));
 
       _emberMetal.runInDebug(function () {
         var lazyInjections = undefined;
@@ -1868,8 +1881,9 @@ enifed('container/container', ['exports', 'ember-utils', 'ember-environment', 'e
         throw new Error('Failed to create an instance of \'' + this.normalizedName + '\'. Most likely an improperly defined class or' + ' an invalid module export.');
       }
 
-      if (this.class.prototype) {
-        injectDeprecatedContainer(this.class.prototype, this.container);
+      var prototype = this.class.prototype;
+      if (prototype) {
+        injectDeprecatedContainer(prototype, this.container);
       }
 
       return this.class.create(props);
@@ -1964,7 +1978,7 @@ enifed('container/registry', ['exports', 'ember-utils', 'ember-metal', 'containe
     this._factoryTypeInjections = _emberUtils.dictionary(null);
     this._factoryInjections = _emberUtils.dictionary(null);
 
-    this._localLookupCache = new _emberUtils.EmptyObject();
+    this._localLookupCache = Object.create(null);
     this._normalizeCache = _emberUtils.dictionary(null);
     this._resolveCache = _emberUtils.dictionary(null);
     this._failCache = _emberUtils.dictionary(null);
@@ -2117,7 +2131,7 @@ enifed('container/registry', ['exports', 'ember-utils', 'ember-metal', 'containe
 
       var normalizedName = this.normalize(fullName);
 
-      this._localLookupCache = new _emberUtils.EmptyObject();
+      this._localLookupCache = Object.create(null);
 
       delete this.registrations[normalizedName];
       delete this._resolveCache[normalizedName];
@@ -2659,7 +2673,7 @@ enifed('container/registry', ['exports', 'ember-utils', 'ember-metal', 'containe
     var normalizedNameCache = cache[normalizedName];
 
     if (!normalizedNameCache) {
-      normalizedNameCache = cache[normalizedName] = new _emberUtils.EmptyObject();
+      normalizedNameCache = cache[normalizedName] = Object.create(null);
     }
 
     var cached = normalizedNameCache[normalizedSource];
@@ -4847,8 +4861,8 @@ enifed('ember-application/system/engine', ['exports', 'ember-utils', 'ember-runt
   });
 
   Engine.reopenClass({
-    initializers: new _emberUtils.EmptyObject(),
-    instanceInitializers: new _emberUtils.EmptyObject(),
+    initializers: Object.create(null),
+    instanceInitializers: Object.create(null),
 
     /**
       The goal of initializers should be to register dependencies and injections.
@@ -6491,7 +6505,7 @@ enifed('ember-extension-support/container_debug_adapter', ['exports', 'ember-met
   /**
     The `ContainerDebugAdapter` helps the container and resolver interface
     with tools that debug Ember such as the
-    [Ember Extension](https://github.com/tildeio/ember-extension)
+    [Ember Inspector](https://github.com/emberjs/ember-inspector)
     for Chrome and Firefox.
   
     This class can be extended by a custom resolver implementer
@@ -9023,7 +9037,7 @@ enifed('ember-glimmer/components/text_area', ['exports', 'ember-glimmer/componen
     cols: null
   });
 });
-enifed('ember-glimmer/components/text_field', ['exports', 'ember-utils', 'ember-metal', 'ember-environment', 'ember-glimmer/component', 'ember-glimmer/templates/empty', 'ember-views'], function (exports, _emberUtils, _emberMetal, _emberEnvironment, _emberGlimmerComponent, _emberGlimmerTemplatesEmpty, _emberViews) {
+enifed('ember-glimmer/components/text_field', ['exports', 'ember-metal', 'ember-environment', 'ember-glimmer/component', 'ember-glimmer/templates/empty', 'ember-views'], function (exports, _emberMetal, _emberEnvironment, _emberGlimmerComponent, _emberGlimmerTemplatesEmpty, _emberViews) {
   /**
   @module ember
   @submodule ember-views
@@ -9031,7 +9045,7 @@ enifed('ember-glimmer/components/text_field', ['exports', 'ember-utils', 'ember-
   'use strict';
 
   var inputTypeTestElement = undefined;
-  var inputTypes = new _emberUtils.EmptyObject();
+  var inputTypes = Object.create(null);
   function canSetTypeOfInput(type) {
     if (type in inputTypes) {
       return inputTypes[type];
@@ -14750,7 +14764,7 @@ enifed('ember-glimmer/utils/iterable', ['exports', 'ember-utils', 'ember-metal',
       this.length = array.length;
       this.keyFor = keyFor;
       this.position = 0;
-      this.seen = new _emberUtils.EmptyObject();
+      this.seen = Object.create(null);
     }
 
     ArrayIterator.prototype.isEmpty = function isEmpty() {
@@ -14788,7 +14802,7 @@ enifed('ember-glimmer/utils/iterable', ['exports', 'ember-utils', 'ember-metal',
       this.length = _emberMetal.get(array, 'length');
       this.keyFor = keyFor;
       this.position = 0;
-      this.seen = new _emberUtils.EmptyObject();
+      this.seen = Object.create(null);
     }
 
     EmberArrayIterator.prototype.isEmpty = function isEmpty() {
@@ -14826,7 +14840,7 @@ enifed('ember-glimmer/utils/iterable', ['exports', 'ember-utils', 'ember-metal',
       this.values = values;
       this.keyFor = keyFor;
       this.position = 0;
-      this.seen = new _emberUtils.EmptyObject();
+      this.seen = Object.create(null);
     }
 
     ObjectKeysIterator.prototype.isEmpty = function isEmpty() {
@@ -15083,8 +15097,8 @@ enifed('ember-glimmer/utils/process-args', ['exports', 'ember-utils', 'glimmer-r
 
       var keys = namedArgs.keys;
       var attrs = namedArgs.value();
-      var props = new _emberUtils.EmptyObject();
-      var args = new _emberUtils.EmptyObject();
+      var props = Object.create(null);
+      var args = Object.create(null);
 
       props[_emberGlimmerComponent.ARGS] = args;
 
@@ -15215,7 +15229,7 @@ enifed('ember-glimmer/utils/references', ['exports', 'ember-utils', 'ember-metal
       babelHelpers.classCallCheck(this, RootReference);
 
       _ConstReference.call(this, value);
-      this.children = new _emberUtils.EmptyObject();
+      this.children = Object.create(null);
     }
 
     RootReference.prototype.get = function get(propertyKey) {
@@ -15887,7 +15901,7 @@ enifed('ember-glimmer/views/outlet', ['exports', 'ember-utils', 'glimmer-referen
         return null;
       }
 
-      var state = new _emberUtils.EmptyObject();
+      var state = Object.create(null);
       state[matched.render.outlet] = matched;
       matched.wasUsed = true;
       return { outlets: state };
@@ -16590,7 +16604,7 @@ enifed('ember-metal/binding', ['exports', 'ember-utils', 'ember-console', 'ember
 
   exports.Binding = Binding;
 });
-enifed('ember-metal/cache', ['exports', 'ember-utils', 'ember-metal/meta'], function (exports, _emberUtils, _emberMetalMeta) {
+enifed('ember-metal/cache', ['exports', 'ember-metal/meta'], function (exports, _emberMetalMeta) {
   'use strict';
 
   var Cache = (function () {
@@ -16657,7 +16671,7 @@ enifed('ember-metal/cache', ['exports', 'ember-utils', 'ember-metal/meta'], func
     function DefaultStore() {
       babelHelpers.classCallCheck(this, DefaultStore);
 
-      this.data = new _emberUtils.EmptyObject();
+      this.data = Object.create(null);
     }
 
     DefaultStore.prototype.get = function get(key) {
@@ -16669,13 +16683,13 @@ enifed('ember-metal/cache', ['exports', 'ember-utils', 'ember-metal/meta'], func
     };
 
     DefaultStore.prototype.clear = function clear() {
-      this.data = new _emberUtils.EmptyObject();
+      this.data = Object.create(null);
     };
 
     return DefaultStore;
   })();
 });
-enifed('ember-metal/chains', ['exports', 'ember-utils', 'ember-metal/property_get', 'ember-metal/meta', 'ember-metal/watch_key', 'ember-metal/computed', 'ember-metal/watch_path'], function (exports, _emberUtils, _emberMetalProperty_get, _emberMetalMeta, _emberMetalWatch_key, _emberMetalComputed, _emberMetalWatch_path) {
+enifed('ember-metal/chains', ['exports', 'ember-metal/property_get', 'ember-metal/meta', 'ember-metal/watch_key', 'ember-metal/computed', 'ember-metal/watch_path'], function (exports, _emberMetalProperty_get, _emberMetalMeta, _emberMetalWatch_key, _emberMetalComputed, _emberMetalWatch_path) {
   'use strict';
 
   exports.finishChains = finishChains;
@@ -16701,7 +16715,7 @@ enifed('ember-metal/chains', ['exports', 'ember-utils', 'ember-metal/property_ge
       // chain nodes that reference a key in this obj by key
       // we only create ChainWatchers when we are going to add them
       // so create this upfront
-      this.chains = new _emberUtils.EmptyObject();
+      this.chains = Object.create(null);
     }
 
     ChainWatchers.prototype.add = function add(key, node) {
@@ -16918,7 +16932,7 @@ enifed('ember-metal/chains', ['exports', 'ember-utils', 'ember-metal/property_ge
       var chains = this._chains;
       var node = undefined;
       if (chains === undefined) {
-        chains = this._chains = new _emberUtils.EmptyObject();
+        chains = this._chains = Object.create(null);
       } else {
         node = chains[key];
       }
@@ -19281,10 +19295,10 @@ enifed('ember-metal/map', ['exports', 'ember-utils'], function (exports, _emberU
   }
 
   function copyNull(obj) {
-    var output = new _emberUtils.EmptyObject();
+    var output = Object.create(null);
 
     for (var prop in obj) {
-      // hasOwnPropery is not needed because obj is new EmptyObject();
+      // hasOwnPropery is not needed because obj is Object.create(null);
       output[prop] = obj[prop];
     }
 
@@ -19340,7 +19354,7 @@ enifed('ember-metal/map', ['exports', 'ember-utils'], function (exports, _emberU
       @private
     */
     clear: function () {
-      this.presenceSet = new _emberUtils.EmptyObject();
+      this.presenceSet = Object.create(null);
       this.list = [];
       this.size = 0;
     },
@@ -19496,7 +19510,7 @@ enifed('ember-metal/map', ['exports', 'ember-utils'], function (exports, _emberU
     if (this instanceof Map) {
       this._keys = OrderedSet.create();
       this._keys._silenceRemoveDeprecation = true;
-      this._values = new _emberUtils.EmptyObject();
+      this._values = Object.create(null);
       this.size = 0;
     } else {
       missingNew('Map');
@@ -19652,7 +19666,7 @@ enifed('ember-metal/map', ['exports', 'ember-utils'], function (exports, _emberU
     */
     clear: function () {
       this._keys.clear();
-      this._values = new _emberUtils.EmptyObject();
+      this._values = Object.create(null);
       this.size = 0;
     },
 
@@ -19984,14 +19998,15 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/features', 'e
     };
 
     Meta.prototype._getOrCreateOwnMap = function _getOrCreateOwnMap(key) {
-      return this[key] || (this[key] = new _emberUtils.EmptyObject());
+      return this[key] || (this[key] = Object.create(null));
     };
 
     Meta.prototype._getInherited = function _getInherited(key) {
       var pointer = this;
       while (pointer !== undefined) {
-        if (pointer[key]) {
-          return pointer[key];
+        var map = pointer[key];
+        if (map) {
+          return map;
         }
         pointer = pointer.parent;
       }
@@ -20020,7 +20035,7 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/features', 'e
       var outerMap = this._getOrCreateOwnMap('_deps');
       var innerMap = outerMap[subkey];
       if (!innerMap) {
-        innerMap = outerMap[subkey] = new _emberUtils.EmptyObject();
+        innerMap = outerMap[subkey] = Object.create(null);
       }
       innerMap[itemkey] = value;
     };
@@ -20032,8 +20047,9 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/features', 'e
         if (map) {
           var value = map[subkey];
           if (value) {
-            if (value[itemkey] !== undefined) {
-              return value[itemkey];
+            var itemvalue = value[itemkey];
+            if (itemvalue !== undefined) {
+              return itemvalue;
             }
           }
         }
@@ -20058,16 +20074,18 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/features', 'e
 
     Meta.prototype._forEachIn = function _forEachIn(key, subkey, fn) {
       var pointer = this;
-      var seen = new _emberUtils.EmptyObject();
-      var calls = [];
+      var seen = undefined;
+      var calls = undefined;
       while (pointer !== undefined) {
         var map = pointer[key];
         if (map) {
           var innerMap = map[subkey];
           if (innerMap) {
             for (var innerKey in innerMap) {
+              seen = seen || Object.create(null);
               if (!seen[innerKey]) {
                 seen[innerKey] = true;
+                calls = calls || [];
                 calls.push([innerKey, innerMap[innerKey]]);
               }
             }
@@ -20075,12 +20093,14 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/features', 'e
         }
         pointer = pointer.parent;
       }
-      for (var i = 0; i < calls.length; i++) {
-        var _calls$i = calls[i];
-        var innerKey = _calls$i[0];
-        var value = _calls$i[1];
+      if (calls) {
+        for (var i = 0; i < calls.length; i++) {
+          var _calls$i = calls[i];
+          var innerKey = _calls$i[0];
+          var value = _calls$i[1];
 
-        fn(innerKey, value);
+          fn(innerKey, value);
+        }
       }
     };
 
@@ -20094,7 +20114,7 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/features', 'e
         if (map) {
           var value = map[subkey];
           if (value !== undefined || subkey in map) {
-            return map[subkey];
+            return value;
           }
         }
         pointer = pointer.parent;
@@ -20160,11 +20180,12 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/features', 'e
 
     Meta.prototype['forEach' + capitalized] = function (fn) {
       var pointer = this;
-      var seen = new _emberUtils.EmptyObject();
+      var seen = undefined;
       while (pointer !== undefined) {
         var map = pointer[key];
         if (map) {
           for (var _key in map) {
+            seen = seen || Object.create(null);
             if (!seen[_key]) {
               seen[_key] = true;
               fn(_key, map[_key]);
@@ -20272,7 +20293,7 @@ enifed('ember-metal/meta', ['exports', 'ember-utils', 'ember-metal/features', 'e
         if (map) {
           var value = map[subkey];
           if (value !== undefined || subkey in map) {
-            return map[subkey];
+            return value;
           }
         }
         pointer = pointer.parent;
@@ -25350,7 +25371,7 @@ enifed('ember-routing/services/routing', ['exports', 'ember-utils', 'ember-runti
     return req;
   }
 });
-enifed('ember-routing/system/cache', ['exports', 'ember-utils', 'ember-runtime'], function (exports, _emberUtils, _emberRuntime) {
+enifed('ember-routing/system/cache', ['exports', 'ember-runtime'], function (exports, _emberRuntime) {
   'use strict';
 
   /**
@@ -25362,7 +25383,7 @@ enifed('ember-routing/system/cache', ['exports', 'ember-utils', 'ember-runtime']
   */
   exports.default = _emberRuntime.Object.extend({
     init: function () {
-      this.cache = new _emberUtils.EmptyObject();
+      this.cache = Object.create(null);
     },
 
     has: function (bucketKey) {
@@ -25373,7 +25394,7 @@ enifed('ember-routing/system/cache', ['exports', 'ember-utils', 'ember-runtime']
       var bucket = this.cache[bucketKey];
 
       if (!bucket) {
-        bucket = this.cache[bucketKey] = new _emberUtils.EmptyObject();
+        bucket = this.cache[bucketKey] = Object.create(null);
       }
 
       bucket[key] = value;
@@ -27224,7 +27245,7 @@ enifed('ember-routing/system/route', ['exports', 'ember-utils', 'ember-metal', '
       when implementing your `setupController` function, make sure to call
       `_super`:
        ```app/routes/photos.js
-      import Ember from 'ebmer';
+      import Ember from 'ember';
        export default Ember.Route.extend({
         model() {
           return this.store.findAll('photo');
@@ -27965,15 +27986,15 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
     init: function () {
       this._super.apply(this, arguments);
 
-      this._qpCache = new _emberUtils.EmptyObject();
+      this._qpCache = Object.create(null);
       this._resetQueuedQueryParameterChanges();
       this._handledErrors = _emberUtils.dictionary(null);
-      this._engineInstances = new _emberUtils.EmptyObject();
-      this._engineInfoByRoute = new _emberUtils.EmptyObject();
+      this._engineInstances = Object.create(null);
+      this._engineInfoByRoute = Object.create(null);
     },
 
     /*
-      Resets all pending query paramter changes.
+      Resets all pending query parameter changes.
       Called after transitioning to a new route
       based on query parameter changes.
     */
@@ -28388,7 +28409,7 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
     _getHandlerFunction: function () {
       var _this2 = this;
 
-      var seen = new _emberUtils.EmptyObject();
+      var seen = Object.create(null);
       var owner = _emberUtils.getOwner(this);
 
       return function (name) {
@@ -28841,7 +28862,7 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
       var engineInstances = this._engineInstances;
 
       if (!engineInstances[name]) {
-        engineInstances[name] = new _emberUtils.EmptyObject();
+        engineInstances[name] = Object.create(null);
       }
 
       var engineInstance = engineInstances[name][instanceId];
@@ -29303,7 +29324,7 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
     var target = undefined;
     var myState = {
       render: renderOptions,
-      outlets: new _emberUtils.EmptyObject(),
+      outlets: Object.create(null),
       wasUsed: false
     };
     if (renderOptions.into) {
@@ -29344,7 +29365,7 @@ enifed('ember-routing/system/router', ['exports', 'ember-utils', 'ember-console'
         render: {
           name: '__ember_orphans__'
         },
-        outlets: new _emberUtils.EmptyObject()
+        outlets: Object.create(null)
       };
     }
     liveRoutes.outlets.__ember_orphans__.outlets[into] = myState;
@@ -30913,7 +30934,7 @@ enifed('ember-runtime/computed/reduce_computed_macros', ['exports', 'ember-utils
   function uniqBy(dependentKey, propertyKey) {
     return _emberMetal.computed(dependentKey + '.[]', function () {
       var uniq = _emberRuntimeSystemNative_array.A();
-      var seen = new _emberUtils.EmptyObject();
+      var seen = Object.create(null);
       var list = _emberMetal.get(this, dependentKey);
       if (_emberRuntimeUtils.isArray(list)) {
         list.forEach(function (item) {
@@ -33022,6 +33043,36 @@ enifed('ember-runtime/mixins/container_proxy', ['exports', 'ember-metal', 'conta
   }, _containerProxyMixin);
 
   if (true) {
+    /**
+     Given a fullName return a factory manager.
+      This method returns a manager which can be used for introspection of the
+     factory's class or for the creation of factory instances with initial
+     properties. The manager is an object with the following properties:
+      * `class` - The registered or resolved class.
+     * `create` - A function that will create an instance of the class with
+       any dependencies injected.
+      For example:
+      ```javascript
+     let owner = Ember.getOwner(otherInstance);
+     // the owner is commonly the `applicationInstance`, and can be accessed via
+     // an instance initializer.
+      let factory = owner.factoryFor('service:bespoke');
+      factory.class;
+     // The registered or resolved class. For example when used with an Ember-CLI
+     // app, this would be the default export from `app/services/bespoke.js`.
+      let instance = factory.create({
+       someProperty: 'an initial property value'
+     });
+     // Create an instance with any injections and the passed options as
+     // initial properties.
+     ```
+      @public
+     @class ContainerProxyMixin
+     @method factoryFor
+     @param {String} fullName
+     @param {Object} options
+     @return {FactoryManager}
+     */
     containerProxyMixin.factoryFor = function ContainerProxyMixin_factoryFor(fullName) {
       var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
 
@@ -34189,7 +34240,7 @@ enifed('ember-runtime/mixins/enumerable', ['exports', 'ember-utils', 'ember-meta
 
     uniqBy: function (key) {
       var ret = emberA();
-      var seen = new _emberUtils.EmptyObject();
+      var seen = Object.create(null);
 
       this.forEach(function (item) {
         var guid = _emberUtils.guidFor(_emberMetal.get(item, key));
@@ -37239,7 +37290,7 @@ babelHelpers.classCallCheck(this, Class);
   @param {Object} binding
   @private
 */
-enifed('ember-runtime/system/each_proxy', ['exports', 'ember-utils', 'ember-metal', 'ember-runtime/mixins/array'], function (exports, _emberUtils, _emberMetal, _emberRuntimeMixinsArray) {
+enifed('ember-runtime/system/each_proxy', ['exports', 'ember-metal', 'ember-runtime/mixins/array'], function (exports, _emberMetal, _emberRuntimeMixinsArray) {
   'use strict';
 
   exports.default = EachProxy;
@@ -37308,7 +37359,7 @@ enifed('ember-runtime/system/each_proxy', ['exports', 'ember-utils', 'ember-meta
     beginObservingContentKey: function (keyName) {
       var keys = this._keys;
       if (!keys) {
-        keys = this._keys = new _emberUtils.EmptyObject();
+        keys = this._keys = Object.create(null);
       }
 
       if (!keys[keyName]) {
@@ -40179,52 +40230,23 @@ enifed("ember-utils/assign", ["exports"], function (exports) {
     return original;
   }
 });
-enifed('ember-utils/dictionary', ['exports', 'ember-utils/empty-object'], function (exports, _emberUtilsEmptyObject) {
-  'use strict';
-
-  exports.default = makeDictionary;
-
+enifed('ember-utils/dictionary', ['exports'], function (exports) {
   // the delete is meant to hint at runtimes that this object should remain in
   // dictionary mode. This is clearly a runtime specific hack, but currently it
   // appears worthwhile in some usecases. Please note, these deletes do increase
   // the cost of creation dramatically over a plain Object.create. And as this
   // only makes sense for long-lived dictionaries that aren't instantiated often.
+  'use strict';
+
+  exports.default = makeDictionary;
 
   function makeDictionary(parent) {
-    var dict = undefined;
-    if (parent === null) {
-      dict = new _emberUtilsEmptyObject.default();
-    } else {
-      dict = Object.create(parent);
-    }
+    var dict = Object.create(parent);
     dict['_dict'] = null;
     delete dict['_dict'];
     return dict;
   }
 });
-enifed("ember-utils/empty-object", ["exports"], function (exports) {
-  // This exists because `Object.create(null)` is absurdly slow compared
-  // to `new EmptyObject()`. In either case, you want a null prototype
-  // when you're treating the object instances as arbitrary dictionaries
-  // and don't want your keys colliding with build-in methods on the
-  // default object prototype.
-
-  "use strict";
-
-  var proto = Object.create(null, {
-    // without this, we will always still end up with (new
-    // EmptyObject()).constructor === Object
-    constructor: {
-      value: undefined,
-      enumerable: false,
-      writable: true
-    }
-  });
-
-  function EmptyObject() {}
-  EmptyObject.prototype = proto;
-  exports.default = EmptyObject;
-});
 enifed('ember-utils/guid', ['exports', 'ember-utils/intern'], function (exports, _emberUtilsIntern) {
   'use strict';
 
@@ -40429,7 +40451,7 @@ enifed('ember-utils/guid', ['exports', 'ember-utils/intern'], function (exports,
     }
   }
 });
-enifed('ember-utils/index', ['exports', 'ember-utils/symbol', 'ember-utils/owner', 'ember-utils/assign', 'ember-utils/empty-object', 'ember-utils/dictionary', 'ember-utils/guid', 'ember-utils/intern', 'ember-utils/super', 'ember-utils/inspect', 'ember-utils/lookup-descriptor', 'ember-utils/invoke', 'ember-utils/make-array', 'ember-utils/apply-str', 'ember-utils/name', 'ember-utils/to-string', 'ember-utils/weak-map-utils', 'ember-utils/proxy-utils'], function (exports, _emberUtilsSymbol, _emberUtilsOwner, _emberUtilsAssign, _emberUtilsEmptyObject, _emberUtilsDictionary, _emberUtilsGuid, _emberUtilsIntern, _emberUtilsSuper, _emberUtilsInspect, _emberUtilsLookupDescriptor, _emberUtilsInvoke, _emberUtilsMakeArray, _emberUtilsApplyStr, _emberUtilsName, _emberUtilsToString, _emberUtilsWeakMapUtils, _emberUtilsProxyUtils) {
+enifed('ember-utils/index', ['exports', 'ember-utils/symbol', 'ember-utils/owner', 'ember-utils/assign', 'ember-utils/dictionary', 'ember-utils/guid', 'ember-utils/intern', 'ember-utils/super', 'ember-utils/inspect', 'ember-utils/lookup-descriptor', 'ember-utils/invoke', 'ember-utils/make-array', 'ember-utils/apply-str', 'ember-utils/name', 'ember-utils/to-string', 'ember-utils/weak-map-utils', 'ember-utils/proxy-utils'], function (exports, _emberUtilsSymbol, _emberUtilsOwner, _emberUtilsAssign, _emberUtilsDictionary, _emberUtilsGuid, _emberUtilsIntern, _emberUtilsSuper, _emberUtilsInspect, _emberUtilsLookupDescriptor, _emberUtilsInvoke, _emberUtilsMakeArray, _emberUtilsApplyStr, _emberUtilsName, _emberUtilsToString, _emberUtilsWeakMapUtils, _emberUtilsProxyUtils) {
   /*
    This package will be eagerly parsed and should have no dependencies on external
    packages.
@@ -40447,7 +40469,6 @@ enifed('ember-utils/index', ['exports', 'ember-utils/symbol', 'ember-utils/owner
   exports.setOwner = _emberUtilsOwner.setOwner;
   exports.OWNER = _emberUtilsOwner.OWNER;
   exports.assign = _emberUtilsAssign.default;
-  exports.EmptyObject = _emberUtilsEmptyObject.default;
   exports.dictionary = _emberUtilsDictionary.default;
   exports.uuid = _emberUtilsGuid.uuid;
   exports.GUID_KEY = _emberUtilsGuid.GUID_KEY;
@@ -43539,7 +43560,7 @@ enifed('ember/index', ['exports', 'require', 'ember-environment', 'ember-utils',
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.12.0-beta.3";
+  exports.default = "2.12.0";
 });
 enifed('internal-test-helpers/apply-mixins', ['exports', 'ember-utils'], function (exports, _emberUtils) {
   'use strict';