Merge pull request #51 from bem/fixes

Fixes

Author: eGavr

lib/cli.js

@@ -2,7 +2,8 @@ var path = require('path'),
     vow = require('vow'),
     vfs = require('vow-fs'),
     HtmlDiffer = require('./index').HtmlDiffer,
-    diffLogger = require('./diff-logger');
+    diffLogger = require('./diff-logger'),
+    utils = require('./utils');
 
 module.exports = require('coa').Cmd()
     .name(process.argv[1])
@@ -26,6 +27,14 @@ module.exports = require('coa').Cmd()
         .title('Path to configuration JSON-file')
         .long('config')
         .end()
+    .opt()
+        .name('charsAroundDiff')
+        .title('Number of characters around diff')
+        .long('chars-around-diff')
+        .val(function(val) {
+            return parseInt(val);
+        })
+        .end()
     .arg()
         .name('path1')
         .title('Path to the 1-st html-file')
@@ -44,11 +53,13 @@ module.exports = require('coa').Cmd()
             ]).spread(function (html1, html2, config) {
                 config = config ? JSON.parse(config) : {};
 
-                var diffOpts = { ignoreHtmlAttrs: config.ignoreHtmlAttrs || [], compareHtmlAttrsAsJSON: config.compareHtmlAttrsAsJSON },
-                    logOpts = { showCharacters: config.showCharacters || 20 };
+                var options = utils.defaults(config),
+                    loggerOptions = {
+                        charsAroundDiff: opts.charsAroundDiff || 20
+                    };
 
-                htmlDiffer = new HtmlDiffer(diffOpts),
-                diffLogger.log(htmlDiffer.diffHtml(html1, html2), logOpts);
+                htmlDiffer = new HtmlDiffer(options),
+                diffLogger.log(htmlDiffer.diffHtml(html1, html2), loggerOptions);
             });
     })
     .run(process.argv.slice(2));

lib/diff-logger.js

@@ -20,7 +20,7 @@ function getDiffText(diff, options) {
     var charsAroundDiff = options.charsAroundDiff,
         output = '';
 
-    if (charsAroundDiff > 0) {
+    if (charsAroundDiff < 0) {
         charsAroundDiff = 20;
     }
 
@@ -35,7 +35,7 @@ function getDiffText(diff, options) {
         if (part.removed) color = 'red';
 
         if (color !== 'grey') {
-            output += (!index ? '\n' : '') +  partValue[color];
+            output += (!index ? '\n' : '') + partValue[color];
 
             return;
         }

lib/index.js

@@ -142,6 +142,8 @@ HtmlDiffer.prototype.diffHtml = function(html1, html2, options) {
         console.warn('WARNING! The third param of "diffHtml" method is deprecated!');
     }
 
+    options = _.defaults(this.options, options);
+
     var htmlDiffer = new HtmlDiff(options);
 
     return htmlDiffer.diff(html1, html2);

lib/utils.js

@@ -38,7 +38,7 @@ exports.parseAttr = function(val, isClick) {
 };
 
 /**
- * Sorts the gieven CSS class attribute
+ * Sorts the given CSS class attribute
  * @param {String} cssClasses
  * @returns {String}
  */