Move settings methods to app.settings and deprecate old versions

History.md

@@ -1,6 +1,8 @@
 unreleased
 ========================
 
+* Deprecate `.get(setting)`, `.set()`, `.disable()`, `.enable()`, `.enabled()`, `.disabled()` in favor of new
+`.settings` api
 * deps: [email protected]
 * Remove `utils-merge` dependency - use spread syntax instead
 * Remove `Object.setPrototypeOf` polyfill

examples/auth/index.js

@@ -13,8 +13,8 @@ var app = module.exports = express();
 
 // config
 
-app.set('view engine', 'ejs');
-app.set('views', path.join(__dirname, 'views'));
+app.settings.set('view engine', 'ejs');
+app.settings.set('views', path.join(__dirname, 'views'));
 
 // middleware
 

examples/ejs/index.js

@@ -24,7 +24,7 @@ app.engine('.html', require('ejs').__express);
 
 // Optional since express defaults to CWD/views
 
-app.set('views', path.join(__dirname, 'views'));
+app.settings.set('views', path.join(__dirname, 'views'));
 
 // Path to our public directory
 
@@ -33,7 +33,7 @@ app.use(express.static(path.join(__dirname, 'public')));
 // Without this you would need to
 // supply the extension to res.render()
 // ex: res.render('users.html').
-app.set('view engine', 'html');
+app.settings.set('view engine', 'html');
 
 // Dummy users
 var users = [

examples/error-pages/index.js

@@ -11,17 +11,17 @@ var logger = require('morgan');
 var silent = process.env.NODE_ENV === 'test'
 
 // general config
-app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'ejs');
+app.settings.set('views', path.join(__dirname, 'views'));
+app.settings.set('view engine', 'ejs');
 
 // our custom "verbose errors" setting
 // which we can use in the templates
 // via settings['verbose errors']
-app.enable('verbose errors');
+app.settings.enable('verbose errors');
 
 // disable them in production
 // use $ NODE_ENV=production node examples/error-pages
-if (app.settings.env === 'production') app.disable('verbose errors')
+if (app.settings.env === 'production') app.settings.disable('verbose errors')
 
 silent || app.use(logger('dev'));
 

examples/error/index.js

@@ -7,7 +7,7 @@
 var express = require('../../');
 var logger = require('morgan');
 var app = module.exports = express();
-var test = app.get('env') === 'test'
+var test = app.settings.get('env') === 'test'
 
 if (!test) app.use(logger('dev'));
 

examples/markdown/index.js

@@ -24,10 +24,10 @@ app.engine('md', function(path, options, fn){
   });
 });
 
-app.set('views', path.join(__dirname, 'views'));
+app.settings.set('views', path.join(__dirname, 'views'));
 
 // make it the default, so we don't need .md
-app.set('view engine', 'md');
+app.settings.set('view engine', 'md');
 
 app.get('/', function(req, res){
   res.render('index', { title: 'Markdown Example' });

examples/mvc/index.js

@@ -14,10 +14,10 @@ var app = module.exports = express();
 
 // set our default template engine to "ejs"
 // which prevents the need for using file extensions
-app.set('view engine', 'ejs');
+app.settings.set('view engine', 'ejs');
 
 // set views for error and 404 pages
-app.set('views', path.join(__dirname, 'views'));
+app.settings.set('views', path.join(__dirname, 'views'));
 
 // define a custom res.message() method
 // which stores messages in the session

examples/mvc/lib/boot.js

@@ -24,8 +24,8 @@ module.exports = function(parent, options){
     var url;
 
     // allow specifying the view engine
-    if (obj.engine) app.set('view engine', obj.engine);
-    app.set('views', path.join(__dirname, '..', 'controllers', name, 'views'));
+    if (obj.engine) app.settings.set('view engine', obj.engine);
+    app.settings.set('views', path.join(__dirname, '..', 'controllers', name, 'views'));
 
     // generate routes based
     // on the exported methods

examples/route-separation/index.js

@@ -18,8 +18,8 @@ module.exports = app;
 
 // Config
 
-app.set('view engine', 'ejs');
-app.set('views', path.join(__dirname, 'views'));
+app.settings.set('view engine', 'ejs');
+app.settings.set('views', path.join(__dirname, 'views'));
 
 /* istanbul ignore next */
 if (!module.parent) {

examples/view-constructor/github-view.js

@@ -24,7 +24,7 @@ function GithubView(name, options){
   this.name = name;
   options = options || {};
   this.engine = options.engines[extname(name)];
-  // "root" is the app.set('views') setting, however
+  // "root" is the app.settings.set('views') setting, however
   // in your own implementation you could ignore this
   this.path = '/' + options.root + '/master/' + name;
 }

examples/view-constructor/index.js

@@ -24,10 +24,10 @@ app.engine('md', function(str, options, fn){
 });
 
 // pointing to a particular github repo to load files from it
-app.set('views', 'expressjs/express');
+app.settings.set('views', 'expressjs/express');
 
 // register a new view constructor
-app.set('view', GithubView);
+app.settings.set('view', GithubView);
 
 app.get('/', function(req, res){
   // rendering a view relative to the repo.

examples/view-locals/index.js

@@ -9,8 +9,8 @@ var path = require('node:path');
 var User = require('./user');
 var app = express();
 
-app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'ejs');
+app.settings.set('views', path.join(__dirname, 'views'));
+app.settings.set('view engine', 'ejs');
 
 // filter ferrets only