updated collection find api

README.md

@@ -84,15 +84,13 @@ dunkel.save(function (err) {
 
 ### _collection_.validate()
 
-### _collection_.add(model)
+### _collection_.add(properties)
 
 ### _collection_.remove(query)
 
 ### _collection_.get(query)
 
-### _collection_.each(callback, context)
-
-### _collection_.find(callback, context)
+### _collection_.find(query, callback, context)
 
 ## License
 Copyright (c) 2012 August Hovland

dist/lilmodel.js

@@ -1,4 +1,4 @@
-/*! lilmodel - v0.0.5 - 2012-12-09
+/*! lilmodel - v0.0.6 - 2012-12-10
  * Copyright (c) 2012 August Hovland <gushov@gmail.com>; Licensed MIT */
 
 (function (ctx) {
@@ -407,6 +407,17 @@ var arr = require('lilobj').arr;
 var _ = require('lil_');
 var syncr = require('./syncr');
 
+function parser(ctx, model, next) {
+
+  return function (err, values) {
+
+    var instance = !err && model.create(values);
+    next.call(ctx, err, instance);
+
+  };
+
+}
+
 module.exports = arr.extend({
 
   construct: function (values) {
@@ -473,14 +484,11 @@ module.exports = arr.extend({
 
   },
 
-  each: function (next, ctx) {
-    _.each(this, next, ctx);
-  },
-
-  find: function (next, ctx) {
+  find: function (query, next, ctx) {
 
     var sync = syncr();
-    sync('find', this, next.bind(ctx));
+    this.query = query;
+    sync('find', this, parser(ctx, this, next));
 
   }
 
@@ -520,7 +528,10 @@ function setter(name, value)   {
 function parser(ctx, model, next) {
 
   return function (err, values) {
-    next.call(ctx, err, model.create(values || {}));
+
+    var instance = !err ? model.create(values) : null;
+    next.call(ctx, err, instance);
+
   };
 
 }
@@ -593,13 +604,17 @@ module.exports = obj.extend({
   },
 
   fetch: function (next, ctx) {
+
     var sync = syncr();
     sync('fetch', this, parser(ctx, this, next));
+
   },
 
   destroy: function (next, ctx) {
+
     var sync = syncr();
     sync('destroy', this, parser(ctx, this, next));
+
   }
 
 });

lib/lilmodel/collection.js

@@ -9,7 +9,10 @@ var syncr = require('./syncr');
 function parser(ctx, model, next) {
 
   return function (err, values) {
-    next.call(ctx, err, model.create(values || []));
+
+    var instance = !err && model.create(values);
+    next.call(ctx, err, instance);
+
   };
 
 }
@@ -80,13 +83,10 @@ module.exports = arr.extend({
 
   },
 
-  each: function (next, ctx) {
-    _.each(this, next, ctx);
-  },
-
-  find: function (next, ctx) {
+  find: function (query, next, ctx) {
 
     var sync = syncr();
+    this.query = query;
     sync('find', this, parser(ctx, this, next));
 
   }

lib/lilmodel/model.js

@@ -28,7 +28,10 @@ function setter(name, value)   {
 function parser(ctx, model, next) {
 
   return function (err, values) {
-    next.call(ctx, err, model.create(values));
+
+    var instance = !err ? model.create(values) : null;
+    next.call(ctx, err, instance);
+
   };
 
 }
@@ -101,13 +104,17 @@ module.exports = obj.extend({
   },
 
   fetch: function (next, ctx) {
+
     var sync = syncr();
     sync('fetch', this, parser(ctx, this, next));
+
   },
 
   destroy: function (next, ctx) {
+
     var sync = syncr();
     sync('destroy', this, parser(ctx, this, next));
+
   }
 
 });

package.json

@@ -2,7 +2,7 @@
   "author": "August Hovland <gushov@gmail.com>",
   "name": "lilmodel",
   "description": "A li'l model wrapper",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "repository": {
     "type": "git",
     "url": "git://github.com/gushov/lilmodel.git"

test/lilmodel-test.js

@@ -83,6 +83,36 @@ buster.testCase("lilmodel", {
     assert.equals(results.length, 1);
     assert.equals(results[0], chef.recipes[0]);
 
+  },
+
+  "should call sync on collection find": function () {
+
+    var syncStub = this.stub().callsArg(2);
+    var nextSpy = this.spy();
+
+    lilModel.syncr(syncStub);
+
+    var Recipe = lilModel.model.extend({
+      rules: {
+        name: ['required', 'string']
+      }
+    });
+
+    var Recipes = lilModel.collection.extend({
+      model: Recipe
+    });
+
+    var recipes = Recipes.create();
+    var context = { me: 'gus' };
+    var query = { name: 'gus' };
+    recipes.find(query, nextSpy, context);
+
+    assert(syncStub.calledOnce);
+    assert(syncStub.calledWith('find', recipes));
+    assert.equals(syncStub.getCall(0).args[1].query, query);
+    assert(nextSpy.calledOnce);
+    assert(nextSpy.calledOn(context));
+
   }
 
 });