Closes #133.

Author: jmdobry

CHANGELOG.md

@@ -5,6 +5,7 @@
 
 ###### Backwards compatible API changes
 - #132 - Added `findHasMany` option and capability to `DS.inject`
+- #133 - Override resource end point in async methods
 - #136 - Add a way to force computed properties to be computed. Added `DS.compute`. Added `DSCompute` to prototype of instances.
 - #137 - Add `DS.link`, `DS.linkAll`, and `DS.linkInverse`, and added `linkInverse` option to `DS.inject`
 

src/adapters/http.js

@@ -228,7 +228,8 @@ function DSHttpAdapterProvider() {
        * @param {string|number} id Primary key of the entity to update.
        * @param {object=} options Optional configuration. Also passed along to `$http([config])`. Properties:
        *
-       * - `{string=}` - `baseUrl` - Base url to use.
+       * - `{string=}` - `baseUrl` - Override the default base url.
+       * - `{string=}` - `endpoint` - Override the default endpoint.
        * - `{object=}` - `params` - Additional query string parameters to add to the url.
        *
        * @returns {Promise} Promise.
@@ -259,7 +260,8 @@ function DSHttpAdapterProvider() {
        * @param {object=} params Search query parameters. See the [query guide](/documentation/guide/queries/index).
        * @param {object=} options Optional configuration. Also passed along to `$http([config])`. Properties:
        *
-       * - `{string=}` - `baseUrl` - Base url to use.
+       * - `{string=}` - `baseUrl` - Override the default base url.
+       * - `{string=}` - `endpoint` - Override the default endpoint.
        * - `{object=}` - `params` - Additional query string parameters to add to the url.
        *
        * @returns {Promise} Promise.
@@ -295,7 +297,8 @@ function DSHttpAdapterProvider() {
        * @param {object} attrs The attribute payload.
        * @param {object=} options Optional configuration. Also passed along to `$http([config])`. Properties:
        *
-       * - `{string=}` - `baseUrl` - Base url to use.
+       * - `{string=}` - `baseUrl` - Override the default base url.
+       * - `{string=}` - `endpoint` - Override the default endpoint.
        * - `{object=}` - `params` - Additional query string parameters to add to the url.
        *
        * @returns {Promise} Promise.
@@ -328,7 +331,8 @@ function DSHttpAdapterProvider() {
        * @param {object} attrs The attribute payload.
        * @param {object=} options Optional configuration. Also passed along to `$http([config])`. Properties:
        *
-       * - `{string=}` - `baseUrl` - Base url to use.
+       * - `{string=}` - `baseUrl` - Override the default base url.
+       * - `{string=}` - `endpoint` - Override the default endpoint.
        * - `{object=}` - `params` - Additional query string parameters to add to the url.
        *
        * @returns {Promise} Promise.
@@ -361,7 +365,8 @@ function DSHttpAdapterProvider() {
        * @param {object=} params Search query parameters. See the [query guide](/documentation/guide/queries/index).
        * @param {object=} options Optional configuration. Also passed along to `$http([config])`. Properties:
        *
-       * - `{string=}` - `baseUrl` - Base url to use.
+       * - `{string=}` - `baseUrl` - Override the default base url.
+       * - `{string=}` - `endpoint` - Override the default endpoint.
        * - `{object=}` - `params` - Additional query string parameters to add to the url.
        *
        * @returns {Promise} Promise.
@@ -398,7 +403,8 @@ function DSHttpAdapterProvider() {
        * @param {string|number} id Primary key of the entity to update.
        * @param {object=} options Optional configuration. Also passed along to `$http([config])`. Properties:
        *
-       * - `{string=}` - `baseUrl` - Base url to use.
+       * - `{string=}` - `baseUrl` - Override the default base url.
+       * - `{string=}` - `endpoint` - Override the default endpoint.
        * - `{object=}` - `params` - Additional query string parameters to add to the url.
        *
        * @returns {Promise} Promise.
@@ -429,7 +435,8 @@ function DSHttpAdapterProvider() {
        * @param {object=} params Search query parameters. See the [query guide](/documentation/guide/queries/index).
        * @param {object=} options Optional configuration. Also passed along to `$http([config])`. Properties:
        *
-       * - `{string=}` - `baseUrl` - Base url to use.
+       * - `{string=}` - `baseUrl` - Override the default base url.
+       * - `{string=}` - `endpoint` - Override the default endpoint.
        * - `{object=}` - `params` - Additional query string parameters to add to the url.
        *
        * @returns {Promise} Promise.

src/datastore/sync_methods/defineResource.js

@@ -152,6 +152,8 @@ function defineResource(definition) {
       var parentKey = this.parentKey;
       var item;
       var endpoint;
+      var thisEndpoint = options.endpoint || this.endpoint;
+      delete options.endpoint;
       options = options || {};
       options.params = options.params || {};
       if (parent && parentKey && definitions[parent] && options.params[parentKey] !== false) {
@@ -160,19 +162,19 @@ function defineResource(definition) {
         }
         if (DS.utils.isObject(attrs) && parentKey in attrs) {
           delete options.params[parentKey];
-          endpoint = DS.utils.makePath(definitions[parent].getEndpoint(attrs, options), attrs[parentKey], this.endpoint);
+          endpoint = DS.utils.makePath(definitions[parent].getEndpoint(attrs, options), attrs[parentKey], thisEndpoint);
         } else if (item && parentKey in item) {
           delete options.params[parentKey];
-          endpoint = DS.utils.makePath(definitions[parent].getEndpoint(attrs, options), item[parentKey], this.endpoint);
+          endpoint = DS.utils.makePath(definitions[parent].getEndpoint(attrs, options), item[parentKey], thisEndpoint);
         } else if (options && options.params[parentKey]) {
-          endpoint = DS.utils.makePath(definitions[parent].getEndpoint(attrs, options), options.params[parentKey], this.endpoint);
+          endpoint = DS.utils.makePath(definitions[parent].getEndpoint(attrs, options), options.params[parentKey], thisEndpoint);
           delete options.params[parentKey];
         }
       }
       if (options.params[parentKey] === false) {
         delete options.params[parentKey];
       }
-      return endpoint || this.endpoint;
+      return endpoint || thisEndpoint;
     };
 
     // Remove this in v0.11.0 and make a breaking change notice