Move volume specific code to volume/

api/routes/file.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var fs = require('fs'),
-    HttpError = require('../httperror'),
-    HttpSuccess = require('../httpsuccess'),
+    HttpError = require('../../common/httperror.js'),
+    HttpSuccess = require('../../common/httpsuccess.js'),
     mime = require('mime'),
     debug = require('debug')('server:routes/file'),
     express = require('express'),

api/routes/fileops.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var HttpError = require('../httperror'),
-    HttpSuccess = require('../httpsuccess');
+var HttpError = require('../../common/httperror.js'),
+    HttpSuccess = require('../../common/httpsuccess.js');
 
 exports = module.exports = {
     remove: remove,

api/routes/index.js

@@ -3,7 +3,7 @@
 exports = module.exports = {
     user: require('./user.js'),
     file: require('./file.js'),
-    volume: require('./volume.js'),
+    volume: require('../../volume/routes/volume.js'),
     sync: require('./sync.js'),
     fileops: require('./fileops.js')
 };

api/routes/sync.js

@@ -2,8 +2,8 @@
 
 var debug = require('debug')('server:routes/sync'),
     syncer = require('../syncer'),
-    HttpError = require('../httperror'),
-    HttpSuccess = require('../httpsuccess'),
+    HttpError = require('../../common/httperror.js'),
+    HttpSuccess = require('../../common/httpsuccess.js'),
     util = require('util');
 
 exports = module.exports = {

api/routes/user.js

@@ -3,14 +3,14 @@
 var db = require('../database'),
     DatabaseError = db.DatabaseError,
     user = require('../user'),
-    Volume = require('../volume'),
+    Volume = require('../../volume/volume.js'),
     VolumeError = Volume.VolumeError,
     UserError = user.UserError,
     crypto = require('crypto'),
     async = require('async'),
     debug = require('debug')('server:routes/user'),
-    HttpError = require('../httperror'),
-    HttpSuccess = require('../httpsuccess');
+    HttpError = require('../../common/httperror.js'),
+    HttpSuccess = require('../../common/httpsuccess.js');
 
 exports = module.exports = {
     initialize: initialize,

api/server.js

@@ -2,13 +2,13 @@
 
 var express = require('express'),
     http = require('http'),
-    HttpError = require('./httperror'),
-    HttpSuccess = require('./httpsuccess'),
+    HttpError = require('../common/httperror'),
+    HttpSuccess = require('../common/httpsuccess'),
     path = require('path'),
     fs = require('fs'),
     mkdirp = require('mkdirp'),
     db = require('./database.js'),
-    routes = require('./routes'),
+    routes = require('./routes/index.js'),
     debug = require('debug')('server:server'),
     assert = require('assert'),
     util = require('util'),

api/user.js

@@ -3,7 +3,7 @@
 var db = require('./database.js'),
     DatabaseError = db.DatabaseError,
     crypto = require('crypto'),
-    aes = require('./aes-helper'),
+    aes = require('../common/aes-helper.js'),
     util = require('util'),
     debug = require('debug')('server:user'),
     assert = require('assert'),

package.json

@@ -49,6 +49,6 @@
     "expect.js": "*"
   },
   "scripts": {
-    "test": "./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- -R spec ./test ./api/test ./api/routes/test"
+    "test": "./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- -R spec ./test ./api/test ./api/routes/test ./volume/test ./volume/routes/test"
   }
 }

volume/routes/test/volume-test.js

@@ -5,10 +5,10 @@
 /* global before:false */
 /* global after:false */
 
-var Server = require('../../server.js'),
+var Server = require('../../../api/server.js'),
     request = require('superagent'),
     expect = require('expect.js'),
-    database = require('../../database.js'),
+    database = require('../../../api/database.js'),
     crypto = require('crypto'),
     rimraf = require('rimraf'),
     path = require('path'),

volume/routes/volume.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var HttpError = require('../httperror'),
-    HttpSuccess = require('../httpsuccess'),
+var HttpError = require('../../common/httperror.js'),
+    HttpSuccess = require('../../common/httpsuccess.js'),
     async = require('async'),
-    volume = require('../volume'),
-    User = require('../user'),
+    volume = require('../volume.js'),
+    User = require('../../api/user'),
     VolumeError = volume.VolumeError;
 
 exports = module.exports = {

volume/test/volume-test.js

@@ -6,8 +6,8 @@
 /* global after:false */
 
 var volume = require('../volume.js'),
-    db = require('../database.js'),
-    User = require('../user'),
+    db = require('../../api/database.js'),
+    User = require('../../api/user.js'),
     VolumeError = volume.VolumeError,
     path = require('path'),
     mkdirp = require('mkdirp'),

volume/volume.js

@@ -1,20 +1,19 @@
 'use strict';
 
 var fs = require('fs'),
-    db = require('./database'),
-    User = require('./user'),
+    User = require('../api/user.js'),
     debug = require('debug')('server:volume'),
     encfs = require('encfs'),
     rimraf = require('rimraf'),
     path = require('path'),
     assert = require('assert'),
     uuid = require('node-uuid'),
-    aes = require('./aes-helper'),
+    aes = require('../common/aes-helper.js'),
     ursa = require('ursa'),
     async = require('async'),
     util = require('util'),
-    Repo = require('./repo'),
-    Config = require('./config'),
+    Repo = require('../api/repo'),
+    Config = require('./config.js'),
     safe = require('safetydance');
 
 exports = module.exports = {