From 7fc66a182ea1bf15396a534ddade36f3468303e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Wed, 12 Nov 2014 12:36:16 +0100 Subject: [PATCH] Move middleware sources to `server/middleware` The new location allows developer to use the following identifiers when loading the middleware using the new declarative style: app.middlewareFromConfig( require('loopback/server/middleware/rest'), { phase: 'routes' }); app.middlewareFromConfig( require('loopback/server/middleware/url-not-found'), { phase: 'final' }); --- Gruntfile.js | 6 +++++- lib/loopback.js | 7 +++++-- {lib => server}/middleware/context.js | 2 +- {lib => server}/middleware/rest.js | 2 +- {lib => server}/middleware/static.js | 0 {lib => server}/middleware/status.js | 0 {lib => server}/middleware/token.js | 2 +- .../urlNotFound.js => server/middleware/url-not-found.js | 0 8 files changed, 13 insertions(+), 6 deletions(-) rename {lib => server}/middleware/context.js (98%) rename {lib => server}/middleware/rest.js (97%) rename {lib => server}/middleware/static.js (100%) rename {lib => server}/middleware/status.js (100%) rename {lib => server}/middleware/token.js (97%) rename lib/middleware/urlNotFound.js => server/middleware/url-not-found.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 877fca969..a9804e590 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -36,6 +36,9 @@ module.exports = function(grunt) { common: { src: ['common/**/*.js'] }, + server: { + src: ['server/**/*.js'] + } // TODO tests don't pass yet // test: { // src: ['test/**/*.js'] @@ -44,7 +47,8 @@ module.exports = function(grunt) { jscs: { gruntfile: 'Gruntfile.js', lib: ['lib/**/*.js'], - common: ['common/**/*.js'] + common: ['common/**/*.js'], + server: ['server/**/*.js'] // TODO(bajtos) - test/**/*.js }, watch: { diff --git a/lib/loopback.js b/lib/loopback.js index ef82dae28..fae80bb22 100644 --- a/lib/loopback.js +++ b/lib/loopback.js @@ -120,13 +120,16 @@ if (loopback.isServer) { if (loopback.isServer) { fs - .readdirSync(path.join(__dirname, 'middleware')) + .readdirSync(path.join(__dirname, '..', 'server', 'middleware')) .filter(function(file) { return file.match(/\.js$/); }) .forEach(function(m) { - loopback[m.replace(/\.js$/, '')] = require('./middleware/' + m); + loopback[m.replace(/\.js$/, '')] = require('../server/middleware/' + m); }); + + loopback.urlNotFound = loopback['url-not-found']; + delete loopback['url-not-found']; } /* diff --git a/lib/middleware/context.js b/server/middleware/context.js similarity index 98% rename from lib/middleware/context.js rename to server/middleware/context.js index 85b258dc0..c86903a06 100644 --- a/lib/middleware/context.js +++ b/server/middleware/context.js @@ -1,4 +1,4 @@ -var loopback = require('../loopback'); +var loopback = require('../../lib/loopback'); var juggler = require('loopback-datasource-juggler'); var remoting = require('strong-remoting'); var cls = require('continuation-local-storage'); diff --git a/lib/middleware/rest.js b/server/middleware/rest.js similarity index 97% rename from lib/middleware/rest.js rename to server/middleware/rest.js index 71c98154a..cfe9de772 100644 --- a/lib/middleware/rest.js +++ b/server/middleware/rest.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var loopback = require('../loopback'); +var loopback = require('../../lib/loopback'); var async = require('async'); /*! diff --git a/lib/middleware/static.js b/server/middleware/static.js similarity index 100% rename from lib/middleware/static.js rename to server/middleware/static.js diff --git a/lib/middleware/status.js b/server/middleware/status.js similarity index 100% rename from lib/middleware/status.js rename to server/middleware/status.js diff --git a/lib/middleware/token.js b/server/middleware/token.js similarity index 97% rename from lib/middleware/token.js rename to server/middleware/token.js index 235640aa9..72eb340e4 100644 --- a/lib/middleware/token.js +++ b/server/middleware/token.js @@ -2,7 +2,7 @@ * Module dependencies. */ -var loopback = require('../loopback'); +var loopback = require('../../lib/loopback'); var assert = require('assert'); /*! diff --git a/lib/middleware/urlNotFound.js b/server/middleware/url-not-found.js similarity index 100% rename from lib/middleware/urlNotFound.js rename to server/middleware/url-not-found.js