🔥 replace scout-brain with new mongodb-*-*models

Author: imlucas

package.json

@@ -67,9 +67,14 @@
   "dependencies": {
     "ampersand-form-view": "^5.1.1",
     "ampersand-input-view": "^5.0.0",
+    "ampersand-rest-collection": "^5.0.0",
     "debug": "^2.2.0",
     "electron-squirrel-startup": "^0.1.2",
+    "mongodb-collection-model": "^0.1.0",
     "mongodb-connection-model": "^0.0.3",
+    "mongodb-database-model": "^0.1.0",
+    "mongodb-instance-model": "^0.2.0",
+    "mongodb-ns": "^1.0.0",
     "scout-server": "http://bin.mongodb.org/js/scout-server/v0.2.2/scout-server-0.2.2.tar.gz"
   },
   "devDependencies": {
@@ -130,7 +135,6 @@
     "raf": "^3.0.0",
     "run-sequence": "^1.1.2",
     "run-series": "^1.1.2",
-    "scout-brain": "http://bin.mongodb.org/js/scout-brain/v0.0.2/scout-brain-0.0.2.tar.gz",
     "scout-client": "http://bin.mongodb.org/js/scout-client/v0.1.3/scout-client-0.1.3.tar.gz",
     "stream-combiner2": "^1.0.2",
     "uuid": "^2.0.1",

src/home/collection.js

@@ -92,7 +92,7 @@ var MongoDBCollectionView = View.extend({
     var ns = this.parent.ns;
     if (!ns) {
       this.visible = false;
-      debug('not updating because parent has no collection namespace.');
+      debug('No active collection namespace so no schema has been requested yet.');
       return;
     }
     this.visible = true;

src/home/index.js

@@ -1,9 +1,9 @@
 var View = require('ampersand-view');
 var format = require('util').format;
 var SidebarView = require('../sidebar');
-var debug = require('debug')('scout-ui:home');
 var CollectionView = require('./collection');
 var app = require('ampersand-app');
+var debug = require('debug')('scout:home');
 
 var HomeView = View.extend({
   props: {
@@ -32,6 +32,7 @@ var HomeView = View.extend({
     this.listenTo(app.instance, 'sync', this.onInstanceFetched);
     this.listenTo(app.connection, 'change:name', this.updateTitle);
     this.once('change:rendered', this.onRendered);
+    debug('fetching instance model...');
     app.instance.fetch();
   },
   onInstanceFetched: function() {

src/models/mongodb-collection.js

@@ -1,13 +1,13 @@
-var MongoDBCollection = require('scout-brain').models.Collection;
-var types = require('./types');
+var MongoDBCollection = require('mongodb-collection-model');
+var toNS = require('mongodb-ns');
 var scoutClientMixin = require('./scout-client-mixin');
 var format = require('util').format;
 
 /**
  * Metadata for a MongoDB Collection.
- * @see https://github.com/10gen/scout/blob/dev/scout-brain/lib/models/collection.js
+ * @see http://npm.im/mongodb-collection-model
  */
-module.exports = MongoDBCollection.extend(scoutClientMixin, {
+var CollectionModel = MongoDBCollection.extend(scoutClientMixin, {
   namespace: 'MongoDBCollection',
   session: {
     selected: {
@@ -19,14 +19,14 @@ module.exports = MongoDBCollection.extend(scoutClientMixin, {
     name: {
       deps: ['_id'],
       fn: function() {
-        return types.ns(this._id).collection;
+        return toNS(this._id).collection;
       }
     },
     specialish: {
       name: {
         deps: ['_id'],
         fn: function() {
-          return types.ns(this._id).specialish;
+          return toNS(this._id).specialish;
         }
       }
     },
@@ -43,3 +43,9 @@ module.exports = MongoDBCollection.extend(scoutClientMixin, {
     }, true);
   }
 });
+
+module.exports = CollectionModel;
+
+module.exports.Collection = MongoDBCollection.Collection.extend({
+  model: CollectionModel
+});

src/models/mongodb-instance.js

@@ -1,32 +1,32 @@
-var MongoDBInstance = require('scout-brain').models.Instance;
-var MongoDBCollectionCollection = require('scout-brain').models.CollectionCollection;
+var MongoDBInstance = require('mongodb-instance-model');
 var MongoDBCollection = require('./mongodb-collection');
 var scoutClientMixin = require('./scout-client-mixin');
 var selectableMixin = require('./selectable-collection-mixin');
-var types = require('./types');
+var toNS = require('mongodb-ns');
 
 /**
  * A user selectable collection of `MongoDBCollection`'s with `specialish`
   * collections filtered out.
  */
-var MongoDBCollectionOnInstanceCollection = MongoDBCollectionCollection.extend(selectableMixin, {
+var MongoDBCollectionOnInstanceCollection = MongoDBCollection.Collection.extend(selectableMixin, {
   namespace: 'MongoDBCollectionOnInstanceCollection',
   model: MongoDBCollection,
   parse: function(res) {
     return res.filter(function(d) {
-      return !types.ns(d._id).specialish;
+      return !toNS(d._id).specialish;
     });
   }
 });
 
 /**
  * Metadata for a MongoDB Instance, such as a `db.hostInfo()`, `db.listDatabases()`,
  * `db.buildInfo()`, and more.
- * @see https://github.com/10gen/scout/blob/dev/scout-brain/lib/models/instance.js
+ *
+ * @see http://npm.im/mongodb-instance-model
  */
 module.exports = MongoDBInstance.extend(scoutClientMixin, {
   namespace: 'MongoDBInstance',
-  children: {
+  collections: {
     collections: MongoDBCollectionOnInstanceCollection
   },
   url: '/instance'

src/models/sampled-document-collection.js

@@ -1,9 +1,23 @@
-var DocumentCollection = require('scout-brain').models.DocumentCollection;
+var State = require('ampersand-state');
+var Collection = require('ampersand-rest-collection');
 
-module.exports = DocumentCollection.extend({
+var DocumentModel = State.extend({
+  idAttribute: '_id',
+  extraProperties: 'allow'
+});
+
+var DocumentCollection = Collection.extend({
+  model: DocumentModel,
+  comparator: '_id'
+});
+
+
+var SampledDocumentCollection = DocumentCollection.extend({
   /**
    * Don't do client-side sorting as the cursor on the server-side handles sorting.
    */
   comparator: false,
   namespace: 'SampledDocumentCollection'
 });
+
+module.exports = SampledDocumentCollection;