Merge pull request #227 from fabien/fix/definition-tojson

Fix ModelDefinition toJSON bug

lib/model-definition.js

@@ -265,7 +265,7 @@ ModelDefinition.prototype.toJSON = function (forceRebuild) {
     this.json = null;
   }
   if (this.json) {
-    return json;
+    return this.json;
   }
   var json = {
     name: this.name,

test/model-definition.test.js

@@ -37,6 +37,8 @@ describe('ModelDefinition class', function () {
     assert.equal(json.properties.joinedAt.type, "Date");
     assert.equal(json.properties.age.type, "Number");
     
+    assert.deepEqual(User.toJSON(), json);
+    
     done();
 
   });