# v0.5.2

* Fixed issue with `writeToString` and `writeToPath` examples C2FO#64 * Fixed issue with creating a csv without headers C2FO#63
doug-martin · Sep 5, 2014 · d958ddd · d958ddd
1 parent e697564
commit d958ddd
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 8 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,8 @@
+# v0.5.2
+
+* Fixed issue with `writeToString` and `writeToPath` examples [#64](https://github.com/C2FO/fast-csv/issues/64)
+* Fixed issue with creating a csv without headers [#63](https://github.com/C2FO/fast-csv/issues/63)
+
 # v0.5.1
 
 * Fixed issue where line data was not being passed between transforms in the parser_stream

diff --git a/README.md b/README.md
@@ -607,7 +607,7 @@ csv
    .pipe(ws);
 ```
 
-**`writeToPath(arr[, options])`**
+**`writeToPath(path, arr[, options])`**
 
 Write an array of values to the specified path
 
@@ -698,7 +698,7 @@ csv.writeToString(
         }
     },
     function (err, data) {
-        console.log(data); //"a,b\na1,b1\na2,b2\n"
+        console.log(data); //"A,B\na1,b1\na2,b2\n"
     }
 );
 ```

diff --git a/docs/History.html b/docs/History.html
@@ -176,6 +176,11 @@
 
 
 
+<h1>v0.5.2</h1>
+<ul>
+<li>Fixed issue with <code>writeToString</code> and <code>writeToPath</code> examples <a href="https://github.com/C2FO/fast-csv/issues/64">#64</a></li>
+<li>Fixed issue with creating a csv without headers <a href="https://github.com/C2FO/fast-csv/issues/63">#63</a></li>
+</ul>
 <h1>v0.5.1</h1>
 <ul>
 <li>Fixed issue where line data was not being passed between transforms in the parser_stream</li>

diff --git a/docs/index.html b/docs/index.html
@@ -664,7 +664,7 @@ <h3>Formatting Functions</h3>
         }
    })
    .pipe(ws);</code></pre>
-<p><strong><code>writeToPath(arr[, options])</code></strong></p>
+<p><strong><code>writeToPath(path, arr[, options])</code></strong></p>
 <p>Write an array of values to the specified path</p>
 <pre class='prettyprint linenums lang-js'><code class="lang-javascript">csv
    .writeToPath(&quot;my.csv&quot;, [
@@ -736,7 +736,7 @@ <h3>Formatting Functions</h3>
         }
     },
     function (err, data) {
-        console.log(data); //&quot;a,b\na1,b1\na2,b2\n&quot;
+        console.log(data); //&quot;A,B\na1,b1\na2,b2\n&quot;
     }
 );</code></pre>
 <h2>Piping from Parser to Writer</h2>

diff --git a/examples/write_to_string_no_headers_example.js b/examples/write_to_string_no_headers_example.js
@@ -0,0 +1,12 @@
+var csv = require("../");
+
+csv.writeToString(
+    [
+        {a: "a1", b: "b1"},
+        {a: "a2", b: "b2"}
+    ], {
+        headers: false
+    }, function (err, data) {
+        console.log('err:', err, 'data: |' + data + '|');
+    }
+);
diff --git a/examples/write_to_string_transform_example.js b/examples/write_to_string_transform_example.js
@@ -0,0 +1,19 @@
+var csv = require("../");
+csv.writeToString(
+    [
+        {a: "a1", b: "b1"},
+        {a: "a2", b: "b2"}
+    ],
+    {
+        headers: true,
+        transform: function (row) {
+            return {
+                A: row.a,
+                B: row.b
+            };
+        }
+    },
+    function (err, data) {
+        console.log(data); //"A,B\na1,b1\na2,b2\n"
+    }
+);
diff --git a/lib/formatter/formatter.js b/lib/formatter/formatter.js
@@ -123,12 +123,12 @@ function gatherHeaders(item) {
 function checkHeaders(stream, item) {
     var headers, ret = true;
     if (!stream.parsedHeaders) {
-        stream.totalCount++;
         stream.parsedHeaders = true;
         headers = stream.headers = gatherHeaders(item);
         stream.headersLength = headers.length;
     }
     if (!stream.hasWrittenHeaders) {
+        stream.totalCount++;
         stream.push(new Buffer(stream.formatter(headers, true), "utf8"));
         stream.hasWrittenHeaders = true;
         ret = isHashArray(item) || !isArray(item);

diff --git a/lib/formatter/formatter_stream.js b/lib/formatter/formatter_stream.js
@@ -30,8 +30,6 @@ function CsvTransformStream(options) {
         } else {
             this.parsedHeaders = false;
         }
-    } else {
-        this.parsedHeaders = true;
     }
     this.hasWrittenHeaders = hasHeaders ? false : true;
     this.includeEndRowDelimiter = !!options.includeEndRowDelimiter,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "fast-csv",
-    "version": "0.5.1",
+    "version": "0.5.2",
     "description": "CSV parser and writer",
     "main": "index.js",
     "scripts": {

diff --git a/test/fast-csv.test.js b/test/fast-csv.test.js
@@ -1936,6 +1936,107 @@ it.describe("fast-csv", function (it) {
             });
         });
 
+        it.describe("header option", function (it) {
+
+            it.should("write an array of objects without headers", function (next) {
+                csv.writeToString([
+                    {a: "a1", b: "b1"},
+                    {a: "a2", b: "b2"}
+                ], {
+                    headers: false
+                }, function (err, csv) {
+                    if (err) {
+                        next(err);
+                    } else {
+                        assert.equal(csv, "a1,b1\na2,b2");
+                        next();
+                    }
+                });
+            });
+
+            it.should("write an array of objects with headers", function (next) {
+                csv.writeToString([
+                    {a: "a1", b: "b1"},
+                    {a: "a2", b: "b2"}
+                ], {
+                    headers: true
+                }, function (err, csv) {
+                    if (err) {
+                        next(err);
+                    } else {
+                        assert.equal(csv, "a,b\na1,b1\na2,b2");
+                        next();
+                    }
+                });
+            });
+
+            it.should("write an array of arrays without headers", function (next) {
+                csv.writeToString([
+                    ["a1", "b1"],
+                    ["a2", "b2"]
+                ], {
+                    headers: false
+                }, function (err, csv) {
+                    if (err) {
+                        next(err);
+                    } else {
+                        assert.equal(csv, "a1,b1\na2,b2");
+                        next();
+                    }
+                });
+            });
+
+            it.should("write an array of arrays with headers", function (next) {
+                csv.writeToString([
+                    ["a", "b"],
+                    ["a1", "b1"],
+                    ["a2", "b2"]
+                ], {
+                    headers: true
+                }, function (err, csv) {
+                    if (err) {
+                        next(err);
+                    } else {
+                        assert.equal(csv, "a,b\na1,b1\na2,b2");
+                        next();
+                    }
+                });
+            });
+
+            it.should("write an array of multi-dimensional arrays without headers", function (next) {
+                csv.writeToString([
+                    [["a", "a1"], ["b", "b1"]],
+                    [["a", "a2"], ["b", "b2"]],
+                ], {
+                    headers: false
+                }, function (err, csv) {
+                    if (err) {
+                        next(err);
+                    } else {
+                        assert.equal(csv, "a1,b1\na2,b2");
+                        next();
+                    }
+                });
+            });
+
+            it.should("write an array of multi-dimensional arrays with headers", function (next) {
+                csv.writeToString([
+                    [["a", "a1"], ["b", "b1"]],
+                    [["a", "a2"], ["b", "b2"]],
+                ], {
+                    headers: true
+                }, function (err, csv) {
+                    if (err) {
+                        next(err);
+                    } else {
+                        assert.equal(csv, "a,b\na1,b1\na2,b2");
+                        next();
+                    }
+                });
+            });
+        });
+
+
         it.describe("rowDelimiter option", function (it) {
             it.should("support specifying an alternate row delimiter", function (next) {
                 csv.writeToString([