Permalink
Browse files

Merge branch 'master' into extending_template_engine_support

  • Loading branch information...
2 parents d6f37e7 + eb95c15 commit 9ab5a2c4d070ec6f7db2c95b11abf58b925c9aaf @larzconwell larzconwell committed Jun 19, 2012
Showing with 6 additions and 4 deletions.
  1. +1 −1 bin/cli.js
  2. +1 −1 lib/model/adapters/mongo.js
  3. +3 −2 lib/model/index.js
  4. +1 −0 test/model_create_user.js
View
@@ -25,7 +25,7 @@ usage = ''
+ '{Usage}: geddy [options]\n'
+ '\n'
+ '{Options}:\n'
- + ' -e, --environment Environment config to use\n'
+ + ' -e, --environment Evironment config to use\n'
+ ' -p, --port NUM Port number, defaults to 4000\n'
+ ' -n, --workers NUM Number of worker processes to use, defaults to 2\n'
+ ' -V/v, --version Outputs the version of geddy that you have installed\n'
@@ -142,7 +142,7 @@ var Mongo = function (config) {
instance = geddy.model[this.model].create(cleanInstance);
if (!instance.isValid()) {
- return callback(instace.errors, null);
+ return callback(instance.errors, null);
}
// Check to see if we have this to do item already
View
@@ -192,11 +192,12 @@ utils.mixin(model, new (function () {
var obj = {}
, createAPIMethod = function (method) {
return function () {
+ var adapt;
if (!model.adapter) {
throw new Error('geddy.model.adapter is not defined.');
}
- return model.adapter[name][method].apply(model.adapter,
- arguments);
+ adapt = model.adapter[name];
+ return adapt[method].apply(adapt, arguments);
};
};
@@ -16,6 +16,7 @@ geddy.model = model;
var User = function () {
this.property('login', 'string', {required: true});
this.property('password', 'string', {required: true});
+ this.property('confirmPassword', 'string', {required: true});
this.property('lastName', 'string');
this.property('firstName', 'string');

0 comments on commit 9ab5a2c

Please sign in to comment.