Merge pull request #128 from 10gen/INT-506-limit-vs-size

INT-605 limit vs size

Author: imlucas

src/home/collection.js

@@ -7,8 +7,8 @@ var SamplingMessageView = require('../sampling-message');
 var MongoDBCollection = require('../models/mongodb-collection');
 var SampledSchema = require('../models/sampled-schema');
 var app = require('ampersand-app');
-
 var $ = require('jquery');
+var _ = require('lodash');
 var debug = require('debug')('scout:home:collection');
 
 require('bootstrap/js/modal');
@@ -102,9 +102,9 @@ var MongoDBCollectionView = View.extend({
     this.schema.ns = this.model._id = ns;
     debug('updating namespace to `%s`', ns);
     this.schema.reset();
-    this.schema.fetch({
+    this.schema.fetch(_.assign({}, app.volatileQueryOptions.serialize(), {
       message: 'Analyzing documents...'
-    });
+    }));
     this.model.fetch();
   },
   onQueryChanged: function() {

src/models/query-options.js

@@ -6,7 +6,7 @@ var Query = require('mongodb-language-model').Query;
 var DEFAULT_SORT = {
   $natural: -1
 };
-var DEFAULT_LIMIT = 100;
+var DEFAULT_SIZE = 100;
 var DEFAULT_SKIP = 0;
 
 var getDefaultQuery = function() {
@@ -32,9 +32,9 @@ module.exports = Model.extend({
         return DEFAULT_SORT;
       }
     },
-    limit: {
+    size: {
       type: 'number',
-      default: DEFAULT_LIMIT
+      default: DEFAULT_SIZE
     },
     skip: {
       type: 'number',
@@ -59,7 +59,7 @@ module.exports = Model.extend({
     this.set({
       query: getDefaultQuery(),
       sort: DEFAULT_SORT,
-      limit: DEFAULT_LIMIT,
+      size: DEFAULT_SIZE,
       skip: DEFAULT_SKIP
     });
     this.trigger('reset', this);

src/models/sampled-schema.js

@@ -64,11 +64,11 @@ module.exports = Schema.extend({
    * Take another sample on top of what you currently have.
    *
    * @example
-   * schema.fetch({limit: 100});
+   * schema.fetch({size: 100});
    * // schema.documents.length is now 100
-   * schema.more({limit: 100});
+   * schema.more({size: 100});
    * // schema.documents.length is now 200
-   * schema.more({limit: 10});
+   * schema.more({size: 10});
    * // schema.documents.length is now 210
    * @param {Object} options - Passthrough options.
    */

src/sampling-message/index.js

@@ -44,7 +44,7 @@ var SamplingMessageView = View.extend({
     is_sample: {
       deps: ['schema_sample_size'],
       fn: function() {
-        return this.schema_sample_size === app.queryOptions.limit;
+        return this.schema_sample_size === app.queryOptions.size;
       }
     },
     sample_size_message: {