From 1b965fab95067e469939c51153bc32e12b5d4660 Mon Sep 17 00:00:00 2001 From: Aileen Nowak Date: Mon, 15 May 2017 19:52:01 +0900 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=20Move=20`scheduling`=20and=20`?= =?UTF-8?q?storage`=20in=20`adapters/`=20(#8435)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no issue Move `core/server/scheduling` to `core/server/adapters/scheduling` and `core/server/storage` to `core/server/adapters/storage` --- .../server/{ => adapters}/scheduling/SchedulingBase.js | 0 .../{ => adapters}/scheduling/SchedulingDefault.js | 4 ++-- core/server/{ => adapters}/scheduling/index.js | 0 .../{ => adapters}/scheduling/post-scheduling/index.js | 8 ++++---- core/server/{ => adapters}/scheduling/utils.js | 2 +- core/server/{ => adapters}/storage/LocalFileStorage.js | 8 ++++---- core/server/{ => adapters}/storage/index.js | 4 ++-- core/server/api/upload.js | 2 +- core/server/blog/app.js | 2 +- core/server/config/overrides.json | 4 ++-- core/server/data/importer/handlers/image.js | 2 +- core/server/data/importer/importers/image.js | 2 +- core/server/index.js | 2 +- core/server/middleware/serve-favicon.js | 2 +- core/server/themes/Storage.js | 2 +- .../scheduling/SchedulingDefault_spec.js | 4 ++-- core/test/unit/{ => adapters}/scheduling/index_spec.js | 6 +++--- .../scheduling/post-scheduling/index_spec.js | 8 ++++---- core/test/unit/{ => adapters}/scheduling/utils_spec.js | 10 +++++----- .../{ => adapters}/storage/LocalFileStorage_spec.js | 8 ++++---- core/test/unit/{ => adapters}/storage/index_spec.js | 8 ++++---- core/test/unit/config/index_spec.js | 2 +- core/test/unit/importer_spec.js | 2 +- core/test/unit/middleware/serve-favicon_spec.js | 2 +- 24 files changed, 47 insertions(+), 47 deletions(-) rename core/server/{ => adapters}/scheduling/SchedulingBase.js (100%) rename core/server/{ => adapters}/scheduling/SchedulingDefault.js (98%) rename core/server/{ => adapters}/scheduling/index.js (100%) rename core/server/{ => adapters}/scheduling/post-scheduling/index.js (92%) rename core/server/{ => adapters}/scheduling/utils.js (98%) rename core/server/{ => adapters}/storage/LocalFileStorage.js (96%) rename core/server/{ => adapters}/storage/index.js (97%) rename core/test/unit/{ => adapters}/scheduling/SchedulingDefault_spec.js (98%) rename core/test/unit/{ => adapters}/scheduling/index_spec.js (80%) rename core/test/unit/{ => adapters}/scheduling/post-scheduling/index_spec.js (95%) rename core/test/unit/{ => adapters}/scheduling/utils_spec.js (91%) rename core/test/unit/{ => adapters}/storage/LocalFileStorage_spec.js (97%) rename core/test/unit/{ => adapters}/storage/index_spec.js (91%) diff --git a/core/server/scheduling/SchedulingBase.js b/core/server/adapters/scheduling/SchedulingBase.js similarity index 100% rename from core/server/scheduling/SchedulingBase.js rename to core/server/adapters/scheduling/SchedulingBase.js diff --git a/core/server/scheduling/SchedulingDefault.js b/core/server/adapters/scheduling/SchedulingDefault.js similarity index 98% rename from core/server/scheduling/SchedulingDefault.js rename to core/server/adapters/scheduling/SchedulingDefault.js index dfaf7c32f6..6bed9acf39 100644 --- a/core/server/scheduling/SchedulingDefault.js +++ b/core/server/adapters/scheduling/SchedulingDefault.js @@ -2,8 +2,8 @@ var util = require('util'), moment = require('moment'), request = require('superagent'), SchedulingBase = require(__dirname + '/SchedulingBase'), - errors = require(__dirname + '/../errors'), - logging = require(__dirname + '/../logging'); + errors = require(__dirname + '/../../errors'), + logging = require(__dirname + '/../../logging'); /** * allJobs is a sorted list by time attribute diff --git a/core/server/scheduling/index.js b/core/server/adapters/scheduling/index.js similarity index 100% rename from core/server/scheduling/index.js rename to core/server/adapters/scheduling/index.js diff --git a/core/server/scheduling/post-scheduling/index.js b/core/server/adapters/scheduling/post-scheduling/index.js similarity index 92% rename from core/server/scheduling/post-scheduling/index.js rename to core/server/adapters/scheduling/post-scheduling/index.js index f208921f55..92d03d7bbe 100644 --- a/core/server/scheduling/post-scheduling/index.js +++ b/core/server/adapters/scheduling/post-scheduling/index.js @@ -1,10 +1,10 @@ var Promise = require('bluebird'), moment = require('moment'), localUtils = require(__dirname + '/../utils'), - events = require(__dirname + '/../../events'), - errors = require(__dirname + '/../../errors'), - models = require(__dirname + '/../../models'), - schedules = require(__dirname + '/../../api/schedules'), + events = require(__dirname + '/../../../events'), + errors = require(__dirname + '/../../../errors'), + models = require(__dirname + '/../../../models'), + schedules = require(__dirname + '/../../../api/schedules'), _private = {}; _private.normalize = function normalize(options) { diff --git a/core/server/scheduling/utils.js b/core/server/adapters/scheduling/utils.js similarity index 98% rename from core/server/scheduling/utils.js rename to core/server/adapters/scheduling/utils.js index 599ad2835b..873f7ee9c3 100644 --- a/core/server/scheduling/utils.js +++ b/core/server/adapters/scheduling/utils.js @@ -1,7 +1,7 @@ var _ = require('lodash'), Promise = require('bluebird'), SchedulingBase = require(__dirname + '/SchedulingBase'), - errors = require(__dirname + '/../errors'); + errors = require(__dirname + '/../../errors'); exports.createAdapter = function (options) { options = options || {}; diff --git a/core/server/storage/LocalFileStorage.js b/core/server/adapters/storage/LocalFileStorage.js similarity index 96% rename from core/server/storage/LocalFileStorage.js rename to core/server/adapters/storage/LocalFileStorage.js index 7340a621e7..2d836d1458 100644 --- a/core/server/storage/LocalFileStorage.js +++ b/core/server/adapters/storage/LocalFileStorage.js @@ -9,10 +9,10 @@ var serveStatic = require('express').static, fs = require('fs-extra'), path = require('path'), Promise = require('bluebird'), - config = require('../config'), - errors = require('../errors'), - i18n = require('../i18n'), - utils = require('../utils'), + config = require('../../config'), + errors = require('../../errors'), + i18n = require('../../i18n'), + utils = require('../../utils'), StorageBase = require('ghost-storage-base'); class LocalFileStore extends StorageBase { diff --git a/core/server/storage/index.js b/core/server/adapters/storage/index.js similarity index 97% rename from core/server/storage/index.js rename to core/server/adapters/storage/index.js index 96a9cd682d..abc5203b11 100644 --- a/core/server/storage/index.js +++ b/core/server/adapters/storage/index.js @@ -1,5 +1,5 @@ -var errors = require('../errors'), - config = require('../config'), +var errors = require('../../errors'), + config = require('../../config'), StorageBase = require('ghost-storage-base'), _ = require('lodash'), storage = {}; diff --git a/core/server/api/upload.js b/core/server/api/upload.js index a1747525e9..e97ca89424 100644 --- a/core/server/api/upload.js +++ b/core/server/api/upload.js @@ -1,7 +1,7 @@ var Promise = require('bluebird'), fs = require('fs-extra'), pUnlink = Promise.promisify(fs.unlink), - storage = require('../storage'), + storage = require('../adapters/storage'), upload; /** diff --git a/core/server/blog/app.js b/core/server/blog/app.js index 51b95b1a0a..c839e3a3e5 100644 --- a/core/server/blog/app.js +++ b/core/server/blog/app.js @@ -3,7 +3,7 @@ var debug = require('debug')('ghost:blog'), // App requires config = require('../config'), - storage = require('../storage'), + storage = require('../adapters/storage'), utils = require('../utils'), // This should probably be an internal app diff --git a/core/server/config/overrides.json b/core/server/config/overrides.json index 68217ed511..7057e5661b 100644 --- a/core/server/config/overrides.json +++ b/core/server/config/overrides.json @@ -7,8 +7,8 @@ "adminViews": "core/server/admin/views/", "defaultViews": "core/server/views/", "internalAppPath": "core/server/apps/", - "internalStoragePath": "core/server/storage/", - "internalSchedulingPath": "core/server/scheduling/", + "internalStoragePath": "core/server/adapters/storage/", + "internalSchedulingPath": "core/server/adapters/scheduling/", "migrationPath": "core/server/data/migrations", "publicFilePath": "core/server/public" }, diff --git a/core/server/data/importer/handlers/image.js b/core/server/data/importer/handlers/image.js index 5b8c8ee9df..ceae17f00f 100644 --- a/core/server/data/importer/handlers/image.js +++ b/core/server/data/importer/handlers/image.js @@ -3,7 +3,7 @@ var _ = require('lodash'), path = require('path'), config = require('../../../config'), utils = require('../../../utils'), - storage = require('../../../storage'), + storage = require('../../../adapters/storage'), ImageHandler; diff --git a/core/server/data/importer/importers/image.js b/core/server/data/importer/importers/image.js index b239bf378b..4168a55ff1 100644 --- a/core/server/data/importer/importers/image.js +++ b/core/server/data/importer/importers/image.js @@ -1,6 +1,6 @@ var _ = require('lodash'), Promise = require('bluebird'), - storage = require('../../../storage'), + storage = require('../../../adapters/storage'), replaceImage, ImageImporter, preProcessPosts, diff --git a/core/server/index.js b/core/server/index.js index e2e1de9132..1ffcd32370 100644 --- a/core/server/index.js +++ b/core/server/index.js @@ -27,7 +27,7 @@ var debug = require('debug')('ghost:boot:init'), xmlrpc = require('./data/xml/xmlrpc'), slack = require('./data/slack'), GhostServer = require('./ghost-server'), - scheduling = require('./scheduling'), + scheduling = require('./adapters/scheduling'), settings = require('./settings'), settingsCache = require('./settings/cache'), themes = require('./themes'), diff --git a/core/server/middleware/serve-favicon.js b/core/server/middleware/serve-favicon.js index d8602e09f5..00d7e872c4 100644 --- a/core/server/middleware/serve-favicon.js +++ b/core/server/middleware/serve-favicon.js @@ -1,7 +1,7 @@ var fs = require('fs'), path = require('path'), crypto = require('crypto'), - storage = require('../storage'), + storage = require('../adapters/storage'), utils = require('../utils'), settingsCache = require('../settings/cache'), blogIconUtils = require('../utils/blog-icon'), diff --git a/core/server/themes/Storage.js b/core/server/themes/Storage.js index 596ff63e91..f530ba0025 100644 --- a/core/server/themes/Storage.js +++ b/core/server/themes/Storage.js @@ -8,7 +8,7 @@ var fs = require('fs-extra'), Promise = require('bluebird'), config = require('../config'), utils = require('../utils'), - LocalFileStorage = require('../storage/LocalFileStorage'), + LocalFileStorage = require('../adapters/storage/LocalFileStorage'), remove = Promise.promisify(fs.remove); /** diff --git a/core/test/unit/scheduling/SchedulingDefault_spec.js b/core/test/unit/adapters/scheduling/SchedulingDefault_spec.js similarity index 98% rename from core/test/unit/scheduling/SchedulingDefault_spec.js rename to core/test/unit/adapters/scheduling/SchedulingDefault_spec.js index d448dbafb4..df6576b3b6 100644 --- a/core/test/unit/scheduling/SchedulingDefault_spec.js +++ b/core/test/unit/adapters/scheduling/SchedulingDefault_spec.js @@ -1,12 +1,12 @@ var should = require('should'), sinon = require('sinon'), - config = require(__dirname + '/../../../server/config'), + config = require(__dirname + '/../../../../server/config'), moment = require('moment'), _ = require('lodash'), express = require('express'), bodyParser = require('body-parser'), http = require('http'), - SchedulingDefault = require(config.get('paths').corePath + '/server/scheduling/SchedulingDefault'), + SchedulingDefault = require(config.get('paths').corePath + '/server/adapters/scheduling/SchedulingDefault'), sandbox = sinon.sandbox.create(); diff --git a/core/test/unit/scheduling/index_spec.js b/core/test/unit/adapters/scheduling/index_spec.js similarity index 80% rename from core/test/unit/scheduling/index_spec.js rename to core/test/unit/adapters/scheduling/index_spec.js index 11a4e1cee7..ffd94fbe35 100644 --- a/core/test/unit/scheduling/index_spec.js +++ b/core/test/unit/adapters/scheduling/index_spec.js @@ -2,8 +2,8 @@ var should = require('should'), // jshint ignore:line sinon = require('sinon'), rewire = require('rewire'), Promise = require('bluebird'), - config = require(__dirname + '/../../../server/config'), - postScheduling = require(__dirname + '/../../../server/scheduling/post-scheduling'), + config = require(__dirname + '/../../../../server/config'), + postScheduling = require(__dirname + '/../../../../server/adapters/scheduling/post-scheduling'), sandbox = sinon.sandbox.create(); @@ -12,7 +12,7 @@ describe('Scheduling', function () { before(function () { sandbox.stub(postScheduling, 'init').returns(Promise.resolve()); - scope.scheduling = rewire(config.get('paths').corePath + '/server/scheduling'); + scope.scheduling = rewire(config.get('paths').corePath + '/server/adapters/scheduling'); }); after(function () { diff --git a/core/test/unit/scheduling/post-scheduling/index_spec.js b/core/test/unit/adapters/scheduling/post-scheduling/index_spec.js similarity index 95% rename from core/test/unit/scheduling/post-scheduling/index_spec.js rename to core/test/unit/adapters/scheduling/post-scheduling/index_spec.js index 61a01af430..a342a1460a 100644 --- a/core/test/unit/scheduling/post-scheduling/index_spec.js +++ b/core/test/unit/adapters/scheduling/post-scheduling/index_spec.js @@ -2,15 +2,15 @@ var should = require('should'), sinon = require('sinon'), Promise = require('bluebird'), moment = require('moment'), - config = require(__dirname + '/../../../../server/config'), + config = require(__dirname + '/../../../../../server/config'), testUtils = require(config.get('paths').corePath + '/test/utils'), errors = require(config.get('paths').corePath + '/server/errors'), events = require(config.get('paths').corePath + '/server/events'), models = require(config.get('paths').corePath + '/server/models'), api = require(config.get('paths').corePath + '/server/api'), - schedulingUtils = require(config.get('paths').corePath + '/server/scheduling/utils'), - SchedulingDefault = require(config.get('paths').corePath + '/server/scheduling/SchedulingDefault'), - postScheduling = require(config.get('paths').corePath + '/server/scheduling/post-scheduling'), + schedulingUtils = require(config.get('paths').corePath + '/server/adapters/scheduling/utils'), + SchedulingDefault = require(config.get('paths').corePath + '/server/adapters/scheduling/SchedulingDefault'), + postScheduling = require(config.get('paths').corePath + '/server/adapters/scheduling/post-scheduling'), sandbox = sinon.sandbox.create(); diff --git a/core/test/unit/scheduling/utils_spec.js b/core/test/unit/adapters/scheduling/utils_spec.js similarity index 91% rename from core/test/unit/scheduling/utils_spec.js rename to core/test/unit/adapters/scheduling/utils_spec.js index adf3424591..bf5aaa5192 100644 --- a/core/test/unit/scheduling/utils_spec.js +++ b/core/test/unit/adapters/scheduling/utils_spec.js @@ -1,14 +1,14 @@ var should = require('should'), fs = require('fs'), - config = require(__dirname + '/../../../server/config'), + config = require(__dirname + '/../../../../server/config'), errors = require(config.get('paths').corePath + '/server/errors'), - schedulingUtils = require(config.get('paths').corePath + '/server/scheduling/utils'); + schedulingUtils = require(config.get('paths').corePath + '/server/adapters/scheduling/utils'); describe('Scheduling: utils', function () { describe('success', function () { it('create good adapter', function (done) { schedulingUtils.createAdapter({ - active: __dirname + '/../../../server/scheduling/SchedulingDefault' + active: __dirname + '/../../../../server/adapters/scheduling/SchedulingDefault' }).then(function (adapter) { should.exist(adapter); done(); @@ -18,7 +18,7 @@ describe('Scheduling: utils', function () { it('create good adapter', function (done) { var jsFile = '' + 'var util = require(\'util\');' + - 'var SchedulingBase = require(__dirname + \'/../../../server/scheduling/SchedulingBase\');' + + 'var SchedulingBase = require(__dirname + \'/../../../../server/adapters/scheduling/SchedulingBase\');' + 'var AnotherAdapter = function (){ SchedulingBase.call(this); };' + 'util.inherits(AnotherAdapter, SchedulingBase);' + 'AnotherAdapter.prototype.run = function (){};' + @@ -62,7 +62,7 @@ describe('Scheduling: utils', function () { it('create with adapter, but missing fn\'s', function (done) { var jsFile = '' + 'var util = require(\'util\');' + - 'var SchedulingBase = require(__dirname + \'/../../../server/scheduling/SchedulingBase\');' + + 'var SchedulingBase = require(__dirname + \'/../../../../server/adapters/scheduling/SchedulingBase\');' + 'var BadAdapter = function (){ SchedulingBase.call(this); };' + 'util.inherits(BadAdapter, SchedulingBase);' + 'BadAdapter.prototype.schedule = function (){};' + diff --git a/core/test/unit/storage/LocalFileStorage_spec.js b/core/test/unit/adapters/storage/LocalFileStorage_spec.js similarity index 97% rename from core/test/unit/storage/LocalFileStorage_spec.js rename to core/test/unit/adapters/storage/LocalFileStorage_spec.js index 1526197330..c462436a55 100644 --- a/core/test/unit/storage/LocalFileStorage_spec.js +++ b/core/test/unit/adapters/storage/LocalFileStorage_spec.js @@ -3,11 +3,11 @@ var should = require('should'), // jshint ignore:line fs = require('fs-extra'), moment = require('moment'), path = require('path'), - errors = require('../../../server/errors'), - LocalFileStore = require('../../../server/storage/LocalFileStorage'), + errors = require('../../../../server/errors'), + LocalFileStore = require('../../../../server/adapters/storage/LocalFileStorage'), localFileStore, - configUtils = require('../../utils/configUtils'), + configUtils = require('../../../utils/configUtils'), sandbox = sinon.sandbox.create(); @@ -150,7 +150,7 @@ describe('Local File System Storage', function () { describe('read image', function () { beforeEach(function () { // we have some example images in our test utils folder - localFileStore.storagePath = path.join(__dirname, '../../utils/fixtures/images/'); + localFileStore.storagePath = path.join(__dirname, '../../../utils/fixtures/images/'); }); it('success', function (done) { diff --git a/core/test/unit/storage/index_spec.js b/core/test/unit/adapters/storage/index_spec.js similarity index 91% rename from core/test/unit/storage/index_spec.js rename to core/test/unit/adapters/storage/index_spec.js index eb08ae06e6..3e5b99c046 100644 --- a/core/test/unit/storage/index_spec.js +++ b/core/test/unit/adapters/storage/index_spec.js @@ -1,10 +1,10 @@ var should = require('should'), // jshint ignore:line fs = require('fs-extra'), StorageBase = require('ghost-storage-base'), - configUtils = require('../../utils/configUtils'), - storage = require('../../../server/storage'), - errors = require('../../../server/errors'), - LocalFileStorage = require('../../../server/storage/LocalFileStorage'); + configUtils = require('../../../utils/configUtils'), + storage = require('../../../../server/adapters/storage'), + errors = require('../../../../server/errors'), + LocalFileStorage = require('../../../../server/adapters/storage/LocalFileStorage'); describe('storage: index_spec', function () { var scope = {adapter: null}; diff --git a/core/test/unit/config/index_spec.js b/core/test/unit/config/index_spec.js index 3ee8306e56..2ff48a30ec 100644 --- a/core/test/unit/config/index_spec.js +++ b/core/test/unit/config/index_spec.js @@ -116,7 +116,7 @@ describe('Config', function () { describe('Storage', function () { it('should default to local-file-store', function () { - configUtils.config.get('paths').should.have.property('internalStoragePath', path.join(configUtils.config.get('paths').corePath, '/server/storage/')); + configUtils.config.get('paths').should.have.property('internalStoragePath', path.join(configUtils.config.get('paths').corePath, '/server/adapters/storage/')); configUtils.config.get('storage').should.have.property('active', 'LocalFileStorage'); }); diff --git a/core/test/unit/importer_spec.js b/core/test/unit/importer_spec.js index 21b3ce0986..51af57f794 100644 --- a/core/test/unit/importer_spec.js +++ b/core/test/unit/importer_spec.js @@ -15,7 +15,7 @@ var should = require('should'), DataImporter = require('../../server/data/importer/importers/data'), ImageImporter = require('../../server/data/importer/importers/image'), - storage = require('../../server/storage'), + storage = require('../../server/adapters/storage'), configUtils = require('../utils/configUtils'), sandbox = sinon.sandbox.create(); diff --git a/core/test/unit/middleware/serve-favicon_spec.js b/core/test/unit/middleware/serve-favicon_spec.js index e548150734..ebe4d590af 100644 --- a/core/test/unit/middleware/serve-favicon_spec.js +++ b/core/test/unit/middleware/serve-favicon_spec.js @@ -3,7 +3,7 @@ var should = require('should'), // jshint ignore:line express = require('express'), serveFavicon = require('../../../server/middleware/serve-favicon'), settingsCache = require('../../../server/settings/cache'), - storage = require('../../../server/storage'), + storage = require('../../../server/adapters/storage'), configUtils = require('../../utils/configUtils'), path = require('path'),