Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-10 23:36:14 -05:00
Code Issues Activity

🎨 Move scheduling and storage in adapters/ (#8435)

Browse source 
no issue

Move `core/server/scheduling` to `core/server/adapters/scheduling` and
`core/server/storage` to `core/server/adapters/storage`
This commit is contained in:
Aileen Nowak 2017-05-15 19:52:01 +09:00 • committed by Katharina Irrgang
parent 9bea2077cf
commit 1b965fab95
24 changed files with 47 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
core/server/scheduling/SchedulingBase.js → core/server/adapters/scheduling/SchedulingBase.js
View file

4
core/server/scheduling/SchedulingDefault.js → core/server/adapters/scheduling/SchedulingDefault.js
View file

@ -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

0
core/server/scheduling/index.js → core/server/adapters/scheduling/index.js
View file

8
core/server/scheduling/post-scheduling/index.js → core/server/adapters/scheduling/post-scheduling/index.js
View file

@ -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) {

2
core/server/scheduling/utils.js → core/server/adapters/scheduling/utils.js
View file

@ -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 || {};

8
core/server/storage/LocalFileStorage.js → core/server/adapters/storage/LocalFileStorage.js
View file

@ -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 {

4
core/server/storage/index.js → core/server/adapters/storage/index.js
View file

@ -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 = {};

2
core/server/api/upload.js
View file

@ -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;
/**

2
core/server/blog/app.js
View file

@ -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

4
core/server/config/overrides.json
View file

@ -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"
},

2
core/server/data/importer/handlers/image.js
View file

@ -3,7 +3,7 @@ var _ = require('lodash'),
path = require('path'),
config = require('../../../config'),
utils = require('../../../utils'),
storage = require('../../../storage'),
storage = require('../../../adapters/storage'),
ImageHandler;

2
core/server/data/importer/importers/image.js
View file

@ -1,6 +1,6 @@
var _ = require('lodash'),
Promise = require('bluebird'),
storage = require('../../../storage'),
storage = require('../../../adapters/storage'),
replaceImage,
ImageImporter,
preProcessPosts,

2
core/server/index.js
View file

@ -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'),

2
core/server/middleware/serve-favicon.js
View file

@ -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'),

2
core/server/themes/Storage.js
View file

@ -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);
/**

4
core/test/unit/scheduling/SchedulingDefault_spec.js → core/test/unit/adapters/scheduling/SchedulingDefault_spec.js
View file

@ -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();

6
core/test/unit/scheduling/index_spec.js → core/test/unit/adapters/scheduling/index_spec.js
View file

@ -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 () {

8
core/test/unit/scheduling/post-scheduling/index_spec.js → core/test/unit/adapters/scheduling/post-scheduling/index_spec.js
View file

@ -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();

10
core/test/unit/scheduling/utils_spec.js → core/test/unit/adapters/scheduling/utils_spec.js
View file

@ -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 (){};' +

8
core/test/unit/storage/LocalFileStorage_spec.js → core/test/unit/adapters/storage/LocalFileStorage_spec.js
View file

@ -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) {

8
core/test/unit/storage/index_spec.js → core/test/unit/adapters/storage/index_spec.js
View file

@ -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};

2
core/test/unit/config/index_spec.js
View file

@ -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');
});

2
core/test/unit/importer_spec.js
View file

@ -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();

2
core/test/unit/middleware/serve-favicon_spec.js
View file

@ -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'),