ember-source 1.10.0.beta.1 → 1.10.0.beta.2

data/dist/ember-testing.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.10.0-beta.1
+ * @version   1.10.0-beta.2
  */
 
 (function() {

data/dist/ember-tests.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.10.0-beta.1
+ * @version   1.10.0-beta.2
  */
 
 (function() {
@@ -1065,7 +1065,7 @@ enifed("ember-application/system/resolver.jshint",
     });
   });
 enifed("ember-application/tests/system/application_test",
-  ["ember-metal/core","ember-metal/run_loop","ember-application/system/application","ember-application/system/resolver","ember-routing/system/router","ember-views/views/view","ember-runtime/controllers/controller","ember-routing/location/none_location","ember-runtime/system/object","ember-views/system/jquery","ember-htmlbars/system/compile"],
+  ["ember-metal/core","ember-metal/run_loop","ember-application/system/application","ember-application/system/resolver","ember-routing/system/router","ember-views/views/view","ember-runtime/controllers/controller","ember-routing/location/none_location","ember-runtime/system/object","ember-views/system/jquery","ember-template-compiler/system/compile"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__) {
     "use strict";
     /*globals EmberDev */
@@ -3183,10 +3183,14 @@ enifed("ember-dev/test-helper/assertion",
     AssertExpectation.Error = function(){};
     AssertExpectation.prototype = o_create(MethodCallExpectation.prototype);
     AssertExpectation.prototype.handleCall = function(message, test){
+      var noAssertion = typeof test === 'function' ? test() : test;
+
       this.sawCall = true;
-      if (test) {
-        return; // Only get message for failures
+
+      if (noAssertion) {
+        return;
       }
+
       this.actualMessage = message;
       // Halt execution
       throw new AssertExpectation.Error();
@@ -3299,8 +3303,10 @@ enifed("ember-dev/test-helper/deprecation",
         }
         var assertion = this;
         this.env.Ember.deprecate = function(msg, test) {
+          var pushDeprecation = typeof test === 'function' ? !test() : !test;
+
           assertion.actuals = assertion.actuals || [];
-          if (!test) {
+          if (pushDeprecation) {
             assertion.actuals.push([msg, test]);
           }
         };
@@ -4058,13 +4064,13 @@ enifed("ember-htmlbars/attr_nodes/quoted.jshint",
       ok(true, 'ember-htmlbars/attr_nodes/quoted.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/attr_nodes/quoted_class.jshint",
+enifed("ember-htmlbars/attr_nodes/sanitized.jshint",
   [],
   function() {
     "use strict";
     module('JSHint - ember-htmlbars/attr_nodes');
-    test('ember-htmlbars/attr_nodes/quoted_class.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/attr_nodes/quoted_class.js should pass jshint.'); 
+    test('ember-htmlbars/attr_nodes/sanitized.js should pass jshint', function() { 
+      ok(true, 'ember-htmlbars/attr_nodes/sanitized.js should pass jshint.'); 
     });
   });
 enifed("ember-htmlbars/attr_nodes/simple.jshint",
@@ -4382,24 +4388,6 @@ enifed("ember-htmlbars/hooks/subexpr.jshint",
       ok(true, 'ember-htmlbars/hooks/subexpr.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/plugins/transform-each-in-to-hash.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/plugins');
-    test('ember-htmlbars/plugins/transform-each-in-to-hash.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/plugins/transform-each-in-to-hash.js should pass jshint.'); 
-    });
-  });
-enifed("ember-htmlbars/plugins/transform-with-as-to-hash.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/plugins');
-    test('ember-htmlbars/plugins/transform-with-as-to-hash.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/plugins/transform-with-as-to-hash.js should pass jshint.'); 
-    });
-  });
 enifed("ember-htmlbars/system/bootstrap.jshint",
   [],
   function() {
@@ -4409,15 +4397,6 @@ enifed("ember-htmlbars/system/bootstrap.jshint",
       ok(true, 'ember-htmlbars/system/bootstrap.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/system/compile.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/system');
-    test('ember-htmlbars/system/compile.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/system/compile.js should pass jshint.'); 
-    });
-  });
 enifed("ember-htmlbars/system/helper.jshint",
   [],
   function() {
@@ -4454,17 +4433,8 @@ enifed("ember-htmlbars/system/make_bound_helper.jshint",
       ok(true, 'ember-htmlbars/system/make_bound_helper.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/system/template.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/system');
-    test('ember-htmlbars/system/template.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/system/template.js should pass jshint.'); 
-    });
-  });
 enifed("ember-htmlbars/tests/attr_nodes/boolean_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-htmlbars/system/compile","htmlbars-test-helpers"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile","htmlbars-test-helpers"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -4489,7 +4459,7 @@ enifed("ember-htmlbars/tests/attr_nodes/boolean_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/attr_nodes/class_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-htmlbars/system/compile","htmlbars-test-helpers"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile","htmlbars-test-helpers"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -4516,7 +4486,7 @@ enifed("ember-htmlbars/tests/attr_nodes/class_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/attr_nodes/data_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-htmlbars/system/compile","htmlbars-test-helpers","ember-htmlbars","ember-runtime/tests/utils"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-template-compiler/system/compile","htmlbars-test-helpers","ember-htmlbars","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -4542,7 +4512,7 @@ enifed("ember-htmlbars/tests/attr_nodes/data_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/attr_nodes/href_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-htmlbars/system/compile","htmlbars-test-helpers"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile","htmlbars-test-helpers"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -4567,7 +4537,7 @@ enifed("ember-htmlbars/tests/attr_nodes/href_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-htmlbars/system/compile","htmlbars-test-helpers"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile","htmlbars-test-helpers"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -4591,8 +4561,38 @@ enifed("ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test.jshint",
       ok(true, 'ember-htmlbars/tests/attr_nodes/nonmatching_reflection_test.js should pass jshint.'); 
     });
   });
+enifed("ember-htmlbars/tests/attr_nodes/sanitized_test",
+  ["ember-views/views/view","ember-template-compiler/system/compile","ember-htmlbars/utils/string","ember-runtime/tests/utils"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
+    "use strict";
+    /* jshint scripturl:true */
+
+    var EmberView = __dependency1__["default"];
+    var compile = __dependency2__["default"];
+    var SafeString = __dependency3__.SafeString;
+    var runAppend = __dependency4__.runAppend;
+    var runDestroy = __dependency4__.runDestroy;
+
+    var view;
+
+    QUnit.module("ember-htmlbars: sanitized attribute", {
+      teardown: function(){
+        runDestroy(view);
+      }
+    });
+
+      });
+enifed("ember-htmlbars/tests/attr_nodes/sanitized_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-htmlbars/tests/attr_nodes');
+    test('ember-htmlbars/tests/attr_nodes/sanitized_test.js should pass jshint', function() { 
+      ok(true, 'ember-htmlbars/tests/attr_nodes/sanitized_test.js should pass jshint.'); 
+    });
+  });
 enifed("ember-htmlbars/tests/attr_nodes/svg_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-htmlbars/system/compile","htmlbars-test-helpers"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile","htmlbars-test-helpers"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -4617,7 +4617,7 @@ enifed("ember-htmlbars/tests/attr_nodes/svg_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/attr_nodes/value_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-htmlbars/system/compile","htmlbars-test-helpers"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-template-compiler/system/compile","htmlbars-test-helpers"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -4779,7 +4779,7 @@ enifed("ember-htmlbars/tests/compat/handlebars_get_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/compat/helper_test",
-  ["ember-htmlbars/compat/helper","ember-views/views/view","ember-htmlbars/helpers","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-htmlbars/compat/helper","ember-views/views/view","ember-htmlbars/helpers","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
     var registerHandlebarsCompatibleHelper = __dependency1__.registerHandlebarsCompatibleHelper;
@@ -4913,7 +4913,7 @@ enifed("ember-htmlbars/tests/compat/helper_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/compat/make-view-helper_test",
-  ["ember-views/views/view","container/container","ember-htmlbars/system/compile","ember-htmlbars/system/make-view-helper","ember-views/views/component","ember-runtime/tests/utils"],
+  ["ember-views/views/view","container/container","ember-template-compiler/system/compile","ember-htmlbars/system/make-view-helper","ember-views/views/component","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -4967,23 +4967,25 @@ enifed("ember-htmlbars/tests/compat/make-view-helper_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-runtime/system/native_array","ember-metal/property_get","ember-metal/property_set","ember-runtime/tests/utils","ember-htmlbars/compat"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
+  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-runtime/system/native_array","ember-views/views/simple_bound_view","ember-metal/property_get","ember-metal/property_set","ember-runtime/tests/utils","ember-runtime/system/string","ember-htmlbars/compat"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__) {
     "use strict";
     /*jshint newcap:false*/
     var EmberView = __dependency1__["default"];
     var run = __dependency2__["default"];
     var EmberObject = __dependency3__["default"];
     var A = __dependency4__.A;
+    var SimpleBoundView = __dependency5__["default"];
 
     // import {expectAssertion} from "ember-metal/tests/debug_helpers";
 
-    var get = __dependency5__.get;
-    var set = __dependency6__.set;
-    var runAppend = __dependency7__.runAppend;
-    var runDestroy = __dependency7__.runDestroy;
+    var get = __dependency6__.get;
+    var set = __dependency7__.set;
+    var runAppend = __dependency8__.runAppend;
+    var runDestroy = __dependency8__.runDestroy;
+    var dasherize = __dependency9__.dasherize;
 
-    var EmberHandlebars = __dependency8__["default"];
+    var EmberHandlebars = __dependency10__["default"];
 
     var compile, helpers, helper;
     compile = EmberHandlebars.compile;
@@ -4998,7 +5000,7 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
       expectDeprecationInHTMLBars();
 
       helper('repeat', function(value, options) {
-        var count = options.hash.count;
+        var count = options.hash.count || 1;
         var a = [];
         while(a.length < count) {
             a.push(value);
@@ -5053,12 +5055,33 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
       equal(view.$().text(), 'BROGRAMMER', "helper output is correct");
 
       run(function() {
-        set(view.controller, 'name', 'wes');
+        set(view, 'controller.name', 'wes');
       });
 
       equal(view.$().text(), 'WES', "helper output updated");
     });
 
+    test("should update bound helpers in a subexpression when properties change", function() {
+      expectDeprecationInHTMLBars();
+
+      helper('dasherize', function(value) {
+        return dasherize(value);
+      });
+
+      view = EmberView.create({
+        controller: {prop: "isThing"},
+        template: compile("<div {{bind-attr data-foo=(dasherize prop)}}>{{prop}}</div>")
+      });
+
+      runAppend(view);
+
+      equal(view.$('div[data-foo="is-thing"]').text(), 'isThing', "helper output is correct");
+
+      run(view, 'set', 'controller.prop', 'notThing');
+
+      equal(view.$('div[data-foo="not-thing"]').text(), 'notThing', "helper output is correct");
+    });
+
     test("should allow for computed properties with dependencies", function() {
       expectDeprecationInHTMLBars();
 
@@ -5080,7 +5103,7 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
       equal(view.$().text(), 'BROGRAMMER', "helper output is correct");
 
       run(function() {
-        set(view.controller.person, 'name', 'wes');
+        set(view, 'controller.person.name', 'wes');
       });
 
       equal(view.$().text(), 'WES', "helper output updated");
@@ -5229,7 +5252,7 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
       equal(view.$().text(), 'ZOIDNERD', "helper correctly re-rendered after second bound helper property changed");
 
       run(function() {
-        view.controller.setProperties({
+        view.get('controller').setProperties({
           thing1: "WOOT",
           thing2: "YEAH"
         });
@@ -5353,7 +5376,7 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
 
       equal(view.$().text(), '2 1 11', "helper output is correct");
 
-      run(view.controller, 'set', 'aNumber', 5);
+      run(view, 'set', 'controller.aNumber', 5);
 
       equal(view.$().text(), '6 5 11', "helper still updates as expected");
     });
@@ -5376,10 +5399,10 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
 
       equal(view.$().text(), 'jerkwaterloo jerkwater willdidi', "helper output is correct");
 
-      run(view.controller, 'set', 'word', 'bird');
+      run(view, 'set', 'controller.word', 'bird');
       equal(view.$().text(), 'birdloo bird willdidi', "helper still updates as expected");
 
-      run(view.controller, 'set', 'loo', 'soup-de-doo');
+      run(view, 'set', 'controller.loo', 'soup-de-doo');
       equal(view.$().text(), 'birdloo bird willdidi', "helper still updates as expected");
       equal(helperCount, 5, "changing controller property with same name as quoted string doesn't re-render helper");
     });
@@ -5405,8 +5428,8 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
       equal(view.$().text(), '|NOPE 0|NOPE |NOPE false|NOPE OMG|GMO |NOPE 0|NOPE |NOPE false|NOPE OMG|GMO ', "helper output is correct");
 
       run(function() {
-        view.controller.things.pushObject('blorg');
-        view.controller.things.shiftObject();
+        view.get('controller.things').pushObject('blorg');
+        view.get('controller.things').shiftObject();
       });
 
       equal(view.$().text(), '0|NOPE |NOPE false|NOPE OMG|GMO blorg|grolb 0|NOPE |NOPE false|NOPE OMG|GMO blorg|grolb ', "helper output is still correct");
@@ -5432,7 +5455,7 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
 
       equal(view.$().text(), '|NOPE 5|5 |NOPE 5|5 ', "helper output is correct");
 
-      run(view.controller.things, 'pushObject', { foo: 6 });
+      run(view.get('controller.things'), 'pushObject', { foo: 6 });
 
       equal(view.$().text(), '|NOPE 5|5 6|6 |NOPE 5|5 6|6 ', "helper output is correct");
     });
@@ -5482,6 +5505,53 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
 
       equal(view.$().text(), 'undefined, undefined, string, number, object', "helper output is correct");
     });
+
+    test("when no parameters are bound, no new views are created", function(){
+      registerRepeatHelper();
+      var originalRender = SimpleBoundView.prototype.render;
+      var renderWasCalled = false;
+      SimpleBoundView.prototype.render = function(){
+        renderWasCalled = true;
+        return originalRender.apply(this, arguments);
+      };
+
+      try {
+        view = EmberView.create({
+          template: compile('{{repeat "a"}}'),
+          controller: EmberObject.create()
+        });
+        runAppend(view);
+      } finally {
+        SimpleBoundView.prototype.render = originalRender;
+      }
+
+      ok(!renderWasCalled, 'simple bound view should not have been created and rendered');
+      equal(view.$().text(), 'a');
+    });
+
+
+    test('when no hash parameters are bound, no new views are created', function(){
+      registerRepeatHelper();
+      var originalRender = SimpleBoundView.prototype.render;
+      var renderWasCalled = false;
+      SimpleBoundView.prototype.render = function(){
+        renderWasCalled = true;
+        return originalRender.apply(this, arguments);
+      };
+
+      try {
+        view = EmberView.create({
+          template: compile('{{repeat "a" count=3}}'),
+          controller: EmberObject.create()
+        });
+        runAppend(view);
+      } finally {
+        SimpleBoundView.prototype.render = originalRender;
+      }
+
+      ok(!renderWasCalled, 'simple bound view should not have been created and rendered');
+      equal(view.$().text(), 'aaa');
+    });
   });
 enifed("ember-htmlbars/tests/compat/make_bound_helper_test.jshint",
   [],
@@ -5540,7 +5610,7 @@ enifed("ember-htmlbars/tests/compat/precompile_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helper_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-metal/property_set","ember-runtime/tests/utils","ember-htmlbars/helpers","ember-htmlbars/system/compile"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-metal/property_set","ember-runtime/tests/utils","ember-htmlbars/helpers","ember-template-compiler/system/compile"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -5650,8 +5720,8 @@ enifed("ember-htmlbars/tests/helper_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/bind_attr_test",
-  ["ember-metal/core","ember-metal/run_loop","ember-runtime/system/namespace","ember-views/views/view","ember-views/views/metamorph_view","ember-runtime/system/object","ember-runtime/system/native_array","ember-metal/computed","ember-metal/observer","ember-runtime/system/container","ember-metal/property_set","ember-runtime/tests/utils","ember-htmlbars/helpers","ember-htmlbars/system/compile"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__) {
+  ["ember-metal/core","ember-metal/run_loop","ember-runtime/system/namespace","ember-views/views/view","ember-views/views/metamorph_view","ember-runtime/system/object","ember-runtime/system/native_array","ember-metal/computed","ember-metal/observer","ember-runtime/system/container","ember-metal/property_set","ember-runtime/tests/utils","htmlbars-test-helpers","ember-htmlbars/helpers","ember-template-compiler/system/compile"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__) {
     "use strict";
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
@@ -5668,10 +5738,10 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
     var set = __dependency11__.set;
     var runAppend = __dependency12__.runAppend;
     var runDestroy = __dependency12__.runDestroy;
+    var equalInnerHTML = __dependency13__.equalInnerHTML;
 
-    var helpers = __dependency13__["default"];
-    var compile = __dependency14__["default"];
-
+    var helpers = __dependency14__["default"];
+    var compile = __dependency15__["default"];
     var view;
 
     var originalLookup = Ember.lookup;
@@ -5913,6 +5983,25 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
 
       runAppend(view);
 
+      equalInnerHTML(view.element, '<img class="bar">', 'renders class');
+
+      run(function() {
+        set(view, 'foo', 'baz');
+      });
+
+      equalInnerHTML(view.element, '<img class="baz">', 'updates rendered class');
+    });
+
+    test("should be able to bind unquoted class attribute with {{bind-attr}}", function() {
+      var template = compile('<img {{bind-attr class=view.foo}}>');
+
+      view = EmberView.create({
+        template: template,
+        foo: 'bar'
+      });
+
+      runAppend(view);
+
       equal(view.$('img').attr('class'), 'bar', "renders class");
 
       run(function() {
@@ -5932,13 +6021,13 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
 
       runAppend(view);
 
-      equal(view.$('.is-truthy').length, 1, "sets class name");
+      equalInnerHTML(view.element, '<img class="is-truthy">', 'renders class');
 
       run(function() {
         set(view, 'isNumber', 0);
       });
 
-      equal(view.$('.is-truthy').length, 0, "removes class name if bound property is set to something non-truthy");
+      equalInnerHTML(view.element.firstChild.className, undefined, 'removes class');
     });
 
     test("should be able to bind class to view attribute with {{bind-attr}}", function() {
@@ -6120,6 +6209,16 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
       equal(observersFor(view, 'foo').length, 1);
     });
 
+    test("should keep class in the order it appears in", function() {
+      view = EmberView.create({
+        template: compile('<span {{bind-attr class=":foo :baz"}}></span>'),
+      });
+
+      runAppend(view);
+
+      equal(view.element.firstChild.className, 'foo baz', 'classes are in expected order');
+    });
+
     test('should allow either quoted or unquoted values', function() {
       view = EmberView.create({
         value: 'Test',
@@ -6140,6 +6239,19 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
       equal(view.$('img').attr('alt'), "Updated", "updates value");
       equal(view.$('img').attr('src'), "test2.jpg", "updates value");
     });
+
+    test("property before didInsertElement", function() {
+      var matchingElement;
+      view = EmberView.create({
+        name: 'bob',
+        template: compile('<div {{bind-attr alt=view.name}}></div>'),
+        didInsertElement: function(){
+          matchingElement = this.$('div[alt=bob]');
+        }
+      });
+      runAppend(view);
+      equal(matchingElement.length, 1, 'element is in the DOM when didInsertElement');
+    });
   });
 enifed("ember-htmlbars/tests/helpers/bind_attr_test.jshint",
   [],
@@ -6151,7 +6263,7 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/bind_test",
-  ["ember-views/views/view","ember-runtime/system/object","ember-metal/run_loop","ember-views/views/metamorph_view","ember-htmlbars/system/compile","ember-runtime/system/container","ember-runtime/controllers/object_controller","ember-metal/property_get","ember-metal/property_set","ember-runtime/tests/utils"],
+  ["ember-views/views/view","ember-runtime/system/object","ember-metal/run_loop","ember-views/views/metamorph_view","ember-template-compiler/system/compile","ember-runtime/system/container","ember-runtime/controllers/object_controller","ember-metal/property_get","ember-metal/property_set","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -6450,7 +6562,7 @@ enifed("ember-htmlbars/tests/helpers/bind_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/collection_test",
-  ["ember-views/views/collection_view","ember-runtime/system/object","ember-views/views/view","ember-runtime/system/array_proxy","ember-runtime/system/namespace","ember-runtime/system/container","ember-runtime/system/native_array","ember-metal/run_loop","ember-metal/property_get","ember-metal/property_set","ember-views/system/jquery","ember-metal/computed","ember-runtime/tests/utils","ember-htmlbars/system/compile"],
+  ["ember-views/views/collection_view","ember-runtime/system/object","ember-views/views/view","ember-runtime/system/array_proxy","ember-runtime/system/namespace","ember-runtime/system/container","ember-runtime/system/native_array","ember-metal/run_loop","ember-metal/property_get","ember-metal/property_set","ember-views/system/jquery","ember-metal/computed","ember-runtime/tests/utils","ember-template-compiler/system/compile"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__) {
     "use strict";
     /*jshint newcap:false*/
@@ -7149,7 +7261,7 @@ enifed("ember-htmlbars/tests/helpers/collection_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/debug_test",
-  ["ember-metal/core","ember-metal/logger","ember-views/views/view","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-metal/core","ember-metal/logger","ember-views/views/view","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -7233,7 +7345,7 @@ enifed("ember-htmlbars/tests/helpers/debug_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/each_test",
-  ["ember-metal/core","ember-runtime/system/object","ember-metal/run_loop","ember-views/views/view","ember-views/views/metamorph_view","ember-metal/computed","ember-runtime/controllers/array_controller","ember-runtime/system/native_array","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/system/container","ember-metal/property_get","ember-metal/property_set","ember-runtime/tests/utils","ember-htmlbars/system/compile"],
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/run_loop","ember-views/views/view","ember-views/views/metamorph_view","ember-metal/computed","ember-runtime/controllers/array_controller","ember-runtime/system/native_array","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/system/container","ember-metal/property_get","ember-metal/property_set","ember-runtime/tests/utils","ember-template-compiler/system/compile"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__) {
     "use strict";
     /*jshint newcap:false*/
@@ -8173,7 +8285,7 @@ enifed("ember-htmlbars/tests/helpers/each_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/if_unless_test",
-  ["ember-metal/run_loop","ember-runtime/system/namespace","ember-runtime/system/container","ember-views/views/view","ember-runtime/system/object_proxy","ember-runtime/system/object","ember-views/views/metamorph_view","ember-htmlbars/system/compile","ember-metal/property_set","ember-runtime/system/string","ember-metal/utils","ember-metal/enumerable_utils","ember-runtime/tests/utils"],
+  ["ember-metal/run_loop","ember-runtime/system/namespace","ember-runtime/system/container","ember-views/views/view","ember-runtime/system/object_proxy","ember-runtime/system/object","ember-views/views/metamorph_view","ember-template-compiler/system/compile","ember-metal/property_set","ember-runtime/system/string","ember-metal/utils","ember-metal/enumerable_utils","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__) {
     "use strict";
     var run = __dependency1__["default"];
@@ -8861,7 +8973,7 @@ enifed("ember-htmlbars/tests/helpers/if_unless_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/input_test",
-  ["ember-metal/run_loop","ember-metal/property_set","ember-views/views/view","ember-runtime/tests/utils","ember-htmlbars/system/compile"],
+  ["ember-metal/run_loop","ember-metal/property_set","ember-views/views/view","ember-runtime/tests/utils","ember-template-compiler/system/compile"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
     var run = __dependency1__["default"];
@@ -9186,7 +9298,7 @@ enifed("ember-htmlbars/tests/helpers/input_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/loc_test",
-  ["ember-views/views/view","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-views/views/view","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -9279,7 +9391,7 @@ enifed("ember-htmlbars/tests/helpers/loc_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/log_test",
-  ["ember-metal/core","ember-views/views/view","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-metal/core","ember-views/views/view","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -9361,7 +9473,7 @@ enifed("ember-htmlbars/tests/helpers/log_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/partial_test",
-  ["ember-runtime/system/object","ember-metal/run_loop","ember-views/views/view","ember-views/system/jquery","ember-runtime/system/container","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-runtime/system/object","ember-metal/run_loop","ember-views/views/view","ember-views/system/jquery","ember-runtime/system/container","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var EmberObject = __dependency1__["default"];
@@ -9469,8 +9581,107 @@ enifed("ember-htmlbars/tests/helpers/partial_test.jshint",
       ok(true, 'ember-htmlbars/tests/helpers/partial_test.js should pass jshint.'); 
     });
   });
+enifed("ember-htmlbars/tests/helpers/sanitized_bind_attr_test",
+  ["ember-views/views/view","ember-template-compiler/system/compile","ember-metal/run_loop","ember-htmlbars/utils/string","ember-runtime/tests/utils"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+    "use strict";
+    /* jshint scripturl:true */
+
+    var EmberView = __dependency1__["default"];
+    var compile = __dependency2__["default"];
+    var run = __dependency3__["default"];
+    var SafeString = __dependency4__.SafeString;
+    var runAppend = __dependency5__.runAppend;
+    var runDestroy = __dependency5__.runDestroy;
+
+    var view;
+
+    QUnit.module("ember-htmlbars: sanitized attribute", {
+      teardown: function(){
+        runDestroy(view);
+      }
+    });
+
+    var badTags = [
+      { tag: 'a', attr: 'href',
+        template: compile('<a {{bind-attr href=view.badValue}}></a>') },
+      { tag: 'body', attr: 'background',
+        template: compile('<body {{bind-attr background=view.badValue}}></body>') },
+      { tag: 'link', attr: 'href',
+        template: compile('<link {{bind-attr href=view.badValue}}>') },
+      { tag: 'img', attr: 'src',
+        template: compile('<img {{bind-attr src=view.badValue}}>') }
+    ];
+
+    for (var i=0, l=badTags.length; i<l; i++) {
+      (function(){
+        var tagName = badTags[i].tag;
+        var attr = badTags[i].attr;
+        var template = badTags[i].template;
+
+        test("XSS - should not bind unsafe "+tagName+" "+attr+" values", function() {
+          view = EmberView.create({
+            template: template,
+            badValue: "javascript:alert('XSS')"
+          });
+
+          runAppend(view);
+
+          equal( view.element.firstChild.getAttribute(attr),
+                 "unsafe:javascript:alert('XSS')",
+                 "attribute is output" );
+        });
+
+        test("XSS - should not bind unsafe "+tagName+" "+attr+" values on rerender", function() {
+          view = EmberView.create({
+            template: template,
+            badValue: "/sunshine/and/rainbows"
+          });
+
+          runAppend(view);
+
+          equal( view.element.firstChild.getAttribute(attr),
+                 "/sunshine/and/rainbows",
+                 "attribute is output" );
+
+          run(view, 'set', 'badValue', "javascript:alert('XSS')");
+
+          equal( view.element.firstChild.getAttribute(attr),
+                 "unsafe:javascript:alert('XSS')",
+                 "attribute is output" );
+        });
+
+        test("should bind unsafe "+tagName+" "+attr+" values if they are SafeString", function() {
+          view = EmberView.create({
+            template: template,
+            badValue: new SafeString("javascript:alert('XSS')")
+          });
+
+          try {
+            runAppend(view);
+
+            equal( view.element.firstChild.getAttribute(attr),
+                   "javascript:alert('XSS')",
+                   "attribute is output" );
+          } catch(e) {
+            // IE does not allow javascript: to be set on img src
+            ok(true, 'caught exception '+e);
+          }
+        });
+      })(); //jshint ignore:line
+    }
+  });
+enifed("ember-htmlbars/tests/helpers/sanitized_bind_attr_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-htmlbars/tests/helpers');
+    test('ember-htmlbars/tests/helpers/sanitized_bind_attr_test.js should pass jshint', function() { 
+      ok(true, 'ember-htmlbars/tests/helpers/sanitized_bind_attr_test.js should pass jshint.'); 
+    });
+  });
 enifed("ember-htmlbars/tests/helpers/template_test",
-  ["ember-views/views/view","ember-runtime/system/object","ember-views/system/jquery","ember-runtime/system/container","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-views/views/view","ember-runtime/system/object","ember-views/system/jquery","ember-runtime/system/container","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -9543,7 +9754,7 @@ enifed("ember-htmlbars/tests/helpers/template_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/text_area_test",
-  ["ember-metal/run_loop","ember-views/views/view","ember-htmlbars/system/compile","ember-metal/property_set","ember-runtime/tests/utils"],
+  ["ember-metal/run_loop","ember-views/views/view","ember-template-compiler/system/compile","ember-metal/property_set","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
     var run = __dependency1__["default"];
@@ -9604,7 +9815,7 @@ enifed("ember-htmlbars/tests/helpers/text_area_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/unbound_test",
-  ["ember-views/views/view","ember-runtime/system/object","ember-runtime/system/native_array","ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-htmlbars/system/compile","ember-metal/error","ember-htmlbars/helpers","ember-htmlbars/compat/register-bound-helper","ember-htmlbars/compat/make-bound-helper","ember-runtime/system/container","ember-runtime/tests/utils"],
+  ["ember-views/views/view","ember-runtime/system/object","ember-runtime/system/native_array","ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-template-compiler/system/compile","ember-metal/error","ember-htmlbars/helpers","ember-htmlbars/compat/register-bound-helper","ember-htmlbars/compat/make-bound-helper","ember-runtime/system/container","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__) {
     "use strict";
     /*jshint newcap:false*/
@@ -9679,6 +9890,36 @@ enifed("ember-htmlbars/tests/helpers/unbound_test",
       }, EmberError);
     });
 
+    test('should property escape unsafe hrefs', function() {
+      /* jshint scripturl:true */
+
+      expect(3);
+
+      runDestroy(view);
+
+      view = EmberView.create({
+        template: compile('<ul>{{#each person in view.people}}<a href="{{unbound person.url}}">{{person.name}}</a>{{/each}}</ul>'),
+        people: A([{
+          name: 'Bob',
+          url: 'javascript:bob-is-cool'
+        }, {
+          name: 'James',
+          url: 'vbscript:james-is-cool'
+        }, {
+          name: 'Richard',
+          url: 'javascript:richard-is-cool'
+        }])
+      });
+
+      runAppend(view);
+
+      var links = view.$('a');
+      for (var i = 0, l = links.length; i < l; i++) {
+        var link = links[i];
+        equal(link.protocol, 'unsafe:', 'properly escaped');
+      }
+    });
+
     QUnit.module("ember-htmlbars: {{#unbound boundHelper arg1 arg2... argN}} form: render unbound helper invocations", {
       setup: function() {
         Ember.lookup = lookup = { Ember: Ember };
@@ -9864,6 +10105,34 @@ enifed("ember-htmlbars/tests/helpers/unbound_test",
       }
     });
 
+    test("should be able to render bound form of a helper inside unbound form of same helper", function() {
+      view = EmberView.create({
+        template: compile(
+          ["{{#unbound if foo}}",
+            "{{#if bar}}true{{/if}}",
+            "{{#unless bar}}false{{/unless}}",
+            "{{/unbound}}",
+            "{{#unbound unless notfoo}}",
+            "{{#if bar}}true{{/if}}",
+            "{{#unless bar}}false{{/unless}}",
+            "{{/unbound}}"].join("")),
+        context: EmberObject.create({
+          foo: true,
+          notfoo: false,
+          bar: true
+        })
+      });
+      runAppend(view);
+
+      equal(view.$().text(), "truetrue", "first render is correct");
+
+      run(function() {
+        set(view, 'context.bar', false);
+      });
+
+      equal(view.$().text(), "falsefalse", "bound if and unless inside unbound if/unless are updated");
+    });
+
     QUnit.module("ember-htmlbars: {{#unbound}} helper -- Container Lookup", {
       setup: function() {
         Ember.lookup = lookup = { Ember: Ember };
@@ -9984,7 +10253,7 @@ enifed("ember-htmlbars/tests/helpers/unbound_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/view_test",
-  ["ember-metal/property_set","ember-views/views/view","container/container","ember-metal/run_loop","ember-views/system/jquery","ember-views/views/text_field","ember-runtime/system/namespace","ember-runtime/system/object","ember-views/views/container_view","ember-views/views/metamorph_view","htmlbars-util/safe-string","ember-htmlbars/compat/precompile","ember-htmlbars/system/compile","ember-htmlbars/system/template","ember-metal/observer","ember-runtime/controllers/object_controller","ember-runtime/tests/utils","ember-metal/property_get","ember-metal/computed"],
+  ["ember-metal/property_set","ember-views/views/view","container/container","ember-metal/run_loop","ember-views/system/jquery","ember-views/views/text_field","ember-runtime/system/namespace","ember-runtime/system/object","ember-views/views/container_view","ember-views/views/metamorph_view","htmlbars-util/safe-string","ember-htmlbars/compat/precompile","ember-template-compiler/system/compile","ember-template-compiler/system/template","ember-metal/observer","ember-runtime/controllers/object_controller","ember-runtime/tests/utils","ember-metal/property_get","ember-metal/computed"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__) {
     "use strict";
     /*globals EmberDev */
@@ -11198,6 +11467,92 @@ enifed("ember-htmlbars/tests/helpers/view_test",
 
       ok(view.$().text() === 'foobarProperty', 'Property was bound to correctly');
     });
+
+    test('{{view}} should be able to point to a local instance of view', function() {
+      view = EmberView.create({
+        template: compile("{{view view.common}}"),
+
+        common: EmberView.create({
+          template: compile("common")
+        })
+      });
+
+      runAppend(view);
+      equal(view.$().text(), "common", "tries to look up view name locally");
+    });
+
+    test("{{view}} should be able to point to a local instance of subclass of view", function() {
+      var MyView = EmberView.extend();
+      view = EmberView.create({
+        template: compile("{{view view.subclassed}}"),
+        subclassed: MyView.create({
+          template: compile("subclassed")
+        })
+      });
+
+      runAppend(view);
+      equal(view.$().text(), "subclassed", "tries to look up view name locally");
+    });
+
+    test("{{view}} asserts that a view class is present", function() {
+      var MyView = EmberObject.extend();
+      view = EmberView.create({
+        template: compile("{{view view.notView}}"),
+        notView: MyView.extend({
+          template: compile("notView")
+        })
+      });
+
+      expectAssertion(function(){
+        runAppend(view);
+      }, /must be a subclass or an instance of Ember.View/);
+    });
+
+    test("{{view}} asserts that a view class is present off controller", function() {
+      var MyView = EmberObject.extend();
+      view = EmberView.create({
+        template: compile("{{view notView}}"),
+        controller: EmberObject.create({
+          notView: MyView.extend({
+            template: compile("notView")
+          })
+        })
+      });
+
+      expectAssertion(function(){
+        runAppend(view);
+      }, /must be a subclass or an instance of Ember.View/);
+    });
+
+    test("{{view}} asserts that a view instance is present", function() {
+      var MyView = EmberObject.extend();
+      view = EmberView.create({
+        template: compile("{{view view.notView}}"),
+        notView: MyView.create({
+          template: compile("notView")
+        })
+      });
+
+      expectAssertion(function(){
+        runAppend(view);
+      }, /must be a subclass or an instance of Ember.View/);
+    });
+
+    test("{{view}} asserts that a view subclass instance is present off controller", function() {
+      var MyView = EmberObject.extend();
+      view = EmberView.create({
+        template: compile("{{view notView}}"),
+        controller: EmberObject.create({
+          notView: MyView.create({
+            template: compile("notView")
+          })
+        })
+      });
+
+      expectAssertion(function(){
+        runAppend(view);
+      }, /must be a subclass or an instance of Ember.View/);
+    });
   });
 enifed("ember-htmlbars/tests/helpers/view_test.jshint",
   [],
@@ -11209,7 +11564,7 @@ enifed("ember-htmlbars/tests/helpers/view_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/with_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-metal/computed","ember-metal/property_set","ember-metal/property_get","ember-runtime/controllers/object_controller","ember-runtime/system/container","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-metal/computed","ember-metal/property_set","ember-metal/property_get","ember-runtime/controllers/object_controller","ember-runtime/system/container","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__) {
     "use strict";
     /*jshint newcap:false*/
@@ -11724,7 +12079,7 @@ enifed("ember-htmlbars/tests/helpers/with_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/helpers/yield_test",
-  ["ember-metal/run_loop","ember-views/views/view","ember-metal/computed","ember-runtime/system/container","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/native_array","ember-views/views/component","ember-metal/error","ember-htmlbars/helpers","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-metal/run_loop","ember-views/views/view","ember-metal/computed","ember-runtime/system/container","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/native_array","ember-views/views/component","ember-metal/error","ember-htmlbars/helpers","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__) {
     "use strict";
     /*jshint newcap:false*/
@@ -12112,7 +12467,7 @@ enifed("ember-htmlbars/tests/helpers/yield_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/hooks/component_test",
-  ["ember-views/component_lookup","container","ember-views/views/view","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-views/component_lookup","container","ember-views/views/view","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
     var ComponentLookup = __dependency1__["default"];
@@ -12185,7 +12540,7 @@ enifed("ember-htmlbars/tests/hooks/component_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/hooks/text_node_test",
-  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-htmlbars/system/compile","htmlbars-test-helpers","ember-runtime/tests/utils"],
+  ["ember-views/views/view","ember-metal/run_loop","ember-runtime/system/object","ember-template-compiler/system/compile","htmlbars-test-helpers","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -12199,7 +12554,7 @@ enifed("ember-htmlbars/tests/hooks/text_node_test",
     var view;
 
     
-      QUnit.module("ember-htmlbars: basic/text_node_test", {
+      QUnit.module("ember-htmlbars: hooks/text_node_test", {
         teardown: function(){
           runDestroy(view);
         }
@@ -12251,7 +12606,7 @@ enifed("ember-htmlbars/tests/hooks/text_node_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/htmlbars_test",
-  ["ember-htmlbars/system/compile","ember-htmlbars","htmlbars-test-helpers"],
+  ["ember-template-compiler/system/compile","ember-htmlbars","htmlbars-test-helpers"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
     var compile = __dependency1__["default"];
@@ -12279,7 +12634,7 @@ enifed("ember-htmlbars/tests/htmlbars_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/integration/binding_integration_test",
-  ["ember-metal/run_loop","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-runtime/system/object","ember-metal/computed","ember-views/views/container_view","ember-htmlbars/system/compile","ember-htmlbars/helpers/view","ember-runtime/tests/utils","ember-htmlbars/helpers","ember-metal/property_set"],
+  ["ember-metal/run_loop","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-runtime/system/object","ember-metal/computed","ember-views/views/container_view","ember-template-compiler/system/compile","ember-htmlbars/helpers/view","ember-runtime/tests/utils","ember-htmlbars/helpers","ember-metal/property_set"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__) {
     "use strict";
     var run = __dependency1__["default"];
@@ -12476,7 +12831,7 @@ enifed("ember-htmlbars/tests/integration/binding_integration_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/integration/block_params_test",
-  ["container/container","ember-metal/run_loop","ember-views/component_lookup","ember-views/views/view","ember-htmlbars/system/compile","ember-htmlbars/helpers","ember-runtime/tests/utils"],
+  ["container/container","ember-metal/run_loop","ember-views/component_lookup","ember-views/views/view","ember-template-compiler/system/compile","ember-htmlbars/helpers","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var Container = __dependency1__["default"];
@@ -12615,7 +12970,7 @@ enifed("ember-htmlbars/tests/integration/block_params_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/integration/component_invocation_test",
-  ["ember-views/views/view","container/container","ember-views/system/jquery","ember-htmlbars/system/compile","ember-views/component_lookup","ember-runtime/tests/utils"],
+  ["ember-views/views/view","container/container","ember-views/system/jquery","ember-template-compiler/system/compile","ember-views/component_lookup","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
     var EmberView = __dependency1__["default"];
@@ -12714,7 +13069,7 @@ enifed("ember-htmlbars/tests/integration/component_invocation_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/integration/escape_integration_test",
-  ["ember-metal/run_loop","ember-views/views/view","ember-htmlbars/system/compile","ember-metal/property_set","ember-metal/platform","ember-runtime/tests/utils"],
+  ["ember-metal/run_loop","ember-views/views/view","ember-template-compiler/system/compile","ember-metal/property_set","ember-metal/platform","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
     var run = __dependency1__["default"];
@@ -12847,7 +13202,7 @@ enifed("ember-htmlbars/tests/integration/escape_integration_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/integration/globals_integration_test",
-  ["ember-metal/core","ember-views/views/view","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-metal/core","ember-views/views/view","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -12934,7 +13289,7 @@ enifed("ember-htmlbars/tests/integration/globals_integration_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/integration/select_in_template_test",
-  ["ember-runtime/system/object","ember-metal/run_loop","ember-views/views/view","ember-views/system/event_dispatcher","ember-metal/computed","ember-runtime/system/namespace","ember-runtime/controllers/array_controller","ember-runtime/system/array_proxy","ember-views/views/select","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
+  ["ember-runtime/system/object","ember-metal/run_loop","ember-views/views/view","ember-views/system/event_dispatcher","ember-metal/computed","ember-runtime/system/namespace","ember-runtime/controllers/array_controller","ember-runtime/system/array_proxy","ember-views/views/select","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__) {
     "use strict";
     var EmberObject = __dependency1__["default"];
@@ -13229,7 +13584,7 @@ enifed("ember-htmlbars/tests/integration/tagless_views_rerender_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/integration/with_view_test",
-  ["ember-metal/run_loop","ember-views/system/jquery","ember-views/views/view","ember-runtime/system/container","ember-runtime/system/object","ember-views/views/metamorph_view","ember-htmlbars/system/compile","ember-runtime/tests/utils","ember-metal/property_set"],
+  ["ember-metal/run_loop","ember-views/system/jquery","ember-views/views/view","ember-runtime/system/container","ember-runtime/system/object","ember-views/views/metamorph_view","ember-template-compiler/system/compile","ember-runtime/tests/utils","ember-metal/property_set"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__) {
     "use strict";
     var run = __dependency1__["default"];
@@ -13603,46 +13958,6 @@ enifed("ember-htmlbars/tests/system/bootstrap_test.jshint",
       ok(true, 'ember-htmlbars/tests/system/bootstrap_test.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/tests/system/compile_test",
-  ["ember-htmlbars/system/compile","htmlbars-compiler/compiler"],
-  function(__dependency1__, __dependency2__) {
-    "use strict";
-    var compile = __dependency1__["default"];
-    var htmlbarsCompile = __dependency2__.compile;
-
-    
-
-    QUnit.module('ember-htmlbars: compile');
-
-    test('compiles the provided template with htmlbars', function() {
-      var templateString = "{{foo}} -- {{some-bar blah='foo'}}";
-
-      var actual = compile(templateString);
-      var expected = htmlbarsCompile(templateString);
-
-      equal(actual.toString(), expected.toString(), 'compile function matches content with htmlbars compile');
-    });
-
-    test('calls template on the compiled function', function() {
-      var templateString = "{{foo}} -- {{some-bar blah='foo'}}";
-
-      var actual = compile(templateString);
-
-      ok(actual.isTop, 'sets isTop via template function');
-      ok(actual.isMethod === false, 'sets isMethod via template function');
-    });
-
-    
-  });
-enifed("ember-htmlbars/tests/system/compile_test.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/tests/system');
-    test('ember-htmlbars/tests/system/compile_test.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/tests/system/compile_test.js should pass jshint.'); 
-    });
-  });
 enifed("ember-htmlbars/tests/system/lookup-helper_test",
   ["ember-htmlbars/system/lookup-helper","ember-views/component_lookup","container","ember-views/views/component"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
@@ -13782,8 +14097,8 @@ enifed("ember-htmlbars/tests/system/lookup-helper_test.jshint",
     });
   });
 enifed("ember-htmlbars/tests/system/make_bound_helper_test",
-  ["ember-views/views/view","ember-metal/run_loop","container","ember-htmlbars/system/make_bound_helper","ember-htmlbars/system/compile","ember-runtime/tests/utils"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
+  ["ember-views/views/view","ember-metal/run_loop","container","ember-htmlbars/system/make_bound_helper","ember-template-compiler/system/compile","ember-runtime/tests/utils","ember-runtime/system/string","ember-views/views/simple_bound_view","ember-runtime/system/object"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__) {
     "use strict";
     var EmberView = __dependency1__["default"];
     var run = __dependency2__["default"];
@@ -13792,12 +14107,16 @@ enifed("ember-htmlbars/tests/system/make_bound_helper_test",
     var compile = __dependency5__["default"];
     var runAppend = __dependency6__.runAppend;
     var runDestroy = __dependency6__.runDestroy;
+    var dasherize = __dependency7__.dasherize;
+    var SimpleBoundView = __dependency8__["default"];
+    var EmberObject = __dependency9__["default"];
 
     var view, container;
 
     function registerRepeatHelper() {
       container.register('helper:x-repeat', makeBoundHelper(function(params, hash, options, env) {
-        return new Array(hash.times + 1).join( params[0] );
+        var times = hash.times || 1;
+        return new Array(times + 1).join( params[0] );
       }));
     }
 
@@ -13815,6 +14134,26 @@ enifed("ember-htmlbars/tests/system/make_bound_helper_test",
       }
     });
 
+    test("should update bound helpers in a subexpression when properties change", function() {
+      container.register('helper:x-dasherize', makeBoundHelper(function(params, hash, options, env) {
+        return dasherize(params[0]);
+      }));
+
+      view = EmberView.create({
+        container: container,
+        controller: {prop: "isThing"},
+        template: compile("<div {{bind-attr data-foo=(x-dasherize prop)}}>{{prop}}</div>")
+      });
+
+      runAppend(view);
+
+      equal(view.$('div[data-foo="is-thing"]').text(), 'isThing', "helper output is correct");
+
+      run(view, 'set', 'controller.prop', 'notThing');
+
+      equal(view.$('div[data-foo="not-thing"]').text(), 'notThing', "helper output is correct");
+    });
+
     test("should update bound helpers when properties change", function() {
       container.register('helper:x-capitalize', makeBoundHelper(function(params, hash, options, env) {
         return params[0].toUpperCase();
@@ -13872,8 +14211,10 @@ enifed("ember-htmlbars/tests/system/make_bound_helper_test",
       equal(view.$().text(), 'AB', "helper output is correct");
     });
 
-    test("bound helpers should support bound options", function() {
-      registerRepeatHelper();
+    test("bound helpers should not process `fooBinding` style hash properties", function() {
+      container.register('helper:x-repeat', makeBoundHelper(function(params, hash, options, env) {
+        equal(hash.timesBinding, "numRepeats");
+      }));
 
       view = EmberView.create({
         container: container,
@@ -13885,19 +14226,6 @@ enifed("ember-htmlbars/tests/system/make_bound_helper_test",
       });
 
       runAppend(view);
-
-      equal(view.$().text(), 'ababab', "helper output is correct");
-
-      run(view, 'set', 'controller.numRepeats', 4);
-
-      equal(view.$().text(), 'abababab', "helper correctly re-rendered after bound option was changed");
-
-      run(function() {
-        view.set('controller.numRepeats', 2);
-        view.set('controller.text', "YES");
-      });
-
-      equal(view.$().text(), 'YESYES', "helper correctly re-rendered after both bound option and property changed");
     });
 
     test("bound helpers should support multiple bound properties", function() {
@@ -13998,6 +14326,55 @@ enifed("ember-htmlbars/tests/system/make_bound_helper_test",
       equal(view.$().text(), 'undefined, undefined, string, number, object', "helper output is correct");
     });
 
+    test("when no parameters are bound, no new views are created", function(){
+      registerRepeatHelper();
+      var originalRender = SimpleBoundView.prototype.render;
+      var renderWasCalled = false;
+      SimpleBoundView.prototype.render = function(){
+        renderWasCalled = true;
+        return originalRender.apply(this, arguments);
+      };
+
+      try {
+        view = EmberView.create({
+          template: compile('{{x-repeat "a"}}'),
+          controller: EmberObject.create(),
+          container: container
+        });
+        runAppend(view);
+      } finally {
+        SimpleBoundView.prototype.render = originalRender;
+      }
+
+      ok(!renderWasCalled, 'simple bound view should not have been created and rendered');
+      equal(view.$().text(), 'a');
+    });
+
+
+    test('when no hash parameters are bound, no new views are created', function(){
+      registerRepeatHelper();
+      var originalRender = SimpleBoundView.prototype.render;
+      var renderWasCalled = false;
+      SimpleBoundView.prototype.render = function(){
+        renderWasCalled = true;
+        return originalRender.apply(this, arguments);
+      };
+
+      try {
+        view = EmberView.create({
+          template: compile('{{x-repeat "a" times=3}}'),
+          controller: EmberObject.create(),
+          container: container
+        });
+        runAppend(view);
+      } finally {
+        SimpleBoundView.prototype.render = originalRender;
+      }
+
+      ok(!renderWasCalled, 'simple bound view should not have been created and rendered');
+      equal(view.$().text(), 'aaa');
+    });
+
     
   });
 enifed("ember-htmlbars/tests/system/make_bound_helper_test.jshint",
@@ -14036,43 +14413,6 @@ enifed("ember-htmlbars/tests/system/make_view_helper_test.jshint",
       ok(true, 'ember-htmlbars/tests/system/make_view_helper_test.js should pass jshint.'); 
     });
   });
-enifed("ember-htmlbars/tests/system/template_test",
-  ["ember-htmlbars/system/template"],
-  function(__dependency1__) {
-    "use strict";
-    var template = __dependency1__["default"];
-
-    
-
-    QUnit.module('ember-htmlbars: template');
-
-    test('sets `isTop` on the provided function', function() {
-      function test() { }
-
-      template(test);
-
-      equal(test.isTop, true, 'sets isTop on the provided function');
-    });
-
-    test('sets `isMethod` on the provided function', function() {
-      function test() { }
-
-      template(test);
-
-      equal(test.isMethod, false, 'sets isMethod on the provided function');
-    });
-
-    
-  });
-enifed("ember-htmlbars/tests/system/template_test.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/tests/system');
-    test('ember-htmlbars/tests/system/template_test.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/tests/system/template_test.js should pass jshint.'); 
-    });
-  });
 enifed("ember-htmlbars/tests/utils/string_test",
   ["htmlbars-util/safe-string","ember-htmlbars/utils/string"],
   function(__dependency1__, __dependency2__) {
@@ -14957,6 +15297,11 @@ enifed("ember-metal/tests/accessors/getPath_test",
               baz: { biff: 'BIFF' }
             }
           },
+          foothis: {
+            bar: {
+              baz: { biff: 'BIFF' }
+            }
+          },
           falseValue: false
         };
 
@@ -14997,6 +15342,10 @@ enifed("ember-metal/tests/accessors/getPath_test",
       deepEqual(get(obj, 'foo.bar'), obj.foo.bar);
     });
 
+    test('[obj, foothis.bar] -> obj.foothis.bar', function() {
+      deepEqual(get(obj, 'foothis.bar'), obj.foothis.bar);
+    });
+
     test('[obj, this.foo] -> obj.foo', function() {
       deepEqual(get(obj, 'this.foo'), obj.foo);
     });
@@ -18021,13 +18370,13 @@ enifed("ember-metal/tests/injected_property_test",
         ok(new InjectedProperty() instanceof Descriptor);
       });
 
-      test('setting the injected property should error', function() {
+      test('injected properties should be overridable', function() {
         var obj = {};
         defineProperty(obj, 'foo', new InjectedProperty());
 
-        throws(function() {
-          set(obj, 'foo', 'bar');
-        }, /Cannot set injected property 'foo' on object/);
+        set(obj, 'foo', 'bar');
+
+        equal(get(obj, 'foo'), 'bar', 'should return the overriden value');
       });
 
       test("getting on an object without a container should fail assertion", function() {
@@ -18171,6 +18520,68 @@ enifed("ember-metal/tests/instrumentation_test",
       instrument("render", null, function() {});
     });
 
+    test("instrument with 2 args (name, callback) no payload", function() {
+      expect(1);
+
+      subscribe("render", {
+        before: function(name, timestamp, payload) {
+          deepEqual(payload, {});
+        },
+        after: function() {}
+      });
+
+      instrument("render", function() {});
+    });
+
+    test("instrument with 3 args (name, callback, binding) no payload", function() {
+      expect(2);
+
+      var binding = {};
+      subscribe("render", {
+        before: function(name, timestamp, payload) {
+          deepEqual(payload, {});
+        },
+        after: function() {}
+      });
+
+      instrument("render", function() {
+        deepEqual(this, binding);
+      }, binding);
+    });
+
+
+    test("instrument with 3 args (name, payload, callback) with payload", function() {
+      expect(1);
+
+      var expectedPayload = { hi: 1};
+      subscribe("render", {
+        before: function(name, timestamp, payload) {
+          deepEqual(payload, expectedPayload);
+        },
+        after: function() {}
+      });
+
+      instrument("render", expectedPayload, function() {});
+    });
+
+    test("instrument with 4 args (name, payload, callback, binding) with payload", function() {
+      expect(2);
+
+      var expectedPayload = { hi: 1 };
+      var binding = {};
+      subscribe("render", {
+        before: function(name, timestamp, payload) {
+          deepEqual(payload, expectedPayload);
+        },
+        after: function() {}
+      });
+
+      instrument("render", expectedPayload, function() {
+        deepEqual(this, binding);
+      }, binding);
+    });
+
+
     test("raising an exception in the instrumentation attaches it to the payload", function() {
       expect(2);
 
@@ -24458,7 +24869,7 @@ enifed("ember-routing-htmlbars/helpers/render.jshint",
     });
   });
 enifed("ember-routing-htmlbars/tests/helpers/action_test",
-  ["ember-metal/core","ember-metal/property_set","ember-metal/run_loop","ember-views/system/event_dispatcher","ember-views/system/action_manager","ember-runtime/system/container","ember-runtime/system/object","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-htmlbars/system/compile","ember-views/views/view","ember-views/views/component","ember-views/system/jquery","ember-htmlbars/helpers","ember-routing-htmlbars/helpers/action","ember-runtime/tests/utils"],
+  ["ember-metal/core","ember-metal/property_set","ember-metal/run_loop","ember-views/system/event_dispatcher","ember-views/system/action_manager","ember-runtime/system/container","ember-runtime/system/object","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-template-compiler/system/compile","ember-views/views/view","ember-views/views/component","ember-views/system/jquery","ember-htmlbars/helpers","ember-routing-htmlbars/helpers/action","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -25543,7 +25954,7 @@ enifed("ember-routing-htmlbars/tests/helpers/action_test.jshint",
     });
   });
 enifed("ember-routing-htmlbars/tests/helpers/link-to_test",
-  ["ember-routing-htmlbars","ember-metal/run_loop","ember-views/views/view","ember-htmlbars/system/compile","ember-metal/property_set","ember-runtime/controllers/controller","ember-runtime/tests/utils"],
+  ["ember-routing-htmlbars","ember-metal/run_loop","ember-views/views/view","ember-template-compiler/system/compile","ember-metal/property_set","ember-runtime/controllers/controller","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var run = __dependency2__["default"];
@@ -25660,7 +26071,7 @@ enifed("ember-routing-htmlbars/tests/helpers/link-to_test.jshint",
     });
   });
 enifed("ember-routing-htmlbars/tests/helpers/outlet_test",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","container/container","ember-runtime/system/namespace","ember-runtime/system/string","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-routing/system/router","ember-routing/location/hash_location","ember-views/views/metamorph_view","ember-routing/ext/view","ember-views/views/container_view","ember-views/system/jquery","ember-routing-htmlbars/helpers/outlet","ember-htmlbars/system/compile","ember-htmlbars/helpers","ember-runtime/tests/utils"],
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","container/container","ember-runtime/system/namespace","ember-runtime/system/string","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-routing/system/router","ember-routing/location/hash_location","ember-views/views/metamorph_view","ember-routing/ext/view","ember-views/views/container_view","ember-views/system/jquery","ember-routing-htmlbars/helpers/outlet","ember-template-compiler/system/compile","ember-htmlbars/helpers","ember-runtime/tests/utils"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -26056,7 +26467,7 @@ enifed("ember-routing-htmlbars/tests/helpers/outlet_test.jshint",
     });
   });
 enifed("ember-routing-htmlbars/tests/helpers/render_test",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/platform","ember-metal/mixin","container/container","ember-runtime/system/namespace","ember-runtime/system/string","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-routing/system/router","ember-routing/location/hash_location","ember-htmlbars/helpers","ember-htmlbars/system/compile","ember-routing/ext/view","ember-views/views/metamorph_view","ember-views/system/jquery","ember-views/system/action_manager","ember-routing-htmlbars/helpers/render","ember-routing-htmlbars/helpers/action","ember-routing-htmlbars/helpers/outlet"],
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/platform","ember-metal/mixin","container/container","ember-runtime/system/namespace","ember-runtime/system/string","ember-runtime/controllers/controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-routing/system/router","ember-routing/location/hash_location","ember-htmlbars/helpers","ember-template-compiler/system/compile","ember-routing/ext/view","ember-views/views/metamorph_view","ember-views/system/jquery","ember-views/system/action_manager","ember-routing-htmlbars/helpers/render","ember-routing-htmlbars/helpers/action","ember-routing-htmlbars/helpers/outlet"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -45722,6 +46133,223 @@ enifed("ember-runtime/tests/utils.jshint",
       ok(true, 'ember-runtime/tests/utils.js should pass jshint.'); 
     });
   });
+enifed("ember-template-compiler.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - .');
+    test('ember-template-compiler.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/plugins.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler');
+    test('ember-template-compiler/plugins.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/plugins.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/plugins/transform-each-in-to-hash.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/plugins');
+    test('ember-template-compiler/plugins/transform-each-in-to-hash.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/plugins/transform-each-in-to-hash.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/plugins/transform-with-as-to-hash.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/plugins');
+    test('ember-template-compiler/plugins/transform-with-as-to-hash.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/plugins/transform-with-as-to-hash.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/system/compile.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/system');
+    test('ember-template-compiler/system/compile.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/system/compile.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/system/compile_options.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/system');
+    test('ember-template-compiler/system/compile_options.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/system/compile_options.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/system/precompile.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/system');
+    test('ember-template-compiler/system/precompile.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/system/precompile.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/system/template.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/system');
+    test('ember-template-compiler/system/template.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/system/template.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/tests/main_test",
+  [],
+  function() {
+    "use strict";
+
+  });
+enifed("ember-template-compiler/tests/main_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/tests');
+    test('ember-template-compiler/tests/main_test.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/tests/main_test.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/tests/plugins_test",
+  ["ember-template-compiler/plugins","ember-template-compiler/system/compile"],
+  function(__dependency1__, __dependency2__) {
+    "use strict";
+    var plugins = __dependency1__["default"];
+    var registerPlugin = __dependency1__.registerPlugin;
+    var compile = __dependency2__["default"];
+
+    var originalASTPlugins;
+
+    QUnit.module("ember-htmlbars: Ember.HTMLBars.registerASTPlugin", {
+      setup: function() {
+        originalASTPlugins = plugins.ast.slice();
+      },
+
+      teardown: function() {
+        plugins.ast = originalASTPlugins;
+      }
+    });
+
+    test("registering a plugin adds it to htmlbars-compiler options", function() {
+      expect(2);
+
+      function TestPlugin() {
+        ok(true, 'TestPlugin instantiated');
+      }
+
+      TestPlugin.prototype.transform = function(ast) {
+        ok(true, 'transform was called');
+
+        return ast;
+      };
+
+      registerPlugin('ast', TestPlugin);
+
+      compile('some random template');
+    });
+
+    test('registering an unknown type throws an error', function() {
+      throws(function() {
+        registerPlugin('asdf', "whatever");
+      }, /Attempting to register "whatever" as "asdf" which is not a valid HTMLBars plugin type./);
+    });
+  });
+enifed("ember-template-compiler/tests/plugins_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/tests');
+    test('ember-template-compiler/tests/plugins_test.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/tests/plugins_test.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/tests/system/compile_test",
+  ["ember-template-compiler/system/compile","htmlbars-compiler/compiler"],
+  function(__dependency1__, __dependency2__) {
+    "use strict";
+    var compile = __dependency1__["default"];
+    var htmlbarsCompile = __dependency2__.compile;
+
+    
+
+    QUnit.module('ember-htmlbars: compile');
+
+    test('compiles the provided template with htmlbars', function() {
+      var templateString = "{{foo}} -- {{some-bar blah='foo'}}";
+
+      var actual = compile(templateString);
+      var expected = htmlbarsCompile(templateString);
+
+      equal(actual.toString(), expected.toString(), 'compile function matches content with htmlbars compile');
+    });
+
+    test('calls template on the compiled function', function() {
+      var templateString = "{{foo}} -- {{some-bar blah='foo'}}";
+
+      var actual = compile(templateString);
+
+      ok(actual.isTop, 'sets isTop via template function');
+      ok(actual.isMethod === false, 'sets isMethod via template function');
+    });
+
+    
+  });
+enifed("ember-template-compiler/tests/system/compile_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/tests/system');
+    test('ember-template-compiler/tests/system/compile_test.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/tests/system/compile_test.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/tests/system/template_test",
+  ["ember-template-compiler/system/template"],
+  function(__dependency1__) {
+    "use strict";
+    var template = __dependency1__["default"];
+
+    
+
+    QUnit.module('ember-htmlbars: template');
+
+    test('sets `isTop` on the provided function', function() {
+      function test() { }
+
+      template(test);
+
+      equal(test.isTop, true, 'sets isTop on the provided function');
+    });
+
+    test('sets `isMethod` on the provided function', function() {
+      function test() { }
+
+      template(test);
+
+      equal(test.isMethod, false, 'sets isMethod on the provided function');
+    });
+
+    
+  });
+enifed("ember-template-compiler/tests/system/template_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/tests/system');
+    test('ember-template-compiler/tests/system/template_test.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/tests/system/template_test.js should pass jshint.'); 
+    });
+  });
 enifed("ember-testing.jshint",
   [],
   function() {
@@ -45795,7 +46423,7 @@ enifed("ember-testing/test.jshint",
     });
   });
 enifed("ember-testing/tests/acceptance_test",
-  ["ember-metal/run_loop","ember-views/system/jquery","ember-testing/test","ember-testing/adapters/qunit","ember-views/views/view","ember-testing/initializers","ember-application/system/application","ember-routing/system/route","ember-htmlbars/system/compile","ember-routing"],
+  ["ember-metal/run_loop","ember-views/system/jquery","ember-testing/test","ember-testing/adapters/qunit","ember-views/views/view","ember-testing/initializers","ember-application/system/application","ember-routing/system/route","ember-template-compiler/system/compile","ember-routing"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__) {
     "use strict";
     var run = __dependency1__["default"];
@@ -46378,7 +47006,7 @@ enifed("ember-testing/tests/helper_registration_test.jshint",
     });
   });
 enifed("ember-testing/tests/helpers_test",
-  ["ember-metal/core","ember-metal/run_loop","ember-runtime/system/object","ember-runtime/ext/rsvp","ember-views/views/view","ember-views/system/jquery","ember-testing/test","ember-testing/helpers","ember-testing/initializers","ember-testing/setup_for_testing","ember-routing/system/router","ember-routing/system/route","ember-application/system/application","ember-htmlbars/system/compile"],
+  ["ember-metal/core","ember-metal/run_loop","ember-runtime/system/object","ember-runtime/ext/rsvp","ember-views/views/view","ember-views/system/jquery","ember-testing/test","ember-testing/helpers","ember-testing/initializers","ember-testing/setup_for_testing","ember-routing/system/router","ember-routing/system/route","ember-application/system/application","ember-template-compiler/system/compile"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -47209,7 +47837,7 @@ enifed("ember-testing/tests/helpers_test.jshint",
     });
   });
 enifed("ember-testing/tests/integration_test",
-  ["ember-metal/core","ember-metal/run_loop","ember-runtime/system/object","ember-runtime/controllers/array_controller","ember-views/system/jquery","ember-views/views/view","ember-testing/test","ember-routing/system/route","ember-application/system/application","ember-htmlbars/system/compile","ember-application"],
+  ["ember-metal/core","ember-metal/run_loop","ember-runtime/system/object","ember-runtime/controllers/array_controller","ember-views/system/jquery","ember-views/views/view","ember-testing/test","ember-routing/system/route","ember-application/system/application","ember-template-compiler/system/compile","ember-application"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -47418,6 +48046,15 @@ enifed("ember-views/mixins/view_target_action_support.jshint",
       ok(true, 'ember-views/mixins/view_target_action_support.js should pass jshint.'); 
     });
   });
+enifed("ember-views/streams/class_name_binding.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-views/streams');
+    test('ember-views/streams/class_name_binding.js should pass jshint', function() { 
+      ok(true, 'ember-views/streams/class_name_binding.js should pass jshint.'); 
+    });
+  });
 enifed("ember-views/streams/conditional_stream.jshint",
   [],
   function() {
@@ -47508,6 +48145,15 @@ enifed("ember-views/system/renderer.jshint",
       ok(true, 'ember-views/system/renderer.js should pass jshint.'); 
     });
   });
+enifed("ember-views/system/sanitize_attribute_value.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-views/system');
+    test('ember-views/system/sanitize_attribute_value.js should pass jshint', function() { 
+      ok(true, 'ember-views/system/sanitize_attribute_value.js should pass jshint.'); 
+    });
+  });
 enifed("ember-views/system/utils.jshint",
   [],
   function() {
@@ -47578,6 +48224,133 @@ enifed("ember-views/tests/mixins/view_target_action_support_test.jshint",
       ok(true, 'ember-views/tests/mixins/view_target_action_support_test.js should pass jshint.'); 
     });
   });
+enifed("ember-views/tests/streams/class_string_for_value_test",
+  ["ember-views/streams/class_name_binding"],
+  function(__dependency1__) {
+    "use strict";
+    var classStringForValue = __dependency1__.classStringForValue;
+
+    QUnit.module("EmberView - classStringForValue");
+
+    test("returns dasherized version of last path part if value is true", function() {
+      equal(classStringForValue("propertyName", true), "property-name", "class is dasherized");
+      equal(classStringForValue("content.propertyName", true), "property-name", "class is dasherized");
+    });
+
+    test("returns className if value is true and className is specified", function() {
+      equal(classStringForValue("propertyName", true, "truthyClass"), "truthyClass", "returns className if given");
+      equal(classStringForValue("content.propertyName", true, "truthyClass"), "truthyClass", "returns className if given");
+    });
+
+    test("returns falsyClassName if value is false and falsyClassName is specified", function() {
+      equal(classStringForValue("propertyName", false, "truthyClass", "falsyClass"), "falsyClass", "returns falsyClassName if given");
+      equal(classStringForValue("content.propertyName", false, "truthyClass", "falsyClass"), "falsyClass", "returns falsyClassName if given");
+    });
+
+    test("returns null if value is false and falsyClassName is not specified", function() {
+      equal(classStringForValue("propertyName", false, "truthyClass"), null, "returns null if falsyClassName is not specified");
+      equal(classStringForValue("content.propertyName", false, "truthyClass"), null, "returns null if falsyClassName is not specified");
+    });
+
+    test("returns null if value is false", function() {
+      equal(classStringForValue("propertyName", false), null, "returns null if value is false");
+      equal(classStringForValue("content.propertyName", false), null, "returns null if value is false");
+    });
+
+    test("returns null if value is true and className is not specified and falsyClassName is specified", function() {
+      equal(classStringForValue("propertyName", true, undefined, "falsyClassName"), null, "returns null if value is true");
+      equal(classStringForValue("content.propertyName", true, undefined, "falsyClassName"), null, "returns null if value is true");
+    });
+
+    test("returns the value if the value is truthy", function() {
+      equal(classStringForValue("propertyName", "myString"), "myString", "returns value if the value is truthy");
+      equal(classStringForValue("content.propertyName", "myString"), "myString", "returns value if the value is truthy");
+
+      equal(classStringForValue("propertyName", "123"), 123, "returns value if the value is truthy");
+      equal(classStringForValue("content.propertyName", 123), 123, "returns value if the value is truthy");
+    });
+
+    test("treat empty array as falsy value and return null", function() {
+      equal(classStringForValue("propertyName", [], "truthyClass"), null, "returns null if value is false");
+      equal(classStringForValue("content.propertyName", [], "truthyClass"), null, "returns null if value is false");
+    });
+
+    test("treat non-empty array as truthy value and return the className if specified", function() {
+      equal(classStringForValue("propertyName", ['emberjs'], "truthyClass"), "truthyClass", "returns className if given");
+      equal(classStringForValue("content.propertyName", ['emberjs'], "truthyClass"), "truthyClass", "returns className if given");
+    });
+  });
+enifed("ember-views/tests/streams/class_string_for_value_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-views/tests/streams');
+    test('ember-views/tests/streams/class_string_for_value_test.js should pass jshint', function() { 
+      ok(true, 'ember-views/tests/streams/class_string_for_value_test.js should pass jshint.'); 
+    });
+  });
+enifed("ember-views/tests/streams/parse_property_path_test",
+  ["ember-views/streams/class_name_binding"],
+  function(__dependency1__) {
+    "use strict";
+    var parsePropertyPath = __dependency1__.parsePropertyPath;
+
+    QUnit.module("EmberView - parsePropertyPath");
+
+    test("it works with a simple property path", function() {
+      var parsed = parsePropertyPath("simpleProperty");
+
+      equal(parsed.path, "simpleProperty", "path is parsed correctly");
+      equal(parsed.className, undefined, "there is no className");
+      equal(parsed.falsyClassName, undefined, "there is no falsyClassName");
+      equal(parsed.classNames, "", "there is no classNames");
+    });
+
+    test("it works with a more complex property path", function() {
+      var parsed = parsePropertyPath("content.simpleProperty");
+
+      equal(parsed.path, "content.simpleProperty", "path is parsed correctly");
+      equal(parsed.className, undefined, "there is no className");
+      equal(parsed.falsyClassName, undefined, "there is no falsyClassName");
+      equal(parsed.classNames, "", "there is no classNames");
+    });
+
+    test("className is extracted", function() {
+      var parsed = parsePropertyPath("content.simpleProperty:class");
+
+      equal(parsed.path, "content.simpleProperty", "path is parsed correctly");
+      equal(parsed.className, "class", "className is extracted");
+      equal(parsed.falsyClassName, undefined, "there is no falsyClassName");
+      equal(parsed.classNames, ":class", "there is a classNames");
+    });
+
+    test("falsyClassName is extracted", function() {
+      var parsed = parsePropertyPath("content.simpleProperty:class:falsyClass");
+
+      equal(parsed.path, "content.simpleProperty", "path is parsed correctly");
+      equal(parsed.className, "class", "className is extracted");
+      equal(parsed.falsyClassName, "falsyClass", "falsyClassName is extracted");
+      equal(parsed.classNames, ":class:falsyClass", "there is a classNames");
+    });
+
+    test("it works with an empty true class", function() {
+      var parsed = parsePropertyPath("content.simpleProperty::falsyClass");
+
+      equal(parsed.path, "content.simpleProperty", "path is parsed correctly");
+      equal(parsed.className, undefined, "className is undefined");
+      equal(parsed.falsyClassName, "falsyClass", "falsyClassName is extracted");
+      equal(parsed.classNames, "::falsyClass", "there is a classNames");
+    });
+  });
+enifed("ember-views/tests/streams/parse_property_path_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-views/tests/streams');
+    test('ember-views/tests/streams/parse_property_path_test.js should pass jshint', function() { 
+      ok(true, 'ember-views/tests/streams/parse_property_path_test.js should pass jshint.'); 
+    });
+  });
 enifed("ember-views/tests/system/event_dispatcher_test",
   ["ember-metal/core","ember-metal/property_get","ember-metal/run_loop","ember-runtime/system/object","ember-views/system/jquery","ember-views/views/view","ember-views/system/event_dispatcher","ember-views/views/container_view"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
@@ -48142,7 +48915,6 @@ enifed("ember-views/tests/system/render_buffer_test",
 
       var el = buffer.element();
       equal(el.tagName.toLowerCase(), 'div');
-      console.log('el.', el.childNodes);
       equal(el.childNodes[0].tagName, 'SPAN', "Fragment is pushed into the buffer");
     });
 
@@ -48440,6 +49212,74 @@ enifed("ember-views/tests/system/render_buffer_test.jshint",
       ok(true, 'ember-views/tests/system/render_buffer_test.js should pass jshint.'); 
     });
   });
+enifed("ember-views/tests/system/sanitize_attribute_value_test",
+  ["ember-views/system/sanitize_attribute_value","ember-htmlbars/utils/string"],
+  function(__dependency1__, __dependency2__) {
+    "use strict";
+    var sanitizeAttributeValue = __dependency1__["default"];
+    var SafeString = __dependency2__.SafeString;
+
+    QUnit.module('ember-views: sanitizeAttributeValue(null, "href")');
+
+    var goodProtocols = [ 'https', 'http', 'ftp', 'tel', 'file'];
+
+    for (var i = 0, l = goodProtocols.length; i < l; i++) {
+      buildProtocolTest(goodProtocols[i]);
+    }
+
+    function buildProtocolTest(protocol) {
+      test('allows ' + protocol + ' protocol when element is not provided', function() {
+        expect(1);
+
+        var expected = protocol + '://foo.com';
+        var actual = sanitizeAttributeValue(null, 'href', expected);
+
+        equal(actual, expected, 'protocol not escaped');
+      });
+    }
+
+    test('blocks javascript: protocol', function() {
+      /* jshint scripturl:true */
+
+      expect(1);
+
+      var expected = 'javascript:alert("foo")';
+      var actual = sanitizeAttributeValue(null, 'href', expected);
+
+      equal(actual, 'unsafe:' + expected, 'protocol escaped');
+    });
+
+    test('blocks blacklisted protocols', function() {
+      /* jshint scripturl:true */
+
+      expect(1);
+
+      var expected = 'javascript:alert("foo")';
+      var actual = sanitizeAttributeValue(null, 'href', expected);
+
+      equal(actual, 'unsafe:' + expected, 'protocol escaped');
+    });
+
+    test('does not block SafeStrings', function() {
+      /* jshint scripturl:true */
+
+      expect(1);
+
+      var expected = 'javascript:alert("foo")';
+      var actual = sanitizeAttributeValue(null, 'href', new SafeString(expected));
+
+      equal(actual, expected, 'protocol unescaped');
+    });
+  });
+enifed("ember-views/tests/system/sanitize_attribute_value_test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-views/tests/system');
+    test('ember-views/tests/system/sanitize_attribute_value_test.js should pass jshint', function() { 
+      ok(true, 'ember-views/tests/system/sanitize_attribute_value_test.js should pass jshint.'); 
+    });
+  });
 enifed("ember-views/tests/system/view_utils_test",
   ["ember-metal/run_loop","ember-views/views/view"],
   function(__dependency1__, __dependency2__) {
@@ -50573,17 +51413,16 @@ enifed("ember-views/tests/views/instrumentation_test.jshint",
     });
   });
 enifed("ember-views/tests/views/metamorph_view_test",
-  ["ember-views/system/jquery","ember-metal/run_loop","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-htmlbars/system/compile","ember-views/views/metamorph_view"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
+  ["ember-views/system/jquery","ember-metal/run_loop","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-template-compiler/system/compile","ember-views/views/metamorph_view"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var jQuery = __dependency1__["default"];
     var run = __dependency2__["default"];
     var EmberView = __dependency3__["default"];
     var get = __dependency4__.get;
     var set = __dependency5__.set;
-    var observer = __dependency6__.observer;
-    var compile = __dependency7__["default"];
-    var _MetamorphView = __dependency8__["default"];
+    var compile = __dependency6__["default"];
+    var _MetamorphView = __dependency7__["default"];
 
     var view, childView, metamorphView;
 
@@ -50740,7 +51579,7 @@ enifed("ember-views/tests/views/metamorph_view_test",
     });
 
     test("replacing a Metamorph should invalidate childView elements", function() {
-      var elementOnDidChange, elementOnDidInsert;
+      var elementOnDidInsert;
 
       view = EmberView.create({
         show: false,
@@ -50754,10 +51593,6 @@ enifed("ember-views/tests/views/metamorph_view_test",
             this.get('element');
           },
 
-          elementDidChange: observer('element', function() {
-            elementOnDidChange = this.get('element');
-          }),
-
           didInsertElement: function() {
             elementOnDidInsert = this.get('element');
           }
@@ -50770,7 +51605,6 @@ enifed("ember-views/tests/views/metamorph_view_test",
 
       run(function() { view.set('show', true); });
 
-      ok(elementOnDidChange, "should have an element on change");
       ok(elementOnDidInsert, "should have an element on insert");
 
       run(function() { view.destroy(); });
@@ -52849,15 +53683,16 @@ enifed("ember-views/tests/views/view/append_to_test.jshint",
     });
   });
 enifed("ember-views/tests/views/view/attribute_bindings_test",
-  ["ember-metal/core","ember-metal/run_loop","ember-metal/observer","ember-metal/property_events","ember-views/views/view"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+  ["ember-metal/core","ember-metal/run_loop","ember-metal/observer","ember-metal/property_events","ember-htmlbars/utils/string","ember-views/views/view"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var run = __dependency2__["default"];
     var observersFor = __dependency3__.observersFor;
     var changeProperties = __dependency4__.changeProperties;
+    var SafeString = __dependency5__.SafeString;
 
-    var EmberView = __dependency5__["default"];
+    var EmberView = __dependency6__["default"];
 
     var originalLookup = Ember.lookup;
     var lookup, view;
@@ -53155,6 +53990,25 @@ enifed("ember-views/tests/views/view/attribute_bindings_test",
         appendView();
       }, 'You cannot use class as an attributeBinding, use classNameBindings instead.');
     });
+
+    test("blacklists href bindings based on protocol", function() {
+      /* jshint scripturl:true */
+
+      view = EmberView.create({
+        attributeBindings: ['href'],
+        href: "javascript:alert('foo')"
+      });
+
+      appendView();
+
+      equal(view.$().attr('href'), "unsafe:javascript:alert('foo')", "value property sanitized");
+
+      run(function() {
+        view.set('href', new SafeString(view.get('href')));
+      });
+
+      equal(view.$().attr('href'), "javascript:alert('foo')", "value is not defined");
+    });
   });
 enifed("ember-views/tests/views/view/attribute_bindings_test.jshint",
   [],
@@ -53545,73 +54399,6 @@ enifed("ember-views/tests/views/view/class_name_bindings_test.jshint",
       ok(true, 'ember-views/tests/views/view/class_name_bindings_test.js should pass jshint.'); 
     });
   });
-enifed("ember-views/tests/views/view/class_string_for_value_test",
-  ["ember-views/views/view"],
-  function(__dependency1__) {
-    "use strict";
-    var View = __dependency1__["default"];
-
-    QUnit.module("View - _classStringForValue");
-
-    var cSFV = View._classStringForValue;
-
-    test("returns dasherized version of last path part if value is true", function() {
-      equal(cSFV("propertyName", true), "property-name", "class is dasherized");
-      equal(cSFV("content.propertyName", true), "property-name", "class is dasherized");
-    });
-
-    test("returns className if value is true and className is specified", function() {
-      equal(cSFV("propertyName", true, "truthyClass"), "truthyClass", "returns className if given");
-      equal(cSFV("content.propertyName", true, "truthyClass"), "truthyClass", "returns className if given");
-    });
-
-    test("returns falsyClassName if value is false and falsyClassName is specified", function() {
-      equal(cSFV("propertyName", false, "truthyClass", "falsyClass"), "falsyClass", "returns falsyClassName if given");
-      equal(cSFV("content.propertyName", false, "truthyClass", "falsyClass"), "falsyClass", "returns falsyClassName if given");
-    });
-
-    test("returns null if value is false and falsyClassName is not specified", function() {
-      equal(cSFV("propertyName", false, "truthyClass"), null, "returns null if falsyClassName is not specified");
-      equal(cSFV("content.propertyName", false, "truthyClass"), null, "returns null if falsyClassName is not specified");
-    });
-
-    test("returns null if value is false", function() {
-      equal(cSFV("propertyName", false), null, "returns null if value is false");
-      equal(cSFV("content.propertyName", false), null, "returns null if value is false");
-    });
-
-    test("returns null if value is true and className is not specified and falsyClassName is specified", function() {
-      equal(cSFV("propertyName", true, undefined, "falsyClassName"), null, "returns null if value is true");
-      equal(cSFV("content.propertyName", true, undefined, "falsyClassName"), null, "returns null if value is true");
-    });
-
-    test("returns the value if the value is truthy", function() {
-      equal(cSFV("propertyName", "myString"), "myString", "returns value if the value is truthy");
-      equal(cSFV("content.propertyName", "myString"), "myString", "returns value if the value is truthy");
-
-      equal(cSFV("propertyName", "123"), 123, "returns value if the value is truthy");
-      equal(cSFV("content.propertyName", 123), 123, "returns value if the value is truthy");
-    });
-
-    test("treat empty array as falsy value and return null", function() {
-      equal(cSFV("propertyName", [], "truthyClass"), null, "returns null if value is false");
-      equal(cSFV("content.propertyName", [], "truthyClass"), null, "returns null if value is false");
-    });
-
-    test("treat non-empty array as truthy value and return the className if specified", function() {
-      equal(cSFV("propertyName", ['emberjs'], "truthyClass"), "truthyClass", "returns className if given");
-      equal(cSFV("content.propertyName", ['emberjs'], "truthyClass"), "truthyClass", "returns className if given");
-    });
-  });
-enifed("ember-views/tests/views/view/class_string_for_value_test.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-views/tests/views/view');
-    test('ember-views/tests/views/view/class_string_for_value_test.js should pass jshint', function() { 
-      ok(true, 'ember-views/tests/views/view/class_string_for_value_test.js should pass jshint.'); 
-    });
-  });
 enifed("ember-views/tests/views/view/context_test",
   ["ember-metal/run_loop","ember-views/views/view","ember-views/views/container_view"],
   function(__dependency1__, __dependency2__, __dependency3__) {
@@ -54189,20 +54976,22 @@ enifed("ember-views/tests/views/view/element_test",
       equal(get(view, 'element'), dom, 'now has set element');
     });
 
-    test("should not allow the elementId to be changed after inserted", function() {
-      view = EmberView.create({
-        elementId: 'one'
-      });
+    Ember.runInDebug(function() {
+      test("should not allow the elementId to be changed after inserted", function() {
+        view = EmberView.create({
+          elementId: 'one'
+        });
 
-      run(function() {
-        view.appendTo('#qunit-fixture');
-      });
+        run(function() {
+          view.appendTo('#qunit-fixture');
+        });
 
-      raises(function() {
-        view.set('elementId', 'two');
-      }, "raises elementId changed exception");
+        raises(function() {
+          view.set('elementId', 'two');
+        }, "raises elementId changed exception");
 
-      equal(view.get('elementId'), 'one', 'elementId is still "one"');
+        equal(view.get('elementId'), 'one', 'elementId is still "one"');
+      });
     });
   });
 enifed("ember-views/tests/views/view/element_test.jshint",
@@ -54924,7 +55713,7 @@ enifed("ember-views/tests/views/view/nearest_of_type_test.jshint",
     });
   });
 enifed("ember-views/tests/views/view/nested_view_ordering_test",
-  ["container","ember-metal/run_loop","ember-views/views/view","ember-htmlbars/system/compile"],
+  ["container","ember-metal/run_loop","ember-views/views/view","ember-template-compiler/system/compile"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     var Container = __dependency1__["default"];
@@ -54979,68 +55768,6 @@ enifed("ember-views/tests/views/view/nested_view_ordering_test.jshint",
       ok(true, 'ember-views/tests/views/view/nested_view_ordering_test.js should pass jshint.'); 
     });
   });
-enifed("ember-views/tests/views/view/parse_property_path_test",
-  ["ember-views/views/view"],
-  function(__dependency1__) {
-    "use strict";
-    var EmberView = __dependency1__["default"];
-
-    QUnit.module("EmberView - _parsePropertyPath");
-
-    test("it works with a simple property path", function() {
-      var parsed = EmberView._parsePropertyPath("simpleProperty");
-
-      equal(parsed.path, "simpleProperty", "path is parsed correctly");
-      equal(parsed.className, undefined, "there is no className");
-      equal(parsed.falsyClassName, undefined, "there is no falsyClassName");
-      equal(parsed.classNames, "", "there is no classNames");
-    });
-
-    test("it works with a more complex property path", function() {
-      var parsed = EmberView._parsePropertyPath("content.simpleProperty");
-
-      equal(parsed.path, "content.simpleProperty", "path is parsed correctly");
-      equal(parsed.className, undefined, "there is no className");
-      equal(parsed.falsyClassName, undefined, "there is no falsyClassName");
-      equal(parsed.classNames, "", "there is no classNames");
-    });
-
-    test("className is extracted", function() {
-      var parsed = EmberView._parsePropertyPath("content.simpleProperty:class");
-
-      equal(parsed.path, "content.simpleProperty", "path is parsed correctly");
-      equal(parsed.className, "class", "className is extracted");
-      equal(parsed.falsyClassName, undefined, "there is no falsyClassName");
-      equal(parsed.classNames, ":class", "there is a classNames");
-    });
-
-    test("falsyClassName is extracted", function() {
-      var parsed = EmberView._parsePropertyPath("content.simpleProperty:class:falsyClass");
-
-      equal(parsed.path, "content.simpleProperty", "path is parsed correctly");
-      equal(parsed.className, "class", "className is extracted");
-      equal(parsed.falsyClassName, "falsyClass", "falsyClassName is extracted");
-      equal(parsed.classNames, ":class:falsyClass", "there is a classNames");
-    });
-
-    test("it works with an empty true class", function() {
-      var parsed = EmberView._parsePropertyPath("content.simpleProperty::falsyClass");
-
-      equal(parsed.path, "content.simpleProperty", "path is parsed correctly");
-      equal(parsed.className, undefined, "className is undefined");
-      equal(parsed.falsyClassName, "falsyClass", "falsyClassName is extracted");
-      equal(parsed.classNames, "::falsyClass", "there is a classNames");
-    });
-  });
-enifed("ember-views/tests/views/view/parse_property_path_test.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-views/tests/views/view');
-    test('ember-views/tests/views/view/parse_property_path_test.js should pass jshint', function() { 
-      ok(true, 'ember-views/tests/views/view/parse_property_path_test.js should pass jshint.'); 
-    });
-  });
 enifed("ember-views/tests/views/view/remove_test",
   ["ember-metal/property_get","ember-metal/run_loop","ember-metal/enumerable_utils","ember-views/system/jquery","ember-views/views/view","ember-views/views/container_view"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
@@ -55215,16 +55942,17 @@ enifed("ember-views/tests/views/view/remove_test.jshint",
     });
   });
 enifed("ember-views/tests/views/view/render_test",
-  ["ember-metal/property_get","ember-metal/run_loop","ember-views/system/jquery","ember-views/views/view","ember-views/views/container_view","ember-htmlbars/system/compile"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
+  ["ember-metal/property_get","ember-metal/run_loop","ember-views/system/jquery","ember-views/views/view","ember-views/views/container_view","ember-metal/computed","ember-template-compiler/system/compile"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var get = __dependency1__.get;
     var run = __dependency2__["default"];
     var jQuery = __dependency3__["default"];
     var EmberView = __dependency4__["default"];
     var ContainerView = __dependency5__["default"];
+    var computed = __dependency6__.computed;
 
-    var compile = __dependency6__["default"];
+    var compile = __dependency7__["default"];
 
     var view;
 
@@ -55341,6 +56069,28 @@ enifed("ember-views/tests/views/view/render_test",
       ok(view.$().hasClass('ember-view'), "the view has ember-view");
     });
 
+    test("should allow tagName to be a computed property [DEPRECATED]", function() {
+      view = EmberView.extend({
+        tagName: computed(function() {
+          return 'span';
+        })
+      }).create();
+
+      expectDeprecation(function(){
+        run(function() {
+          view.createElement();
+        });
+      }, /using a computed property to define tagName will not be permitted/);
+
+      equal(view.element.tagName, 'SPAN', "the view has was created with the correct element");
+
+      run(function() {
+        view.set('tagName', 'div');
+      });
+
+      equal(view.element.tagName, 'SPAN', "the tagName cannot be changed after initial render");
+    });
+
     test("should allow hX tags as tagName", function() {
       expectDeprecation("Setting `childViews` on a Container is deprecated.");
 
@@ -56857,7 +57607,7 @@ enifed("ember/tests/application_lifecycle.jshint",
     });
   });
 enifed("ember/tests/component_registration_test",
-  ["ember","ember-htmlbars/system/compile","ember-htmlbars/helpers"],
+  ["ember","ember-template-compiler/system/compile","ember-htmlbars/helpers"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";