ember-source 1.10.0.beta.3 → 1.10.0.beta.4

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.3
+ * @version   1.10.0-beta.4
  */
 
 (function() {
@@ -183,8 +183,10 @@ enifed("ember-debug",
       @param {String} message A description of the deprecation.
       @param {Boolean} test An optional boolean. If falsy, the deprecation
         will be displayed.
+      @param {Object} options An optional object that can be used to pass
+        in a `url` to the transition guide on the emberjs.com website.
     */
-    Ember.deprecate = function(message, test) {
+    Ember.deprecate = function(message, test, options) {
       var noDeprecation;
 
       if (typeof test === 'function') {
@@ -202,6 +204,13 @@ enifed("ember-debug",
       // When using new Error, we can't do the arguments check for Chrome. Alternatives are welcome
       try { __fail__.fail(); } catch (e) { error = e; }
 
+      if (arguments.length === 3) {
+        Ember.assert('options argument to Ember.deprecate should be an object', options && typeof options === 'object');
+        if (options.url) {
+          message += ' See ' + options.url + ' for more details.';
+        }
+      }
+
       if (Ember.LOG_STACKTRACE_ON_DEPRECATION && error.stack) {
         var stack;
         var stackStr = '';

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.3
+ * @version   1.10.0-beta.4
  */
 
 (function() {
@@ -4034,7 +4034,7 @@ enifed("ember-htmlbars.jshint",
     "use strict";
     module('JSHint - .');
     test('ember-htmlbars.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars.js should pass jshint.'); 
+      ok(false, 'ember-htmlbars.js should pass jshint.\nember-htmlbars.js: line 26, col 3, \'helper\' is defined but never used.\n\n1 error'); 
     });
   });
 enifed("ember-htmlbars/compat.jshint",
@@ -4732,17 +4732,19 @@ 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-template-compiler/system/compile","ember-runtime/tests/utils"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+  ["ember-htmlbars/compat/helper","ember-views/views/view","ember-views/views/component","ember-htmlbars/system/make-view-helper","ember-htmlbars/helpers","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
     var registerHandlebarsCompatibleHelper = __dependency1__.registerHandlebarsCompatibleHelper;
 
     var EmberView = __dependency2__["default"];
+    var Component = __dependency3__["default"];
 
-    var helpers = __dependency3__["default"];
-    var compile = __dependency4__["default"];
-    var runAppend = __dependency5__.runAppend;
-    var runDestroy = __dependency5__.runDestroy;
+    var makeViewHelper = __dependency4__["default"];
+    var helpers = __dependency5__["default"];
+    var compile = __dependency6__["default"];
+    var runAppend = __dependency7__.runAppend;
+    var runDestroy = __dependency7__.runDestroy;
 
     var view;
 
@@ -4753,6 +4755,7 @@ enifed("ember-htmlbars/tests/compat/helper_test",
         runDestroy(view);
 
         delete helpers.test;
+        delete helpers['view-helper'];
       }
     });
 
@@ -4854,6 +4857,25 @@ enifed("ember-htmlbars/tests/compat/helper_test",
       runAppend(view);
     });
 
+    test('registering a helper created from `Ember.Handlebars.makeViewHelper` does not double wrap the helper', function() {
+      expect(1);
+
+      var ViewHelperComponent = Component.extend({
+        layout: compile('woot!')
+      });
+
+      var helper = makeViewHelper(ViewHelperComponent);
+      registerHandlebarsCompatibleHelper('view-helper', helper);
+
+      view = EmberView.extend({
+        template: compile('{{view-helper}}')
+      }).create();
+
+      runAppend(view);
+
+      equal(view.$().text(), 'woot!');
+    });
+
     
   });
 enifed("ember-htmlbars/tests/compat/helper_test.jshint",
@@ -4977,8 +4999,8 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
     });
 
     test("primitives should work correctly [DEPRECATED]", function() {
-      expectDeprecation('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
-      expectDeprecation('Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      expectDeprecation('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
+      expectDeprecation('Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       view = EmberView.create({
         prims: Ember.A(["string", 12]),
@@ -5376,7 +5398,7 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       equal(view.$().text(), '|NOPE 0|NOPE |NOPE false|NOPE OMG|GMO |NOPE 0|NOPE |NOPE false|NOPE OMG|GMO ', "helper output is correct");
 
@@ -5404,7 +5426,7 @@ enifed("ember-htmlbars/tests/compat/make_bound_helper_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       equal(view.$().text(), '|NOPE 5|5 |NOPE 5|5 ', "helper output is correct");
 
@@ -5562,116 +5584,6 @@ enifed("ember-htmlbars/tests/compat/precompile_test.jshint",
       ok(true, 'ember-htmlbars/tests/compat/precompile_test.js should pass 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-template-compiler/system/compile"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
-    "use strict";
-    var EmberView = __dependency1__["default"];
-    var run = __dependency2__["default"];
-    var EmberObject = __dependency3__["default"];
-    var set = __dependency4__.set;
-    var runAppend = __dependency5__.runAppend;
-    var runDestroy = __dependency5__.runDestroy;
-
-    var helpers = __dependency6__["default"];
-    var helper = __dependency6__.helper;
-    var compile = __dependency7__["default"];
-
-    var view;
-
-    QUnit.module("ember-htmlbars: Ember.HTMLBars.helper", {
-      teardown: function() {
-        runDestroy(view);
-
-        delete helpers.oceanView;
-        delete helpers.something;
-      }
-    });
-
-    test("should render an instance of the specified view", function() {
-      var OceanView = EmberView.extend({
-        template: compile('zomg, nice view')
-      });
-
-      helper('oceanView', OceanView);
-
-      view = EmberView.create({
-        controller: EmberObject.create(),
-        template: compile('{{oceanView tagName="strong"}}')
-      });
-
-      runAppend(view);
-
-      var oceanViews = view.$().find("strong:contains('zomg, nice view')");
-
-      equal(oceanViews.length, 1, "helper rendered an instance of the view");
-    });
-
-    test("Should bind to this keyword", function() {
-      var OceanView = EmberView.extend({
-        model: null,
-        template: compile('{{view.model}}')
-      });
-
-      helper('oceanView', OceanView);
-
-      view = EmberView.create({
-        context: 'foo',
-        controller: EmberObject.create(),
-        template: compile('{{oceanView tagName="strong" viewName="ocean" model=this}}')
-      });
-
-      runAppend(view);
-
-      var oceanViews = view.$().find("strong:contains('foo')");
-
-      equal(oceanViews.length, 1, "helper rendered an instance of the view");
-
-      run(function() {
-        set(view, 'ocean.model', 'bar');
-      });
-
-      oceanViews = view.$().find("strong:contains('bar')");
-
-      equal(oceanViews.length, 1, "helper rendered an instance of the view");
-    });
-
-    test('should create a bound helper when provided a function', function() {
-      var boundFunc;
-      
-        boundFunc = function(params, hash) {
-          return params[0];
-        };
-      
-      helper('something', boundFunc);
-
-      view = EmberView.create({
-        controller: {
-          value: 'foo'
-        },
-        template: compile('{{something value}}')
-      });
-
-      runAppend(view);
-
-      equal(view.$().text(), 'foo', 'renders the bound value initially');
-
-      run(function() {
-        set(view, 'controller.value', 'bar');
-      });
-
-      equal(view.$().text(), 'bar', 're-renders the bound value');
-    });
-  });
-enifed("ember-htmlbars/tests/helper_test.jshint",
-  [],
-  function() {
-    "use strict";
-    module('JSHint - ember-htmlbars/tests');
-    test('ember-htmlbars/tests/helper_test.js should pass jshint', function() { 
-      ok(true, 'ember-htmlbars/tests/helper_test.js should pass 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","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__) {
@@ -5884,13 +5796,16 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
       var originalBindAttr = helpers['bind-attr'];
 
       try {
-        helpers['bind-attr'] = function() {
-          equal(arguments[0], 'foo', 'First arg match');
-          equal(arguments[1], 'bar', 'Second arg match');
-
-          return 'result';
-        };
+        
+          helpers['bind-attr'] = {
+            helperFunction: function() {
+              equal(arguments[0], 'foo', 'First arg match');
+              equal(arguments[1], 'bar', 'Second arg match');
 
+              return 'result';
+            }
+          };
+        
         expectDeprecation(function() {
           var result;
 
@@ -5903,6 +5818,27 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
       }
     });
 
+    test("{{bindAttr}} can be used to bind attributes [DEPRECATED]", function() {
+      expect(3);
+
+      view = EmberView.create({
+        value: 'Test',
+        template: compile('<img src="test.jpg" {{bindAttr alt=view.value}}>')
+      });
+
+      expectDeprecation(function() {
+        runAppend(view);
+      }, /The 'bindAttr' view helper is deprecated in favor of 'bind-attr'/);
+
+      equal(view.$('img').attr('alt'), "Test", "renders initial value");
+
+      run(function() {
+        view.set('value', 'Updated');
+      });
+
+      equal(view.$('img').attr('alt'), "Updated", "updates value");
+    });
+
     test("should be able to bind element attributes using {{bind-attr}} inside a block", function() {
       var template = compile('{{#with view.content as image}}<img {{bind-attr src=image.url alt=image.title}}>{{/with}}');
 
@@ -6091,7 +6027,7 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
     });
 
     test("should be able to bind-attr to 'this' in an {{#each}} block [DEPRECATED]", function() {
-      expectDeprecation('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      expectDeprecation('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       view = EmberView.create({
         template: compile('{{#each view.images}}<img {{bind-attr src=this}}>{{/each}}'),
@@ -6107,7 +6043,7 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
     });
 
     test("should be able to bind classes to 'this' in an {{#each}} block with {{bind-attr class}} [DEPRECATED]", function() {
-      expectDeprecation('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      expectDeprecation('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       view = EmberView.create({
         template: compile('{{#each view.items}}<li {{bind-attr class="this"}}>Item</li>{{/each}}'),
@@ -6205,6 +6141,32 @@ enifed("ember-htmlbars/tests/helpers/bind_attr_test",
       runAppend(view);
       equal(matchingElement.length, 1, 'element is in the DOM when didInsertElement');
     });
+
+    test("asserts for <div class='foo' {{bind-attr class='bar'}}></div>", function() {
+      var template = compile('<div class="foo" {{bind-attr class=view.foo}}></div>');
+
+      view = EmberView.create({
+        template: template,
+        foo: 'bar'
+      });
+
+      expectAssertion(function() {
+        runAppend(view);
+      }, /You cannot set `class` manually and via `{{bind-attr}}` helper on the same element/);
+    });
+
+    test("asserts for <div data-bar='foo' {{bind-attr data-bar='blah'}}></div>", function() {
+      var template = compile('<div data-bar="foo" {{bind-attr data-bar=view.blah}}></div>');
+
+      view = EmberView.create({
+        template: template,
+        blah: 'bar'
+      });
+
+      expectAssertion(function() {
+        runAppend(view);
+      }, /You cannot set `data-bar` manually and via `{{bind-attr}}` helper on the same element/);
+    });
   });
 enifed("ember-htmlbars/tests/helpers/bind_attr_test.jshint",
   [],
@@ -6994,7 +6956,7 @@ enifed("ember-htmlbars/tests/helpers/collection_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       equal(view.$().text(), "Mac OS X 10.7: Lion Mac OS X 10.6: Snow Leopard Mac OS X 10.5: Leopard ", "prints each item in sequence");
     });
@@ -7327,7 +7289,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
     var compile = __dependency15__["default"];
 
     var people, view, container;
-    var template, templateMyView, MyView;
+    var template, templateMyView, MyView, MyEmptyView, templateMyEmptyView;
 
     // This function lets us write {{#EACH|people|p}} {{p}} {{/each}}
     // and generate:
@@ -7406,9 +7368,14 @@ enifed("ember-htmlbars/tests/helpers/each_test",
           template: templateMyView
         });
 
+        templateMyEmptyView = templateFor("I'm empty");
+        lookup.MyEmptyView = MyEmptyView = EmberView.extend({
+          template: templateMyEmptyView
+        });
+
         expectDeprecation(function() {
           runAppend(view);
-        },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+        },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
       },
 
       teardown: function() {
@@ -7803,9 +7770,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
       view = EmberView.create({
         template: templateFor('{{each view.people itemView="anItemView"}}'),
         people: people,
-        controller: {
-          container: container
-        }
+        container: container
       });
 
       container.register('view:anItemView', itemView);
@@ -7825,9 +7790,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
       view = EmberView.create({
         template: templateFor('{{each view.people itemView="an-item-view"}}'),
         people: people,
-        controller: {
-          container: container
-        }
+        container: container
       });
 
       container.register('view:an-item-view', itemView);
@@ -7914,6 +7877,123 @@ enifed("ember-htmlbars/tests/helpers/each_test",
 
     });
 
+    test("it supports {{emptyView=}}", function() {
+      var emptyView = EmberView.extend({
+        template: templateFor('emptyView:sad panda')
+      });
+
+      runDestroy(view);
+
+      view = EmberView.create({
+        template: templateFor('{{each view.people emptyView="anEmptyView"}}'),
+        people: A(),
+        container: container
+      });
+
+      container.register('view:anEmptyView', emptyView);
+
+      runAppend(view);
+
+      assertText(view, "emptyView:sad panda");
+    });
+
+    test("it defers all normalization of emptyView names to the resolver", function() {
+      var emptyView = EmberView.extend({
+        template: templateFor('emptyView:sad panda')
+      });
+
+      runDestroy(view);
+
+      view = EmberView.create({
+        template: templateFor('{{each view.people emptyView="an-empty-view"}}'),
+        people: A(),
+        container: container
+      });
+
+      container.register('view:an-empty-view', emptyView);
+
+      container.resolve = function(fullname) {
+        equal(fullname, "view:an-empty-view", "leaves fullname untouched");
+        return Container.prototype.resolve.call(this, fullname);
+      };
+
+      runAppend(view);
+    });
+
+    test("it supports {{emptyViewClass=}} with global (DEPRECATED)", function() {
+      runDestroy(view);
+
+      view = EmberView.create({
+        template: templateFor('{{each view.people emptyViewClass=MyEmptyView}}'),
+        people: A()
+      });
+
+      var deprecation = /Resolved the view "MyEmptyView" on the global context/;
+
+      
+        deprecation = /Global lookup of MyEmptyView from a Handlebars template is deprecated/;
+      
+
+      expectDeprecation(function() {
+        runAppend(view);
+      }, deprecation);
+
+      assertText(view, "I'm empty");
+    });
+
+    test("it supports {{emptyViewClass=}} via container", function() {
+      runDestroy(view);
+
+      view = EmberView.create({
+        container: {
+          lookupFactory: function(name) {
+            equal(name, 'view:my-empty-view');
+            return MyEmptyView;
+          }
+        },
+        template: templateFor('{{each view.people emptyViewClass="my-empty-view"}}'),
+        people: A()
+      });
+
+      runAppend(view);
+
+      assertText(view, "I'm empty");
+    });
+
+    test("it supports {{emptyViewClass=}} with tagName (DEPRECATED)", function() {
+      runDestroy(view);
+
+      view = EmberView.create({
+        template: templateFor('{{each view.people emptyViewClass=MyEmptyView tagName="b"}}'),
+        people: A()
+      });
+
+      expectDeprecation(/Supplying a tagName to Metamorph views is unreliable and is deprecated./);
+
+      runAppend(view);
+
+      equal(view.$('b').length, 1, 'rendered b tag');
+      equal(view.$('b').text(), "I'm empty");
+    });
+
+    test("it supports {{emptyViewClass=}} with in format", function() {
+      runDestroy(view);
+
+      view = EmberView.create({
+        container: {
+          lookupFactory: function(name) {
+            return MyEmptyView;
+          }
+        },
+        template: templateFor('{{each person in view.people emptyViewClass="myEmptyView"}}'),
+        people: A()
+      });
+
+      runAppend(view);
+
+      assertText(view, "I'm empty");
+    });
+
     test("it supports {{else}}", function() {
       runDestroy(view);
       view = EmberView.create({
@@ -7965,7 +8045,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       equal(view.$().text(), "AdamSteve");
     });
@@ -7980,7 +8060,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       equal(view.$().text(), "AdamSteve");
     });
@@ -7995,7 +8075,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       equal(view.$().text(), "AdamSteve");
     });
@@ -8083,7 +8163,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
 
           expectDeprecation(function() {
             runAppend(view);
-          },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+          },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
           equal(view.$().text(), "AdamSteve");
         });
@@ -8204,7 +8284,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
 
           expectDeprecation(function() {
             runAppend(view);
-          },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+          },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
           equal(view.$().text(), "AdamSteve");
         });
@@ -8219,7 +8299,7 @@ enifed("ember-htmlbars/tests/helpers/each_test",
 
           expectDeprecation(function() {
             runAppend(view);
-          },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+          },'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
           equal(view.$().text(), "AdamSteve");
         });
@@ -8294,7 +8374,7 @@ enifed("ember-htmlbars/tests/helpers/if_unless_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       equal(view.$().text(), 'foo: 42');
     });
@@ -8447,6 +8527,15 @@ enifed("ember-htmlbars/tests/helpers/if_unless_test",
       equal(view.$().text(), 'Nope');
     });
 
+    test("The `unboundIf` helper should work when its inverse is not present", function() {
+      view = EmberView.create({
+        conditional: false,
+        template: compile('{{#unboundIf view.conditional}}Yep{{/unboundIf}}')
+      });
+      runAppend(view);
+      equal(view.$().text(), '');
+    });
+
     test("The `if` helper ignores a controller option", function() {
       var lookupCalled = false;
 
@@ -11695,7 +11784,7 @@ enifed("ember-htmlbars/tests/helpers/with_test",
 
       expectDeprecation(function(){
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       equal(view.$().text(), "controller:Steve Holt and Bob Loblaw");
 
@@ -11836,7 +11925,7 @@ enifed("ember-htmlbars/tests/helpers/with_test",
 
       expectDeprecation(function(){
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       runDestroy(view);
 
@@ -11967,8 +12056,8 @@ 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-template-compiler/system/compile","ember-runtime/tests/utils"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__) {
+  ["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/make-view-helper","ember-template-compiler/system/compile","ember-runtime/tests/utils"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__) {
     "use strict";
     /*jshint newcap:false*/
     var run = __dependency1__["default"];
@@ -11980,12 +12069,13 @@ enifed("ember-htmlbars/tests/helpers/yield_test",
     var A = __dependency7__.A;
     var Component = __dependency8__["default"];
     var EmberError = __dependency9__["default"];
-    var helper = __dependency10__.helper;
+    var registerHelper = __dependency10__.registerHelper;
     var helpers = __dependency10__["default"];
+    var makeViewHelper = __dependency11__["default"];
 
-    var compile = __dependency11__["default"];
-    var runAppend = __dependency12__.runAppend;
-    var runDestroy = __dependency12__.runDestroy;
+    var compile = __dependency12__["default"];
+    var runAppend = __dependency13__.runAppend;
+    var runDestroy = __dependency13__.runDestroy;
 
     var view, container;
 
@@ -12123,7 +12213,7 @@ enifed("ember-htmlbars/tests/helpers/yield_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       equal(view.$('div p:contains(inner) + p:contains(insideWith)').length, 1, "Yield points at the right context");
     });
@@ -12198,7 +12288,7 @@ enifed("ember-htmlbars/tests/helpers/yield_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       equal('outerinner', view.$('p').text(), "Yield points at the right context");
     });
@@ -12294,13 +12384,13 @@ enifed("ember-htmlbars/tests/helpers/yield_test",
         }
       });
 
-      helper('inner-component', InnerComponent);
+      registerHelper('inner-component', makeViewHelper(InnerComponent));
 
       var OuterComponent = Component.extend({
         layout: compile("{{#inner-component}}<span>{{yield}}</span>{{/inner-component}}")
       });
 
-      helper('outer-component', OuterComponent);
+      registerHelper('outer-component', makeViewHelper(OuterComponent));
 
       view = EmberView.create({
         template: compile(
@@ -13520,7 +13610,7 @@ enifed("ember-htmlbars/tests/integration/with_view_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       equal(view.$('#first').text(), 'bam', 'precond - view renders Handlebars template');
 
@@ -13551,7 +13641,7 @@ enifed("ember-htmlbars/tests/integration/with_view_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       equal(view.$().text(), 'barbang', 'renders values from view and child view');
     });
@@ -13574,7 +13664,7 @@ enifed("ember-htmlbars/tests/integration/with_view_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       equal(trim(view.$().text()), 'Name: SFMoMA Price: $20', 'should print baz twice');
     });
@@ -20241,6 +20331,28 @@ enifed("ember-metal/tests/mixin/mergedProperties_test",
       deepEqual(get(obj, 'bar'), { a: true, l: true, e: true, x: true }, "get bar");
     });
 
+    test("mergedProperties should exist even if not explicitly set on create", function() {
+
+      var AnObj = Ember.Object.extend({
+        mergedProperties: ['options'],
+        options: {
+          a: 'a',
+          b: {
+            c: 'ccc'
+          }
+        }
+      });
+
+      var obj = AnObj.create({
+        options: {
+          a: 'A'
+        }
+      });
+
+      equal(get(obj, "options").a, 'A');
+      equal(get(obj, "options").b.c, 'ccc');
+    });
+
     test("mergedProperties' overwriting methods can call _super", function() {
 
       expect(4);
@@ -24979,7 +25091,7 @@ enifed("ember-routing-htmlbars/tests/helpers/action_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       equal(registeredTarget, itemController, "the item controller is the target of action");
     });
@@ -25009,14 +25121,14 @@ enifed("ember-routing-htmlbars/tests/helpers/action_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       ok(registeredTarget instanceof PersonController, "the with-controller is the target of action");
     });
 
     test("should target the with-controller inside an {{each}} in a {{#with controller='person'}} [DEPRECATED]", function() {
-      expectDeprecation('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
-      expectDeprecation('Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      expectDeprecation('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
+      expectDeprecation('Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       var eventsCalled = [];
 
@@ -25316,7 +25428,7 @@ enifed("ember-routing-htmlbars/tests/helpers/action_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       view.$('a').trigger('click');
 
@@ -25747,7 +25859,7 @@ enifed("ember-routing-htmlbars/tests/helpers/action_test",
           view.set('controller', controller);
           view.appendTo('#qunit-fixture');
         });
-      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       var testBoundAction = function(propertyValue){
         run(function(){
@@ -26335,7 +26447,7 @@ enifed("ember-routing-htmlbars/tests/helpers/outlet_test",
 
       expectDeprecation(function() {
         runAppend(view);
-      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead.');
 
       run(function() {
         view.connectOutlet('main', bottomView);
@@ -28452,7 +28564,13 @@ enifed("ember-routing/tests/system/route_test",
       deepEqual(route.serialize(model, ['post_id']), {post_id: 2}, "serialized correctly");
     });
 
-    test("returns undefined if model is not set", function(){
+    test("returns checks for existence of model.post_id before trying model.id", function() {
+      var model = { post_id: 3 };
+
+      deepEqual(route.serialize(model, ['post_id']), { post_id: 3 }, "serialized correctly");
+    });
+
+    test("returns undefined if model is not set", function() {
       equal(route.serialize(undefined, ['post_id']), undefined, "serialized correctly");
     });
 
@@ -46174,6 +46292,56 @@ enifed("ember-template-compiler/tests/main_test.jshint",
       ok(true, 'ember-template-compiler/tests/main_test.js should pass jshint.'); 
     });
   });
+enifed("ember-template-compiler/tests/plugins/transform-each-in-to-hash-test",
+  ["ember-template-compiler"],
+  function(__dependency1__) {
+    "use strict";
+    var compile = __dependency1__.compile;
+
+    QUnit.module('ember-template-compiler: transform-each-in-to-hash');
+
+    test('cannot use block params and keyword syntax together', function() {
+      expect(1);
+
+      throws(function() {
+        compile('{{#each thing in controller as |other-thing|}}{{thing}}-{{other-thing}}{{/each}}', true);
+      },/You cannot use keyword \(`{{each foo in bar}}`\) and block params \(`{{each bar as \|foo\|}}`\) at the same time\./);
+    });
+  });
+enifed("ember-template-compiler/tests/plugins/transform-each-in-to-hash-test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/tests/plugins');
+    test('ember-template-compiler/tests/plugins/transform-each-in-to-hash-test.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/tests/plugins/transform-each-in-to-hash-test.js should pass jshint.'); 
+    });
+  });
+enifed("ember-template-compiler/tests/plugins/transform-with-as-to-hash-test",
+  ["ember-template-compiler"],
+  function(__dependency1__) {
+    "use strict";
+    var compile = __dependency1__.compile;
+
+    QUnit.module('ember-template-compiler: transform-with-as-to-hash');
+
+    test('cannot use block params and keyword syntax together', function() {
+      expect(1);
+
+      throws(function() {
+        compile('{{#with foo as thing as |other-thing|}}{{thing}}-{{other-thing}}{{/with}}');
+      }, /You cannot use keyword/);
+    });
+  });
+enifed("ember-template-compiler/tests/plugins/transform-with-as-to-hash-test.jshint",
+  [],
+  function() {
+    "use strict";
+    module('JSHint - ember-template-compiler/tests/plugins');
+    test('ember-template-compiler/tests/plugins/transform-with-as-to-hash-test.js should pass jshint', function() { 
+      ok(true, 'ember-template-compiler/tests/plugins/transform-with-as-to-hash-test.js should pass jshint.'); 
+    });
+  });
 enifed("ember-template-compiler/tests/plugins_test",
   ["ember-template-compiler/plugins","ember-template-compiler/system/compile"],
   function(__dependency1__, __dependency2__) {
@@ -55088,7 +55256,7 @@ enifed("ember-views/tests/views/view/init_test",
 
     QUnit.module("EmberView.createWithMixins");
 
-    test("should warn if a non-array is used for classNames", function() {
+    test("should warn if a computed property is used for classNames", function() {
       expectAssertion(function() {
         EmberView.createWithMixins({
           elementId: 'test',
@@ -55096,10 +55264,10 @@ enifed("ember-views/tests/views/view/init_test",
             return ['className'];
           })["volatile"]()
         });
-      }, /Only arrays are allowed/i);
+      }, /Only arrays of static class strings.*For dynamic classes/i);
     });
 
-    test("should warn if a non-array is used for classNamesBindings", function() {
+    test("should warn if a non-array is used for classNameBindings", function() {
       expectAssertion(function() {
         EmberView.createWithMixins({
           elementId: 'test',
@@ -59029,7 +59197,7 @@ enifed("ember/tests/helpers/link_to_test",
 
       expectDeprecation(function() {
         bootApplication();
-      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+      }, 'Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead.');
 
       function linksEqual($links, expected) {
         equal($links.length, expected.length, "Has correct number of links");