Merge branch 'release/0.2.13'

.gitignore

@@ -1,3 +1,4 @@
+.idea
 node_modules
 npm-debug.log
 tmp

Gruntfile.js

@@ -21,16 +21,16 @@ module.exports = function(grunt) {
       all: [
         'Gruntfile.js',
         'tasks/*.js',
-        '<%= nodeunit.tests %>',
+        '<%= nodeunit.tests %>'
       ],
       options: {
-        jshintrc: '.jshintrc',
-      },
+        jshintrc: '.jshintrc'
+      }
     },
 
     // Before generating any new files, remove any previously-created files.
     clean: {
-      tests: ['tmp'],
+      tests: ['tmp']
     },
 
     // Configuration to be run (and then tested).
@@ -39,22 +39,22 @@ module.exports = function(grunt) {
         options: {
         },
         files: {
-          'tmp/email.html': ['<%= paths.fixtures %>/email.html'],
-        },
+          'tmp/email.html': ['<%= paths.fixtures %>/email.html']
+        }
       },
       multiple: {
         files: {
           'tmp/email.html': ['<%= paths.fixtures %>/inexistant.html', '<%= paths.fixtures %>/email.html', '<%= paths.fixtures %>/email-not-tobe-included.html'],
           'tmp/email-2.html': ['<%= paths.fixtures %>/email-2.html']
-        },
+        }
       },
       txt: {
         options: {
           mode: 'txt'
         },
         files: {
-          'tmp/email.txt': ['<%= paths.fixtures %>/email.html'],
-        },
+          'tmp/email.txt': ['<%= paths.fixtures %>/email.html']
+        }
       },
       full: {
         options: {
@@ -67,13 +67,13 @@ module.exports = function(grunt) {
           verbose: true
         },
         files: {
-          'tmp/email-full.html': ['<%= paths.fixtures %>/email-full.html'],
-        },
+          'tmp/email-full.html': ['<%= paths.fixtures %>/email-full.html']
+        }
       },
 
       verbose: {
         files: {
-          'tmp/email-verbose.html': ['<%= paths.fixtures %>/email-verbose.html'],
+          'tmp/email-verbose.html': ['<%= paths.fixtures %>/email-verbose.html']
         }
       },
 
@@ -82,21 +82,21 @@ module.exports = function(grunt) {
           css: ['<%= paths.fixtures %>/css/external-mq.css']
         },
         files: {
-          'tmp/email-mq.html': ['<%= paths.fixtures %>/email-mq.html'],
+          'tmp/email-mq.html': ['<%= paths.fixtures %>/email-mq.html']
         }
       },
 
       overwrite: {
         files: {
-          '<%= paths.fixtures %>/email-overwrite.html': ['<%= paths.fixtures %>/email-overwrite.html'],
+          '<%= paths.fixtures %>/email-overwrite.html': ['<%= paths.fixtures %>/email-overwrite.html']
         }
       }
     },
 
     // Unit tests.
     nodeunit: {
-      tests: ['test/*_test.js'],
-    },
+      tests: ['test/*_test.js']
+    }
 
   });
 

README.md

@@ -96,6 +96,12 @@ Default value: `false`
 
 Removes HTML comments.
 
+#### options.removeIds
+Type: `Boolean`
+Default value: `false`
+
+Removes HTML ids.
+
 
 #### options.preserveStyles
 Type: `Boolean`
@@ -121,6 +127,12 @@ Default value: `false`
 
 Prints additional information at runtime.
 
+#### options.warnLevel
+Type: `String`
+Default value: `'safe'`
+
+What level of CSS compatibility warnings to show (either `'none'`, `'safe'`, `'poor'`, `'risky'`).
+
 ### Usage Examples
 
 #### Default Options
@@ -169,6 +181,8 @@ In lieu of a formal styleguide, take care to maintain the existing coding style.
 
 ## Release History
 
+0.2.13 Added option `warnLevel` and `removeIds`
+
 0.2.12 Dependencies updated. Fixing a bug when source and destination files are the same (#25)
 
 0.2.11 Fixing EventEmitter error (#21)

lib/premailer.rb

@@ -12,7 +12,10 @@
   :remove_comments => false,
   :verbose => false,
   :line_length => 65,
-  :preserve_styles => false
+  :preserve_styles => false,
+  :escape_url_attributes => true,
+  :replace_html_entities => false,
+  :remove_ids => false
 }
 
 file_in = nil
@@ -56,6 +59,10 @@
     options[:remove_classes] = v
   end
 
+  opts.on("--remove-ids", "Remove HTML ids") do |v|
+      options[:remove_ids] = v
+  end
+
   opts.on("-j", "--remove-scripts", "Remove HTML scripts") do |v|
     options[:remove_scripts] = v
   end
@@ -76,6 +83,18 @@
     options[:verbose] = v
   end
 
+  opts.on("--warn-level N", Integer, "Warning level") do |v|
+      options[:warn_level] = v
+  end
+
+  opts.on("--replace-html-entities", "Replace HTML entities") do |v|
+        options[:replace_html_entities] = v
+  end
+
+  opts.on("--escape-url-attributes", "Replace HTML entities") do |v|
+        options[:escape_url_attributes] = v
+  end
+
   opts.on("--file-in STRING", String, "Input filename") do |v|
     file_in = v
   end

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-premailer",
   "description": "Grunt wrapper task for premailer",
-  "version": "0.2.12",
+  "version": "0.2.13",
   "homepage": "https://github.com/dwightjack/grunt-premailer",
   "author": {
     "name": "Marco Solazzi",
@@ -46,7 +46,7 @@
     "chalk": "~1.0.0",
     "dargs": "~4.0.0",
     "is-utf8": "^0.2.0",
-    "lodash": "~3.3.1",
+    "lodash": "~3.5.0",
     "semver": "~4.3.1"
   }
 }

tasks/premailer.js

@@ -15,7 +15,15 @@ module.exports = function(grunt) {
         fs = require('fs'),
         async = require('async'),
         isUtf8 = require('is-utf8'),
-        _ = require('lodash');
+        _ = require('lodash'),
+        warnLevels;
+
+    warnLevels = {
+        none: 0,
+        safe: 1,
+        poor: 2,
+        risky: 3
+    };
 
     grunt.registerMultiTask('premailer', 'Grunt wrapper task for premailer', function() {
         // Merge task-specific and/or target-specific options with these defaults.
@@ -34,10 +42,13 @@ module.exports = function(grunt) {
                 lineLength: 65,
                 ioException: false,
                 verbose: false,
-                mode: 'html'
+                mode: 'html',
+                warnLevel: 'safe',
+                removeIds: false,
+                replaceHtmlEntities: false,
+                escapeUrlAttributes: true
             });
 
-
         var keys = Object.keys(options);
 
         // Remove bundleExec from arguments
@@ -50,11 +61,15 @@ module.exports = function(grunt) {
             if (typeof val === 'string') {
                 val = grunt.template.process(val);
             }
-            if ((typeof val === 'object' && !_.isEmpty(val)) || (typeof val !== 'object' && !! val)) {
+            //warn level could be 0, preserve it
+            if ((typeof val === 'object' && !_.isEmpty(val)) || (typeof val !== 'object' && !!val)) {
                 args[key] = val;
             }
         });
 
+        //convert warn level
+        args.warnLevel = _.has(warnLevels, args.warnLevel) ? warnLevels[args.warnLevel] : 0;
+
         //also manage properly the css option
         if (_.has(args, 'css') && Array.isArray(args.css)) {
             args.css = _(args.css)

test/premailer_test.js

@@ -105,5 +105,5 @@ exports.premailer = {
     test.ok(actual.indexOf('<body style="color: red') !== -1, 'Content is preserved.');
 
     test.done();
-  },
+  }
 };