From 222dd701901ff0be5479f0baf3e629698b08cef3 Mon Sep 17 00:00:00 2001
From: Tilde Engineering <engineering@tilde.io>
Date: Sat, 28 Feb 2015 19:40:47 -0800
Subject: [PATCH] =?UTF-8?q?Improve=20=E2=80=9Creal=20app=E2=80=9D=20bootin?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a series of improvements made to get Skylight booting on this
branch:

* Implement the new version of `makeBoundHelper` semantics and the
  param `apply`ing behavior of `Handlebars.makeBoundHelper`. The
  dependent key behavior of `makeBoundHelper` is not yet implemented.
* Implement the HTMLBars helper hooks.
* Make `each` support Ember Array-likes and falsy arrays.
* Implement partials, including bound partial names
* Support pass-through routes with no templates
* Implement a very simple `link-to` stub
* Implement a passable but not-very-good attribute bindings including
  fixing up view streams
---
 .../lib/compat/make-bound-helper.js           | 101 ++----------------
 packages/ember-htmlbars/lib/env.js            |  10 +-
 packages/ember-htmlbars/lib/helpers/each.js   |  16 +--
 .../ember-htmlbars/lib/hooks/bind-self.js     |   2 +-
 .../lib/hooks/create-shadow-scope.js          |   1 +
 packages/ember-htmlbars/lib/hooks/get-root.js |  27 ++---
 .../ember-htmlbars/lib/hooks/has-helper.js    |   5 +
 .../ember-htmlbars/lib/hooks/lookup-helper.js |   5 +
 .../ember-htmlbars/lib/keywords/outlet.js     |   8 ++
 .../ember-htmlbars/lib/keywords/partial.js    |  17 +++
 .../lib/system/lookup-helper.js               |   4 +-
 .../lib/system/make_bound_helper.js           |  45 +-------
 .../ember-htmlbars/lib/templates/link-to.hbs  |   1 +
 packages/ember-metal/lib/streams/stream.js    |   7 ++
 packages/ember-metal/lib/streams/utils.js     |  12 +++
 .../lib/helpers/link-to.js                    |  69 ++----------
 .../lib/mixins/attribute_bindings_support.js  |   2 +-
 .../lib/mixins/class_names_support.js         |  23 ++--
 .../lib/mixins/view_stream_support.js         |  83 +-------------
 .../ember-views/lib/streams/key_stream.js     |   7 --
 .../ember-views/lib/system/lookup_partial.js  |  21 +++-
 .../ember-views/lib/views/states/in_buffer.js |   4 +-
 packages/ember-views/lib/views/view.js        |   4 +-
 23 files changed, 136 insertions(+), 338 deletions(-)
 create mode 100644 packages/ember-htmlbars/lib/hooks/has-helper.js
 create mode 100644 packages/ember-htmlbars/lib/hooks/lookup-helper.js
 create mode 100644 packages/ember-htmlbars/lib/keywords/partial.js
 create mode 100644 packages/ember-htmlbars/lib/templates/link-to.hbs

diff --git a/packages/ember-htmlbars/lib/compat/make-bound-helper.js b/packages/ember-htmlbars/lib/compat/make-bound-helper.js
index 6d7ebc9eadb..a1ec272eed4 100644
--- a/packages/ember-htmlbars/lib/compat/make-bound-helper.js
+++ b/packages/ember-htmlbars/lib/compat/make-bound-helper.js
@@ -3,19 +3,8 @@
 @submodule ember-htmlbars
 */
 
-import Ember from "ember-metal/core"; // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
-import { IS_BINDING } from "ember-metal/mixin";
 import Helper from "ember-htmlbars/system/helper";
 
-import Stream from "ember-metal/streams/stream";
-import {
-  readArray,
-  scanArray,
-  scanHash,
-  readHash,
-  isStream
-} from "ember-metal/streams/utils";
-
 /**
   A helper function used by `registerBoundHelper`. Takes the
   provided Handlebars helper function fn and returns it in wrapped
@@ -42,88 +31,10 @@ import {
   @since 1.2.0
   @deprecated
 */
-export default function makeBoundHelper(fn, compatMode) {
-  var dependentKeys = [];
-  for (var i = 1; i < arguments.length; i++) {
-    dependentKeys.push(arguments[i]);
-  }
-
-  function helperFunc(params, hash, options, env) {
-    var view = this;
-    var numParams = params.length;
-    var param;
-
-    Ember.assert("registerBoundHelper-generated helpers do not support use with Handlebars blocks.", !options.template);
-
-    for (var prop in hash) {
-      if (IS_BINDING.test(prop)) {
-        hash[prop.slice(0, -7)] = view.getStream(hash[prop]);
-        delete hash[prop];
-      }
-    }
-
-    function valueFn() {
-      var args = readArray(params);
-      var properties = new Array(params.length);
-      for (var i = 0, l = params.length; i < l; i++) {
-        param = params[i];
-
-        if (isStream(param)) {
-          properties[i] = param._label;
-        } else {
-          properties[i] = param;
-        }
-      }
-
-      args.push({
-        hash: readHash(hash),
-        data: { properties: properties }
-      });
-      return fn.apply(view, args);
-    }
-
-    // If none of the hash parameters are bound, act as an unbound helper.
-    // This prevents views from being unnecessarily created
-    var hasStream = scanArray(params) || scanHash(hash);
-    if (hasStream) {
-      var lazyValue = new Stream(valueFn);
-
-      for (i = 0; i < numParams; i++) {
-        param = params[i];
-        if (isStream(param)) {
-          param.subscribe(lazyValue.notify, lazyValue);
-        }
-      }
-
-      for (prop in hash) {
-        param = hash[prop];
-        if (isStream(param)) {
-          param.subscribe(lazyValue.notify, lazyValue);
-        }
-      }
-
-      if (numParams > 0) {
-        var firstParam = params[0];
-        // Only bother with subscriptions if the first argument
-        // is a stream itself, and not a primitive.
-        if (isStream(firstParam)) {
-          var onDependentKeyNotify = function onDependentKeyNotify(stream) {
-            stream.value();
-            lazyValue.notify();
-          };
-          for (i = 0; i < dependentKeys.length; i++) {
-            var childParam = firstParam.get(dependentKeys[i]);
-            childParam.value();
-            childParam.subscribe(onDependentKeyNotify);
-          }
-        }
-      }
-
-      return lazyValue;
-    } else {
-      return valueFn();
-    }
-  }
-
-  return new Helper(helperFunc);
+export default function makeBoundHelper(fn) {
+  return new Helper(function(params, hash, templates) {
+    var args = params.slice();
+    args.push({ hash: hash, templates: templates });
+    fn.apply(undefined, args);
+  });
 }
diff --git a/packages/ember-htmlbars/lib/env.js b/packages/ember-htmlbars/lib/env.js
index 26aa71fc455..b973cb0ac97 100644
--- a/packages/ember-htmlbars/lib/env.js
+++ b/packages/ember-htmlbars/lib/env.js
@@ -19,6 +19,8 @@ import getValue from "ember-htmlbars/hooks/get-value";
 import cleanup from "ember-htmlbars/hooks/cleanup";
 import classify from "ember-htmlbars/hooks/classify";
 import component from "ember-htmlbars/hooks/component";
+import lookupHelper from "ember-htmlbars/hooks/lookup-helper";
+import hasHelper from "ember-htmlbars/hooks/has-helper";
 
 import helpers from "ember-htmlbars/helpers";
 
@@ -38,7 +40,9 @@ merge(emberHooks, {
   concat: concat,
   cleanup: cleanup,
   classify: classify,
-  component: component
+  component: component,
+  lookupHelper: lookupHelper,
+  hasHelper: hasHelper
 });
 
 import debuggerKeyword from "ember-htmlbars/keywords/debugger";
@@ -47,6 +51,7 @@ import outlet from "ember-htmlbars/keywords/outlet";
 import unbound from "ember-htmlbars/keywords/unbound";
 import view from "ember-htmlbars/keywords/view";
 import componentKeyword from "ember-htmlbars/keywords/component";
+import partial from "ember-htmlbars/keywords/partial";
 
 merge(emberHooks.keywords, {
   "debugger": debuggerKeyword,
@@ -54,7 +59,8 @@ merge(emberHooks.keywords, {
   outlet: outlet,
   unbound: unbound,
   view: view,
-  component: componentKeyword
+  component: componentKeyword,
+  partial: partial
 });
 
 export default {
diff --git a/packages/ember-htmlbars/lib/helpers/each.js b/packages/ember-htmlbars/lib/helpers/each.js
index f0e27385dd0..7099f243775 100644
--- a/packages/ember-htmlbars/lib/helpers/each.js
+++ b/packages/ember-htmlbars/lib/helpers/each.js
@@ -1,14 +1,18 @@
-import { guidFor } from "ember-metal/utils";
 import { get } from "ember-metal/property_get";
+import { forEach } from "ember-metal/enumerable_utils";
 
 export default function eachHelper(params, hash, blocks) {
   var list = params[0];
   var keyPath = hash.key;
 
-  for (var i=0, l=list.length; i<l; i++) {
-    var item = list[i];
-    var key = keyPath ? get(item, keyPath) : guidFor(item);
-
-    this.yieldItem(key, [item, i]);
+  // TODO: Correct falsy semantics
+  if (!list) {
+    if (blocks.inverse.yield) { blocks.inverse.yield(); }
+    return;
   }
+
+  forEach(list, function(item, i) {
+    var key = keyPath ? get(item, keyPath) : String(i);
+    blocks.template.yieldItem(key, [item, i]);
+  });
 }
diff --git a/packages/ember-htmlbars/lib/hooks/bind-self.js b/packages/ember-htmlbars/lib/hooks/bind-self.js
index 6b6d08beb55..23d08e77464 100644
--- a/packages/ember-htmlbars/lib/hooks/bind-self.js
+++ b/packages/ember-htmlbars/lib/hooks/bind-self.js
@@ -6,7 +6,7 @@
 import { get } from "ember-metal/property_get";
 import updateScope from "ember-htmlbars/utils/update-scope";
 
-export default function bindSelf(scope, self) {
+export default function bindSelf(env, scope, self) {
   Ember.assert("BUG: scope.attrs and self.isView should not both be true", !(scope.attrs && self.isView));
 
   if (self.isView) {
diff --git a/packages/ember-htmlbars/lib/hooks/create-shadow-scope.js b/packages/ember-htmlbars/lib/hooks/create-shadow-scope.js
index 2454b7049f6..ef155980fe9 100644
--- a/packages/ember-htmlbars/lib/hooks/create-shadow-scope.js
+++ b/packages/ember-htmlbars/lib/hooks/create-shadow-scope.js
@@ -5,6 +5,7 @@
 
 export default function createShadowScope(env, parentScope, options) {
   var shadowScope = env.hooks.createFreshScope();
+  if (!options) { return shadowScope; }
 
   if (options.view) {
     shadowScope.renderNode = options.renderNode;
diff --git a/packages/ember-htmlbars/lib/hooks/get-root.js b/packages/ember-htmlbars/lib/hooks/get-root.js
index bf3099e3ecf..bce0f6d782f 100644
--- a/packages/ember-htmlbars/lib/hooks/get-root.js
+++ b/packages/ember-htmlbars/lib/hooks/get-root.js
@@ -3,9 +3,7 @@
 @submodule ember-htmlbars
 */
 
-//import Ember from "ember-metal/core";
-import Stream from "ember-metal/streams/stream";
-import { read } from "ember-metal/streams/utils";
+import Ember from "ember-metal/core";
 
 export default function getRoot(scope, key) {
   if (key === 'this') {
@@ -33,21 +31,10 @@ function getKey(scope, key) {
   var value = self[key];
   if (value !== undefined) { return value; }
 
-  var viewKey = scope.locals.view.getKey(key);
-
-  var stream = new Stream(function() {
-    var attrs = scope.attrs;
-
-    if (key in attrs) {
-      Ember.deprecate("You accessed the `" + key + "` attribute directly. Please use `attrs." + key + "` instead.");
-      return read(attrs[key]);
-    }
-
-    return read(viewKey);
-  });
-
-  stream.addDependency(viewKey);
-  stream.addDependency(scope.attrs[key]);
-
-  return stream;
+  if (key in scope.attrs) {
+    Ember.deprecate("You accessed the `" + key + "` attribute directly. Please use `attrs." + key + "` instead.");
+    return scope.attrs[key];
+  } else {
+    return scope.locals.view.getKey(key);
+  }
 }
diff --git a/packages/ember-htmlbars/lib/hooks/has-helper.js b/packages/ember-htmlbars/lib/hooks/has-helper.js
new file mode 100644
index 00000000000..de1173544c0
--- /dev/null
+++ b/packages/ember-htmlbars/lib/hooks/has-helper.js
@@ -0,0 +1,5 @@
+import lookupHelper from "ember-htmlbars/system/lookup-helper";
+
+export default function hasHelperHook(env, scope, helperName) {
+  return !!lookupHelper(helperName, scope.self, env);
+}
diff --git a/packages/ember-htmlbars/lib/hooks/lookup-helper.js b/packages/ember-htmlbars/lib/hooks/lookup-helper.js
new file mode 100644
index 00000000000..73bd277b435
--- /dev/null
+++ b/packages/ember-htmlbars/lib/hooks/lookup-helper.js
@@ -0,0 +1,5 @@
+import lookupHelper from "ember-htmlbars/system/lookup-helper";
+
+export default function lookupHelperHook(env, scope, helperName) {
+  return lookupHelper(helperName, scope.self, env);
+}
diff --git a/packages/ember-htmlbars/lib/keywords/outlet.js b/packages/ember-htmlbars/lib/keywords/outlet.js
index 2bd70c2ef04..cb631a6d522 100644
--- a/packages/ember-htmlbars/lib/keywords/outlet.js
+++ b/packages/ember-htmlbars/lib/keywords/outlet.js
@@ -6,6 +6,9 @@
 import merge from "ember-metal/merge";
 import ShadowRoot from "ember-htmlbars/system/shadow-root";
 
+import topLevelViewTemplate from "ember-htmlbars/templates/top-level-view";
+topLevelViewTemplate.revision = 'Ember@VERSION_STRING_PLACEHOLDER';
+
 export default {
   willRender: function(renderNode, env) {
     env.view.ownerView._outlets.push(renderNode);
@@ -18,6 +21,11 @@ export default {
     var outletName = read(params[0]) || 'main';
     var selectedOutletState = outletState[outletName];
 
+    var toRender = selectedOutletState && selectedOutletState.render;
+    if (toRender && !toRender.template && !toRender.ViewClass) {
+      toRender.template = topLevelViewTemplate;
+    }
+
     state.lastOutletState = state.outletState;
     state.outletState = selectedOutletState;
   },
diff --git a/packages/ember-htmlbars/lib/keywords/partial.js b/packages/ember-htmlbars/lib/keywords/partial.js
new file mode 100644
index 00000000000..5fa06e176ad
--- /dev/null
+++ b/packages/ember-htmlbars/lib/keywords/partial.js
@@ -0,0 +1,17 @@
+/**
+@module ember
+@submodule ember-htmlbars
+*/
+
+import lookupPartial from "ember-views/system/lookup_partial";
+import { internal } from "htmlbars-runtime";
+
+export default function partialKeyword(morph, env, scope, params, hash, template, inverse, visitor) {
+  var found = lookupPartial(env, env.hooks.getValue(params[0])).raw;
+
+  internal.hostBlock(morph, env, scope, found, null, null, visitor, function(options) {
+    options.templates.template.yield();
+  });
+
+  return true;
+}
diff --git a/packages/ember-htmlbars/lib/system/lookup-helper.js b/packages/ember-htmlbars/lib/system/lookup-helper.js
index 93b5e08df9d..f9ed7e1d338 100644
--- a/packages/ember-htmlbars/lib/system/lookup-helper.js
+++ b/packages/ember-htmlbars/lib/system/lookup-helper.js
@@ -33,7 +33,7 @@ export default function lookupHelper(name, view, env) {
     return helper;
   }
 
-  var container = view.container;
+  var container = env.container;
 
   if (!container || ISNT_HELPER_CACHE.get(name)) {
     return;
@@ -59,5 +59,5 @@ export default function lookupHelper(name, view, env) {
     container._registry.register(helperName, helper);
   }
 
-  return helper;
+  return helper.helperFunction;
 }
diff --git a/packages/ember-htmlbars/lib/system/make_bound_helper.js b/packages/ember-htmlbars/lib/system/make_bound_helper.js
index 59df30447dd..ea3d466c018 100644
--- a/packages/ember-htmlbars/lib/system/make_bound_helper.js
+++ b/packages/ember-htmlbars/lib/system/make_bound_helper.js
@@ -3,18 +3,8 @@
 @submodule ember-htmlbars
 */
 
-import Ember from "ember-metal/core"; // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
 import Helper from "ember-htmlbars/system/helper";
 
-import Stream from "ember-metal/streams/stream";
-import {
-  readArray,
-  readHash,
-  subscribe,
-  scanHash,
-  scanArray
-} from "ember-metal/streams/utils";
-
 /**
   Create a bound helper. Accepts a function that receives the ordered and hash parameters
   from the template. If a bound property was provided in the template it will be resolved to its
@@ -59,38 +49,5 @@ import {
   @since 1.10.0
 */
 export default function makeBoundHelper(fn) {
-  function helperFunc(params, hash, options, env) {
-    var view = this;
-    var numParams = params.length;
-    var param, prop;
-
-    Ember.assert("makeBoundHelper generated helpers do not support use with blocks", !options.template);
-
-    function valueFn() {
-      return fn.call(view, readArray(params), readHash(hash), options, env);
-    }
-
-    // If none of the hash parameters are bound, act as an unbound helper.
-    // This prevents views from being unnecessarily created
-    var hasStream = scanArray(params) || scanHash(hash);
-    if (hasStream) {
-      var lazyValue = new Stream(valueFn);
-
-      for (var i = 0; i < numParams; i++) {
-        param = params[i];
-        subscribe(param, lazyValue.notify, lazyValue);
-      }
-
-      for (prop in hash) {
-        param = hash[prop];
-        subscribe(param, lazyValue.notify, lazyValue);
-      }
-
-      return lazyValue;
-    } else {
-      return valueFn();
-    }
-  }
-
-  return new Helper(helperFunc);
+  return new Helper(fn);
 }
diff --git a/packages/ember-htmlbars/lib/templates/link-to.hbs b/packages/ember-htmlbars/lib/templates/link-to.hbs
new file mode 100644
index 00000000000..265dd5b7831
--- /dev/null
+++ b/packages/ember-htmlbars/lib/templates/link-to.hbs
@@ -0,0 +1 @@
+<a href={{href}}>{{yield}}</a>
diff --git a/packages/ember-metal/lib/streams/stream.js b/packages/ember-metal/lib/streams/stream.js
index 52c04b11bfe..d155bc64b90 100644
--- a/packages/ember-metal/lib/streams/stream.js
+++ b/packages/ember-metal/lib/streams/stream.js
@@ -107,6 +107,8 @@ function Stream(fn) {
   this.valueFn = fn;
 }
 
+var KeyStream;
+
 Stream.prototype = {
   isStream: true,
 
@@ -125,6 +127,11 @@ Stream.prototype = {
     this.gotValueWhileInactive = false;
   },
 
+  _makeChildStream: function(key) {
+    KeyStream = KeyStream || Ember.__loader.require('ember-views/streams/key_stream').default;
+    return new KeyStream(this, key);
+  },
+
   removeChild: function(key) {
     delete this.children[key];
   },
diff --git a/packages/ember-metal/lib/streams/utils.js b/packages/ember-metal/lib/streams/utils.js
index 0e3262dbc5f..7014aca4cd3 100644
--- a/packages/ember-metal/lib/streams/utils.js
+++ b/packages/ember-metal/lib/streams/utils.js
@@ -203,6 +203,18 @@ export function addDependency(stream, dependency) {
   }
 }
 
+export function zip(streams, callback) {
+  var stream = new Stream(function() {
+    return callback(readArray(streams));
+  });
+
+  for (var i=0, l=streams.length; i<l; i++) {
+    stream.addDependency(streams[i]);
+  }
+
+  return stream;
+}
+
 /**
  Generate a new stream by providing a source stream and a function that can
  be used to transform the stream's value. In the case of a non-stream object,
diff --git a/packages/ember-routing-htmlbars/lib/helpers/link-to.js b/packages/ember-routing-htmlbars/lib/helpers/link-to.js
index c716f196df1..b4d9259b438 100644
--- a/packages/ember-routing-htmlbars/lib/helpers/link-to.js
+++ b/packages/ember-routing-htmlbars/lib/helpers/link-to.js
@@ -4,9 +4,12 @@
 */
 
 import Ember from "ember-metal/core"; // assert
-import { LinkView } from "ember-routing-views/views/link";
-import { read, isStream } from "ember-metal/streams/utils";
-import ControllerMixin from "ember-runtime/mixins/controller";
+//import { LinkView } from "ember-routing-views/views/link";
+//import { read, isStream } from "ember-metal/streams/utils";
+//import ControllerMixin from "ember-runtime/mixins/controller";
+
+import linkToTemplate from "ember-htmlbars/templates/link-to";
+linkToTemplate.revision = 'Ember@VERSION_STRING_PLACEHOLDER';
 
 // We need the HTMLBars view helper from ensure ember-htmlbars.
 // This ensures it is loaded first:
@@ -284,63 +287,9 @@ import 'ember-htmlbars';
   @return {String} HTML string
   @see {Ember.LinkView}
 */
-function linkToHelper(params, hash, options, env) {
-  var queryParamsObject;
-
-  Ember.assert("You must provide one or more parameters to the link-to helper.", params.length);
-
-  var lastParam = params[params.length - 1];
-
-  if (lastParam && lastParam.isQueryParams) {
-    hash.queryParamsObject = queryParamsObject = params.pop();
-  }
-
-  if (hash.disabledWhen) {
-    hash.disabled = hash.disabledWhen;
-    delete hash.disabledWhen;
-  }
-
-  if (!options.template) {
-    var linkTitle = params.shift();
-    var parseTextAsHTML = options.morph.parseTextAsHTML;
-
-    if (isStream(linkTitle)) {
-      hash.linkTitle = { stream: linkTitle };
-    }
-
-    options.template = {
-      isHTMLBars: true,
-      revision: 'Ember@VERSION_STRING_PLACEHOLDER',
-      render: function(view, env) {
-        var value = read(linkTitle) || "";
-        if (!parseTextAsHTML) {
-          value =  env.dom.createTextNode(value);
-        }
-
-        return { fragment: value };
-      }
-    };
-  }
-
-  for (var i = 0; i < params.length; i++) {
-    if (isStream(params[i])) {
-      var lazyValue = params[i];
-
-      if (!lazyValue._isController) {
-        while (ControllerMixin.detect(lazyValue.value())) {
-          lazyValue = lazyValue.get('model');
-        }
-      }
-
-      params[i] = lazyValue;
-    }
-  }
-
-  hash.params = params;
-
-  options.helperName = options.helperName || 'link-to';
-
-  return env.helpers.view.helperFunction.call(this, [LinkView], hash, options, env);
+function linkToHelper(params, hash) {
+  // TODO: Implement more than just stub functionality here
+  this.yieldIn(linkToTemplate, { href: "#" });
 }
 
 /**
diff --git a/packages/ember-views/lib/mixins/attribute_bindings_support.js b/packages/ember-views/lib/mixins/attribute_bindings_support.js
index 501c7ed6073..a4aa7908478 100644
--- a/packages/ember-views/lib/mixins/attribute_bindings_support.js
+++ b/packages/ember-views/lib/mixins/attribute_bindings_support.js
@@ -74,7 +74,7 @@ var AttributeBindingsSupport = Mixin.create({
       if (property in this) {
         attrValue = this.getStream('view.'+property);
         attrNode = new AttrNode(attrName, attrValue);
-        this.appendAttr(attrNode);
+        this.appendAttr(attrNode, buffer);
         if (!canSetNameOnInputs && attrName === 'name') {
           buffer.attr('name', read(attrValue));
         }
diff --git a/packages/ember-views/lib/mixins/class_names_support.js b/packages/ember-views/lib/mixins/class_names_support.js
index da816b1aea5..51c70f9d5e4 100644
--- a/packages/ember-views/lib/mixins/class_names_support.js
+++ b/packages/ember-views/lib/mixins/class_names_support.js
@@ -26,6 +26,8 @@ var ClassNamesSupport = Mixin.create({
     Ember.assert("Only arrays are allowed for 'classNameBindings'", typeOf(this.classNameBindings) === 'array');
     this.classNameBindings = emberA(this.classNameBindings.slice());
 
+    this._classNameUnsubscribers = [];
+
     Ember.assert("Only arrays of static class strings are allowed for 'classNames'. For dynamic classes, use 'classNameBindings'.", typeOf(this.classNames) === 'array');
     this.classNames = emberA(this.classNames.slice());
   },
@@ -157,17 +159,18 @@ var ClassNamesSupport = Mixin.create({
         oldClass = dasherizedClass;
       }
 
-      subscribe(boundBinding, observer, this);
-      // Remove className so when the view is rerendered,
-      // the className is added based on binding reevaluation
-      this.one('willClearRender', function() {
-        if (oldClass) {
-          classNames.removeObject(oldClass);
-          oldClass = null;
-        }
-      });
-
+      this._classNameUnsubscribers.push(subscribe(boundBinding, observer, this));
     }, this);
+  },
+
+  willDestroyElement: function() {
+    var unsubscribers = this._classNameUnsubscribers;
+
+    for (var i=0, l=unsubscribers.length; i<l; i++) {
+      unsubscribers[i]();
+    }
+
+    this._super.apply(this, arguments);
   }
 });
 
diff --git a/packages/ember-views/lib/mixins/view_stream_support.js b/packages/ember-views/lib/mixins/view_stream_support.js
index 12c2c3f9d2c..22159ea545d 100644
--- a/packages/ember-views/lib/mixins/view_stream_support.js
+++ b/packages/ember-views/lib/mixins/view_stream_support.js
@@ -1,94 +1,17 @@
 import { Mixin } from "ember-metal/mixin";
-import StreamBinding from "ember-metal/streams/stream_binding";
-import KeyStream from "ember-views/streams/key_stream";
-import ContextStream from "ember-views/streams/context_stream";
-import create from 'ember-metal/platform/create';
-import { isStream } from "ember-metal/streams/utils";
+import SimpleStream from "ember-metal/streams/simple";
 
 var ViewStreamSupport = Mixin.create({
   init: function() {
-    this._baseContext = undefined;
-    this._contextStream = undefined;
-    this._streamBindings = undefined;
+    this._scopeStream = new SimpleStream(this).getKey('context');
     this._super.apply(this, arguments);
   },
 
   getStream: function(path) {
-    var stream = this._getContextStream().get(path);
-
+    var stream = this._scopeStream.get(path);
     stream._label = path;
 
     return stream;
-  },
-
-  _willDestroyElement: function() {
-    if (this._streamBindings) {
-      this._destroyStreamBindings();
-    }
-    if (this._contextStream) {
-      this._destroyContextStream();
-    }
-  },
-
-  _getBindingForStream: function(pathOrStream) {
-    if (this._streamBindings === undefined) {
-      this._streamBindings = create(null);
-    }
-
-    var path = pathOrStream;
-    if (isStream(pathOrStream)) {
-      path = pathOrStream._label;
-
-      if (!path) {
-        // if no _label is present on the provided stream
-        // it is likely a subexpr and cannot be set (so it
-        // does not need a StreamBinding)
-        return pathOrStream;
-      }
-    }
-
-    if (this._streamBindings[path] !== undefined) {
-      return this._streamBindings[path];
-    } else {
-      var stream = this._getContextStream().get(path);
-      var streamBinding = new StreamBinding(stream);
-
-      streamBinding._label = path;
-
-      return this._streamBindings[path] = streamBinding;
-    }
-  },
-
-  _destroyStreamBindings: function() {
-    var streamBindings = this._streamBindings;
-    for (var path in streamBindings) {
-      streamBindings[path].destroy();
-    }
-    this._streamBindings = undefined;
-  },
-
-  _getContextStream: function() {
-    if (this._contextStream === undefined) {
-      this._baseContext = new KeyStream(this, 'context');
-      this._contextStream = new ContextStream(this);
-    }
-
-    return this._contextStream;
-  },
-
-  _destroyContextStream: function() {
-    this._baseContext.destroy();
-    this._baseContext = undefined;
-    this._contextStream.destroy();
-    this._contextStream = undefined;
-  },
-
-  _unsubscribeFromStreamBindings: function() {
-    for (var key in this._streamBindingSubscriptions) {
-      var streamBinding = this[key + 'Binding'];
-      var callback = this._streamBindingSubscriptions[key];
-      streamBinding.unsubscribe(callback);
-    }
   }
 });
 
diff --git a/packages/ember-views/lib/streams/key_stream.js b/packages/ember-views/lib/streams/key_stream.js
index 5a83ff65f3b..36a1bb77bfb 100644
--- a/packages/ember-views/lib/streams/key_stream.js
+++ b/packages/ember-views/lib/streams/key_stream.js
@@ -88,10 +88,3 @@ merge(KeyStream.prototype, {
 });
 
 export default KeyStream;
-
-// The transpiler does not resolve cycles, so we export
-// the `_makeChildStream` method onto `Stream` here.
-
-Stream.prototype._makeChildStream = function(key) {
-  return new KeyStream(this, key);
-};
diff --git a/packages/ember-views/lib/system/lookup_partial.js b/packages/ember-views/lib/system/lookup_partial.js
index f672eb35227..3b3f3fbd3e6 100644
--- a/packages/ember-views/lib/system/lookup_partial.js
+++ b/packages/ember-views/lib/system/lookup_partial.js
@@ -1,16 +1,14 @@
 import Ember from "ember-metal/core"; // Ember.assert
+import EmberError from "ember-metal/error";
 
-export default function lookupPartial(view, templateName) {
+export default function lookupPartial(env, templateName) {
   var nameParts = templateName.split("/");
   var lastPart = nameParts[nameParts.length - 1];
 
   nameParts[nameParts.length - 1] = "_" + lastPart;
 
   var underscoredName = nameParts.join('/');
-  var template = view.templateForName(underscoredName);
-  if (!template) {
-    template = view.templateForName(templateName);
-  }
+  var template = templateFor(env, underscoredName, templateName);
 
   Ember.assert(
     'Unable to find partial with name "' + templateName + '"',
@@ -19,3 +17,16 @@ export default function lookupPartial(view, templateName) {
 
   return template;
 }
+
+function templateFor(env, underscored, name) {
+  if (!name) { return; }
+  Ember.assert("templateNames are not allowed to contain periods: "+name, name.indexOf('.') === -1);
+
+  if (!env.container) {
+    throw new EmberError('Container was not found when looking up a views template. ' +
+               'This is most likely due to manually instantiating an Ember.View. ' +
+               'See: http://git.io/EKPpnA');
+  }
+
+  return env.container.lookup('template:' + underscored) || env.container.lookup('template:' + name);
+}
diff --git a/packages/ember-views/lib/views/states/in_buffer.js b/packages/ember-views/lib/views/states/in_buffer.js
index 01adbb54b38..24d43ae1198 100644
--- a/packages/ember-views/lib/views/states/in_buffer.js
+++ b/packages/ember-views/lib/views/states/in_buffer.js
@@ -48,15 +48,13 @@ merge(inBuffer, {
     return childView;
   },
 
-  appendAttr: function(view, attrNode) {
-    var buffer = view.buffer;
+  appendAttr: function(view, attrNode, buffer) {
     var _childViews = view._childViews;
 
     if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
     _childViews.push(attrNode);
 
     if (!attrNode._morph) {
-      Ember.assert("bound attributes that do not have a morph must have a buffer", !!buffer);
       buffer.pushAttrNode(attrNode);
     }
 
diff --git a/packages/ember-views/lib/views/view.js b/packages/ember-views/lib/views/view.js
index d400b5c602d..4b8e99981d0 100644
--- a/packages/ember-views/lib/views/view.js
+++ b/packages/ember-views/lib/views/view.js
@@ -1241,8 +1241,8 @@ var View = CoreView.extend(
     }
   },
 
-  appendAttr: function(node) {
-    return this.currentState.appendAttr(this, node);
+  appendAttr: function(node, buffer) {
+    return this.currentState.appendAttr(this, node, buffer);
   },
 
   templateRenderer: null,