update to partial saves

nw · nw · commit 591c7e5e7883 · 2010-08-17T14:42:53.000-07:00
diff --git a/lib/model.js b/lib/model.js
@@ -32,14 +32,21 @@ Model = this.Model = Class({
   _diff: function(){
     var keys = Object.keys(this.__doc),
         casters = Object.keys(this._casters),
+        arrs = Object.keys(this._arrays),
         exclude = {};
     
     for(var i = 0, l = casters.length; i < l; i++){
       this._partials[casters[i]] = JSON.stringify(this._get(casters[i]));
     }
     
     for(var i = 0, l = keys.length; i < l; i++){
-        this._partials[keys[i]] = JSON.stringify(this.__doc[keys[i]]);
+      this._partials[keys[i]] = JSON.stringify(this.__doc[keys[i]]);
+    }
+    
+    for(var i = 0, l = arrs.length; i < l; i++){
+      if(!this._partials[arrs[i]]){     
+        this._partials[arrs[i]] = JSON.stringify(this.__doc[keys[i]]);
+      }
     }
   },
   
@@ -51,9 +58,10 @@ Model = this.Model = Class({
     _parent = _parent || this;
     var keys = Object.getOwnPropertyNames(doc);
     keys.forEach(function(i){
-      if (_parent[i] && typeof(_parent[i] == 'object') && !(_parent[i] instanceof Array)) this.merge(doc[i], _parent[i]);
+      if (_parent[i] && typeof _parent[i] == 'object' && !(_parent[i] instanceof Array)) this.merge(doc[i], _parent[i]);
       else _parent[i] = doc[i];
     }, this);
+    return this;
   },
   
   _set: function(path, value, internal){
@@ -296,7 +304,8 @@ _define = function(proto, key, value){
       if(Object.prototype.toString.call(prop) == '[object Object]'){
         for(field in prop){
           if(prop[field] instanceof Array){
-            _arr[(path ? path + '.' : '') + field] = true;
+            p = (path ? path + '.' : '') + field;
+            _arr[p] = true;
             if(!prop[field].length) _ret[field] = [];
             else if(prop[field][0] instanceof Array) _ret[field] = [];
             else _ret[field] = _compileProperties(prop[field],_arr,p);
