From ed4f315a97995056c2fd9bf81268063259b76956 Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Sat, 26 May 2012 19:00:39 +0100
Subject: [PATCH] [#128,backend/csv][s]: rename localcsv to csv and make into a
 module recline.Backend.CSv.

---
 app/js/app.js                                       |  2 +-
 src/backend/{localcsv.js => csv.js}                 | 13 ++++++++++---
 .../csv.test.js}                                    | 10 +++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)
 rename src/backend/{localcsv.js => csv.js} (93%)
 rename test/{backend.localcsv.test.js => backend/csv.test.js} (79%)

diff --git a/app/js/app.js b/app/js/app.js
index 7c976fcf..b3ea3f22 100755
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -154,7 +154,7 @@ var ExplorerApp = Backbone.View.extend({
       delimiter : $form.find('input[name="delimiter"]').val(),
       encoding : $form.find('input[name="encoding"]').val()
     };
-    recline.Backend.loadFromCSVFile(file, function(dataset) {
+    recline.Backend.CSV.load(file, function(dataset) {
         self.createExplorer(dataset)
       },
       options
diff --git a/src/backend/localcsv.js b/src/backend/csv.js
similarity index 93%
rename from src/backend/localcsv.js
rename to src/backend/csv.js
index 0510feb6..a680ef17 100644
--- a/src/backend/localcsv.js
+++ b/src/backend/csv.js
@@ -1,8 +1,15 @@
 this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
+this.recline.Backend.CSV = this.recline.Backend.CSV || {};
 
-(function($, my) {
-  my.loadFromCSVFile = function(file, callback, options) {
+(function(my) {
+  // ## 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 metadata = {
@@ -168,4 +175,4 @@ this.recline.Backend = this.recline.Backend || {};
   }
 
 
-}(jQuery, this.recline.Backend));
+}(this.recline.Backend.CSV));
diff --git a/test/backend.localcsv.test.js b/test/backend/csv.test.js
similarity index 79%
rename from test/backend.localcsv.test.js
rename to test/backend/csv.test.js
index 8325e549..e47c46bf 100644
--- a/test/backend.localcsv.test.js
+++ b/test/backend/csv.test.js
@@ -6,7 +6,7 @@ test("parseCSV", function() {
   '"Xyz ""ABC"" O\'Brien",11:35\n' +
   '"Other, AN",12:35\n';
 
-  var array = recline.Backend.parseCSV(csv);
+  var array = recline.Backend.CSV.parseCSV(csv);
   var exp = [
     ['Jones, Jay', 10],
     ['Xyz "ABC" O\'Brien', '11:35' ],
@@ -17,14 +17,14 @@ test("parseCSV", function() {
   var csv = '"Jones, Jay", 10\n' +
   '"Xyz ""ABC"" O\'Brien", 11: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);
 
   var csv = 'Name, Value\n' +
   '"Jones, Jay", 10\n' +
   '"Xyz ""ABC"" O\'Brien", 11:35\n' +
   '"Other, AN", 12:35\n';
-  var dataset = recline.Backend.csvToDataset(csv);
+  var dataset = recline.Backend.CSV.csvToDataset(csv);
   dataset.query();
   equal(dataset.currentDocuments.length, 3);
 });
@@ -34,7 +34,7 @@ test("parseCSVsemicolon", function() {
   '"Xyz ""ABC"" O\'Brien";11:35\n' +
   '"Other; AN";12:35\n';
 
-  var array = recline.Backend.parseCSV(csv, {separator : ';'});
+  var array = recline.Backend.CSV.parseCSV(csv, {separator : ';'});
   var exp = [
     ['Jones; Jay', 10],
     ['Xyz "ABC" O\'Brien', '11:35' ],
@@ -49,7 +49,7 @@ test("parseCSVdelimiter", function() {
   "'Xyz \"ABC\" O''Brien',11:35\n" +
   "'Other; AN',12:35\n";
 
-  var array = recline.Backend.parseCSV(csv, {delimiter:"'"});
+  var array = recline.Backend.CSV.parseCSV(csv, {delimiter:"'"});
   var exp = [
     ["Jones, Jay", 10],
     ["Xyz \"ABC\" O'Brien", "11:35" ],