adaltas#120: trailing whitespace and empty headers

src/index.coffee.md

@@ -273,7 +273,6 @@ Implementation of the [`stream.Transform` API][transform]
           {rowDelimiter: matchedRowDelimiter, matched: true}
         else
           {rowDelimiter: matchedRowDelimiter, matched: false}
-
       ltrim = @options.trim or @options.ltrim
       rtrim = @options.trim or @options.rtrim
       chars = @buf + chars
@@ -423,11 +422,12 @@ Implementation of the [`stream.Transform` API][transform]
           else
             throw Error "Row delimiter(s) not found in the file #{JSON.stringify(@options.rowDelimiter)}"
       # Flush remaining fields and lines
-
       if end
-        if rtrim
-          @field = @field.trimRight() unless @closingQuote
-        if @field isnt ''
+        rtrimed = false
+        if rtrim and not @closingQuote
+          @field = @field.trimRight()
+          rtrimed = true
+        if @field isnt '' or rtrimed
           @line.push auto_parse @field
           @field = ''
         if @field.length > @options.max_limit_on_data_read
@@ -439,7 +439,6 @@ Implementation of the [`stream.Transform` API][transform]
             throw Error "Row delimiter(s) not found in the file #{JSON.stringify(@options.rowDelimiter[0])}"
           else
             throw Error "Row delimiter(s) not found in the file #{JSON.stringify(@options.rowDelimiter)}"
-      
       # Store un-parsed chars for next call
       @buf = ''
       while i < l

test/options.trim.coffee

@@ -108,6 +108,19 @@ describe 'trim', ->
     28392898392, 1974, 8.8392926E7," ABC DEF ", 23, 2050-11-27
     """
     parser.end()
+
+  it 'with header and column count', (next) ->
+    parse 'h1,h2,h3, \n1,2,3, \n4,5,6, ', 
+      delimiter: ','
+      columns: true
+      trim: true
+    , (err, data) ->
+      return next err if err
+      data.should.eql [
+        { h1: '1', h2: '2', h3: '3', '': '' },
+        { h1: '4', h2: '5', h3: '6', '': '' }
+      ]
+      next()
 
   it 'write aggressively', (next) ->
     data = []