Skip to content

Commit

Permalink
use new tabletop lib
Browse files Browse the repository at this point in the history
  • Loading branch information
@benbreedlove
benbreedlove committed Mar 26, 2015
1 parent 16662fb commit 4d48b23
Show file tree
Hide file tree
Showing 2 changed files with 105 additions and 13 deletions.
2 changes: 2 additions & 0 deletions js/script.js
View file
Expand Up @@ -219,7 +219,9 @@

load_from_google_spreadsheet: function(spreadsheet_id) {
Tabletop.init({
proxy: this.proxy ? this.proxy : undefined,
key: spreadsheet_id,
prettyColumnNames: false,
callback: function(data) {
var quiz_data = self.make_quiz_data_from_spreadsheet_data(data);
var results_data = self.make_results_data_from_spreadsheet_data(data, quiz_data);
Expand Down
116 changes: 103 additions & 13 deletions js/tabletop.js
View file
Expand Up @@ -69,6 +69,7 @@
this.singleton = !!options.singleton;
this.simple_url = !!options.simple_url;
this.callbackContext = options.callbackContext;
this.prettyColumnNames = typeof(options.prettyColumnNames) == 'undefined' ? true : options.prettyColumnNames

if(typeof(options.proxy) !== 'undefined') {
// Remove trailing slash, it will break the app
Expand All @@ -92,7 +93,7 @@
/* Be friendly about what you accept */
if(/key=/.test(this.key)) {
this.log("You passed an old Google Docs url as the key! Attempting to parse.");
this.key = this.key.match("key=(.*?)&")[1];
this.key = this.key.match("key=(.*?)(&|#|$)")[1];
}

if(/pubhtml/.test(this.key)) {
Expand Down Expand Up @@ -309,7 +310,7 @@
// Only pull in desired sheets to reduce loading
if( this.isWanted(data.feed.entry[i].content.$t) ) {
var linkIdx = data.feed.entry[i].link.length-1;
var sheet_id = data.feed.entry[i].link[linkIdx].href.substr( data.feed.entry[i].link[linkIdx].href.length - 3, 3);
var sheet_id = data.feed.entry[i].link[linkIdx].href.split('/').pop();
var json_path = "/feeds/list/" + this.key + "/" + sheet_id + "/public/values?alt="
if (inNodeJS || supportsCORS) {
json_path += 'json';
Expand Down Expand Up @@ -353,24 +354,33 @@
}
},

/*
Parse a single list-based worksheet, turning it into a Tabletop Model
Used as a callback for the list-based JSON
*/
loadSheet: function(data) {
var model = new Tabletop.Model( { data: data,
parseNumbers: this.parseNumbers,
postProcess: this.postProcess,
tabletop: this } );
sheetReady: function(model) {
this.models[ model.name ] = model;
if(ttIndexOf(this.model_names, model.name) === -1) {
this.model_names.push(model.name);
}

this.sheetsToLoad--;
if(this.sheetsToLoad === 0)
this.doCallback();
},

/*
Parse a single list-based worksheet, turning it into a Tabletop Model
Used as a callback for the list-based JSON
*/
loadSheet: function(data) {
var that = this;
var model = new Tabletop.Model( { data: data,
parseNumbers: this.parseNumbers,
postProcess: this.postProcess,
tabletop: this,
prettyColumnNames: this.prettyColumnNames,
onReady: function() {
that.sheetReady(this);
} } );
},

/*
Execute the callback upon loading! Rely on this.data() because you might
Expand Down Expand Up @@ -403,7 +413,9 @@
var i, j, ilen, jlen;
this.column_names = [];
this.name = options.data.feed.title.$t;
this.tabletop = options.tabletop;
this.elements = [];
this.onReady = options.onReady;
this.raw = options.data; // A copy of the sheet's raw data, for accessing minutiae

if(typeof(options.data.feed.entry) === 'undefined') {
Expand All @@ -417,6 +429,8 @@
this.column_names.push( key.replace("gsx$","") );
}

this.original_columns = this.column_names;

for(i = 0, ilen = options.data.feed.entry.length ; i < ilen; i++) {
var source = options.data.feed.entry[i];
var element = {};
Expand All @@ -437,7 +451,11 @@
options.postProcess(element);
this.elements.push(element);
}


if(options.prettyColumnNames)
this.fetchPrettyColumns();
else
this.onReady.call(this);
};

Tabletop.Model.prototype = {
Expand All @@ -447,6 +465,74 @@
all: function() {
return this.elements;
},

fetchPrettyColumns: function() {
if(!this.raw.feed.link[3])
return this.ready();
var cellurl = this.raw.feed.link[3].href.replace('/feeds/list/', '/feeds/cells/').replace('https://spreadsheets.google.com', '');
var that = this;
this.tabletop.requestData(cellurl, function(data) {
that.loadPrettyColumns(data)
});
},

ready: function() {
this.onReady.call(this);
},

/*
* Store column names as an object
* with keys of Google-formatted "columnName"
* and values of human-readable "Column name"
*/
loadPrettyColumns: function(data) {
var pretty_columns = {};

var column_names = this.column_names;

var i = 0;
var l = column_names.length;

for (; i < l; i++) {
if (typeof data.feed.entry[i].content.$t !== 'undefined') {
pretty_columns[column_names[i]] = data.feed.entry[i].content.$t;
} else {
pretty_columns[column_names[i]] = column_names[i];
}
}

this.pretty_columns = pretty_columns;

this.prettifyElements();
this.ready();
},

/*
* Go through each row, substitutiting
* Google-formatted "columnName"
* with human-readable "Column name"
*/
prettifyElements: function() {
var pretty_elements = [],
ordered_pretty_names = [],
i, j, ilen, jlen;

var ordered_pretty_names;
for(j = 0, jlen = this.column_names.length; j < jlen ; j++) {
ordered_pretty_names.push(this.pretty_columns[this.column_names[j]]);
}

for(i = 0, ilen = this.elements.length; i < ilen; i++) {
var new_element = {};
for(j = 0, jlen = this.column_names.length; j < jlen ; j++) {
var new_column_name = this.pretty_columns[this.column_names[j]];
new_element[new_column_name] = this.elements[i][this.column_names[j]];
}
pretty_elements.push(new_element);
}
this.elements = pretty_elements;
this.column_names = ordered_pretty_names;
},

/*
Return the elements as an array of arrays, instead of an array of objects
Expand All @@ -467,6 +553,10 @@

if(inNodeJS) {
module.exports = Tabletop;
} else if (typeof define === 'function' && define.amd) {
define(function () {
return Tabletop;
});
} else {
global.Tabletop = Tabletop;
}
Expand Down

0 comments on commit 4d48b23

Please sign in to comment.