Skip to content

Commit 1fe3c46

Browse files
committed
Merging 3.0 into master
2 parents 7ad465e + f5eab68 commit 1fe3c46

18 files changed

+3237
-1533
lines changed

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
bower_components/*
2-
node_modules/*
1+
_gitignore/
2+
bower_components/
3+
node_modules/

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013 Matt
3+
Copyright (c) 2014 Matthew Holt
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

README.md

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,34 @@ Parse CSV with Javascript
33

44
[![mholt on Gittip](http://img.shields.io/badge/tips-accepted-brightgreen.svg?style=flat)](https://www.gittip.com/mholt/)
55

6-
76
Papa Parse (formerly the jQuery Parse Plugin) is a robust and powerful CSV (character-separated values) parser with these features:
87

9-
- Parses delimited text strings without any fuss
10-
- Attach to `<input type="file">` elements to load and parse files from disk
11-
- Automatically detects delimiter (or specify a delimiter yourself)
12-
- Supports streaming large inputs
13-
- Utilize the header row, if present
14-
- Gracefully handles malformed data
15-
- Optional dynamic typing so that numeric data is parsed as numbers
16-
- Descriptive and contextual errors
8+
- Easy to use
9+
- Parse CSV files directly (local or over the network)
10+
- Stream large files (even via HTTP)
11+
- Reverse parsing (converts JSON to CSV)
12+
- Auto-detects the delimiter
13+
- Worker threads to keep your web page responsive
14+
- Header row support
15+
- Can convert numbers and booleans to their types
16+
- Graceful and robust error handling
17+
- Minor jQuery integration to get files from `<input type="file">` elements
18+
19+
All are optional (except for being easy to use).
20+
1721

1822

19-
Demo
23+
[Demo](http://papaparse.com/demo.html)
2024
----
2125

22-
Visit **[PapaParse.com](http://papaparse.com/#demo)** to give Papa a whirl!
26+
Visit **[PapaParse.com/demo.html](http://papaparse.com/demo.html)** to try Papa!
2327

2428

2529

2630
Get Started
2731
-----------
2832

29-
Use [jquery.parse.min.js](https://github.com/mholt/jquery.parse/blob/master/jquery.parse.min.js) for production.
33+
Use [papaparse.min.js](https://github.com/mholt/PapaParse/blob/master/papaparse.min.js) for production.
3034

3135
For usage instructions, see the [homepage](http://papaparse.com) and, for more detail, the [documentation](http://papaparse.com/docs.html).
3236

@@ -35,18 +39,18 @@ For usage instructions, see the [homepage](http://papaparse.com) and, for more d
3539
Tests
3640
-----
3741

38-
The Parser component is under test. Download this repository and open `tests.html` in your browser to run them.
42+
Papa Parse is under test (especially its core Parser). Download this repository and open `tests/tests.html` in your browser to run them.
3943

4044

4145

4246
Contributing
4347
------------
4448

45-
If you'd like to see a feature or bug fix, pull down the code and submit a pull request. But remember, if you're changing anything in the Parser function, a pull request, *with test*, is best. (All changes to the parser component should be validated with tests.) You may also open issues for discussion or join in on Twitter with [#PapaParse](https://twitter.com/search?q=%23PapaParse&src=typd&f=realtime)
49+
To discuss a new feature or ask a question, open an issue. To fix a bug, submit a pull request to be credited with the [contributors](https://github.com/mholt/PapaParse/graphs/contributors)! Remember, a pull request, *with test*, is best. (Especially all changes to the Parser component should be validated with tests.) You may also discuss on Twitter with [#PapaParse](https://twitter.com/search?q=%23PapaParse&src=typd&f=realtime) or directly to me, [@mholt6](https://twitter.com/mholt6).
4650

4751

4852

4953
Origins
5054
-------
5155

52-
Papa Parse is the result of an experiment by [SmartyStreets](http://smartystreets.com) which matured into a fully-featured, independent jQuery plugin. Wanting to enhance the demo on their homepage, SmartyStreets looked into ways to simulate their list service. This involved processing at least part of a potentially large delimited text file. And what else? They wanted to do it without requiring a file upload (for simplicity and to alleviate privacy concerns). No suitable solutions were found, so they built their own. After finding it successful, the code was brought out into this jQuery plugin, now known as Papa Parse.
56+
Papa Parse is the result of a successful experiment by [SmartyStreets](http://smartystreets.com) which matured into a fully-featured, independent Javascript library.

bower.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Papa-Parse",
3-
"main": "jquery.parse.js",
3+
"main": "papaparse.js",
44
"homepage": "http://papaparse.com",
55
"authors": [
66
"Matthew Holt"
@@ -20,17 +20,19 @@
2020
"pipe",
2121
"file",
2222
"filereader",
23-
"stream"
23+
"stream",
24+
"workers",
25+
"ajax",
26+
"threading",
27+
"multi-threaded"
2428
],
2529
"license": "MIT",
2630
"ignore": [
2731
"**/.*",
2832
"node_modules",
2933
"bower_components",
3034
"test",
31-
"tests"
32-
],
33-
"dependencies": {
34-
"jquery": ">=1.6.0"
35-
}
35+
"tests",
36+
"player"
37+
]
3638
}

0 commit comments

Comments
 (0)