knight/datahub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#128,backend/csv][s]: rename localcsv to csv and make into a module recline.Backend.CSv.

Browse Source
This commit is contained in:
Rufus Pollock
2012-05-26 19:00:39 +01:00
parent 72ed877ae2
commit ed4f315a97
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/js/app.js
View File

@@ -154,7 +154,7 @@ var ExplorerApp = Backbone.View.extend({
delimiter : $form.find('input[name="delimiter"]').val(), delimiter : $form.find('input[name="delimiter"]').val(),
encoding : $form.find('input[name="encoding"]').val() encoding : $form.find('input[name="encoding"]').val()
}; };
recline.Backend.loadFromCSVFile(file, function(dataset) { recline.Backend.CSV.load(file, function(dataset) {
self.createExplorer(dataset) self.createExplorer(dataset)
}, },
options options

13
src/backend/localcsv.js → src/backend/csv.js
View File

@@ -1,8 +1,15 @@
this.recline = this.recline || {}; this.recline = this.recline || {};
this.recline.Backend = this.recline.Backend || {}; this.recline.Backend = this.recline.Backend || {};
this.recline.Backend.CSV = this.recline.Backend.CSV || {};
(function($, my) { (function(my) {
my.loadFromCSVFile = function(file, callback, options) { // ## load
//
// Load data from a CSV file referenced in an HTMl5 file object returning the
// dataset in the callback
//
// @param options as for parseCSV below
my.load = function(file, callback, options) {
var encoding = options.encoding || 'UTF-8'; var encoding = options.encoding || 'UTF-8';
var metadata = { var metadata = {
@@ -168,4 +175,4 @@ this.recline.Backend = this.recline.Backend || {};
} }
}(jQuery, this.recline.Backend)); }(this.recline.Backend.CSV));

10
test/backend.localcsv.test.js → test/backend/csv.test.js
View File

@@ -6,7 +6,7 @@ test("parseCSV", function() {
'"Xyz ""ABC"" O\'Brien",11:35\n' + '"Xyz ""ABC"" O\'Brien",11:35\n' +
'"Other, AN",12:35\n'; '"Other, AN",12:35\n';
var array = recline.Backend.parseCSV(csv); var array = recline.Backend.CSV.parseCSV(csv);
var exp = [ var exp = [
['Jones, Jay', 10], ['Jones, Jay', 10],
['Xyz "ABC" O\'Brien', '11:35' ], ['Xyz "ABC" O\'Brien', '11:35' ],
@@ -17,14 +17,14 @@ test("parseCSV", function() {
var csv = '"Jones, Jay", 10\n' + var csv = '"Jones, Jay", 10\n' +
'"Xyz ""ABC"" O\'Brien", 11:35\n' + '"Xyz ""ABC"" O\'Brien", 11:35\n' +
'"Other, AN", 12:35\n'; '"Other, AN", 12:35\n';
var array = recline.Backend.parseCSV(csv, {trim : true}); var array = recline.Backend.CSV.parseCSV(csv, {trim : true});
deepEqual(exp, array); deepEqual(exp, array);
var csv = 'Name, Value\n' + var csv = 'Name, Value\n' +
'"Jones, Jay", 10\n' + '"Jones, Jay", 10\n' +
'"Xyz ""ABC"" O\'Brien", 11:35\n' + '"Xyz ""ABC"" O\'Brien", 11:35\n' +
'"Other, AN", 12:35\n'; '"Other, AN", 12:35\n';
var dataset = recline.Backend.csvToDataset(csv); var dataset = recline.Backend.CSV.csvToDataset(csv);
dataset.query(); dataset.query();
equal(dataset.currentDocuments.length, 3); equal(dataset.currentDocuments.length, 3);
}); });
@@ -34,7 +34,7 @@ test("parseCSVsemicolon", function() {
'"Xyz ""ABC"" O\'Brien";11:35\n' + '"Xyz ""ABC"" O\'Brien";11:35\n' +
'"Other; AN";12:35\n'; '"Other; AN";12:35\n';
var array = recline.Backend.parseCSV(csv, {separator : ';'}); var array = recline.Backend.CSV.parseCSV(csv, {separator : ';'});
var exp = [ var exp = [
['Jones; Jay', 10], ['Jones; Jay', 10],
['Xyz "ABC" O\'Brien', '11:35' ], ['Xyz "ABC" O\'Brien', '11:35' ],
@@ -49,7 +49,7 @@ test("parseCSVdelimiter", function() {
"'Xyz \"ABC\" O''Brien',11:35\n" + "'Xyz \"ABC\" O''Brien',11:35\n" +
"'Other; AN',12:35\n"; "'Other; AN',12:35\n";
var array = recline.Backend.parseCSV(csv, {delimiter:"'"}); var array = recline.Backend.CSV.parseCSV(csv, {delimiter:"'"});
var exp = [ var exp = [
["Jones, Jay", 10], ["Jones, Jay", 10],
["Xyz \"ABC\" O'Brien", "11:35" ], ["Xyz \"ABC\" O'Brien", "11:35" ],