use mquery public selection methods

Automattic · Jan 9, 2014 · 39a4bc0 · 39a4bc0
1 parent e324846
commit 39a4bc0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -971,7 +971,7 @@ Model.find = function find (conditions, fields, options, callback) {
   // get the raw mongodb collection object
   var mq = new Query({}, options, this, this.collection);
   mq.select(fields);
-  if (this.schema.discriminatorMapping && mq._selectedInclusively()) {
+  if (this.schema.discriminatorMapping && mq.selectedInclusively()) {
     mq.select(this.schema.options.discriminatorKey);
   }
 
@@ -1076,7 +1076,7 @@ Model.findOne = function findOne (conditions, fields, options, callback) {
   // get the mongodb collection object
   var mq = new Query({}, options, this, this.collection);
   mq.select(fields);
-  if (this.schema.discriminatorMapping && mq._selectedInclusively()) {
+  if (this.schema.discriminatorMapping && mq.selectedInclusively()) {
     mq.select(this.schema.options.discriminatorKey);
   }
 

diff --git a/lib/query.js b/lib/query.js
@@ -2812,21 +2812,40 @@ Query.prototype.centerSphere = function () {
 }
 
 /**
- * Determines if query fields are inclusive
+ * Determines if field selection has been made.
  *
- * @return {Boolean} bool defaults to true
+ * @method selected
- * @api private
+ * @memberOf Query
+ * @return {Boolean}
+ * @api public
  */
 
-Query.prototype._selectedInclusively = Query.prototype.selectedInclusively;
+/**
-
+ * Determines if inclusive field selection has been made.
-/*!
+ *
- * Remove from public api for 3.8
+ *     query.selectedInclusively() // false
+ *     query.select('name')
+ *     query.selectedInclusively() // true
+ *
+ * @method selectedInclusively
+ * @memberOf Query
+ * @return {Boolean}
+ * @api public
  */
 
-Query.prototype.selected =
+/**
-Query.prototype.selectedInclusively =
+ * Determines if exclusive field selection has been made.
-Query.prototype.selectedExclusively = undefined;
+ *
+ *     query.selectedExclusively() // false
+ *     query.select('-name')
+ *     query.selectedExclusively() // true
+ *     query.selectedInclusively() // false
+ *
+ * @method selectedExclusively
+ * @memberOf Query
+ * @return {Boolean}
+ * @api public
+ */
 
 /*!
  * Export