[FEATURE query-params-new] Query params rewrite

See here for some examples: https://gist.github.com/machty/8167051

Depends on Handlebars subexpressions:
handlebars-lang/handlebars.js#690

FEATURES.md

@@ -21,14 +21,6 @@ for a detailed explanation.
 
   Added in [#3614](https://github.com/emberjs/ember.js/pull/3614).
 
-* `query-params`
-
-  Add query params support to the ember router. You can now define which query
-  params your routes respond to, use them in your route hooks to affect model
-  loading or controller state, and transition query parameters with the link-to
-  helper and the transitionTo method.
-
-  Added in [#3182](https://github.com/emberjs/ember.js/pull/3182).
 * `propertyBraceExpansion`
 
   Adds support for brace-expansion in dependent keys, observer, and watch properties.
@@ -129,3 +121,12 @@ for a detailed explanation.
 Ember.computed.oneWay('foo').readOnly().
 
   Added in [#3879](https://github.com/emberjs/ember.js/pull/3879)
+
+* `query-params-new`
+
+  Add query params support to the ember router. This is a rewrite of a
+  previous attempt at an API for query params. You can define query
+  param properties on route-driven controllers with the `queryParams`
+  property, and any changes to those properties will cause the URL
+  to update, and in the other direction, any URL changes to the query
+  params will cause those controller properties to update.

Gemfile.lock

@@ -28,7 +28,7 @@ PATH
   remote: .
   specs:
     ember-source (1.4.0.beta.1.canary)
-      handlebars-source (~> 1.1.2)
+      handlebars-source (~> 1.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -45,7 +45,7 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
-    handlebars-source (1.1.2)
+    handlebars-source (1.2.1)
     json (1.8.1)
     kicker (3.0.0)
       listen (~> 1.3.0)

ember-source.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
 
   gem.version       = Ember.rubygems_version_string
 
-  gem.add_dependency "handlebars-source", ["~> 1.1.2"]
+  gem.add_dependency "handlebars-source", ["~> 1.2.0"]
 
   gem.files = %w(VERSION) + Dir['dist/*.js', 'lib/ember/*.rb']
 end

features.json

@@ -2,7 +2,7 @@
   "reduceComputed-non-array-dependencies": true,
   "ember-testing-lazy-routing": true,
   "ember-testing-wait-hooks": true,
-  "query-params": null,
+  "query-params-new": null,
   "string-humanize": null,
   "string-parameterize": null,
   "propertyBraceExpansion": null,

packages/ember-handlebars-compiler/lib/main.js

@@ -191,6 +191,7 @@ var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
     INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
 
 Ember.Handlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
+  debugger;
   var helperInvocation = source[source.length - 1],
       helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
       matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);

packages/ember-routing/lib/ext/controller.js

@@ -3,7 +3,10 @@
 @submodule ember-routing
 */
 
-var get = Ember.get, set = Ember.set;
+var get = Ember.get, set = Ember.set,
+    map = Ember.EnumerableUtils.map;
+
+var queuedQueryParamChanges = {};
 
 Ember.ControllerMixin.reopen({
   /**
@@ -61,7 +64,7 @@ Ember.ControllerMixin.reopen({
 
   /**
     Transition into another route while replacing the current URL, if possible.
-    This will replace the current history entry instead of adding a new one. 
+    This will replace the current history entry instead of adding a new one.
     Beside that, it is identical to `transitionToRoute` in all other respects.
 
     ```javascript
@@ -111,3 +114,85 @@ Ember.ControllerMixin.reopen({
     return this.replaceRoute.apply(this, arguments);
   }
 });
+
+if (Ember.FEATURES.isEnabled("query-params-new")) {
+  Ember.ControllerMixin.reopen({
+
+    concatenatedProperties: ['queryParams'],
+
+    queryParams: null,
+
+    _queryParamScope: null,
+
+    _finalizingQueryParams: false,
+    _queryParamHash: Ember.computed(function computeQueryParamHash() {
+
+      // Given: queryParams: ['foo', 'bar:baz'] on controller:thing
+      // _queryParamHash should yield: { 'foo': 'thing[foo]' }
+
+      var result = {};
+      var queryParams = this.queryParams;
+      if (!queryParams) {
+        return result;
+      }
+
+      for (var i = 0, len = queryParams.length; i < len; ++i) {
+        var full = queryParams[i];
+        var parts = full.split(':');
+        var key = parts[0];
+        var urlKey = parts[1];
+        if (!urlKey) {
+          if (this._queryParamScope) {
+            urlKey = this._queryParamScope + '[' + key + ']';
+          } else {
+            urlKey = key;
+          }
+        }
+        result[key] = urlKey;
+      }
+
+      return result;
+    }),
+
+    _activateQueryParamObservers: function() {
+      var queryParams = get(this, '_queryParamHash');
+
+      for (var k in queryParams) {
+        if (queryParams.hasOwnProperty(k)) {
+          this.addObserver(k, this, this._queryParamChanged);
+        }
+      }
+    },
+
+    _deactivateQueryParamObservers: function() {
+      var queryParams = get(this, '_queryParamHash');
+
+      for (var k in queryParams) {
+        if (queryParams.hasOwnProperty(k)) {
+          this.removeObserver(k, this, this._queryParamChanged);
+        }
+      }
+    },
+
+    _queryParamChanged: function(controller, key) {
+      if (this._finalizingQueryParams) {
+        var changes = this._queryParamChangesDuringSuspension;
+        if (changes) {
+          changes[key] = true;
+        }
+        return;
+      }
+
+      var queryParams = get(this, '_queryParamHash');
+      queuedQueryParamChanges[queryParams[key]] = get(this, key);
+      Ember.run.once(this, this._fireQueryParamTransition);
+    },
+
+    _fireQueryParamTransition: function() {
+      this.transitionToRoute({ queryParams: queuedQueryParamChanges });
+      queuedQueryParamChanges = {};
+    },
+
+    _queryParamChangesDuringSuspension: null
+  });
+}