Closes #51.

js-data · May 16, 2014 · 5ff48a6 · 5ff48a6
1 parent 1a32e0e
commit 5ff48a6
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - #30, #48 - DSCacheFactory integration
 - #49 - DS.bindOne($scope, prop, resourceName, id)
 - #50 - DS.bindAll($scope, prop, resourceName, query)
+- #51 - Allow baseUrl to be overridable at the method level
 - #52 - DS.update(resourceName, id, attrs[, options]) (different from DS.save())
 - #54 - Adding functionality to resources
 - #56 - DS.updateAll(resourceName, attrs, params[, options])

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -292,6 +292,14 @@ module.exports = function (grunt) {
 								'bower_components/angular-cache/dist/angular-cache.js'
 							],
 							docs: ['guide/api']
+						},
+						{
+							id: 'angular-data-mocks',
+							title: 'angular-data-mocks',
+							scripts: [
+								'bower_components/angular-data-mocks/dist/angular-data-mocks.js'
+							],
+							docs: ['guide/api']
 						}
 					]
 				}

diff --git a/bower.json b/bower.json
@@ -28,7 +28,7 @@
   "devDependencies": {
     "angular": "~1.2.16",
     "angular-mocks": "~1.2.16",
-    "angular-data-mocks": "0.1.0",
+    "angular-data-mocks": "0.2.0",
     "angular-cache": "~3.0.0-beta.4",
     "observe-js": "~0.2.0"
   }

diff --git a/dist/angular-data.js b/dist/angular-data.js
@@ -1589,7 +1589,7 @@ function DSHttpAdapterProvider() {
 		function find(resourceConfig, id, options) {
 			options = options || {};
 			return this.GET(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint, id),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint, id),
 				options
 			);
 		}
@@ -1602,23 +1602,23 @@ function DSHttpAdapterProvider() {
 			}
 			DSUtils.deepMixIn(options, params);
 			return this.GET(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint),
 				options
 			);
 		}
 
 		function create(resourceConfig, attrs, options) {
 			options = options || {};
 			return this.POST(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint),
 				defaults.serialize(attrs),
 				options
 			);
 		}
 
 		function update(resourceConfig, id, attrs, options) {
 			return this.PUT(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint, id),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint, id),
 				defaults.serialize(attrs),
 				options
 			);
@@ -1632,7 +1632,7 @@ function DSHttpAdapterProvider() {
 			}
 			DSUtils.deepMixIn(options, params);
 			return this.PUT(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint),
 				defaults.serialize(attrs),
 				options
 			);
@@ -1641,7 +1641,7 @@ function DSHttpAdapterProvider() {
 		function destroy(resourceConfig, id, options) {
 			options = options || {};
 			return this.DEL(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint, id),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint, id),
 				options
 			);
 		}
@@ -1654,7 +1654,7 @@ function DSHttpAdapterProvider() {
 			}
 			DSUtils.deepMixIn(options, params);
 			return this.DEL(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint),
 				options
 			);
 		}
@@ -1664,7 +1664,7 @@ function DSHttpAdapterProvider() {
 module.exports = DSHttpAdapterProvider;
 
 },{}],32:[function(require,module,exports){
-var errorPrefix = 'DS.create(resourceName, attrs): ';
+var errorPrefix = 'DS.create(resourceName, attrs[, options]): ';
 
 /**
  * @doc method
@@ -1675,7 +1675,7 @@ var errorPrefix = 'DS.create(resourceName, attrs): ';
  *
  * ## Signature:
  * ```js
- * DS.create(resourceName, attrs)
+ * DS.create(resourceName, attrs[, options])
  * ```
  *
  * ## Example:

diff --git a/dist/angular-data.min.js b/dist/angular-data.min.js
diff --git a/src/adapters/http.js b/src/adapters/http.js
@@ -386,7 +386,7 @@ function DSHttpAdapterProvider() {
 		function find(resourceConfig, id, options) {
 			options = options || {};
 			return this.GET(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint, id),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint, id),
 				options
 			);
 		}
@@ -399,23 +399,23 @@ function DSHttpAdapterProvider() {
 			}
 			DSUtils.deepMixIn(options, params);
 			return this.GET(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint),
 				options
 			);
 		}
 
 		function create(resourceConfig, attrs, options) {
 			options = options || {};
 			return this.POST(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint),
 				defaults.serialize(attrs),
 				options
 			);
 		}
 
 		function update(resourceConfig, id, attrs, options) {
 			return this.PUT(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint, id),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint, id),
 				defaults.serialize(attrs),
 				options
 			);
@@ -429,7 +429,7 @@ function DSHttpAdapterProvider() {
 			}
 			DSUtils.deepMixIn(options, params);
 			return this.PUT(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint),
 				defaults.serialize(attrs),
 				options
 			);
@@ -438,7 +438,7 @@ function DSHttpAdapterProvider() {
 		function destroy(resourceConfig, id, options) {
 			options = options || {};
 			return this.DEL(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint, id),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint, id),
 				options
 			);
 		}
@@ -451,7 +451,7 @@ function DSHttpAdapterProvider() {
 			}
 			DSUtils.deepMixIn(options, params);
 			return this.DEL(
-				DSUtils.makePath(resourceConfig.baseUrl, resourceConfig.endpoint),
+				DSUtils.makePath(options.baseUrl || resourceConfig.baseUrl, resourceConfig.endpoint),
 				options
 			);
 		}

diff --git a/src/datastore/async_methods/create.js b/src/datastore/async_methods/create.js
@@ -1,4 +1,4 @@
-var errorPrefix = 'DS.create(resourceName, attrs): ';
+var errorPrefix = 'DS.create(resourceName, attrs[, options]): ';
 
 /**
  * @doc method
@@ -9,7 +9,7 @@ var errorPrefix = 'DS.create(resourceName, attrs): ';
  *
  * ## Signature:
  * ```js
- * DS.create(resourceName, attrs)
+ * DS.create(resourceName, attrs[, options])
  * ```
  *
  * ## Example:

diff --git a/test/integration/datastore/async_methods/create.test.js b/test/integration/datastore/async_methods/create.test.js
@@ -1,5 +1,5 @@
-describe('DS.create(resourceName, attrs)', function () {
-	var errorPrefix = 'DS.create(resourceName, attrs): ';
+describe('DS.create(resourceName, attrs[, options])', function () {
+	var errorPrefix = 'DS.create(resourceName, attrs[, options]): ';
 
 	it('should throw an error when method pre-conditions are not met', function (done) {
 		DS.create('does not exist', 5).then(function () {