From e6fcc4632b682414ddb0ceab85ee1104b5b83ea0 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Thu, 18 Jul 2013 14:48:39 +0000
Subject: [PATCH] fix(rest) change the way params mv

---
 lib/server/rest.js | 64 +++++++++++++++++++++++++++++-----------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/lib/server/rest.js b/lib/server/rest.js
index 20a10bfd..b37cc83c 100644
--- a/lib/server/rest.js
+++ b/lib/server/rest.js
@@ -141,34 +141,50 @@
                             else
                                 main.sendError(pParams, pError);
                         });
-                    else if(lQuery === 'patch') {
+                    else if(lQuery === 'patch')
                         getBody(p.request, function(pPatch) {
-                            fs.readFile(p.name, function(pError, pData) {
-                                var lRet, lDiff, lStr;
+                            fs.readFile(p.name, Util.call(read, pParams));
+                            
+                            function read(pParams) {
+                                var lDiff, lStr, p, lData, lName,
+                                    lRet    = main.checkCallBackParams(pParams) &&
+                                              main.checkParams(pParams.params);
                                 
-                                if (pError)
-                                    main.sendError(pParams, pError);
-                                else {
-                                    lStr = pData.toString();
-                                    lRet = Util.tryCatchLog(function(){
-                                        lDiff = diff.applyPatch(lStr, pPatch);
-                                    });
+                                if (lRet) {
+                                    p       = pParams;
+                                    lName   =  p.params.name;
                                     
-                                    if (lDiff && !lRet)
-                                        fs.writeFile(p.name, lDiff, function(){  
-                                            var lName = path.basename(p.name);
-                                            
-                                            if (pError)
-                                                main.sendError(pParams, pError);
-                                            else
-                                                main.sendResponse(pParams, 'edit: save(' + lName +')');
+                                    if (p.error)
+                                        main.sendError(p.params, p.error);
+                                    else {
+                                        lStr = p.data.toString();
+                                        lRet = Util.tryCatchLog(function(){
+                                            lDiff = diff.applyPatch(lStr, pPatch);
                                         });
-                                    else
-                                        main.sendError(pParams, lRet || lDiff);
+                                        
+                                        if (lDiff && !lRet)
+                                            fs.writeFile(lName, lDiff, Util.call(write, p.params));
+                                        else
+                                            main.sendError(pParams, lRet || lDiff);
+                                    }
                                 }
-                            });
-                        });
-                    }
+                            }
+                            
+                            function write(pParams) {
+                                var p, lName,
+                                    lRet    = main.checkCallBackParams(pParams) &&
+                                              main.checkParams(pParams.params);
+                                if(lRet) {
+                                    p = pParams;
+                                    if (p.error)
+                                        main.sendError(p.params, p.error);
+                                    else {
+                                        lName = path.basename(p.params.name);
+                                        main.sendResponse(p.params, 'patch: ok("' + lName +'")');
+                                    }
+                                }
+                            }
+                    });
                     else {
                         lWriteStream    = fs.createWriteStream(p.name);
                         
@@ -180,7 +196,7 @@
                         p.request.on('error', lError);
                         p.request.on('end', function(){
                             var lName = path.basename(p.name);
-                            main.sendResponse(pParams, 'edit: save(' + lName +')');
+                            main.sendResponse(pParams, 'save: ok("' + lName +'")');
                         });
                         
                         //p.request.pipe(process.stdout);