added observable cursors

README.md

@@ -6,4 +6,3 @@ Inspired by [meteor](http://meteor.com)
 - I wanted a decoupled library with the same level of functionality provided in [meteor](http://meteor.com)
 - Cached on the client-side, and server-side. Less hits to mongodb itself.
 - Allows for users to be sandboxed in their own collection (authentication).
-- Ability 

docs/pseudo-schema.js

@@ -0,0 +1,17 @@
+var Profile = new Schema({
+	comments: { ref: 'Comment' },
+	email: String,
+	password: String
+});
+
+
+var Comment = new Schema({
+	profile: { ref: 'Profile' },
+	title: String,
+	message: String
+});
+
+
+
+
+

examples/memory.js

@@ -0,0 +1,45 @@
+var mdblite = require("../lib"),
+db = mdblite.db(new mdblite.drivers.Memory());
+
+var helloCollection = db.collection("hello");
+
+
+helloCollection.insert([
+{
+	name: "Craig",
+	age: 22
+},
+{
+	name: "Tim",
+	age:21
+},
+{
+	name: "John",
+	age:22
+}
+]);
+
+setTimeout(function() {
+	helloCollection.insert([
+	{
+		name: "Sarah",
+		age: 22
+	}
+	]);
+}, 1000);
+
+var cursor = helloCollection.find({age:{$gt:21}});
+
+cursor.on("insert", function(item) {
+	console.log("new item added!");
+	console.log(item)
+});
+
+
+
+
+cursor.each(function(err, item) {
+	if(item) console.log(item);
+})
+
+

lib/abstract/abstract.js

@@ -0,0 +1,6 @@
+
+module.exports = {
+	_abstract: function() {
+		throw new Error("Not implemented");
+	}
+}

src/common/abstract/collection.js → lib/abstract/collection.js

@@ -3,7 +3,7 @@ EventEmitter = require('events').EventEmiter,
 ObjectId     = require('../types/objectid'),
 _            = require('underscore');
 
-var Collection = module.exports = structr(EventEmitter, {
+var Collection = module.exports = structr(EventEmitter, require("./abstract"), {
 
 	/**
 	 * constructor.
@@ -14,7 +14,7 @@ var Collection = module.exports = structr(EventEmitter, {
 	__construct: function(database, name) {
 		this.db   = database;
 		this.name = name;
-	}
+	},
 
 	/**
 	 * finds more than one item in a collection
@@ -88,14 +88,5 @@ var Collection = module.exports = structr(EventEmitter, {
 
 	reset: function(items) {
 		this._abstract();
-	},
-
-
-	/**
-	 * throws an error
-	 */
-
-	__abstract: function() {
-		throw new Error("Not implemented");
 	}
 });

src/common/abstract/cursor.js → lib/abstract/cursor.js

@@ -11,7 +11,7 @@ module.exports = structr({
 		this.selector    = selector;
 		this.collection  = collection;
 		this.options     = options || {};
-		this._sift       = sift(this.selector);
+		this.sift        = sift(this.selector);
 		this._position   = 0;
 	},
 
@@ -82,7 +82,7 @@ module.exports = structr({
 			if(!document) return fn(err, docs);
 			docs.push(document);
 		});
-	},
+	}
 
 	/**
 	 */

lib/abstract/db.js

@@ -0,0 +1,11 @@
+var structr = require("structr");
+
+module.exports = structr(require("./abstract"), {
+
+	/**
+	 */
+
+	connect: function() {
+		this._abstract();
+	}
+});

src/common/chainable.js → lib/chainable.js

@@ -14,9 +14,9 @@ module.exports = structr({
 	 */
 
 	"__construct": function() {
-		this._queue = tq.queue();
 		this._isReady = false;
-		this._em = new EventEmitter();
+		this._queue   = tq.queue().start();
+		this._em      = new EventEmitter();
 	},
 
 	/**
@@ -26,6 +26,13 @@ module.exports = structr({
 		this._em.on(type, callback);
 	},
 
+	/**
+	 */
+
+	"emit": function(type, value) {
+		this._em.emit(type, value);
+	},
+
 	/**
 	 * pushes a callback to the queue
 	 */
@@ -39,12 +46,15 @@ module.exports = structr({
 	 */
 
 	"target": function(value) {
+
 		if(!arguments.length) return this._target;
+
 		if(!this._target) {
 			this._target = value;
 			this._em.emit("ready");
 			this._em.removeAllListeners("ready");
 		}
+
 		return value;
 	},
 
@@ -65,11 +75,13 @@ module.exports = structr({
 	 */
 
 	"_wrap": function() {
+
 		var args = arguments, self = this;
+
 		return function() {
 			var i = 0;
-			for(; n = args.length; i < n; i++) {
-				args[i].apply(self, arguments);
+			for(n = args.length; i < n; i++) {
+				(args[i] || function(){}).apply(self, arguments);
 			}
 		}
 	}

src/common/collection.js → lib/collection.js

@@ -1,4 +1,6 @@
-var Cursor = require('./cursor');
+var Cursor = require('./cursor'),
+_          = require("underscore"),
+ObjectId   = require("./types/objectid");
 
 /**
  * wrapper for the drivers
@@ -24,13 +26,22 @@ var Cursor = require('./cursor');
  		//ready? get the collection
  		this.next(function() {
  			var next = this;
- 			db.target.collection(name, function(target) {
+ 			db.target().collection(name, function(err, target) {
  				self.target(target);
  				next();
- 			})
+ 			});
  		});
  	},
 
+
+ 	/**
+ 	 */
+
+ 	"modelClass": function(value) {
+ 		if(!arguments.length) return this._modelClass;
+ 		return this._modelClass = value;
+ 	},
+
  	/**
  	 */
 
@@ -66,37 +77,57 @@ var Cursor = require('./cursor');
 
 
  	"insert": function(item, next) {
+
  		var items = item instanceof Array ? item : [item],
  		self = this;
 
  		this.next(function() {
- 			self.collection.insert(items, self._wrap(next || function(){}, this));
+
+ 			_.each(items, function(item) {
+ 				if(!item._id) item._id = new ObjectId();
+ 			})
+
+ 			self.target().insert(items, self._wrap(next || function(){}, this, function(err, items) {
+ 				if(err) return;
+ 				self.emit("insert", items);
+ 			}));
  		});
  	},
 
+ 	/**
+ 	 */
+
+ 	"ensureIndex": function(key) {
+ 		this.next(function() {
+ 			self.target().ensureIndex(key);
+ 		})
+ 	},
+
  	/**
  	 */
 
  	"update": function(selector, toUpdate, options, next) {
+
  		var self = this;
 
  		if(typeof options == 'function') {
- 			next = options;
+ 			next    = options;
  			options = undefined;
  		}
 
  		this.next(function() {
- 			self.collection.update(selector, toUpdate, options || {}, self._wrap(next || function(){}, this))
+ 			self.target().update(selector, toUpdate, options || {}, self._wrap(next || function(){}, this))
  		});
  	},
 
  	/**
  	 */
 
  	"remove": function(selector, next) {
+
  		var self = this;
  		this.next(function() {
- 			self.colletion.remove(selector, self._wrap(next || function(){}, next));
+ 			self.target().remove(selector, self._wrap(next || function(){}, next));
  		});
  	}
 

src/common/cursor.js → lib/cursor.js

@@ -1,5 +1,6 @@
 var tq = require('tq'),
-Chainable = require('./chainable');
+Chainable = require('./chainable'),
+Observer  = require("./cursorObserver");
 
 module.exports = require("./abstract/cursor").extend({
 
@@ -14,7 +15,7 @@ module.exports = require("./abstract/cursor").extend({
 
 		this._chain.next(function() {
 			collection.ready(this);
-		})
+		});
 	},
 
 	/**
@@ -29,15 +30,30 @@ module.exports = require("./abstract/cursor").extend({
 	 */
 
 	"target": function() {
-		return this._chain.apply(this._chain, arguments);
+		return this._chain.target.apply(this._chain, arguments);
+	},
+
+
+
+	/**
+	 * listens for insert / update / remove
+	 */
+
+	on: function(type, callback) {
+		if(!this._em) {
+			this._observer = new Observer(this);
+		}
+		this._observer.on(type, callback);
 	},
 
+
 	/**
 	 */
 
 
 	"nextObject": function(fn) {
 		var self = this;
+
 		this._cursor(function(cursor) {
 			cursor.nextObject(function(err, item) {
 				if(!item) return fn(err);
@@ -56,8 +72,8 @@ module.exports = require("./abstract/cursor").extend({
 		}
 
 		this._waiting = true;
-
 		var self = this;
+
 		this._chain.next(function() {
 			var next = this;
 			self.collection.target().find(self.selector, self.options, function(err, cursor) {
@@ -67,4 +83,5 @@ module.exports = require("./abstract/cursor").extend({
 			});
 		});
 	}
-})
+});
+