From 263353a611104299f633271ed8b7285607b808b0 Mon Sep 17 00:00:00 2001
From: Keyang <keyang.xiang@gmail.com>
Date: Mon, 23 Jan 2017 21:35:35 +0000
Subject: [PATCH] fix 134

---
 libs/core/Converter.js    | 480 +++++++++++++++++++-------------------
 libs/core/fileline.js     |  10 +-
 package.json              |   2 +-
 test/data/dataIgnoreEmpty |   3 +
 test/data/longHeader      |   2 +
 test/testCSVConverter.js  |   3 +-
 test/testCSVConverter2.js |  15 ++
 7 files changed, 275 insertions(+), 240 deletions(-)
 create mode 100644 test/data/longHeader

diff --git a/libs/core/Converter.js b/libs/core/Converter.js
index 87e9651..f16f311 100644
--- a/libs/core/Converter.js
+++ b/libs/core/Converter.js
@@ -3,311 +3,319 @@ var Transform = require("stream").Transform;
 var os = require("os");
 var eol = os.EOL;
 // var Processor = require("./Processor.js");
-var defParam=require("./defParam");
-var csvline=require("./csvline");
-var fileline=require("./fileline");
-var dataToCSVLine=require("./dataToCSVLine");
-var fileLineToCSVLine=require("./fileLineToCSVLine");
-var linesToJson=require("./linesToJson");
-var CSVError=require("./CSVError");
-var workerMgr=require("./workerMgr");
-function Converter(params,options) {
-  Transform.call(this,options);
-  _param=defParam(params);
-  this._options=options || {};
+var defParam = require("./defParam");
+var csvline = require("./csvline");
+var fileline = require("./fileline");
+var dataToCSVLine = require("./dataToCSVLine");
+var fileLineToCSVLine = require("./fileLineToCSVLine");
+var linesToJson = require("./linesToJson");
+var CSVError = require("./CSVError");
+var workerMgr = require("./workerMgr");
+function Converter(params, options) {
+  Transform.call(this, options);
+  _param = defParam(params);
+  this._options = options || {};
   this.param = _param;
-  this.param._options=this._options;
+  this.param._options = this._options;
   // this.resultObject = new Result(this);
   // this.pipe(this.resultObject); // it is important to have downstream for a transform otherwise it will stuck
   this.started = false;//indicate if parsing has started.
   this.recordNum = 0;
-  this.lineNumber=0; //file line number
-  this._csvLineBuffer="";
-  this.lastIndex=0; // index in result json array
+  this.lineNumber = 0; //file line number
+  this._csvLineBuffer = "";
+  this.lastIndex = 0; // index in result json array
   //this._pipe(this.lineParser).pipe(this.processor);
   // this.initNoFork();
-  if (this.param.forked){
-    this.param.forked=false;
-    this.workerNum=2;
-  } 
+  if (this.param.forked) {
+    this.param.forked = false;
+    this.workerNum = 2;
+  }
   this.flushCb = null;
   this.processEnd = false;
   this.sequenceBuffer = [];
-  this._needJson=null;
-  this._needEmitResult=null;
-  this._needEmitFinalResult=null;
-  this._needEmitJson=null;
-  this._needPush=null;
-  this._needEmitCsv=null;
-  this._csvTransf=null;
-  this.finalResult=[];
+  this._needJson = null;
+  this._needEmitResult = null;
+  this._needEmitFinalResult = null;
+  this._needEmitJson = null;
+  this._needPush = null;
+  this._needEmitCsv = null;
+  this._csvTransf = null;
+  this.finalResult = [];
   // this.on("data", function() {});
   this.on("error", emitDone(this));
   this.on("end", emitDone(this));
   this.initWorker();
-  process.nextTick(function(){
-    if (this._needEmitFinalResult === null){
-      this._needEmitFinalResult=this.listeners("end_parsed").length > 0
+  process.nextTick(function () {
+    if (this._needEmitFinalResult === null) {
+      this._needEmitFinalResult = this.listeners("end_parsed").length > 0
     }
-    if (this._needEmitResult===null){
-      this._needEmitResult=this.listeners("record_parsed").length>0
+    if (this._needEmitResult === null) {
+      this._needEmitResult = this.listeners("record_parsed").length > 0
     }
-    if (this._needEmitJson === null){
-      this._needEmitJson=this.listeners("json").length>0
+    if (this._needEmitJson === null) {
+      this._needEmitJson = this.listeners("json").length > 0
     }
-    if (this._needEmitCsv === null){
-      this._needEmitCsv=this.listeners("csv").length>0
+    if (this._needEmitCsv === null) {
+      this._needEmitCsv = this.listeners("csv").length > 0
     }
-    if (this._needJson === null){
-      this._needJson=this._needEmitJson || this._needEmitFinalResult || this._needEmitResult || this.transform || this._options.objectMode;
+    if (this._needJson === null) {
+      this._needJson = this._needEmitJson || this._needEmitFinalResult || this._needEmitResult || this.transform || this._options.objectMode;
     }
-    if (this._needPush === null){
-      this._needPush = this.listeners("data").length > 0 || this.listeners("readable").length>0
+    if (this._needPush === null) {
+      this._needPush = this.listeners("data").length > 0 || this.listeners("readable").length > 0
       // this._needPush=false;
     }
-    this.param._needParseJson=this._needJson || this._needPush; 
+    this.param._needParseJson = this._needJson || this._needPush;
 
   }.bind(this))
   return this;
 }
 util.inherits(Converter, Transform);
-function emitDone(conv){
-  return function(err){
-    process.nextTick(function(){
-      conv.emit('done',err)
+function emitDone(conv) {
+  return function (err) {
+    process.nextTick(function () {
+      conv.emit('done', err)
     })
   }
 }
-Converter.prototype._transform = function(data, encoding, cb) {
+Converter.prototype._transform = function (data, encoding, cb) {
   if (this.param.toArrayString && this.started === false) {
     this.started = true;
-    if (this._needPush){
+    if (this._needPush) {
       this.push("[" + eol, "utf8");
     }
   }
-  data=data.toString("utf8");
-  var self=this;
-  this.preProcessRaw(data,function(d){
-    if (d && d.length>0){
+  data = data.toString("utf8");
+  var self = this;
+  this.preProcessRaw(data, function (d) {
+    if (d && d.length > 0) {
       self.processData(self.prepareData(d), cb);
-    }else{
+    } else {
       cb();
     }
   })
 };
-Converter.prototype.prepareData=function(data){
-  return this._csvLineBuffer+data;
+Converter.prototype.prepareData = function (data) {
+  return this._csvLineBuffer + data;
 }
-Converter.prototype.setPartialData=function(d){
-  this._csvLineBuffer=d;
+Converter.prototype.setPartialData = function (d) {
+  this._csvLineBuffer = d;
 }
-Converter.prototype.processData=function(data,cb){
-  var params=this.param;
-  var fileLines=fileline(data,this.param)
-  if (this.preProcessLine && typeof this.preProcessLine === "function"){
-    fileLines.lines=this._preProcessLines(fileLines.lines,this.lastIndex)
+Converter.prototype.processData = function (data, cb) {
+  var params = this.param;
+  if (params.ignoreEmpty && !params._headers){
+    data=data.trimLeft(); 
   }
-  if (!params._headers){ //header is not inited. init header
-    this.processHead(fileLines,cb);
-  }else{
-    if (params.workerNum<=1){
-      var lines=fileLineToCSVLine(fileLines,params);
-      this.setPartialData(lines.partial);
-      var jsonArr=linesToJson(lines.lines,params,this.recordNum);
-      this.processResult(jsonArr)
-      this.lastIndex+=jsonArr.length;
-      this.recordNum+=jsonArr.length;
-      cb();
-    }else{
-      this.workerProcess(fileLines,cb);
+  var fileLines = fileline(data, this.param)
+  if (fileLines.lines.length > 0) {
+    if (this.preProcessLine && typeof this.preProcessLine === "function") {
+      fileLines.lines = this._preProcessLines(fileLines.lines, this.lastIndex)
     }
+    if (!params._headers) { //header is not inited. init header
+      this.processHead(fileLines, cb);
+    } else {
+      if (params.workerNum <= 1) {
+        var lines = fileLineToCSVLine(fileLines, params);
+        this.setPartialData(lines.partial);
+        var jsonArr = linesToJson(lines.lines, params, this.recordNum);
+        this.processResult(jsonArr)
+        this.lastIndex += jsonArr.length;
+        this.recordNum += jsonArr.length;
+        cb();
+      } else {
+        this.workerProcess(fileLines, cb);
+      }
+    }
+  }else{
+    this.setPartialData(fileLines.partial)
+    cb();
   }
 }
-Converter.prototype._preProcessLines=function(lines,startIdx){
-  var rtn=[]
-  for (var i=0;i<lines.length;i++){
-    var result=this.preProcessLine(lines[i],startIdx+i+1)
-    if (typeof result ==="string"){
+Converter.prototype._preProcessLines = function (lines, startIdx) {
+  var rtn = []
+  for (var i = 0; i < lines.length; i++) {
+    var result = this.preProcessLine(lines[i], startIdx + i + 1)
+    if (typeof result === "string") {
       rtn.push(result)
-    }else{
+    } else {
       rtn.push(lines[i])
-      this.emit("error",new Error("preProcessLine should return a string but got: "+JSON.stringify(result)))
+      this.emit("error", new Error("preProcessLine should return a string but got: " + JSON.stringify(result)))
     }
   }
   return rtn
 }
-Converter.prototype.initWorker=function(){
-  var workerNum=this.param.workerNum-1;
-  if (workerNum>0){
-    this.workerMgr=workerMgr();
-    this.workerMgr.initWorker(workerNum,this.param);
+Converter.prototype.initWorker = function () {
+  var workerNum = this.param.workerNum - 1;
+  if (workerNum > 0) {
+    this.workerMgr = workerMgr();
+    this.workerMgr.initWorker(workerNum, this.param);
   }
 }
-Converter.prototype.preRawData=function(func){
-  this.preProcessRaw=func;
+Converter.prototype.preRawData = function (func) {
+  this.preProcessRaw = func;
   return this;
 }
-Converter.prototype.preFileLine=function(func){
-  this.preProcessLine=func;
+Converter.prototype.preFileLine = function (func) {
+  this.preProcessLine = func;
   return this;
 }
 /**
  * workerpRocess does not support embeded multiple lines. 
  */
 
-Converter.prototype.workerProcess=function(fileLine,cb){
-  var self=this;
-  var line=fileLine
-  var eol=this.getEol()
+Converter.prototype.workerProcess = function (fileLine, cb) {
+  var self = this;
+  var line = fileLine
+  var eol = this.getEol()
   this.setPartialData(line.partial)
-  this.workerMgr.sendWorker(line.lines.join(eol)+eol,this.lastIndex,cb,function(results,lastIndex){
-      var cur=self.sequenceBuffer[0];
-      if (cur.idx === lastIndex){
-        cur.result=results;
-        var records=[];
-        while (self.sequenceBuffer[0] && self.sequenceBuffer[0].result){
-          var buf=self.sequenceBuffer.shift();
-          records=records.concat(buf.result)
-        }
-        self.processResult(records)
-        self.recordNum+=records.length;
-      }else{
-        for (var i=0;i<self.sequenceBuffer.length;i++){
-          var buf=self.sequenceBuffer[i];
-          if (buf.idx === lastIndex){
-            buf.result=results;
-            break;
-          }
+  this.workerMgr.sendWorker(line.lines.join(eol) + eol, this.lastIndex, cb, function (results, lastIndex) {
+    var cur = self.sequenceBuffer[0];
+    if (cur.idx === lastIndex) {
+      cur.result = results;
+      var records = [];
+      while (self.sequenceBuffer[0] && self.sequenceBuffer[0].result) {
+        var buf = self.sequenceBuffer.shift();
+        records = records.concat(buf.result)
+      }
+      self.processResult(records)
+      self.recordNum += records.length;
+    } else {
+      for (var i = 0; i < self.sequenceBuffer.length; i++) {
+        var buf = self.sequenceBuffer[i];
+        if (buf.idx === lastIndex) {
+          buf.result = results;
+          break;
         }
       }
-      // self.processResult(JSON.parse(results),function(){},true);
+    }
+    // self.processResult(JSON.parse(results),function(){},true);
   })
   this.sequenceBuffer.push({
-    idx:this.lastIndex,
-    result:null
+    idx: this.lastIndex,
+    result: null
   });
-  this.lastIndex+=line.lines.length;
+  this.lastIndex += line.lines.length;
 }
-Converter.prototype.processHead=function(fileLine,cb){
-  var params=this.param;
-  if (!params._headers){ //header is not inited. init header
-    var lines=fileLineToCSVLine(fileLine,params);
+Converter.prototype.processHead = function (fileLine, cb) {
+  var params = this.param;
+  if (!params._headers) { //header is not inited. init header
+    var lines = fileLineToCSVLine(fileLine, params);
     this.setPartialData(lines.partial);
-    if (params.noheader){
-      if (params.headers){
-        params._headers=params.headers;
-      }else{
-        params._headers=[];
+    if (params.noheader) {
+      if (params.headers) {
+        params._headers = params.headers;
+      } else {
+        params._headers = [];
       }
-    }else{
-      var headerRow=lines.lines.shift();
-      if (params.headers){
-        params._headers=params.headers;
-      }else{
-        params._headers=headerRow;
+    } else {
+      var headerRow = lines.lines.shift();
+      if (params.headers) {
+        params._headers = params.headers;
+      } else {
+        params._headers = headerRow;
       }
     }
-    if (this.param.workerNum>1){
+    if (this.param.workerNum > 1) {
       this.workerMgr.setParams(params);
     }
-    var res=linesToJson(lines.lines,params,0);
+    var res = linesToJson(lines.lines, params, 0);
     this.processResult(res);
-    this.lastIndex+=res.length;
-    this.recordNum+=res.length;
+    this.lastIndex += res.length;
+    this.recordNum += res.length;
     cb();
-  }else{
+  } else {
     cb();
   }
 }
-Converter.prototype.processResult=function(result){
-    
-    for (var i=0;i<result.length;i++){
-      var r=result[i];
-      if (r.err){
-        this.emit("error",r.err);
-      }else{
-        this.emitResult(r);
-      }
+Converter.prototype.processResult = function (result) {
+
+  for (var i = 0; i < result.length; i++) {
+    var r = result[i];
+    if (r.err) {
+      this.emit("error", r.err);
+    } else {
+      this.emitResult(r);
     }
-    // this.lastIndex+=result.length;
-    // cb();
+  }
+  // this.lastIndex+=result.length;
+  // cb();
 }
 
-Converter.prototype.emitResult=function(r){
-  var index=r.index;
-  var row=r.row;
-  var result=r.json;
-  var resultJson=null;
-  var resultStr=null;
-  if (typeof result === "string"){
-    resultStr=result;
-  }else{
-    resultJson=result;
+Converter.prototype.emitResult = function (r) {
+  var index = r.index;
+  var row = r.row;
+  var result = r.json;
+  var resultJson = null;
+  var resultStr = null;
+  if (typeof result === "string") {
+    resultStr = result;
+  } else {
+    resultJson = result;
   }
-  if (resultJson===null && this._needJson){
-    resultJson=JSON.parse(resultStr)
-    if (typeof row ==="string"){
-      row=JSON.parse(row)
+  if (resultJson === null && this._needJson) {
+    resultJson = JSON.parse(resultStr)
+    if (typeof row === "string") {
+      row = JSON.parse(row)
     }
   }
-  if (this.transform && typeof this.transform==="function"){
-    this.transform(resultJson,row,index);
-    resultStr=null;
+  if (this.transform && typeof this.transform === "function") {
+    this.transform(resultJson, row, index);
+    resultStr = null;
   }
-  if (this._needEmitJson){
-    this.emit("json",resultJson,index)
+  if (this._needEmitJson) {
+    this.emit("json", resultJson, index)
   }
-  if (this._needEmitCsv){
-    if (typeof row ==="string"){
-      row=JSON.parse(row)
+  if (this._needEmitCsv) {
+    if (typeof row === "string") {
+      row = JSON.parse(row)
     }
-    this.emit("csv",row,index)
+    this.emit("csv", row, index)
   }
-  if (this.param.constructResult && this._needEmitFinalResult){
+  if (this.param.constructResult && this._needEmitFinalResult) {
     this.finalResult.push(resultJson)
   }
-  if (this._needEmitResult){
+  if (this._needEmitResult) {
     this.emit("record_parsed", resultJson, row, index);
   }
   if (this.param.toArrayString && index > 0 && this._needPush) {
     this.push("," + eol);
   }
-  if (this._options && this._options.objectMode){
+  if (this._options && this._options.objectMode) {
     this.push(resultJson);
-  }else{
-    if (this._needPush){
-      if (resultStr===null){
-        resultStr=JSON.stringify(resultJson)
+  } else {
+    if (this._needPush) {
+      if (resultStr === null) {
+        resultStr = JSON.stringify(resultJson)
       }
-      this.push(!this.param.toArrayString?resultStr+eol:resultStr, "utf8");
+      this.push(!this.param.toArrayString ? resultStr + eol : resultStr, "utf8");
     }
   }
 }
 
-Converter.prototype.preProcessRaw=function(data,cb){
+Converter.prototype.preProcessRaw = function (data, cb) {
   cb(data);
 }
 
-Converter.prototype.preProcessLine=function(line,lineNumber){
-    return line;
+Converter.prototype.preProcessLine = function (line, lineNumber) {
+  return line;
 }
-Converter.prototype._flush = function(cb) {
+Converter.prototype._flush = function (cb) {
   var self = this;
-  this.flushCb=function(){
-    self.emit("end_parsed",self.finalResult);
-    if (self.workerMgr){
+  this.flushCb = function () {
+    self.emit("end_parsed", self.finalResult);
+    if (self.workerMgr) {
       self.workerMgr.destroyWorker();
     }
     cb()
-    if (!self._needPush){
+    if (!self._needPush) {
       self.emit("end")
     }
   };
   if (this._csvLineBuffer.length > 0) {
-    if (this._csvLineBuffer[this._csvLineBuffer.length-1] != this.getEol()){
-      this._csvLineBuffer+=this.getEol();
+    if (this._csvLineBuffer[this._csvLineBuffer.length - 1] != this.getEol()) {
+      this._csvLineBuffer += this.getEol();
     }
-    this.processData(this._csvLineBuffer,function(){
+    this.processData(this._csvLineBuffer, function () {
       this.checkAndFlush();
     }.bind(this));
   } else {
@@ -322,100 +330,98 @@ Converter.prototype._flush = function(cb) {
 //   this.child.stdin.end();
 //   this.child.on("exit", cb);
 // }
-Converter.prototype.checkAndFlush = function() {
-    if (this._csvLineBuffer.length !== 0) {
-      this.emit("error", CSVError.unclosed_quote(this.recordNum,this._csvLineBuffer), this._csvLineBuffer);
-    }
-    if (this.param.toArrayString && this._needPush) {
-      this.push(eol + "]", "utf8");
-    }
-    if (this.workerMgr && this.workerMgr.isRunning()){
-      this.workerMgr.drain=function(){
-        this.flushCb();
-      }.bind(this);
-    }else{
+Converter.prototype.checkAndFlush = function () {
+  if (this._csvLineBuffer.length !== 0) {
+    this.emit("error", CSVError.unclosed_quote(this.recordNum, this._csvLineBuffer), this._csvLineBuffer);
+  }
+  if (this.param.toArrayString && this._needPush) {
+    this.push(eol + "]", "utf8");
+  }
+  if (this.workerMgr && this.workerMgr.isRunning()) {
+    this.workerMgr.drain = function () {
       this.flushCb();
-    }
+    }.bind(this);
+  } else {
+    this.flushCb();
+  }
 }
-Converter.prototype.getEol = function(data) {
+Converter.prototype.getEol = function (data) {
   if (!this.param.eol && data) {
-    for (var i=0;i<data.length;i++){
-      if (data[i]==="\r"){
-        if (data[i+1] === "\n"){
-          this.param.eol="\r\n";
-        }else{
-          this.param.eol="\r";
+    for (var i = 0; i < data.length; i++) {
+      if (data[i] === "\r") {
+        if (data[i + 1] === "\n") {
+          this.param.eol = "\r\n";
+        } else {
+          this.param.eol = "\r";
         }
         return this.param.eol;
-      }else if (data[i]==="\n"){
-        this.param.eol="\n";
+      } else if (data[i] === "\n") {
+        this.param.eol = "\n";
         return this.param.eol;
       }
     }
-    this.param.eol=eol;
+    this.param.eol = eol;
   }
 
   return this.param.eol || eol;
 };
-Converter.prototype.fromFile = function(filePath, cb) {
+Converter.prototype.fromFile = function (filePath, cb) {
   var fs = require('fs');
-  var rs=null;
-  this.wrapCallback(cb, function() {
-    if (rs && rs.destroy){
+  var rs = null;
+  this.wrapCallback(cb, function () {
+    if (rs && rs.destroy) {
       rs.destroy();
     }
   });
-  fs.exists(filePath, function(exist) {
+  fs.exists(filePath, function (exist) {
     if (exist) {
       rs = fs.createReadStream(filePath);
       rs.pipe(this);
     } else {
-      this.emit('error',new Error("File not exist"))
+      this.emit('error', new Error("File not exist"))
     }
   }.bind(this));
   return this;
 }
-Converter.prototype.fromStream=function(readStream,cb){
-  if (cb && typeof cb ==="function"){
+Converter.prototype.fromStream = function (readStream, cb) {
+  if (cb && typeof cb === "function") {
     this.wrapCallback(cb);
   }
-  process.nextTick(function(){
-    readStream.pipe(this);
-  }.bind(this))
+  readStream.pipe(this);
   return this;
 }
-Converter.prototype.transf=function(func){
-  this.transform=func;
+Converter.prototype.transf = function (func) {
+  this.transform = func;
   return this;
 }
-Converter.prototype.fromString = function(csvString, cb) {
+Converter.prototype.fromString = function (csvString, cb) {
   if (typeof csvString != "string") {
     return cb(new Error("Passed CSV Data is not a string."));
   }
   if (cb && typeof cb === "function") {
-    this.wrapCallback(cb, function() {
+    this.wrapCallback(cb, function () {
     });
   }
-  process.nextTick(function(){
+  process.nextTick(function () {
     this.end(csvString)
   }.bind(this))
   return this;
 };
-Converter.prototype.wrapCallback = function(cb, clean) {
+Converter.prototype.wrapCallback = function (cb, clean) {
 
-  if (clean === undefined){
-    clean=function(){}
+  if (clean === undefined) {
+    clean = function () { }
   }
-  if (cb && typeof cb ==="function"){
-    this.once("end_parsed", function(res) {
+  if (cb && typeof cb === "function") {
+    this.once("end_parsed", function (res) {
       if (!this.hasError) {
         cb(null, res);
       }
     }.bind(this));
   }
-  this.once("error", function(err) {
-    this.hasError=true;
-    if (cb && typeof cb  ==="function"){
+  this.once("error", function (err) {
+    this.hasError = true;
+    if (cb && typeof cb === "function") {
       cb(err);
     }
     clean();
diff --git a/libs/core/fileline.js b/libs/core/fileline.js
index 120bea4..0594575 100644
--- a/libs/core/fileline.js
+++ b/libs/core/fileline.js
@@ -9,5 +9,13 @@ module.exports=function(data,param){
   var eol=getEol(data,param);
   var lines= data.split(eol);
   var partial=lines.pop();
-  return {lines:lines,partial:partial};
+  // if (param.ignoreEmpty){
+  //   var trimmedLines=[];
+  //   for (var i=0;i<lines.length;i++){
+  //     trimmedLines.push(lines[i].trim())
+  //   }
+  //   return {lines:trimmedLines,partial:partial};
+  // }else{
+    return {lines:lines,partial:partial};
+  // }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index a10c067..83cd049 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
       "email": "t3dodson@gmail.com"
     }
   ],
-  "version": "1.1.2",
+  "version": "1.1.3",
   "keywords": [
     "csv",
     "csvtojson",
diff --git a/test/data/dataIgnoreEmpty b/test/data/dataIgnoreEmpty
index 92fb227..538dba8 100644
--- a/test/data/dataIgnoreEmpty
+++ b/test/data/dataIgnoreEmpty
@@ -1,3 +1,6 @@
+
+
+
 col1, col2.0, col2.1,col4.col3,col4.col5
 d1,,d3,,world
 
diff --git a/test/data/longHeader b/test/data/longHeader
new file mode 100644
index 0000000..b34aede
--- /dev/null
+++ b/test/data/longHeader
@@ -0,0 +1,2 @@
+Date,Advertiser,Advertiser ID,Advertiser Status,Advertiser Integration Code,Insertion Order,Insertion Order ID,Insertion Order Status,Insertion Order Integration Code,Partner Currency,Advertiser Currency,Clicks,% Clicks Leading to Conversions,Conversions per 1000 Impressions,CPM Fee 1 (Adv Currency),CPM Fee 1 (Partner Currency),CPM Fee 1 (USD),CPM Fee 2 (Adv Currency),CPM Fee 2 (Partner Currency),CPM Fee 2 (USD),Click Rate (CTR),Data Fees (Adv Currency),Data Fees (Partner Currency),Data Fees (USD),Impressions,% Impressions Leading to Conversions,Post-Click Conversions,Post-View Conversions,Media Cost (Advertiser Currency),Media Cost eCPA (PC) (Adv Currency),Media Cost eCPA (PC) (Partner Currency),Media Cost eCPA (PC) (USD),Media Cost eCPA (PV) (Adv Currency),Media Cost eCPA (PV) (Partner Currency),Media Cost eCPA (PV) (USD),Media Cost eCPA (Adv Currency),Media Cost eCPA (Partner Currency),Media Cost eCPA (USD),Video Media Cost eCPCV (Adv Currency),Video Media Cost eCPCV (Partner Currency),Video Media Cost eCPCV (USD),Media Cost eCPC (Adv Currency),Media Cost eCPC (Partner Currency),Media Cost eCPC (USD),Media Cost eCPM (Adv Currency),Media Cost eCPM (Partner Currency),Media Cost eCPM (USD),Media Cost (Partner Currency),Media Cost (USD),Media Fee 1 (Adv Currency),Media Fee 1 (Partner Currency),Media Fee 1 (USD),Media Fee 2 (Adv Currency),Media Fee 2 (Partner Currency),Media Fee 2 (USD),DCM Post-Click Revenue,DCM Post-View Revenue,Profit (Advertiser Currency),Profit eCPM (Adv Currency),Profit eCPM (Partner Currency),Profit eCPM (USD),Profit Margin,Profit (Partner Currency),Profit (USD),Revenue (Adv Currency),Revenue eCPA (PC) (Adv Currency),Revenue eCPA (PC) (Partner Currency),Revenue eCPA (PC) (USD),Revenue eCPA (PV) (Adv Currency),Revenue eCPA (PV) (Partner Currency),Revenue eCPA (PV) (USD),Revenue eCPA (Adv Currency),Revenue eCPA (Partner Currency),Revenue eCPA (USD),Video Revenue eCPCV (Adv Currency),Video Revenue eCPCV (Partner Currency),Video Revenue eCPCV (USD),Revenue eCPC (Adv Currency),Revenue eCPC (Partner Currency),Revenue eCPC (USD),Revenue eCPM (Adv Currency),Revenue eCPM (Partner Currency),Revenue eCPM (USD),Revenue (Partner Currency),Revenue (USD),Complete Views (Video),First-Quartile Views (Video),Fullscreens (Video),Midpoint Views (Video),Audio Mutes (Video),Pauses (Video),Starts (Video),Skips (Video),Third-Quartile Views (Video),Total Conversions,Total Media Cost (Advertiser Currency),Total Media Cost eCPA (PC) (Adv Currency),Total Media Cost eCPA (PC) (Partner Currency),Total Media Cost eCPA (PC) (USD),Total Media Cost eCPA (PV) (Adv Currency),Total Media Cost eCPA (PV) (Partner Currency),Total Media Cost eCPA (PV) (USD),Total Media Cost eCPA (Adv Currency),Total Media Cost eCPA (Partner Currency),Total Media Cost eCPA (USD),Total Video Media Cost eCPCV (Adv Currency),Total Video Media Cost eCPCV (Partner Currency),Total Video Media Cost eCPCV (USD),Total Media Cost eCPC (Adv Currency),Total Media Cost eCPC (Partner Currency),Total Media Cost eCPC (USD),Total Media Cost eCPM (Adv Currency),Total Media Cost eCPM (Partner Currency),Total Media Cost eCPM (USD),Total Media Cost (Partner Currency),Total Media Cost (USD),Completion Rate (Video)
+8/26/16,1000 AAAAAA AAAA AAAA - AAAAAA - #AAAAAAAA - AAA,1161431,Active,,1010101010 - 1000 AAAAAAA AAAA AAAA - AAAAAAA AAAA - 28 Jun 2016 - AAAAAAA - #AAAAAAAA - AAAAAAA,2427940,Paused,CTR,CAD,CAD,2,0.00%,0,0,0,0,0,0,0,0.13%,0,0,0,1540,0.00%,0,0,7.476659,0,0,0,0,0,0,0,0,0,0,0,0,3.738329,3.73833,2.892061,4.854973,4.854973,3.755923,7.476659,5.784121,0.971966,0.971966,0.751936,0,0,0,0,0,10.031375,6.51388,6.51388,5.035214,54.26%,10.031375,7.75423,18.48,0,0,0,0,0,0,0,0,0,0,0,0,9.24,9.24,7.145143,12,12,9.279407,18.48,14.290287,0,0,0,0,0,0,0,0,0,0,8.448625,0,0,0,0,0,0,0,0,0,0,0,0,4.224312,4.224312,3.268029,5.48612,5.48612,4.244193,8.448625,6.536057,0.00%
\ No newline at end of file
diff --git a/test/testCSVConverter.js b/test/testCSVConverter.js
index 25da047..3f42f78 100644
--- a/test/testCSVConverter.js
+++ b/test/testCSVConverter.js
@@ -1,4 +1,5 @@
 var Converter = require("../libs/core/Converter.js");
+var csv=require('../')
 var assert = require("assert");
 var fs = require("fs");
 var file = __dirname + "/data/testData";
@@ -281,7 +282,7 @@ describe("CSV Converter", function () {
   it ("be able to ignore empty columns",function (done){
     var testData = __dirname + "/data/dataIgnoreEmpty";
     var rs = fs.createReadStream(testData);
-    var st = rs.pipe(new Converter({ignoreEmpty:true}));
+    var st = rs.pipe(csv({ignoreEmpty:true}));
     st.on("end_parsed",function (res){
       var j = res[0];
       assert(res.length  === 3);
diff --git a/test/testCSVConverter2.js b/test/testCSVConverter2.js
index c2fd748..bc153a1 100644
--- a/test/testCSVConverter2.js
+++ b/test/testCSVConverter2.js
@@ -352,4 +352,19 @@ describe("CSV Converter", function () {
     })
       .on("end", done)
   })
+    it("should process long header", function (done) {
+    var testData = __dirname + "/data/longHeader";
+    var rs = fs.createReadStream(testData,{highWaterMark:100});
+    var numofrow = 0;
+    var numofjson = 0;
+    csv({},{highWaterMark:100})
+      .fromStream(rs)
+      .on("json", function (res) {
+        console.log(res)
+        assert.equal(res.Date,'8/26/16')
+      })
+      .on("end", function () {
+        done();
+      })
+  })
 });