fixed OverwriteModel bug

Author: emmanuel

README.md

@@ -140,7 +140,7 @@ var task = Fawn.Task();
 
   > modelName (required): Name of the collection associated with this model
   
-  > schema (required): Same as object passed to [mongoose Schema](http://mongoosejs.com/docs/guide.html#definition). Also see [validation](http://mongoosejs.com/docs/validation.html)
+  > schema (optional): Same as object passed to [mongoose Schema](http://mongoosejs.com/docs/guide.html#definition). Also see [validation](http://mongoosejs.com/docs/validation.html)
   
   <br>If you're using mongoose, define your models with mongoose wherever possible. If the model has been defined by mongoose before this function is called, mongoose will throw an OverwriteModelError and if it was defined by Fawn, Fawn will throw an Error. Models can be defined only once.
 

lib/task.js

@@ -42,11 +42,13 @@ var Task = function(){
   };
 
   task.initModel = function(modelName, schema){
-    if(!(modelName && schema)) throw new Error("Missing Args: modelName, Schema, or both");
+    // if(!(modelName && schema)) throw new Error("Missing Args: modelName, Schema, or both");
     if(modelCache[modelName]) throw new Error("The schema for this model has already been set");
-    if(!isObject(schema)) throw new Error("Invalid Schema");
+    if (schema && !isObject(schema)) throw new Error("Invalid Schema");
 
-    setModel(modelName, new Schema(schema, {strict: true}));
+    var DEFAULT_SCHEMA = new Schema({}, {strict: false});
+
+    setModel(modelName, schema ? new Schema(schema, {strict: true}) : DEFAULT_SCHEMA);
 
     return task;
   };

lib/utils.js

@@ -9,15 +9,18 @@ var modelCache = {};
 module.exports = function(_mongoose){
   var mongoose = _mongoose || require("mongoose");
   var Schema = mongoose.Schema;
-  var DEFAULT_SCHEMA = new Schema({}, {strict: false});
 
   function updateState(task, index, state){
     task.steps[index].state = state;
     return task.save();
   }
 
   function getCollection(name, schema){
-    return mongoose.model(name, schema || DEFAULT_SCHEMA, name);
+    if (schema) {
+      return mongoose.model(name, schema);
+    }
+
+    return mongoose.model(name);
   }
 
   function setModel(name, schema){

tests/all.tests.js

@@ -17,15 +17,20 @@ global.expect = config.expect;
 global.Promise = config.Promise;
 global.TEST_COLLECTION_A = config.TEST_COLLECTION_A;
 global.TEST_COLLECTION_B = config.TEST_COLLECTION_B;
-global.TestMdlA = utils.getModel(TEST_COLLECTION_A);
-global.TestMdlB = utils.getModel(TEST_COLLECTION_B);
 
 describe("ALL TESTS", function(){
   before(function(){
     Lint.init(config.db + DB, TASKS);
     global.Task = Lint.Task;
     global.task = Lint.Task();
     global.taskMdl = task.getTaskCollection();
+
+    task.initModel(TEST_COLLECTION_A);
+    task.initModel(TEST_COLLECTION_B);
+
+    global.TestMdlA = utils.getModel(TEST_COLLECTION_A);
+    global.TestMdlB = utils.getModel(TEST_COLLECTION_B);
+
   });
 
   after(function(){