Modify 'compareAttributesAsJSON' option

Author: eGavr

lib/utils/defaults.js

@@ -16,7 +16,11 @@ var _ = require('lodash');
         if (options === 'bem') {
             options = {
                 ignoreAttributes: ['id', 'for'],
-                compareAttributesAsJSON: ['data-bem', 'onclick', 'ondblclick']
+                compareAttributesAsJSON: [
+                    'data-bem',
+                    { name: 'onclick', isFunction: true },
+                    { name: 'ondblclick', isFunction: true }
+                ]
             };
         } else {
             console.error(options.bold.red + ' is an invalid preset name. Use ' + 'bem'.bold.green + ' instead.');

lib/utils/utils.js

@@ -112,9 +112,16 @@ function sortAttrsValues(attrs, compareAttributesAsJSON) {
     }
 
     _.forEach(compareAttributesAsJSON, function (attr) {
+        if (typeof attr === 'string') {
+            var name = attr;
+            attr = {};
+            attr.name = name;
+            attr.isFunction = false;
+        }
+
         var attrValue,
-            isFunction = (attr === 'onclick' || attr === 'ondblclick'), // @FIXME: should be configurable
-            attrIndexes = _getIndexesInArray(attrs, attr);
+            isFunction = (attr.isFunction),
+            attrIndexes = _getIndexesInArray(attrs, attr.name);
 
         _.forEach(attrIndexes, function (index) {
             attrValue = _parseAttr(attrs[index].value, isFunction);

…xtures/first/onclick-and-ondblclick.html …first/sort-functions-in-json-format.htmltest/diff/fixtures/first/onclick-and-ondblclick.html renamed to test/diff/fixtures/first/sort-functions-in-json-format.html test/diff/fixtures/first/onclick-and-ondblclick.html renamed to test/diff/fixtures/first/sort-functions-in-json-format.html

@@ -46,16 +46,22 @@ describe('\'isEqual\'', function () {
         htmlDiffer.isEqual(files.html1, files.html2).must.be.true();
     });
 
-    it('must sort values of attributes as JSON', function () {
-        var htmlDiffer = new HtmlDiffer({ compareAttributesAsJSON: [ 'a', 'b' ] }),
+    it('must sort values of attributes as JSON when the content is not a function', function () {
+        var htmlDiffer = new HtmlDiffer({ compareAttributesAsJSON: [ 'a', { name: 'b', isFunction: false }] }),
             files = readFiles('sort-values-in-json-format');
 
         htmlDiffer.isEqual(files.html1, files.html2).must.be.true();
     });
 
-    it('must sort values of attributes \'onclick\' and \'ondblclick\' as JSON', function () {
-        var htmlDiffer = new HtmlDiffer({ compareAttributesAsJSON: [ 'onclick', 'ondblclick' ] }),
-            files = readFiles('onclick-and-ondblclick');
+    it('must sort values of attributes as JSON when the content is a function', function () {
+        var options = {
+                compareAttributesAsJSON: [
+                    { name: 'onclick', isFunction: true },
+                    { name: 'ondblclick', isFunction: true }
+                ]
+            },
+            htmlDiffer = new HtmlDiffer(options),
+            files = readFiles('sort-functions-in-json-format');
 
         htmlDiffer.isEqual(files.html1, files.html2).must.be.true();
     });
@@ -102,7 +108,7 @@ describe('\'isEqual\'', function () {
         htmlDiffer.isEqual(files.html1, files.html2).must.be.false();
     });
 
-    it('must work preset \'bem\'', function () {
+    it('must work \'bem\' preset', function () {
         var htmlDiffer = new HtmlDiffer('bem'),
             files = readFiles('bem-preset');
 

…tures/second/onclick-and-ondblclick.html …econd/sort-functions-in-json-format.htmltest/diff/fixtures/second/onclick-and-ondblclick.html renamed to test/diff/fixtures/second/sort-functions-in-json-format.html test/diff/fixtures/second/onclick-and-ondblclick.html renamed to test/diff/fixtures/second/sort-functions-in-json-format.html

@@ -40,7 +40,12 @@ describe('\'utils\'', function () {
     });
 
     it('must sort attributes\' values which are in JSON format', function () {
-        var input = [
+        var options = [
+                'a',
+                { name: 'onclick', isFunction: true },
+                { name: 'ondblclick', isFunction: true }
+            ],
+            input = [
                 { name: 'a', value: '{"b":{"b":"b","a":"a"},"a":"a"}' },
                 { name: 'a', value: '{"a":"b","b":"a"}' },
                 { name: 'onclick', value: 'return {"b":{"b":"b","a":"a"},"a":"a"}' },
@@ -55,7 +60,7 @@ describe('\'utils\'', function () {
                 { name: 'c', value: '{"c":"c"}' }
             ];
 
-        utils.sortAttrsValues(input, ['a', 'onclick', 'ondblclick']).must.be.eql(output);
+        utils.sortAttrsValues(input, options).must.be.eql(output);
     });
 
     it('must remove attributes\' values', function () {