Added option 'cleanupdefs' (default: false); When set to true no clea…

…nup is done on elements inside the <defs> element.

Changed option 'cleanup'; it now accepts an array of attributes. For backwards compatibility cleanup === true equals ['style']. The attributes in the array are removed from all elements.

Gruntfile.js

@@ -114,12 +114,42 @@ module.exports = function(grunt) {
 
       removeunreferencedids: {
         options: {
-          cleanup: true
+          cleanup: true,
+          cleanupdefs: true
         },
         files: {
           'tmp/no_unref_ids.svg': ['test/fixtures/usingdef.svg']
         }
+      },
+
+      cleanupfill: {
+        options: {
+          cleanup: ['fill']
+        },
+        files: {
+          'tmp/cleanup_fill.svg': ['test/fixtures/dribbble.svg']
+        }
+      },
+
+      nocleandefs: {
+        options: {
+          cleanup: ['style']
+        },
+        files: {
+          'tmp/defs_noclean.svg': ['test/fixtures/usingdef.svg']
+        }
+      },
+
+      cleandefs: {
+        options: {
+          cleanup: ['style'],
+          cleanupdefs: true
+        },
+        files: {
+          'tmp/defs_clean.svg': ['test/fixtures/usingdef.svg']
+        }
       }
+
     },
 
     // Unit tests.

tasks/svgstore.js

@@ -43,9 +43,18 @@ module.exports = function (grunt) {
       },
       formatting: false,
       includedemo: false,
-      symbol: {}
+      symbol: {},
+      cleanupdefs: false
     });
 
+    var cleanupAttributes = [];
+    if (options.cleanup && typeof options.cleanup === 'boolean') {
+      // For backwards compatibility (introduced in 0.2.6).
+      cleanupAttributes = ['style'];
+    } else if (Array.isArray(options.cleanup)){
+      cleanupAttributes = options.cleanup;
+    }
+
     this.files.forEach(function (file) {
       var $resultDocument = cheerio.load('<svg><defs></defs></svg>', { lowerCaseAttributeNames : false }),
           $resultSvg = $resultDocument('svg'),
@@ -95,8 +104,10 @@ module.exports = function (grunt) {
               $elem.attr(key, value.replace(match[0], 'url(#' + mappedIds[refId] + ')'));
             }
 
-            if (options.cleanup && key === 'style') {
-              $elem.removeAttr(key);
+            if (options.cleanupdefs || !$elem.parents('defs').length) {
+              if (cleanupAttributes.indexOf(key) > -1){
+                $elem.removeAttr(key);
+              }
             }
           });
         });

test/svgstore_test.js

@@ -128,4 +128,36 @@ exports.svgstore = {
     test.equal(actual, expected, 'Remove unreferenced IDs');
 
     test.done();
-  }};
+  },
+
+  with_cleanup_fill: function(test) {
+    test.expect(1);
+
+    var actual = grunt.file.read('tmp/cleanup_fill.svg');
+    var expected = grunt.file.read('test/expected/cleanup_fill.svg');
+    test.equal(actual, expected, 'All fill attributes should be removed');
+
+    test.done();
+  },
+
+  with_cleanupdefs: function(test) {
+    test.expect(1);
+
+    var actual = grunt.file.read('tmp/defs_clean.svg');
+    var expected = grunt.file.read('test/expected/defs_clean.svg');
+    test.equal(actual, expected, 'All style attributes inside <defs> should be removed');
+
+    test.done();
+  },
+
+  without_cleanupdefs: function(test) {
+    test.expect(1);
+
+    var actual = grunt.file.read('tmp/defs_noclean.svg');
+    var expected = grunt.file.read('test/expected/defs_noclean.svg');
+    test.equal(actual, expected, 'All style attributes inside <defs> should be removed');
+
+    test.done();
+  }
+
+};