Merge pull request #144 from muneebs/master

update cradle.js
This commit is contained in:
Anatoliy Chakkaev 2012-11-05 09:09:39 -08:00
commit fb075fdd97
1 changed files with 25 additions and 11 deletions

View File

@ -221,7 +221,7 @@ CradleAdapter.prototype.updateOrCreate = function(model, data, callback) {
if(err) {
this.create(model, data, callback);
} else {
this.updateAttributes(mode, data.id, data, callback);
this.updateAttributes(model, data.id, data, callback);
}
}.bind(this)
)
@ -260,17 +260,31 @@ CradleAdapter.prototype.count = function(model, callback, where) {
};
CradleAdapter.prototype.models = function(model, filter, callback, func) {
this.client.all(
{include_docs: true},
errorHandler(callback, function(res, cb) {
var docs = res.map(function(doc) {
return idealize(doc);
});
var filtered = filtering(docs, model, filter, this._models)
var limit = 200;
var skip = 0;
if (filter != null) {
limit = filter.limit || limit;
skip = filter.skip ||skip;
}
func ? func(filtered, cb) : cb(filtered);
}.bind(this))
);
var self = this;
self.client.save('_design/'+model, {
views : {
all : {
map : 'function(doc) { if (doc.nature == "'+model+'") { emit(doc._id, doc); } }'
}
}
}, function() {
self.client.view(model+'/all', {include_docs:true, limit:limit, skip:skip}, errorHandler(callback, function(res, cb) {
var docs = res.map(function(doc) {
return idealize(doc);
});
var filtered = filtering(docs, model, filter, this._models)
func ? func(filtered, cb) : cb(filtered);
}.bind(self)));
});
};
CradleAdapter.prototype.all = function(model, filter, callback) {