From ab93c00571d62504cb997d3a7944aa430575856f Mon Sep 17 00:00:00 2001
From: James Kyle <me@thejameskyle.com>
Date: Wed, 1 Apr 2015 00:29:14 -0700
Subject: [PATCH] Break buildURL into multiple requestType methods

---
 .../lib/adapters/build-url-mixin.js           | 120 +++++++++++++++++-
 .../ember-data/lib/adapters/rest-adapter.js   |   2 +-
 2 files changed, 115 insertions(+), 7 deletions(-)

diff --git a/packages/ember-data/lib/adapters/build-url-mixin.js b/packages/ember-data/lib/adapters/build-url-mixin.js
index 1ad25c09b29..5d23e813169 100644
--- a/packages/ember-data/lib/adapters/build-url-mixin.js
+++ b/packages/ember-data/lib/adapters/build-url-mixin.js
@@ -43,12 +43,42 @@ export default Ember.Mixin.create({
 
     @method buildURL
     @param {String} type
-    @param {String|Array} id single id or array of ids
+    @param {String|Array|Object} id single id or array of ids or query
     @param {DS.Snapshot|Array} snapshot single snapshot or array of snapshots
     @param {String} requestType
     @return {String} url
   */
   buildURL: function(type, id, snapshot, requestType) {
+    switch (requestType) {
+      case 'find':
+        return this.urlForFind(id, type, snapshot);
+      case 'findAll':
+        return this.urlForFindAll(type);
+      case 'findQuery':
+        return this.urlForFindQuery(id, type);
+      case 'findMany':
+        return this.urlForFindMany(id, type, snapshot);
+      case 'findHasMany':
+        return this.urlForFindHasMany(id, type);
+      case 'findBelongsTo':
+        return this.urlForFindBelongsTo(id, type);
+      case 'createRecord':
+        return this.urlForCreateRecord(type, snapshot);
+      case 'deleteRecord':
+        return this.urlForDeleteRecord(id, type, snapshot);
+      default:
+        return this._buildURL(type, id);
+    }
+  },
+
+  /**
+    @method _buildURL
+    @private
+    @param {String} type
+    @param {String} id
+    @return {String} url
+  */
+  _buildURL: function(type, id) {
     var url = [];
     var host = get(this, 'host');
     var prefix = this.urlPrefix();
@@ -59,11 +89,7 @@ export default Ember.Mixin.create({
       if (path) { url.push(path); }
     }
 
-    //We might get passed in an array of ids from findMany
-    //in which case we don't want to modify the url, as the
-    //ids will be passed in through a query param
-    if (id && !Ember.isArray(id)) { url.push(encodeURIComponent(id)); }
-
+    if (id) { url.push(encodeURIComponent(id)); }
     if (prefix) { url.unshift(prefix); }
 
     url = url.join('/');
@@ -72,6 +98,88 @@ export default Ember.Mixin.create({
     return url;
   },
 
+  /**
+   * @method urlForFind
+   * @param {String} id
+   * @param {String} type
+   * @param {DS.Snapshot} snapshot
+   * @return {String} url
+   */
+  urlForFind: function(id, type, snapshot) {
+    return this._buildURL(type, id);
+  },
+
+  /**
+   * @method urlForFindAll
+   * @param {String} type
+   * @return {String} url
+   */
+  urlForFindAll: function(type) {
+    return this._buildURL(type);
+  },
+
+  /**
+   * @method urlForFindQuery
+   * @param {Object} query
+   * @param {String} type
+   * @return {String} url
+   */
+  urlForFindQuery: function(query, type) {
+    return this._buildURL(type);
+  },
+
+  /**
+   * @method urlForFindMany
+   * @param {Array} ids
+   * @param {String} type
+   * @param {Array} snapshots
+   * @return {String} url
+   */
+  urlForFindMany: function(ids, type, snapshots) {
+    return this._buildURL(type);
+  },
+
+  /**
+   * @method urlForFindHasMany
+   * @param {String} id
+   * @param {String} type
+   * @return {String} url
+   */
+  urlForFindHasMany: function(id, type) {
+    return this._buildURL(type, id);
+  },
+
+  /**
+   * @method urlForFindBelongTo
+   * @param {String} id
+   * @param {String} type
+   * @return {String} url
+   */
+  urlForFindBelongsTo: function(id, type) {
+    return this._buildURL(type, id);
+  },
+
+  /**
+   * @method urlForCreateRecord
+   * @param {String} type
+   * @param {DS.Snapshot} snapshot
+   * @return {String} url
+   */
+  urlForCreateRecord: function(type, snapshot) {
+    return this._buildURL(type);
+  },
+
+  /**
+   * @method urlForDeleteRecord
+   * @param {String} id
+   * @param {String} type
+   * @param {DS.Snapshot} snapshot
+   * @return {String} url
+   */
+  urlForDeleteRecord: function(id, type, snapshot) {
+    return this._buildURL(type, id);
+  },
+
   /**
     @method urlPrefix
     @private
diff --git a/packages/ember-data/lib/adapters/rest-adapter.js b/packages/ember-data/lib/adapters/rest-adapter.js
index ca7e3312033..ac65586873f 100644
--- a/packages/ember-data/lib/adapters/rest-adapter.js
+++ b/packages/ember-data/lib/adapters/rest-adapter.js
@@ -391,7 +391,7 @@ export default Adapter.extend(BuildURLMixin, {
     @return {Promise} promise
   */
   findQuery: function(store, type, query) {
-    var url = this.buildURL(type.typeKey, null, null, 'findQuery');
+    var url = this.buildURL(type.typeKey, query, null, 'findQuery');
 
     if (this.sortQueryParams) {
       query = this.sortQueryParams(query);