Actually fixed Model.js Model instance to handle if no data supplied

wrenoud · Sep 9, 2013 · f8a9edc · f8a9edc
1 parent 1314937
commit f8a9edc
Showing 1 changed file with 20 additions and 16 deletions.
diff --git a/lib/Model.js b/lib/Model.js
@@ -4,12 +4,16 @@ var index_suffix = '-index';
 
 var Model = function Model(name, hashKey, schema, connection){
     function instance(data){
-        this.data = data;
-
+        if(data){
+            this.data = data;
+        }else{
+            this.data = {};
+        }
+
         // populate the default values
         for(var key in schema.paths){
             var path = schema.paths[key];
-            if(path.defaultValue != undefined && ((this.data && this.data[key] == undefined) || this.data == undefined)){
+            if(path.defaultValue != undefined && this.data && this.data[key] == undefined){
                 if(typeof path.defaultValue == 'function'){
                     this.data[key] = path.defaultValue();
                 }else{
@@ -57,11 +61,11 @@ var Model = function Model(name, hashKey, schema, connection){
         this.connection.putItem(this.modelName, data, _dynamodb_options, function(err,res,cap){
             if(err){
                 if(callback) callback(err, res, cap);
-                return;
+                                return;
             }else{
                 // no errors...
                 if(callback) callback(err, res, cap);
-                return;
+                                return;
             }
         });
 
@@ -110,7 +114,7 @@ var Model = function Model(name, hashKey, schema, connection){
                 throw Error("Undefined document attribute { " + path +" : " + value + " }");
             }
         }
-
+        
         try{
             for(var path in updates){
                 switch(path){
@@ -136,7 +140,7 @@ var Model = function Model(name, hashKey, schema, connection){
                         prepared_updates[path] = prep_update(path, updates[path], 'PUT');
                 }
             }
-
+            
             key[this.hash] = schema.paths[this.hash].prep(conditions[this.hash]);
             if(conditions[this.range]){
                 key[this.range] = schema.paths[this.range].prep(conditions[this.range]);
@@ -151,16 +155,16 @@ var Model = function Model(name, hashKey, schema, connection){
         this.connection.updateItem(this.modelName, key, prepared_updates, {}, function(err,res,cap){
             if(err){
                 if(callback) callback(err, res, cap);
-                return;
+                                   return;
             }else{
                 // no errors...
                 if(callback) callback(err, res, cap);
-                return;
+                                   return;
             }
         });
 
     };
-
+    
     instance.getItem = function(conditions, options, callback){
         // apply setters and validation
         var schema = this.schema;
@@ -230,7 +234,7 @@ var Model = function Model(name, hashKey, schema, connection){
         });
     };
     instance.find = instance.query;
-
+    
     // create the table
     instance.create = function(throughput, callback){
         var connection = this.connection;
@@ -258,14 +262,14 @@ var Model = function Model(name, hashKey, schema, connection){
 
         if(paths[this.hash]){
             var hash = {hash: [
-                this.hash,
-                convertType(paths[this.hash].instance)
+            this.hash,
+            convertType(paths[this.hash].instance)
             ]};
-
+            
             if(this.range && paths[this.range]){
                 hash.range = [
-                    this.range,
-                    convertType(paths[this.range].instance)
+                this.range,
+                convertType(paths[this.range].instance)
                 ]
             }
             // lets handle the LSIs