v0.2.0

Author: andris9

lib/libbase64.js

@@ -21,7 +21,7 @@ module.exports = {
  */
 function encode(buffer) {
     if (typeof buffer === 'string') {
-        buffer = new Buffer(buffer, 'utf-8');
+        buffer = Buffer.from(buffer, 'utf-8');
     }
 
     return buffer.toString('base64');
@@ -34,8 +34,8 @@ function encode(buffer) {
  * @returns {Buffer} Decoded value
  */
 function decode(str) {
-    str = (str || '');
-    return new Buffer(str, 'base64');
+    str = str || '';
+    return Buffer.from(str, 'base64');
 }
 
 /**
@@ -82,10 +82,11 @@ function Encoder(options) {
 util.inherits(Encoder, Transform);
 
 Encoder.prototype._transform = function(chunk, encoding, done) {
-    var b64, _self = this;
+    var b64,
+        _self = this;
 
     if (encoding !== 'buffer') {
-        chunk = new Buffer(chunk, encoding);
+        chunk = Buffer.from(chunk, encoding);
     }
 
     if (!chunk || !chunk.length) {
@@ -166,14 +167,15 @@ Decoder.prototype._transform = function(chunk, encoding, done) {
 
     this.inputBytes += chunk.length;
 
-    b64 = (this._curLine + chunk);
+    b64 = this._curLine + chunk;
     this._curLine = '';
 
     b64 = b64.replace(/[^a-zA-Z0-9+\/=]/g, '');
 
     if (b64.length % 4) {
         this._curLine = b64.substr(-b64.length % 4);
-        if (this._curLine.length == b64.length) {
+        if (this._curLine.length == b64.length || this._curLine.length < 4) {
+            this._curLine = b64;
             b64 = '';
         } else {
             b64 = b64.substr(0, this._curLine.length);
@@ -198,4 +200,4 @@ Decoder.prototype._flush = function(done) {
         this._curLine = '';
     }
     done();
-};
+};

package.json

@@ -1,6 +1,6 @@
 {
     "name": "libbase64",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "description": "Encode and decode base64 encoded strings",
     "main": "lib/libbase64.js",
     "scripts": {
@@ -26,4 +26,4 @@
         "grunt-contrib-jshint": "~0.8.0",
         "grunt-mocha-test": "~0.10.0"
     }
-}
+}