Skip to content

Commit

Permalink
Merge pull request #41 from doug-martin/master
Browse files Browse the repository at this point in the history
v0.4.0
  • Loading branch information
doug-martin committed Jun 1, 2014
2 parents a3f772a + eb74861 commit 26385d8
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
4 changes: 4 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# v0.4.0

* Fixed misspelling of `delimiter` [#40](https://github.com/C2FO/fast-csv/issues/40)

# v0.3.1

* Added transform support to formatters
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ All methods accept the following `options`
* `headers=false`: Ste to true if you expect the first line of your `CSV` to contain headers, alternatly you can specify an array of headers to use.
* `ignoreEmpty=false`: If you wish to ignore empty rows.
* `delimiter=','`: If your data uses an alternate delimiter such as `;` or `\t`.
* **NOTE** When specifying an alternate `delimiter` you may only pass in a single character delimeter
* `quote='"'`: The character to use to escape values that contain a delimeter.
* **NOTE** When specifying an alternate `delimiter` you may only pass in a single character delimiter
* `quote='"'`: The character to use to escape values that contain a delimiter.
* `escape='"'`: The character to use when escaping a value that is `quoted` and contains a `quote` character.
* `i.e`: 'First,"Name"' => '"First,""name"""'
* The following are options for parsing only.
Expand Down
4 changes: 4 additions & 0 deletions docs/History.html
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@



<h1>v0.4.0</h1>
<ul>
<li>Fixed misspelling of <code>delimiter</code> <a href="https://github.com/C2FO/fast-csv/issues/40">#40</a></li>
</ul>
<h1>v0.3.1</h1>
<ul>
<li>Added transform support to formatters<ul>
Expand Down
4 changes: 2 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,10 @@ <h3>Parsing</h3>
<li><code>headers=false</code>: Ste to true if you expect the first line of your <code>CSV</code> to contain headers, alternatly you can specify an array of headers to use.</li>
<li><code>ignoreEmpty=false</code>: If you wish to ignore empty rows.</li>
<li><code>delimiter=&#39;,&#39;</code>: If your data uses an alternate delimiter such as <code>;</code> or <code>\t</code>.<ul>
<li><strong>NOTE</strong> When specifying an alternate <code>delimiter</code> you may only pass in a single character delimeter</li>
<li><strong>NOTE</strong> When specifying an alternate <code>delimiter</code> you may only pass in a single character delimiter</li>
</ul>
</li>
<li><code>quote=&#39;&quot;&#39;</code>: The character to use to escape values that contain a delimeter.</li>
<li><code>quote=&#39;&quot;&#39;</code>: The character to use to escape values that contain a delimiter.</li>
<li><code>escape=&#39;&quot;&#39;</code>: The character to use when escaping a value that is <code>quoted</code> and contains a <code>quote</code> character.<ul>
<li><code>i.e</code>: &#39;First,&quot;Name&quot;&#39; =&gt; &#39;&quot;First,&quot;&quot;name&quot;&quot;&quot;&#39;</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion lib/formatter.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ var fs = require("fs"),

function createFormatter(options) {
options = options || {};
var delimiter = options.delimeter || ",",
var delimiter = options.delimiter || ",",
ESCAPE_REGEXP = new RegExp("[" + delimiter + "\\r\\n']"),
QUOTE = options.quote || '"',
ESCAPE = options.escape || '"',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fast-csv",
"version": "0.3.1",
"version": "0.4.0",
"description": "CSV parser and writer",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 26385d8

Please sign in to comment.