mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-03-11 02:12:21 -05:00
Moved labs, auth, permissions, settings, mail, themes to services (#9339)
refs #9178 - move tests as well
This commit is contained in:
parent
2bfff4ecc2
commit
192ebb1739
142 changed files with 184 additions and 188 deletions
|
@ -2,7 +2,7 @@ var Promise = require('bluebird'),
|
|||
_ = require('lodash'),
|
||||
validator = require('validator'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
mail = require('./../mail'),
|
||||
mail = require('../services/mail'),
|
||||
globalUtils = require('../utils'),
|
||||
urlService = require('../services/url'),
|
||||
localUtils = require('./utils'),
|
||||
|
|
|
@ -5,7 +5,7 @@ var Promise = require('bluebird'),
|
|||
urlService = require('../services/url'),
|
||||
models = require('../models'),
|
||||
config = require('../config'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
settingsCache = require('../services/settings/cache'),
|
||||
ghostVersion = require('../utils/ghost-version'),
|
||||
configuration;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
mail = require('./../mail'),
|
||||
mail = require('../services/mail'),
|
||||
globalUtils = require('../utils'),
|
||||
urlService = require('../services/url'),
|
||||
localUtils = require('./utils'),
|
||||
|
|
|
@ -6,7 +6,7 @@ var Promise = require('bluebird'),
|
|||
localUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
mail = require('../mail'),
|
||||
mail = require('../services/mail'),
|
||||
notificationsAPI = require('./notifications'),
|
||||
docName = 'mail',
|
||||
mailer,
|
||||
|
|
|
@ -4,7 +4,7 @@ var Promise = require('bluebird'),
|
|||
_ = require('lodash'),
|
||||
ObjectId = require('bson-objectid'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
permissions = require('../permissions'),
|
||||
permissions = require('../services/permissions'),
|
||||
canThis = permissions.canThis,
|
||||
localUtils = require('./utils'),
|
||||
common = require('../lib/common'),
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
var Promise = require('bluebird'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
canThis = require('../permissions').canThis,
|
||||
canThis = require('../services/permissions').canThis,
|
||||
models = require('../models'),
|
||||
docName = 'roles',
|
||||
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
models = require('../models'),
|
||||
canThis = require('../permissions').canThis,
|
||||
canThis = require('../services/permissions').canThis,
|
||||
localUtils = require('./utils'),
|
||||
common = require('../lib/common'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
settingsCache = require('../services/settings/cache'),
|
||||
docName = 'settings',
|
||||
settings,
|
||||
settingsFilter,
|
||||
|
|
|
@ -6,8 +6,8 @@ var debug = require('ghost-ignition').debug('api:themes'),
|
|||
localUtils = require('./utils'),
|
||||
common = require('../lib/common'),
|
||||
settingsModel = require('../models/settings').Settings,
|
||||
settingsCache = require('../settings/cache'),
|
||||
themeUtils = require('../themes'),
|
||||
settingsCache = require('../services/settings/cache'),
|
||||
themeUtils = require('../services/themes'),
|
||||
themeList = themeUtils.list,
|
||||
themes;
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ var Promise = require('bluebird'),
|
|||
_ = require('lodash'),
|
||||
pipeline = require('../lib/promise/pipeline'),
|
||||
localUtils = require('./utils'),
|
||||
canThis = require('../permissions').canThis,
|
||||
canThis = require('../services/permissions').canThis,
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
docName = 'users',
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
path = require('path'),
|
||||
permissions = require('../permissions'),
|
||||
permissions = require('../services/permissions'),
|
||||
validation = require('../data/validation'),
|
||||
common = require('../lib/common'),
|
||||
utils;
|
||||
|
|
|
@ -3,7 +3,7 @@ var router = require('./lib/router'),
|
|||
|
||||
// Dirty requires
|
||||
config = require('../../config'),
|
||||
settingsCache = require('../../settings/cache');
|
||||
settingsCache = require('../../services/settings/cache');
|
||||
|
||||
module.exports = {
|
||||
activate: function activate(ghost) {
|
||||
|
|
|
@ -6,7 +6,7 @@ var fs = require('fs-extra'),
|
|||
urlService = require('../../../services/url'),
|
||||
globalUtils = require('../../../utils'),
|
||||
common = require('../../../lib/common'),
|
||||
settingsCache = require('../../../settings/cache'),
|
||||
settingsCache = require('../../../services/settings/cache'),
|
||||
privateRoute = '/' + config.get('routeKeywords').private + '/',
|
||||
privateBlogging;
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ var router = require('./lib/router'),
|
|||
|
||||
// Dirty requires
|
||||
config = require('../../config'),
|
||||
labs = require('../../utils/labs');
|
||||
labs = require('../../services/labs');
|
||||
|
||||
module.exports = {
|
||||
activate: function activate(ghost) {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
// Dirty requires!
|
||||
var labs = require('../../../../utils/labs');
|
||||
var labs = require('../../../../services/labs');
|
||||
|
||||
module.exports = function registerHelpers(ghost) {
|
||||
ghost.helpers.register('input_email', require('./input_email'));
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
*/
|
||||
|
||||
var config = require('../../config'),
|
||||
labs = require('../../utils/labs'),
|
||||
labs = require('../../services/labs'),
|
||||
|
||||
// Context patterns, should eventually come from Channel configuration
|
||||
privatePattern = new RegExp('^\\/' + config.get('routeKeywords').private + '\\/'),
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
var api = require('../../api'),
|
||||
_ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
themes = require('../../themes'),
|
||||
themes = require('../../services/themes'),
|
||||
queryDefaults,
|
||||
defaultPostQuery = {};
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ var _ = require('lodash'),
|
|||
url = require('url'),
|
||||
routeMatch = require('path-match')(),
|
||||
api = require('../../api'),
|
||||
settingsCache = require('../../settings/cache'),
|
||||
settingsCache = require('../../services/settings/cache'),
|
||||
optionsFormat = '/:options?';
|
||||
|
||||
function getOptionsFormat(linkStructure) {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
var _ = require('lodash'),
|
||||
path = require('path'),
|
||||
config = require('../../config'),
|
||||
themes = require('../../themes'),
|
||||
themes = require('../../services/themes'),
|
||||
_private = {};
|
||||
|
||||
/**
|
||||
|
|
|
@ -2,7 +2,7 @@ var _ = require('lodash'),
|
|||
url = require('url'),
|
||||
common = require('../lib/common'),
|
||||
safeString = require('../utils').safeString,
|
||||
settingsCache = require('../settings/cache'),
|
||||
settingsCache = require('../services/settings/cache'),
|
||||
|
||||
// Slightly less ugly temporary hack for location of things
|
||||
fetchData = require('./frontend/fetch-data'),
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var urlService = require('../../services/url'),
|
||||
settingsCache = require('../../settings/cache'),
|
||||
settingsCache = require('../../services/settings/cache'),
|
||||
blogIconUtils = require('../../utils/blog-icon');
|
||||
|
||||
function getBlogLogo() {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
var settingsCache = require('../../settings/cache'),
|
||||
var settingsCache = require('../../services/settings/cache'),
|
||||
_ = require('lodash');
|
||||
|
||||
function getContextObject(data, context) {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var _ = require('lodash'),
|
||||
settingsCache = require('../../settings/cache');
|
||||
settingsCache = require('../../services/settings/cache');
|
||||
|
||||
function getDescription(data, root, options) {
|
||||
var description = '',
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var Promise = require('bluebird'),
|
||||
settingsCache = require('../../settings/cache'),
|
||||
settingsCache = require('../../services/settings/cache'),
|
||||
urlService = require('../../services/url'),
|
||||
common = require('../../lib/common'),
|
||||
getUrl = require('./url'),
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var config = require('../../config'),
|
||||
escapeExpression = require('../../themes/engine').escapeExpression,
|
||||
escapeExpression = require('../../services/themes/engine').escapeExpression,
|
||||
socialUrls = require('../../utils/social-urls'),
|
||||
_ = require('lodash');
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var _ = require('lodash'),
|
||||
settingsCache = require('../../settings/cache');
|
||||
settingsCache = require('../../services/settings/cache');
|
||||
|
||||
function getTitle(data, root, options) {
|
||||
var title = '',
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
var _ = require('lodash'),
|
||||
utils = require('../../../schema/fixtures/utils'),
|
||||
permissions = require('../../../../permissions'),
|
||||
permissions = require('../../../../services/permissions'),
|
||||
common = require('../../../../lib/common'),
|
||||
resource = 'theme',
|
||||
_private = {};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
var _ = require('lodash'),
|
||||
utils = require('../../../schema/fixtures/utils'),
|
||||
permissions = require('../../../../permissions'),
|
||||
permissions = require('../../../../services/permissions'),
|
||||
logging = require('../../../../lib/common/logging'),
|
||||
resource = 'webhook',
|
||||
_private = {};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
var _ = require('lodash'),
|
||||
utils = require('../../../schema/fixtures/utils'),
|
||||
permissions = require('../../../../permissions'),
|
||||
permissions = require('../../../../services/permissions'),
|
||||
common = require('../../../../lib/common'),
|
||||
resource = 'redirect',
|
||||
_private = {};
|
||||
|
|
|
@ -5,7 +5,7 @@ var schema = require('../schema').tables,
|
|||
assert = require('assert'),
|
||||
Promise = require('bluebird'),
|
||||
common = require('../../lib/common'),
|
||||
settingsCache = require('../../settings/cache'),
|
||||
settingsCache = require('../../services/settings/cache'),
|
||||
urlService = require('../../services/url'),
|
||||
|
||||
validatePassword,
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
// This file defines everything that helpers "require"
|
||||
// With the exception of modules like lodash, Bluebird
|
||||
// We can later refactor to enforce this something like we do in apps
|
||||
var hbs = require('../themes/engine'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
var hbs = require('../services/themes/engine'),
|
||||
settingsCache = require('../services/settings/cache'),
|
||||
config = require('../config');
|
||||
|
||||
// Direct requires:
|
||||
|
@ -42,7 +42,7 @@ module.exports = {
|
|||
},
|
||||
|
||||
// Labs utils for enabling/disabling helpers
|
||||
labs: require('../utils/labs'),
|
||||
labs: require('../services/labs'),
|
||||
|
||||
// System for apps to hook into one day maybe
|
||||
filters: require('../filters'),
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
var hbs = require('../themes/engine'),
|
||||
var hbs = require('../services/themes/engine'),
|
||||
Promise = require('bluebird'),
|
||||
config = require('../config'),
|
||||
proxy = require('./proxy');
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
var templates = {},
|
||||
_ = require('lodash'),
|
||||
proxy = require('./proxy'),
|
||||
hbs = require('../themes/engine');
|
||||
hbs = require('../services/themes/engine');
|
||||
|
||||
// ## Template utils
|
||||
|
||||
|
|
|
@ -18,13 +18,13 @@ var debug = require('ghost-ignition').debug('boot:init'),
|
|||
Promise = require('bluebird'),
|
||||
common = require('./lib/common'),
|
||||
models = require('./models'),
|
||||
permissions = require('./permissions'),
|
||||
auth = require('./auth'),
|
||||
permissions = require('./services/permissions'),
|
||||
auth = require('./services/auth'),
|
||||
dbHealth = require('./data/db/health'),
|
||||
GhostServer = require('./ghost-server'),
|
||||
scheduling = require('./adapters/scheduling'),
|
||||
settings = require('./settings'),
|
||||
themes = require('./themes'),
|
||||
settings = require('./services/settings'),
|
||||
themes = require('./services/themes'),
|
||||
urlService = require('./services/url'),
|
||||
|
||||
// Services that need initialisation
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
var config = require('../../config/index'),
|
||||
var config = require('../../config'),
|
||||
logging = require('ghost-ignition').logging;
|
||||
|
||||
module.exports = logging({
|
||||
|
|
|
@ -4,7 +4,7 @@ var debug = require('ghost-ignition').debug('services:apps'),
|
|||
api = require('../../api'),
|
||||
common = require('../../lib/common'),
|
||||
config = require('../../config'),
|
||||
settingsCache = require('../../settings/cache'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
loader = require('./loader'),
|
||||
// Internal APps are in config
|
||||
internalApps = config.get('apps:internal'),
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
var _ = require('lodash'),
|
||||
models = require('../models'),
|
||||
globalUtils = require('../utils'),
|
||||
common = require('../lib/common'),
|
||||
models = require('../../models'),
|
||||
globalUtils = require('../../utils'),
|
||||
common = require('../../lib/common'),
|
||||
strategies;
|
||||
|
||||
strategies = {
|
|
@ -1,7 +1,7 @@
|
|||
var passport = require('passport'),
|
||||
authUtils = require('./utils'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
models = require('../../models'),
|
||||
common = require('../../lib/common'),
|
||||
authenticate;
|
||||
|
||||
authenticate = {
|
|
@ -1,5 +1,5 @@
|
|||
var labs = require('../utils/labs'),
|
||||
common = require('../lib/common'),
|
||||
var labs = require('../labs'),
|
||||
common = require('../../lib/common'),
|
||||
authorize;
|
||||
|
||||
authorize = {
|
|
@ -1,11 +1,11 @@
|
|||
var oauth2orize = require('oauth2orize'),
|
||||
_ = require('lodash'),
|
||||
passport = require('passport'),
|
||||
models = require('../models'),
|
||||
models = require('../../models'),
|
||||
authUtils = require('./utils'),
|
||||
spamPrevention = require('../web/middleware/api/spam-prevention'),
|
||||
common = require('../lib/common'),
|
||||
knex = require('../data/db').knex,
|
||||
spamPrevention = require('../../web/middleware/api/spam-prevention'),
|
||||
common = require('../../lib/common'),
|
||||
knex = require('../../data/db').knex,
|
||||
oauthServer,
|
||||
oauth;
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
var Promise = require('bluebird'),
|
||||
_ = require('lodash'),
|
||||
debug = require('ghost-ignition').debug('auth:utils'),
|
||||
models = require('../models'),
|
||||
globalUtils = require('../utils'),
|
||||
knex = require('../data/db').knex,
|
||||
models = require('../../models'),
|
||||
globalUtils = require('../../utils'),
|
||||
knex = require('../../data/db').knex,
|
||||
_private = {};
|
||||
|
||||
/**
|
|
@ -1,7 +1,7 @@
|
|||
var settingsCache = require('../settings/cache'),
|
||||
var settingsCache = require('./settings/cache'),
|
||||
_ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
SafeString = require('../themes/engine').SafeString,
|
||||
SafeString = require('./themes/engine').SafeString,
|
||||
common = require('../lib/common'),
|
||||
labs = module.exports = {};
|
||||
|
|
@ -3,10 +3,10 @@
|
|||
var _ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
validator = require('validator'),
|
||||
config = require('../config'),
|
||||
common = require('../lib/common'),
|
||||
config = require('../../config'),
|
||||
common = require('../../lib/common'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
urlService = require('../services/url');
|
||||
urlService = require('../url');
|
||||
|
||||
function GhostMailer() {
|
||||
var nodemailer = require('nodemailer'),
|
|
@ -2,7 +2,7 @@ var _ = require('lodash').runInContext(),
|
|||
fs = require('fs-extra'),
|
||||
path = require('path'),
|
||||
htmlToText = require('html-to-text'),
|
||||
urlService = require('../services/url'),
|
||||
urlService = require('../url'),
|
||||
templatesDir = path.resolve(__dirname, '..', 'mail', 'templates');
|
||||
|
||||
_.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
|
|
@ -1,7 +1,7 @@
|
|||
var _ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common'),
|
||||
models = require('../../models'),
|
||||
common = require('../../lib/common'),
|
||||
providers = require('./providers'),
|
||||
parseContext = require('./parse-context'),
|
||||
actionsMap = require('./actions-map-cache'),
|
|
@ -1,7 +1,7 @@
|
|||
// canThis(someUser).edit.posts([id]|[[ids]])
|
||||
// canThis(someUser).edit.post(somePost|somePostId)
|
||||
|
||||
var models = require('../models'),
|
||||
var models = require('../../models'),
|
||||
actionsMap = require('./actions-map-cache'),
|
||||
init;
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
var _ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
models = require('../models'),
|
||||
common = require('../lib/common');
|
||||
models = require('../../models'),
|
||||
common = require('../../lib/common');
|
||||
|
||||
module.exports = {
|
||||
user: function (id) {
|
|
@ -1,6 +1,6 @@
|
|||
var _ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
common = require('../lib/common'),
|
||||
common = require('../../lib/common'),
|
||||
parseContext = require('./parse-context'),
|
||||
_private = {};
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
// circular dependency bugs.
|
||||
var debug = require('ghost-ignition').debug('settings:cache'),
|
||||
_ = require('lodash'),
|
||||
common = require('../lib/common'),
|
||||
common = require('../../lib/common'),
|
||||
/**
|
||||
* ## Cache
|
||||
* Holds cached settings
|
|
@ -3,7 +3,7 @@
|
|||
* A collection of utilities for handling settings including a cache
|
||||
*/
|
||||
|
||||
var SettingsModel = require('../models/settings').Settings,
|
||||
var SettingsModel = require('../../models/settings').Settings,
|
||||
SettingsCache = require('./cache');
|
||||
|
||||
module.exports = {
|
|
@ -3,7 +3,7 @@ var https = require('https'),
|
|||
common = require('../lib/common'),
|
||||
urlService = require('../services/url'),
|
||||
blogIconUtils = require('../utils/blog-icon'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
settingsCache = require('./settings/cache'),
|
||||
schema = require('../data/schema').checks,
|
||||
defaultPostSlugs = [
|
||||
'welcome',
|
||||
|
|
|
@ -4,9 +4,9 @@ var fs = require('fs-extra'),
|
|||
os = require('os'),
|
||||
path = require('path'),
|
||||
Promise = require('bluebird'),
|
||||
config = require('../config'),
|
||||
globalUtils = require('../utils'),
|
||||
LocalFileStorage = require('../adapters/storage/LocalFileStorage');
|
||||
config = require('../../config'),
|
||||
globalUtils = require('../../utils'),
|
||||
LocalFileStorage = require('../../adapters/storage/LocalFileStorage');
|
||||
|
||||
/**
|
||||
* @TODO: combine with loader.js?
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
var join = require('path').join,
|
||||
themeConfig = require('./config'),
|
||||
config = require('../config'),
|
||||
config = require('../../config'),
|
||||
engine = require('./engine'),
|
||||
// Current instance of ActiveTheme
|
||||
currentActiveTheme;
|
|
@ -1,5 +1,5 @@
|
|||
var hbs = require('express-hbs'),
|
||||
config = require('../config'),
|
||||
config = require('../../config'),
|
||||
instance = hbs.create();
|
||||
|
||||
// @TODO think about a config option for this e.g. theme.devmode?
|
|
@ -1,5 +1,5 @@
|
|||
var debug = require('ghost-ignition').debug('themes'),
|
||||
common = require('../lib/common'),
|
||||
common = require('../../lib/common'),
|
||||
themeLoader = require('./loader'),
|
||||
active = require('./active'),
|
||||
validate = require('./validate'),
|
|
@ -1,7 +1,7 @@
|
|||
var debug = require('ghost-ignition').debug('themes:loader'),
|
||||
config = require('../config'),
|
||||
config = require('../../config'),
|
||||
themeList = require('./list'),
|
||||
read = require('../utils/packages').read,
|
||||
read = require('../../utils/packages').read,
|
||||
loadAllThemes,
|
||||
loadOneTheme;
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
var _ = require('lodash'),
|
||||
hbs = require('./engine'),
|
||||
urlService = require('../services/url'),
|
||||
config = require('../config'),
|
||||
common = require('../lib/common'),
|
||||
urlService = require('../url'),
|
||||
config = require('../../config'),
|
||||
common = require('../../lib/common'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
activeTheme = require('./active'),
|
||||
themeMiddleware = {};
|
|
@ -1,7 +1,7 @@
|
|||
var _ = require('lodash'),
|
||||
themeList = require('./list'),
|
||||
active = require('./active'),
|
||||
packages = require('../utils/packages'),
|
||||
packages = require('../../utils/packages'),
|
||||
settingsCache = require('../settings/cache');
|
||||
|
||||
/**
|
|
@ -1,6 +1,6 @@
|
|||
var Promise = require('bluebird'),
|
||||
config = require('../config'),
|
||||
common = require('../lib/common'),
|
||||
config = require('../../config'),
|
||||
common = require('../../lib/common'),
|
||||
checkTheme;
|
||||
|
||||
checkTheme = function checkTheme(theme, isZip) {
|
|
@ -4,8 +4,8 @@
|
|||
var moment = require('moment-timezone'),
|
||||
_ = require('lodash'),
|
||||
url = require('url'),
|
||||
config = require('../../config/index'),
|
||||
settingsCache = require('../../settings/cache'),
|
||||
config = require('../../config'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
// @TODO: unify this with the path in server/app.js
|
||||
API_PATH = '/ghost/api/v0.1/',
|
||||
STATIC_IMAGE_URL_PREFIX = 'content/images';
|
||||
|
|
|
@ -4,7 +4,7 @@ var _ = require('lodash'),
|
|||
config = require('../config'),
|
||||
urlService = require('../services/url'),
|
||||
common = require('../lib/common'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
settingsCache = require('./settings/cache'),
|
||||
|
||||
defaultPostSlugs = [
|
||||
'welcome',
|
||||
|
|
|
@ -3,7 +3,7 @@ var sizeOf = require('image-size'),
|
|||
_ = require('lodash'),
|
||||
path = require('path'),
|
||||
common = require('../lib/common'),
|
||||
settingsCache = require('../settings/cache'),
|
||||
settingsCache = require('../services/settings/cache'),
|
||||
config = require('../config'),
|
||||
urlService = require('../services/url'),
|
||||
storageUtils = require('../adapters/storage/utils'),
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
var prettyURLs = require('../middleware/pretty-urls'),
|
||||
cors = require('../middleware/api/cors'),
|
||||
urlRedirects = require('../middleware/url-redirects'),
|
||||
auth = require('../../auth');
|
||||
auth = require('../../services/auth');
|
||||
|
||||
/**
|
||||
* Auth Middleware Packages
|
||||
|
|
|
@ -6,7 +6,7 @@ var express = require('express'),
|
|||
mw = require('./middleware'),
|
||||
|
||||
// API specific
|
||||
auth = require('../../auth'),
|
||||
auth = require('../../services/auth'),
|
||||
cors = require('../middleware/api/cors'),
|
||||
brute = require('../middleware/brute'),
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
var api = require('../../api'),
|
||||
labs = require('../../utils/labs'),
|
||||
labs = require('../../services/labs'),
|
||||
common = require('../../lib/common');
|
||||
|
||||
module.exports = function getFrontendClient(req, res, next) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
var labsUtil = require('../../utils/labs'),
|
||||
var labsUtil = require('../../services/labs'),
|
||||
common = require('../../lib/common'),
|
||||
labs;
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ var fs = require('fs-extra'),
|
|||
storage = require('../../adapters/storage'),
|
||||
urlService = require('../../services/url'),
|
||||
config = require('../../config'),
|
||||
settingsCache = require('../../settings/cache'),
|
||||
settingsCache = require('../../services/settings/cache'),
|
||||
blogIconUtils = require('../../utils/blog-icon'),
|
||||
buildContentResponse,
|
||||
content;
|
||||
|
|
|
@ -2,7 +2,7 @@ var _ = require('lodash'),
|
|||
express = require('express'),
|
||||
path = require('path'),
|
||||
config = require('../../config'),
|
||||
themeUtils = require('../../themes'),
|
||||
themeUtils = require('../../services/themes'),
|
||||
utils = require('../../utils');
|
||||
|
||||
function isBlackListedFileType(file) {
|
||||
|
|
|
@ -30,7 +30,7 @@ var debug = require('ghost-ignition').debug('blog'),
|
|||
adminRedirects = require('../middleware/admin-redirects'),
|
||||
|
||||
// middleware for themes
|
||||
themeMiddleware = require('../../themes').middleware;
|
||||
themeMiddleware = require('../../services/themes').middleware;
|
||||
|
||||
module.exports = function setupSiteApp() {
|
||||
debug('Site setup start');
|
||||
|
|
|
@ -2,7 +2,7 @@ var supertest = require('supertest'),
|
|||
should = require('should'),
|
||||
sinon = require('sinon'),
|
||||
testUtils = require('../../../../utils'),
|
||||
labs = require('../../../../../server/utils/labs'),
|
||||
labs = require('../../../../../server/services/labs'),
|
||||
config = require('../../../../../server/config'),
|
||||
ghost = testUtils.startGhost,
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
|
|
@ -8,7 +8,7 @@ var should = require('should'),
|
|||
testUtils = require('../../utils'),
|
||||
cheerio = require('cheerio'),
|
||||
config = require('../../../../core/server/config'),
|
||||
settingsCache = require('../../../../core/server/settings/cache'),
|
||||
settingsCache = require('../../../server/services/settings/cache'),
|
||||
ghost = testUtils.startGhost,
|
||||
sandbox = sinon.sandbox.create(),
|
||||
request;
|
||||
|
|
|
@ -11,7 +11,7 @@ var should = require('should'),
|
|||
testUtils = require('../../utils'),
|
||||
configUtils = require('../../utils/configUtils'),
|
||||
config = require('../../../server/config'),
|
||||
settingsCache = require('../../../server/settings/cache'),
|
||||
settingsCache = require('../../../server/services/settings/cache'),
|
||||
origCache = _.cloneDeep(settingsCache),
|
||||
ghost = testUtils.startGhost,
|
||||
request,
|
||||
|
|
|
@ -9,7 +9,7 @@ var should = require('should'),
|
|||
db = require('../../../server/data/db'),
|
||||
models = require('../../../server/models'),
|
||||
PostAPI = require('../../../server/api/posts'),
|
||||
settingsCache = require('../../../server/settings/cache'),
|
||||
settingsCache = require('../../../server/services/settings/cache'),
|
||||
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ var should = require('should'),
|
|||
|
||||
// Stuff we are testing
|
||||
SettingsAPI = require('../../../server/api/settings'),
|
||||
settingsCache = require('../../../server/settings/cache'),
|
||||
settingsCache = require('../../../server/services/settings/cache'),
|
||||
defaultContext = {user: 1},
|
||||
internalContext = {internal: true},
|
||||
callApiWithContext,
|
||||
|
|
|
@ -5,7 +5,7 @@ var should = require('should'),
|
|||
_ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
sequence = require('../../../server/lib/promise/sequence'),
|
||||
settingsCache = require('../../../server/settings/cache'),
|
||||
settingsCache = require('../../../server/services/settings/cache'),
|
||||
ghostBookshelf = require('../../../server/models/base'),
|
||||
PostModel = require('../../../server/models/post').Post,
|
||||
TagModel = require('../../../server/models/tag').Tag,
|
||||
|
|
|
@ -6,7 +6,7 @@ var should = require('should'),
|
|||
configUtils = require('../utils/configUtils'),
|
||||
packageInfo = require('../../../package'),
|
||||
updateCheck = rewire('../../server/update-check'),
|
||||
settingsCache = require('../../server/settings/cache'),
|
||||
settingsCache = require('../../server/services/settings/cache'),
|
||||
NotificationsAPI = require('../../server/api/notifications');
|
||||
|
||||
describe('Update Check', function () {
|
||||
|
|
|
@ -3,7 +3,7 @@ var should = require('should'),
|
|||
_ = require('lodash'),
|
||||
Promise = require('bluebird'),
|
||||
ObjectId = require('bson-objectid'),
|
||||
permissions = require('../../../server/permissions'),
|
||||
permissions = require('../../../server/services/permissions'),
|
||||
common = require('../../../server/lib/common'),
|
||||
apiUtils = require('../../../server/api/utils'),
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ var should = require('should'),
|
|||
ampController = rewire('../../../../server/apps/amp/lib/router'),
|
||||
common = require('../../../../server/lib/common'),
|
||||
configUtils = require('../../../utils/configUtils'),
|
||||
themes = require('../../../../server/themes'),
|
||||
themes = require('../../../../server/services/themes'),
|
||||
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ var should = require('should'),
|
|||
sinon = require('sinon'),
|
||||
path = require('path'),
|
||||
configUtils = require('../../../utils/configUtils'),
|
||||
themes = require('../../../../server/themes'),
|
||||
themes = require('../../../../server/services/themes'),
|
||||
privateController = require('../../../../server/apps/private-blogging/lib/router'),
|
||||
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
|
|
@ -4,7 +4,7 @@ var should = require('should'), // jshint ignore:line
|
|||
crypto = require('crypto'),
|
||||
fs = require('fs-extra'),
|
||||
common = require('../../../../server/lib/common'),
|
||||
settingsCache = require('../../../../server/settings/cache'),
|
||||
settingsCache = require('../../../../server/services/settings/cache'),
|
||||
privateBlogging = require('../../../../server/apps/private-blogging/lib/middleware'),
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
||||
|
|
|
@ -11,8 +11,8 @@ var should = require('should'),
|
|||
// Server requires
|
||||
api = require('../../../server/api'),
|
||||
controllers = require('../../../server/controllers'),
|
||||
themes = require('../../../server/themes'),
|
||||
settingsCache = require('../../../server/settings/cache'),
|
||||
themes = require('../../../server/services/themes'),
|
||||
settingsCache = require('../../../server/services/settings/cache'),
|
||||
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ var should = require('should'),
|
|||
// Stuff we are testing
|
||||
channelUtils = require('../../../utils/channelUtils'),
|
||||
setResponseContext = require('../../../../server/controllers/frontend/context'),
|
||||
labs = require('../../../../server/utils/labs'),
|
||||
labs = require('../../../../server/services/labs'),
|
||||
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@ var should = require('should'),
|
|||
Promise = require('bluebird'),
|
||||
// Stuff we are testing
|
||||
api = require('../../../../server/api'),
|
||||
themes = require('../../../../server/themes'),
|
||||
themes = require('../../../../server/services/themes'),
|
||||
fetchData = require('../../../../server/controllers/frontend/fetch-data'),
|
||||
configUtils = require('../../../utils/configUtils'),
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
|
|
@ -4,7 +4,7 @@ var should = require('should'),
|
|||
configUtils = require('../../../utils/configUtils'),
|
||||
api = require('../../../../server/api'),
|
||||
postLookup = require('../../../../server/controllers/frontend/post-lookup'),
|
||||
settingsCache = require('../../../../server/settings/cache'),
|
||||
settingsCache = require('../../../../server/services/settings/cache'),
|
||||
sandbox = sinon.sandbox.create();
|
||||
|
||||
describe('postLookup', function () {
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue