coding style & eslint settings update

Author: Vitaly Puzrin

.eslintrc

@@ -33,16 +33,16 @@ rules:
   no-lonely-if:         2
   no-multi-spaces:      0
   no-process-exit:      0
+  no-path-concat:       2
   no-trailing-spaces:   2
   no-underscore-dangle: 0
   quotes:               [ 2, single, avoid-escape ]
   radix:                2
   space-after-keywords: [ 2, always ] # Fixed in master
   space-in-brackets:    [ 2, always, { propertyName: false } ]
+  yoda:                 2
 
   # temporary
-  yoda:                 0
-  no-path-concat:       0
   consistent-return:    0
 
   #

bin/mincer.js

@@ -113,7 +113,7 @@ if (args.output) {
 }
 
 
-if (1 === filenames.length) {
+if (filenames.length === 1) {
   var asset = environment.findAsset(filenames[0]);
 
   if (!asset) {

examples/manifest.js

@@ -8,6 +8,7 @@
 
 
 var Mincer = require('..');
+var path   = require('path');
 
 
 //
@@ -23,7 +24,7 @@ var environment = require('./environment');
 //
 
 
-var manifest = new Mincer.Manifest(environment, __dirname + '/public/assets');
+var manifest = new Mincer.Manifest(environment, path.join(__dirname, 'public', 'assets'));
 
 
 try {

examples/server.js

@@ -48,7 +48,7 @@ app.use('/assets/', Mincer.createServer(environment));
 var view;
 
 try {
-  view = fs.readFileSync(__dirname + '/views/layout.jade', 'utf8');
+  view = fs.readFileSync(path.join(__dirname, 'views', 'layout.jade'), 'utf8');
   view = jade.compile(view);
 } catch (err) {
   console.error('Failed compile view: ' + (err.message || err.toString()));

lib/mincer/asset_attributes.js

@@ -51,11 +51,11 @@ getter(AssetAttributes.prototype, 'searchPaths', function () {
   }, this.pathname);
 
   // optimization: bower.json can only be nested one level deep
-  if (-1 === path_without_extensions.indexOf(path.sep)) {
+  if (path_without_extensions.indexOf(path.sep) === -1) {
     paths.push(path.join(path_without_extensions, 'bower.json'));
   }
 
-  if ('index' !== path.basename(this.pathname, exts)) {
+  if (path.basename(this.pathname, exts) !== 'index') {
     paths.push(path.join(path_without_extensions, 'index' + exts));
   }
 
@@ -165,7 +165,7 @@ getter(AssetAttributes.prototype, 'engineExtensions', function () {
       exts    = this.extensions,
       offset  = exts.indexOf(this.formatExtension);
 
-  if (0 <= offset) {
+  if (offset >= 0) {
     exts = exts.slice(offset + 1);
   }
 

lib/mincer/assets/asset.js

@@ -45,7 +45,7 @@ function typeToClass(type) {
 var Asset = module.exports = function Asset(environment, logicalPath, pathname) {
   var mtime;
 
-  if ('' === path.extname(logicalPath)) {
+  if (path.extname(logicalPath) === '') {
     throw new Error('Asset logical path has no extension: ' + logicalPath);
   }
 
@@ -267,7 +267,7 @@ Asset.fromHash = function (environment, hash) {
 
     return asset;
   } catch (e) {
-    if ('unserialize_error' === e.code) {
+    if (e.code === 'unserialize_error') {
       // do nothing
       return;
     }

lib/mincer/assets/processed.js

@@ -72,7 +72,7 @@ function buildRequiredAssets(self, context) {
       assets  = resolveDependencies(self, paths),
       stubs   = resolveDependencies(self, context.__stubbedAssets__);
 
-  if (0 < stubs.length) {
+  if (stubs.length > 0) {
     // exclude stubbed assets if any
     assets = _.filter(assets, function (path) {
       return -1 === stubs.indexOf(path);

lib/mincer/base.js

@@ -224,7 +224,7 @@ Base.prototype.resolve = function (logicalPath, options, fn) {
         while (bower.main.length) {
           mainfile = bower.main[0];
 
-          if ('' === extname || extname === path.extname(mainfile)) {
+          if (extname === '' || extname === path.extname(mainfile)) {
             return fn(path.join(path.dirname(pathname), mainfile));
           }
         }
@@ -334,12 +334,12 @@ Base.prototype.findAsset = function (pathname, options) {
     try {
       pathname = this.resolve(logical_path);
 
-      if ('' === path.extname(logical_path)) {
+      if (path.extname(logical_path) === '') {
         expanded_path = this.attributesFor(pathname).logicalPath;
         logical_path += path.extname(expanded_path);
       }
     } catch (err) {
-      if ('FileNotFound' === err.code) {
+      if (err.code === 'FileNotFound') {
         return null;
       }
 
@@ -414,7 +414,7 @@ Base.prototype.eachFile = function (iterator) {
 
 // Returns true if there were no filters, or `filename` matches at least one
 function matches_filter(filters, logicalPath, filename) {
-  if (0 === filters.length) {
+  if (filters.length === 0) {
     return true;
   }
 
@@ -430,15 +430,15 @@ function matches_filter(filters, logicalPath, filename) {
     // prepare string to become RegExp.
     // mimics shell's globbing
     filter = filter.toString().replace(/\*\*|\*|\?|\\.|\./g, function (m) {
-      if ('*' === m[0]) {
-        return '**' === m ? '.+?' : '[^/]+?';
+      if (m[0] === '*') {
+        return m === '**' ? '.+?' : '[^/]+?';
       }
 
-      if ('?' === m[0]) {
+      if (m[0] === '?') {
         return '[^/]?';
       }
 
-      if ('.' === m[0]) {
+      if (m[0] === '.') {
         return '\\.';
       }
 
@@ -462,7 +462,7 @@ function logical_path_for_filename(self, filename, filters) {
   }
 
   // If filename is an index file, retest with alias
-  if ('index' === path.basename(filename).split('.').shift()) {
+  if (path.basename(filename).split('.').shift() === 'index') {
     logical_path = logical_path.replace(/\/index\./, '.');
     if (matches_filter(filters, logical_path, filename)) {
       return logical_path;
@@ -501,11 +501,11 @@ var circular_calls = null;
 
 
 function circular_call_protection(pathname, callback) {
-  var reset = (null === circular_calls),
+  var reset = (circular_calls === null),
       calls = circular_calls || (circular_calls = []);
 
   try {
-    if (0 <= calls.indexOf(pathname)) {
+    if (calls.indexOf(pathname) >= 0) {
       throw new Error('Circular dependency detected: ' + pathname +
                       ' has already been required');
     }
@@ -529,7 +529,7 @@ Base.prototype.buildAsset = function (logicalPath, pathname, options) {
   // If there are any processors to run on the pathname, use
   // `BundledAsset`. Otherwise use `StaticAsset` and treat is as binary.
 
-  if (0 === this.attributesFor(pathname).processors.length) {
+  if (this.attributesFor(pathname).processors.length === 0) {
     return new StaticAsset(this.index, logicalPath, pathname);
   }
 

lib/mincer/common.js

@@ -47,13 +47,13 @@ module.exports.normalizeExtension = function (extension) {
 
 // Dummy alternative to Ruby's Pathname#is_absolute
 module.exports.isAbsolute = function (pathname) {
-  if ('/' === path.sep) {
+  if (path.sep === '/') {
     // unix
-    return '/' === pathname[0];
+    return pathname[0] === '/';
   }
 
   // win
-  return 0 <= pathname.indexOf(':');
+  return pathname.indexOf(':') >= 0;
 };
 
 

lib/mincer/context.js

@@ -259,7 +259,7 @@ Context.prototype.resolve = function (pathname, options, fn) {
   content_type = options.contentType;
 
   if (content_type) {
-    if ('~self~' === content_type) {
+    if (content_type === '~self~') {
       content_type = self.contentType;
     }
 
@@ -434,7 +434,7 @@ Context.prototype.evaluate = function (pathname, options) {
   _.forEach(this.__helpers__, function (payload, name) {
     var helper = payload.helper;
 
-    if ('function' === typeof helper && 'stylus' !== payload.options.type) {
+    if (typeof helper === 'function' && payload.options.type !== 'stylus') {
       helper = helper.bind(self);
     }
 

lib/mincer/engines/coffee_engine.js

@@ -70,7 +70,7 @@ CoffeeEngine.prototype.evaluate = function (context/*, locals*/) {
   var loc, compileOpts, result;
 
   compileOpts = _.extend({}, options, {
-    literate: '.litcoffee' === extname(this.file)
+    literate: extname(this.file) === '.litcoffee'
   });
 
   try {

lib/mincer/engines/ejs_engine.js

@@ -42,7 +42,7 @@ require('util').inherits(EjsEngine, Template);
 
 // Render data
 EjsEngine.prototype.evaluate = function (context, locals) {
-  if (this.nextProcessor && 'JstEngine' === this.nextProcessor.name) {
+  if (this.nextProcessor && this.nextProcessor.name === 'JstEngine') {
     this.data = ejs.compile(this.data, {
       filename: context.logicalPath,
       client:   true

lib/mincer/engines/handlebars_engine.js

@@ -53,7 +53,7 @@ require('util').inherits(HandlebarsEngine, Template);
 HandlebarsEngine.prototype.evaluate = function (context, locals) {
   var data = this.data;
 
-  if (this.nextProcessor && 'JstEngine' === this.nextProcessor.name) {
+  if (this.nextProcessor && this.nextProcessor.name === 'JstEngine') {
     data = Handlebars.precompile(data, _.clone(locals));
     this.data = 'Handlebars.template(' + data + ')';
     return;

lib/mincer/engines/jade_engine.js

@@ -74,7 +74,7 @@ JadeEngine.configure = function (opts) {
 
 // Render data
 JadeEngine.prototype.evaluate = function (context, locals) {
-  if (this.nextProcessor && 'JstEngine' === this.nextProcessor.name) {
+  if (this.nextProcessor && this.nextProcessor.name === 'JstEngine') {
     // Use `compileClient` for Jade v1.0.0+, and `compile` for older versions
     var compile = Jade.compileClient || Jade.compile;
 

lib/mincer/engines/stylus_engine.js

@@ -79,7 +79,7 @@ StylusEngine.prototype.evaluate = function (context, locals) {
 
   // define helpers from the list of passed locals
   _.forEach(locals, function (helper, name) {
-    if ('function' !== typeof helper) {
+    if (typeof helper !== 'function') {
       // Provide object as a function helper
       style.define(name, function () {
         return helper;

lib/mincer/helpers/configuring.js

@@ -75,7 +75,7 @@ function configuration(self, name) {
  *      }
  **/
 module.exports.isEnabled = function (name) {
-  return 'enabled' === configuration(this, name).state;
+  return configuration(this, name).state === 'enabled';
 };
 
 

lib/mincer/manifest.js

@@ -52,7 +52,7 @@ var Manifest = module.exports = function Manifest(environment, pathname) {
 
   prop(this, 'environment', environment);
 
-  if ('' === path.extname(pathname)) {
+  if (path.extname(pathname) === '') {
     prop(this, 'dir',   path.resolve(pathname));
     prop(this, 'path',  path.join(this.dir, 'manifest.json'));
   } else {
@@ -253,7 +253,7 @@ Manifest.prototype.compile = function (files, options) {
 
     write(target, asset.mtime, buffer);
 
-    if ('bundled' === asset.type && options.compress) {
+    if (asset.type === 'bundled' && options.compress) {
       write(target + '.gz', asset.mtime, gzip(buffer));
     }
 

lib/mincer/processors/charset_normalizer.js

@@ -54,7 +54,7 @@ CharsetNormalizer.prototype.evaluate = function (/*context, locals*/) {
     return '';
   });
 
-  if (null !== charset) {
+  if (charset !== null) {
     this.data = charset + '\n' + this.data;
   }
 };

lib/mincer/processors/directive_processor.js

@@ -323,7 +323,7 @@ DirectiveProcessor.prototype.processSource = function () {
 
   // if our own body was not yet appended, and there are header comments,
   // prepend these coments first.
-  if (!self.__hasWrittenBody__ && 0 < self.processedHeader.length) {
+  if (!self.__hasWrittenBody__ && self.processedHeader.length > 0) {
     self.result += self.processedHeader;
   }
 

lib/mincer/processors/safety_colons.js

@@ -42,7 +42,7 @@ require('util').inherits(SafetyColons, Template);
 SafetyColons.prototype.evaluate = function (/*context, locals*/) {
   var data = this.data.trimRight();
 
-  if (';' !== data[data.length - 1]) {
+  if (data[data.length - 1] !== ';') {
     data = data + '\n;\n';
   }
 

lib/mincer/server.js

@@ -83,7 +83,7 @@ function get_fingerprint(pathname) {
 function end(res, code) {
   res.writeHead(code);
 
-  if (400 <= code) {
+  if (code >= 400) {
     // write human-friendly error message
     res.end('[' + code + '] ' + http.STATUS_CODES[code]);
     return;
@@ -109,7 +109,7 @@ function is_etag_match(req, asset) {
 // Tells whenever browser accepts gzip at all
 function is_gzip_accepted(req) {
   var accept = req.headers['accept-encoding'] || '';
-  return '*' === accept || 0 <= accept.indexOf('gzip');
+  return accept === '*' || accept.indexOf('gzip') >= 0;
 }
 
 
@@ -170,7 +170,7 @@ function serve_asset(self, asset, req, res, timer) {
 
   res.statusCode = 200;
 
-  if ('HEAD' === req.method) {
+  if (req.method === 'HEAD') {
     res.end();
     return;
   }
@@ -204,7 +204,7 @@ function serve_source_map(self, asset, req, res, timer) {
     res.setHeader('Content-Length', length);
   }
 
-  if ('HEAD' === req.method) {
+  if (req.method === 'HEAD') {
     res.end();
     return;
   }
@@ -354,14 +354,14 @@ Server.prototype.handle = function handle(req, res) {
   }
 
   // forbid requests with `..` or NUL chars
-  if (0 <= pathname.indexOf('..') || 0 <= pathname.indexOf('\u0000')) {
+  if (pathname.indexOf('..') >= 0 || pathname.indexOf('\u0000') >= 0) {
     self.log('error', log_event(req, 403, 'URL contains unsafe chars', timer.stop()));
     end(res, 403);
     return;
   }
 
   // ignore non-GET requests
-  if ('GET' !== req.method && 'HEAD' !== req.method) {
+  if (req.method !== 'GET' && req.method !== 'HEAD') {
     self.log('error', log_event(req, 403, 'HTTP method not allowed', timer.stop()));
     end(res, 403);
     return;