Merge branch 'master' into extending_template_engine_support

geddy · Jun 19, 2012 · 9ab5a2c · 9ab5a2c
2 parents d6f37e7 + eb95c15
commit 9ab5a2c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/bin/cli.js b/bin/cli.js
@@ -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'

diff --git a/lib/model/adapters/mongo.js b/lib/model/adapters/mongo.js
@@ -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

diff --git a/lib/model/index.js b/lib/model/index.js
@@ -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,
+            adapt = model.adapter[name];
-                arguments);
+            return adapt[method].apply(adapt, arguments);
           };
         };
 

diff --git a/test/model_create_user.js b/test/model_create_user.js
@@ -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');