Stable Version 0.10.0.

For Model.filter and Model.getAll softDeleted items are no longer returned unless the withDeleted option is set to true.

lib/model/static/filter.js

@@ -12,10 +12,18 @@ function _filter(predicate, options) {
 
 	return Promise.resolve().then(function _filterInner() {
 
+		if (!('withDeleted' in options)) {
+			options.withDeleted = false;
+		}
+
 		if (!utils.isEmpty(predicate.where)) {
 			query = query.filter(predicate.where);
 		}
 
+		if (Model.softDelete && !options.withDeleted) {
+			query = query.filter({ deleted: null });
+		}
+
 		if (predicate.orderBy) {
 			if (utils.isString(predicate.orderBy)) {
 				predicate.orderBy = [
@@ -147,6 +155,7 @@ function _filter(predicate, options) {
  * @param {object=} options Optional configuration. Properties:
  *
  * - `{boolean=false}` - `raw`- If `true`, return the raw data instead of instances of Model.
+ * - `{boolean=false}` - `withDeleted`- If `true`, return "softDeleted" items as well.
  *
  * @param {function=} cb Optional callback function for Node-style usage. Signature: `cb(err, instances)`. Arguments:
  *

lib/model/static/getAll.js

@@ -62,6 +62,7 @@ var utils = require('../../support/utils'),
  * @param {object=} options Optional configuration. Properties:
  *
  * - `{boolean=false}` - `raw`- If `true`, return the raw data instead of instances of Model.
+ * - `{boolean=false}` - `withDeleted`- If `true`, return "softDeleted" items as well.
  *
  * @param {function=} cb Optional callback function for Node-style usage. Signature: `cb(err, instances)`. Arguments:
  *
@@ -100,10 +101,18 @@ module.exports = function getAll(keys, index, options, cb) {
 			throw new IllegalArgumentError(errorPrefix + 'options: Must be an object!', { actual: typeof options, expected: 'object' });
 		}
 
+		if (!('withDeleted' in options)) {
+			options.withDeleted = false;
+		}
+
 		keys.push(index);
 
 		query.getAll.apply(query, keys);
 
+		if (Model.softDelete && !options.withDeleted) {
+			query = query.filter({ deleted: null });
+		}
+
 		return Model.connection.run(query, options).then(function (cursor) {
 			var deferred = Promise.defer();
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "reheat",
   "description": "A red hot Node.js ORM for RethinkDB.",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "homepage": "https://github.com/jmdobry/reheat",
   "repository": {
     "type": "git",