Skip to content

Commit

Permalink
Convert to spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
@sgress454
sgress454 committed May 20, 2015
1 parent d76048e commit 78b5e2d
Showing 1 changed file with 85 additions and 85 deletions.
170 changes: 85 additions & 85 deletions lib/hooks/views/configure.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
*/

var _ = require('lodash')
, path = require('path')
, util = require('util')
, consolidate = require('consolidate');
, path = require('path')
, util = require('util')
, consolidate = require('consolidate');



Expand All @@ -18,98 +18,98 @@ var _ = require('lodash')

module.exports = function configure ( sails ) {

if (sails.config.viewEngine) {
sails.log.warn('The `config.viewEngine` config has been deprecated in favor of `config.views.engine`.');
sails.log.warn('It has been automatically migrated, but you\'ll continue to see this warning until you change your configuration files.');
sails.config.views.engine = sails.config.viewEngine;
}
if (sails.config.viewEngine) {
sails.log.warn('The `config.viewEngine` config has been deprecated in favor of `config.views.engine`.');
sails.log.warn('It has been automatically migrated, but you\'ll continue to see this warning until you change your configuration files.');
sails.config.views.engine = sails.config.viewEngine;
}

// Normalize view engine config and allow defining a custom extension
if (typeof sails.config.views.engine === 'string') {
var viewExt = sails.config.views.extension || sails.config.views.engine;
sails.config.views.engine = {
// Normalize view engine config and allow defining a custom extension
if (typeof sails.config.views.engine === 'string') {
var viewExt = sails.config.views.extension || sails.config.views.engine;
sails.config.views.engine = {
name: sails.config.views.engine,
ext: viewExt
};
}
ext: viewExt
};
}

// Get the view engine name
var engineName = sails.config.views.engine.name || sails.config.views.engine.ext;

// Ensure valid config
if (! (sails.config.views.engine && sails.config.views.engine.ext) ) {
sails.log.error('Invalid view engine configuration. `config.views.engine` should');
sails.log.error('be set to either a `string` or an `object` with the following properties:');
sails.log.error(' {');
sails.log.error(' ext: <string>, // the file extension');
sails.log.error(' fn: <function> // the template engine render function');
sails.log.error(' }');
sails.log.error('For example: {ext:"html", fn: require("consolidate").swig}');
sails.log.error('For details: http://expressjs.com/api.html#app.engine');
throw new Error('Invalid view engine configuration.');
}

// Try to load view module if a function wasn't specified directly
if ( !sails.config.views.engine.fn ) {

var appDependenciesPath;
var fn;

appDependenciesPath = path.join(
sails.config.appPath,
'node_modules'
);

try {
//fn = consolidate(appDependenciesPath)[engineName];
// Ensure valid config
if (! (sails.config.views.engine && sails.config.views.engine.ext) ) {
sails.log.error('Invalid view engine configuration. `config.views.engine` should');
sails.log.error('be set to either a `string` or an `object` with the following properties:');
sails.log.error(' {');
sails.log.error(' ext: <string>, // the file extension');
sails.log.error(' fn: <function> // the template engine render function');
sails.log.error(' }');
sails.log.error('For example: {ext:"html", fn: require("consolidate").swig}');
sails.log.error('For details: http://expressjs.com/api.html#app.engine');
throw new Error('Invalid view engine configuration.');
}

// Try to load view module if a function wasn't specified directly
if ( !sails.config.views.engine.fn ) {

var appDependenciesPath;
var fn;

appDependenciesPath = path.join(
sails.config.appPath,
'node_modules'
);

try {
//fn = consolidate(appDependenciesPath)[engineName];

fn = getEngine(appDependenciesPath,engineName);


if ( !_.isFunction(fn) ) {
sails.log.error(util.format('Invalid view engine (%s)-- are you sure it supports `consolidate`?', engineName));
throw new Error();
}
}
catch (e) {
sails.log.error('Your configured server-side view engine (' + engineName + ') could not be found.');
sails.log.error('Usually, this just means you need to install a dependency.');
sails.log.error('To install ' + engineName + ', run: `npm install ' + engineName + ' --save`');
sails.log.error('Otherwise, please change your `engine` configuration in config/views.js.');
throw e;
}

// Save reference to view rendering function
sails.config.views.engine.fn = fn;
sails.log.silly('Configured view engine, `' + engineName + '`');
}


// Let user know that a leading . is not required in the viewEngine option and then fix it
if (sails.config.views.engine.ext[0] === '.') {
sails.log.warn('A leading `.` is not required in the views.engine option. Removing it for you...');
sails.config.views.engine.ext = sails.config.views.engine.ext.substr(1);
}

// Custom layout location
// (if string specified, it's used as the relative path from the views folder)
// (if not string, but truthy, relative path from views folder defaults to ./layout.*)
// (if falsy, don't use layout)
if ( !_.isString(sails.config.views.layout) && sails.config.views.layout ) {
sails.config.views.layout = 'layout.' + sails.config.views.engine.ext;
}

var layoutableEngines = [
'ejs',
'handlebars',
'ractive'
];
if ( sails.config.views.layout && layoutableEngines.indexOf(engineName) < 0 ) {
sails.log.warn('Sails\' built-in layout support only works with the `' +
layoutableEngines.join('`, `') + '` view engines.');
sails.log.warn('You\'re using `'+ engineName +'`.');
sails.log.warn('Ignoring `sails.config.views.layout`...');
}
if ( !_.isFunction(fn) ) {
sails.log.error(util.format('Invalid view engine (%s)-- are you sure it supports `consolidate`?', engineName));
throw new Error();
}
}
catch (e) {
sails.log.error('Your configured server-side view engine (' + engineName + ') could not be found.');
sails.log.error('Usually, this just means you need to install a dependency.');
sails.log.error('To install ' + engineName + ', run: `npm install ' + engineName + ' --save`');
sails.log.error('Otherwise, please change your `engine` configuration in config/views.js.');
throw e;
}

// Save reference to view rendering function
sails.config.views.engine.fn = fn;
sails.log.silly('Configured view engine, `' + engineName + '`');
}


// Let user know that a leading . is not required in the viewEngine option and then fix it
if (sails.config.views.engine.ext[0] === '.') {
sails.log.warn('A leading `.` is not required in the views.engine option. Removing it for you...');
sails.config.views.engine.ext = sails.config.views.engine.ext.substr(1);
}

// Custom layout location
// (if string specified, it's used as the relative path from the views folder)
// (if not string, but truthy, relative path from views folder defaults to ./layout.*)
// (if falsy, don't use layout)
if ( !_.isString(sails.config.views.layout) && sails.config.views.layout ) {
sails.config.views.layout = 'layout.' + sails.config.views.engine.ext;
}

var layoutableEngines = [
'ejs',
'handlebars',
'ractive'
];
if ( sails.config.views.layout && layoutableEngines.indexOf(engineName) < 0 ) {
sails.log.warn('Sails\' built-in layout support only works with the `' +
layoutableEngines.join('`, `') + '` view engines.');
sails.log.warn('You\'re using `'+ engineName +'`.');
sails.log.warn('Ignoring `sails.config.views.layout`...');
}
};

function getEngine(appDependenciesPath,engineName) {
Expand Down

0 comments on commit 78b5e2d

Please sign in to comment.