From b0b6fc396d9a9da2af6d3632bca0947e31a0a0c5 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 15 Sep 2014 08:45:54 -0400 Subject: [PATCH] refactor(fs) get, put, delete --- lib/server/rest.js | 6 +++--- lib/server/rest/fs/delete.js | 6 ++---- lib/server/rest/fs/get.js | 6 ++---- lib/server/rest/fs/put.js | 6 ++---- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/lib/server/rest.js b/lib/server/rest.js index 743647d0..d229f2af 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -28,9 +28,9 @@ CloudFunc = require(DIR_LIB + 'cloudfunc'), format = require(DIR_LIB + 'format'), - onFSGet = require(DIR + 'rest/fs/get').onGet, - onFSPut = require(DIR + 'rest/fs/put').onPut, - onDelete = require(DIR + 'rest/fs/delete').onDelete, + onFSGet = require(DIR + 'rest/fs/get'), + onFSPut = require(DIR + 'rest/fs/put'), + onDelete = require(DIR + 'rest/fs/delete'), markdown = require(DIR + 'rest/markdown'), auth = require(DIR + 'auth'), diff --git a/lib/server/rest/fs/delete.js b/lib/server/rest/fs/delete.js index 01aec8c3..fdd30e71 100644 --- a/lib/server/rest/fs/delete.js +++ b/lib/server/rest/fs/delete.js @@ -7,9 +7,7 @@ Util = require(DIR + 'util'), flop = require(DIR_SERVER + 'flop'); - exports.onDelete = onDelete; - - function onDelete(query, name, files, callback) { + module.exports = function(query, name, files, callback) { var func = Util.exec.ret(callback), fileNames = Util.slice(files); @@ -22,7 +20,7 @@ deleteFiles(name, fileNames, func); break; } - } + }; function deleteFiles(from, names, callback) { var name, diff --git a/lib/server/rest/fs/get.js b/lib/server/rest/fs/get.js index 3db60691..8d00882a 100644 --- a/lib/server/rest/fs/get.js +++ b/lib/server/rest/fs/get.js @@ -10,9 +10,7 @@ mellow = require(DIR_SERVER + 'mellow'), Util = require(DIR + 'util'); - exports.onGet = onGet; - - function onGet(query, name, callback) { + module.exports = function(query, name, callback) { var hash, error, func = Util.exec.ret(callback); @@ -47,5 +45,5 @@ break; } - } + }; })(); diff --git a/lib/server/rest/fs/put.js b/lib/server/rest/fs/put.js index 6073d6d6..148d3237 100644 --- a/lib/server/rest/fs/put.js +++ b/lib/server/rest/fs/put.js @@ -17,9 +17,7 @@ diffPatch = require(DIR + 'diff/diff-match-patch').diff_match_patch, diff = new (require(DIR + 'diff').DiffProto)(diffPatch); - exports.onPut = onPut; - - function onPut(query, name, readStream, callback) { + module.exports = function(query, name, readStream, callback) { var baseName = path.basename(name), onDone = function(msg, error) { if (!error) @@ -71,7 +69,7 @@ }); break; } - } + }; function patchFile(name, patch, callback) { var baseName = path.basename(name),