DS.ejectAll now clears the corresponding completed query. DS.eject is no longer capable of ejecting more than one item.

Author: jmdobry

Gruntfile.js

@@ -279,5 +279,5 @@ module.exports = function (grunt) {
 	grunt.registerTask('default', ['build']);
 
 	// Used by TravisCI
-	grunt.registerTask('ci', ['build', 'karma:ci', /*'coveralls', */'doc']);
+	grunt.registerTask('ci', ['build', 'karma:ci', 'coveralls', 'doc']);
 };

dist/angular-data.js

@@ -2561,31 +2561,22 @@ module.exports = digest;
 var errorPrefix = 'DS.eject(resourceName, id): ';
 
 function _eject(definition, resource, id) {
-	if (id) {
-		var found = false;
-		for (var i = 0; i < resource.collection.length; i++) {
-			if (resource.collection[i][definition.idAttribute] == id) {
-				found = true;
-				break;
-			}
-		}
-		if (found) {
-			resource.collection.splice(i, 1);
-			resource.observers[id].close();
-			delete resource.observers[id];
-			delete resource.index[id];
-			delete resource.changes[id];
-			delete resource.previousAttributes[id];
-			delete resource.modified[id];
-			delete resource.saved[id];
+	var found = false;
+	for (var i = 0; i < resource.collection.length; i++) {
+		if (resource.collection[i][definition.idAttribute] == id) {
+			found = true;
+			break;
 		}
-	} else {
-		resource.collection = [];
-		resource.index = {};
-		resource.modified = {};
-		resource.saved = {};
-		resource.changes = {};
-		resource.previousAttributes = {};
+	}
+	if (found) {
+		resource.collection.splice(i, 1);
+		resource.observers[id].close();
+		delete resource.observers[id];
+		delete resource.index[id];
+		delete resource.changes[id];
+		delete resource.previousAttributes[id];
+		delete resource.modified[id];
+		delete resource.saved[id];
 	}
 }
 
@@ -2594,16 +2585,15 @@ function _eject(definition, resource, id) {
  * @id DS.sync_methods:eject
  * @name eject
  * @description
- * Eject the item of the specified type that has the given primary key from the data store. If no primary key is
- * provided, eject all items of the specified type from the data store. Ejection only removes items from the data store
- * and does not attempt to delete items on the server.
+ * Eject the item of the specified type that has the given primary key from the data store. Ejection only removes items
+ * from the data store and does not attempt to delete items on the server.
  *
  * ## Signature:
  * ```js
  * DS.eject(resourceName[, id])
  * ```
  *
- * ## Examples:
+ * ## Example:
  *
  * ```js
  * DS.get('document', 45); // { title: 'How to Cook', id: 45 }
@@ -2613,29 +2603,19 @@ function _eject(definition, resource, id) {
  * DS.get('document', 45); // undefined
  * ```
  *
- * Eject all items of the specified type from the data store.
- *
- * ```js
- * DS.filter('document'); // [ { title: 'How to Cook', id: 45 }, { title: 'How to Eat', id: 46 } ]
- *
- * DS.eject('document');
- *
- * DS.filter('document'); // [ ]
- * ```
- *
  * ## Throws
  *
  * - `{IllegalArgumentError}`
  * - `{RuntimeError}`
  * - `{UnhandledError}`
  *
  * @param {string} resourceName The resource type, e.g. 'user', 'comment', etc.
- * @param {string|number=} id The primary key of the item to eject.
+ * @param {string|number} id The primary key of the item to eject.
  */
 function eject(resourceName, id) {
 	if (!this.definitions[resourceName]) {
 		throw new this.errors.RuntimeError(errorPrefix + resourceName + ' is not a registered resource!');
-	} else if (id && !this.utils.isString(id) && !this.utils.isNumber(id)) {
+	} else if (!this.utils.isString(id) && !this.utils.isNumber(id)) {
 		throw new this.errors.IllegalArgumentError(errorPrefix + 'id: Must be a string or a number!', { id: { actual: typeof id, expected: 'string|number' } });
 	}
 
@@ -2662,14 +2642,15 @@ module.exports = eject;
 },{}],40:[function(require,module,exports){
 var errorPrefix = 'DS.ejectAll(resourceName[, params]): ';
 
-function _ejectAll(definition, params) {
-	params.query = params.query || {};
-
-	var items = this.filter(definition.name, params);
+function _ejectAll(definition, resource, params) {
+	var queryHash = this.utils.toJson(params),
+		items = this.filter(definition.name, params);
 
 	for (var i = 0; i < items.length; i++) {
 		this.eject(definition.name, items[i][definition.idAttribute]);
 	}
+
+	delete resource.completedQueries[queryHash];
 }
 
 /**
@@ -2748,11 +2729,11 @@ function ejectAll(resourceName, params) {
 	try {
 		if (!this.$rootScope.$$phase) {
 			this.$rootScope.$apply(function () {
-				_ejectAll.apply(_this, [_this.definitions[resourceName], params]);
+				_ejectAll.apply(_this, [_this.definitions[resourceName], resource, params]);
 				resource.collectionModified = _this.utils.updateTimestamp(resource.collectionModified);
 			});
 		} else {
-			_ejectAll.apply(_this, [_this.definitions[resourceName], params]);
+			_ejectAll.apply(_this, [_this.definitions[resourceName], resource, params]);
 			resource.collectionModified = this.utils.updateTimestamp(resource.collectionModified);
 		}
 	} catch (err) {

dist/angular-data.min.js

@@ -11,8 +11,8 @@ module.exports = function (config) {
 			'karma-chai',
 			'karma-chrome-launcher',
 			'karma-phantomjs-launcher',
-			'karma-firefox-launcher'//,
-//			'karma-coverage'
+			'karma-firefox-launcher',
+			'karma-coverage'
 		],
 		autoWatch: false,
 		browsers: ['Chrome'],
@@ -26,11 +26,11 @@ module.exports = function (config) {
 			'karma.start.js'
 		],
 
-		reporters: ['progress'/*, 'coverage'*/],
+		reporters: ['progress', 'coverage'],
 
-//		preprocessors: {
-//			'dist/angular-data.js': ['coverage']
-//		},
+		preprocessors: {
+			'dist/angular-data.js': ['coverage']
+		},
 
 		// optionally, configure the reporter
 		coverageReporter: {

karma.conf.js

@@ -42,7 +42,7 @@
     "grunt-karma": "~0.6.2",
     "karma-chai": "0.1.0",
     "mocha": "~1.17.1",
-    "karma-coverage": "~0.1.4",
+    "karma-coverage": "~0.1.2",
     "grunt-contrib-watch": "~0.5.3",
     "grunt-karma-coveralls": "~2.3.0",
     "karma-mocha": "~0.1.1",

package.json

@@ -1,31 +1,22 @@
 var errorPrefix = 'DS.eject(resourceName, id): ';
 
 function _eject(definition, resource, id) {
-	if (id) {
-		var found = false;
-		for (var i = 0; i < resource.collection.length; i++) {
-			if (resource.collection[i][definition.idAttribute] == id) {
-				found = true;
-				break;
-			}
+	var found = false;
+	for (var i = 0; i < resource.collection.length; i++) {
+		if (resource.collection[i][definition.idAttribute] == id) {
+			found = true;
+			break;
 		}
-		if (found) {
-			resource.collection.splice(i, 1);
-			resource.observers[id].close();
-			delete resource.observers[id];
-			delete resource.index[id];
-			delete resource.changes[id];
-			delete resource.previousAttributes[id];
-			delete resource.modified[id];
-			delete resource.saved[id];
-		}
-	} else {
-		resource.collection = [];
-		resource.index = {};
-		resource.modified = {};
-		resource.saved = {};
-		resource.changes = {};
-		resource.previousAttributes = {};
+	}
+	if (found) {
+		resource.collection.splice(i, 1);
+		resource.observers[id].close();
+		delete resource.observers[id];
+		delete resource.index[id];
+		delete resource.changes[id];
+		delete resource.previousAttributes[id];
+		delete resource.modified[id];
+		delete resource.saved[id];
 	}
 }
 
@@ -34,16 +25,15 @@ function _eject(definition, resource, id) {
  * @id DS.sync_methods:eject
  * @name eject
  * @description
- * Eject the item of the specified type that has the given primary key from the data store. If no primary key is
- * provided, eject all items of the specified type from the data store. Ejection only removes items from the data store
- * and does not attempt to delete items on the server.
+ * Eject the item of the specified type that has the given primary key from the data store. Ejection only removes items
+ * from the data store and does not attempt to delete items on the server.
  *
  * ## Signature:
  * ```js
  * DS.eject(resourceName[, id])
  * ```
  *
- * ## Examples:
+ * ## Example:
  *
  * ```js
  * DS.get('document', 45); // { title: 'How to Cook', id: 45 }
@@ -53,29 +43,19 @@ function _eject(definition, resource, id) {
  * DS.get('document', 45); // undefined
  * ```
  *
- * Eject all items of the specified type from the data store.
- *
- * ```js
- * DS.filter('document'); // [ { title: 'How to Cook', id: 45 }, { title: 'How to Eat', id: 46 } ]
- *
- * DS.eject('document');
- *
- * DS.filter('document'); // [ ]
- * ```
- *
  * ## Throws
  *
  * - `{IllegalArgumentError}`
  * - `{RuntimeError}`
  * - `{UnhandledError}`
  *
  * @param {string} resourceName The resource type, e.g. 'user', 'comment', etc.
- * @param {string|number=} id The primary key of the item to eject.
+ * @param {string|number} id The primary key of the item to eject.
  */
 function eject(resourceName, id) {
 	if (!this.definitions[resourceName]) {
 		throw new this.errors.RuntimeError(errorPrefix + resourceName + ' is not a registered resource!');
-	} else if (id && !this.utils.isString(id) && !this.utils.isNumber(id)) {
+	} else if (!this.utils.isString(id) && !this.utils.isNumber(id)) {
 		throw new this.errors.IllegalArgumentError(errorPrefix + 'id: Must be a string or a number!', { id: { actual: typeof id, expected: 'string|number' } });
 	}
 

src/datastore/sync_methods/eject/index.js

@@ -1,13 +1,14 @@
 var errorPrefix = 'DS.ejectAll(resourceName[, params]): ';
 
-function _ejectAll(definition, params) {
-	params.query = params.query || {};
-
-	var items = this.filter(definition.name, params);
+function _ejectAll(definition, resource, params) {
+	var queryHash = this.utils.toJson(params),
+		items = this.filter(definition.name, params);
 
 	for (var i = 0; i < items.length; i++) {
 		this.eject(definition.name, items[i][definition.idAttribute]);
 	}
+
+	delete resource.completedQueries[queryHash];
 }
 
 /**
@@ -86,11 +87,11 @@ function ejectAll(resourceName, params) {
 	try {
 		if (!this.$rootScope.$$phase) {
 			this.$rootScope.$apply(function () {
-				_ejectAll.apply(_this, [_this.definitions[resourceName], params]);
+				_ejectAll.apply(_this, [_this.definitions[resourceName], resource, params]);
 				resource.collectionModified = _this.utils.updateTimestamp(resource.collectionModified);
 			});
 		} else {
-			_ejectAll.apply(_this, [_this.definitions[resourceName], params]);
+			_ejectAll.apply(_this, [_this.definitions[resourceName], resource, params]);
 			resource.collectionModified = this.utils.updateTimestamp(resource.collectionModified);
 		}
 	} catch (err) {

src/datastore/sync_methods/ejectAll/index.js

@@ -7,11 +7,9 @@ describe('DS.eject(resourceName, id)', function () {
 		}, DS.errors.RuntimeError, errorPrefix + 'does not exist is not a registered resource!');
 
 		angular.forEach(TYPES_EXCEPT_STRING_OR_NUMBER, function (key) {
-			if (key) {
-				assert.throws(function () {
-					DS.eject('post', key);
-				}, DS.errors.IllegalArgumentError, errorPrefix + 'id: Must be a string or a number!');
-			}
+			assert.throws(function () {
+				DS.eject('post', key);
+			}, DS.errors.IllegalArgumentError, errorPrefix + 'id: Must be a string or a number!');
 		});
 
 		done();
@@ -38,29 +36,6 @@ describe('DS.eject(resourceName, id)', function () {
 		assert.isUndefined(DS.get('post', 5));
 		assert.equal(DS.lastModified('post', 5), 0);
 
-		done();
-	});
-	it('should eject all items from the store', function (done) {
-
-		DS.inject('post', p1);
-		DS.inject('post', p2);
-		DS.inject('post', p3);
-		DS.inject('post', p4);
-
-		assert.deepEqual(DS.get('post', 5), p1);
-		assert.deepEqual(DS.get('post', 6), p2);
-		assert.deepEqual(DS.get('post', 7), p3);
-		assert.deepEqual(DS.get('post', 8), p4);
-
-		assert.doesNotThrow(function () {
-			DS.eject('post');
-		});
-
-		assert.isUndefined(DS.get('post', 5));
-		assert.isUndefined(DS.get('post', 6));
-		assert.isUndefined(DS.get('post', 7));
-		assert.isUndefined(DS.get('post', 8));
-
 		done();
 	});
 });