libmime 2.0.3 → 2.1.0

package/.eslintrc.js

@@ -45,7 +45,8 @@ module.exports = {
         'no-bitwise': 2,
         'no-lonely-if': 2,
         'no-mixed-spaces-and-tabs': 2,
-        'no-console': 2
+        'no-console': 2,
+        'no-control-regex': 0
     },
     env: {
         es6: false,

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.1.0 2016-07-24
+
+  * Changed handling of base64 encoded mime words where multiple words are joined together if possible. This fixes issues with multi byte characters getting split into different mime words (against the RFC but occurs)
+
 ## v2.0.3 2016-02-29
 
   * Fixed an issue with rfc2231 filenames

package/lib/charset.js

@@ -72,7 +72,7 @@ var charset = module.exports = {
             return 'UTF-' + match[1];
         }
 
-        if ((match = charset.match(/^win[\-_]?(\d+)$/i))) {
+        if ((match = charset.match(/^win(?:dows)?[\-_]?(\d+)$/i))) {
             return 'WINDOWS-' + match[1];
         }
 

package/lib/libmime.js

@@ -229,14 +229,29 @@ var libmime = module.exports = {
      * @return {String} Decoded unicode string
      */
     decodeWords: function (str) {
-        str = (str || '').toString();
-        str = str.
+        return (str || '').toString().
+
+        // find base64 words that can be joined
+        replace(/(=\?([^?]+)\?[Bb]\?[^?]+[^^=]\?=)\s*(?==\?([^?]+)\?[Bb]\?[^?]+\?=)/g,
+            function (match, left, chLeft, chRight) {
+                // only mark to b64 chunks to be joined if charsets match
+                if (libcharset.normalizeCharset(chLeft || '').toLowerCase().trim() === libcharset.normalizeCharset(chRight || '').toLowerCase().trim()) {
+                    // set a joiner marker
+                    return left + '__\x00JOIN\x00__';
+                }
+                return match;
+            }).
+
+        // join base64 encoded words
+        replace(/(\?=)?__\x00JOIN\x00__(=\?([^?]+)\?[Bb]\?)?/g, '').
+
+        // remove spaces between mime encoded words
         replace(/(=\?[^?]+\?[QqBb]\?[^?]+\?=)\s+(?==\?[^?]+\?[QqBb]\?[^?]+\?=)/g, '$1').
+
+        // decode words
         replace(/\=\?([\w_\-\*]+)\?([QqBb])\?[^\?]+\?\=/g, function (mimeWord) {
             return libmime.decodeWord(mimeWord);
         });
-
-        return str;
     },
 
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "libmime",
   "description": "Encode and decode quoted printable and base64 strings",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "main": "lib/libmime",
   "homepage": "https://github.com/andris9/libmime",
   "repository": {
@@ -16,7 +16,7 @@
   ],
   "author": "Andris Reinman <andris@kreata.ee>",
   "scripts": {
-    "test": "grunt"
+    "test": "grunt mochaTest"
   },
   "dependencies": {
     "iconv-lite": "0.4.13",
@@ -25,10 +25,10 @@
   },
   "devDependencies": {
     "chai": "^3.5.0",
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-eslint": "^18.0.0",
+    "grunt": "^1.0.1",
+    "grunt-cli": "^1.2.0",
+    "grunt-eslint": "^19.0.0",
     "grunt-mocha-test": "^0.12.7",
-    "mocha": "^2.4.5"
+    "mocha": "^3.0.2"
   }
 }