Merge pull request #2 from tanakaworld/multiple-sheets

Multiple sheets

Author: tanakaworld

demo/sample.html

@@ -13,7 +13,9 @@
     window.onload = function () {
         this.updateSpreadSheet = function () {
             var url = $("#publishedUrl")[0].value;
-            var gss = new GoogleSpreadsheetsParser(url, true);
+            var title = $("#sheetTitle")[0].value;
+
+            var gss = new GoogleSpreadsheetsParser(url, {sheetTitle: title, hasTitle: true});
 
             console.log(gss.titles);
             console.log(gss.contents);
@@ -25,11 +27,12 @@ <h1>GoogleSpreadSheetParser Sample</h1>
 
 <div class="panel-body">
     <ul>
-        <li>Enter published Spreadsheet url</li>
+        <li>Enter published Spreadsheet url & sheet title</li>
         <li>Click "Get data", output data into console log.</li>
     </ul>
     <input id="publishedUrl" type="text" size="100px"
            value="https://docs.google.com/spreadsheets/d/1vyPu1EtzU1DvGXfthjrR-blJ8mGe75TL4BFNWtFMm0I/pubhtml">
+    <input id="sheetTitle" type="text" size="50px" value="Sample2">
     <button onclick="updateSpreadSheet()">Get data</button>
 </div>
 

dist/googleSpreadsheetsParser.js

@@ -12,16 +12,27 @@ GoogleSpreadsheetsUtil = (function() {
     return matched[1];
   };
 
-  GoogleSpreadsheetsUtil.prototype.getWorksheetId = function(key) {
-    var basicInfo, matched, url, xhr;
+  GoogleSpreadsheetsUtil.prototype.getWorksheetId = function(key, sheetTitle) {
+    var basicInfo, e, i, matched, ref, url, xhr;
     url = "https://spreadsheets.google.com/feeds/worksheets/" + key + "/public/basic?alt=json";
     xhr = new XMLHttpRequest();
     xhr.open("GET", url, false);
     xhr.send();
     matched = [];
     if (xhr.status === 200) {
       basicInfo = JSON.parse(xhr.responseText);
-      matched = basicInfo.feed.entry[0].id.$t.match(/https:\/\/spreadsheets.google.com\/feeds\/worksheets\/.+\/public\/basic\/(.+)/);
+      if (sheetTitle) {
+        ref = basicInfo.feed.entry;
+        for (i in ref) {
+          e = ref[i];
+          if (e.title.$t === sheetTitle) {
+            matched = e.id.$t.match(/https:\/\/spreadsheets.google.com\/feeds\/worksheets\/.+\/public\/basic\/(.+)/);
+            break;
+          }
+        }
+      } else {
+        matched = basicInfo.feed.entry[0].id.$t.match(/https:\/\/spreadsheets.google.com\/feeds\/worksheets\/.+\/public\/basic\/(.+)/);
+      }
     }
     if (matched === null || matched.length !== 2) {
       return null;
@@ -43,10 +54,10 @@ GoogleSpreadsheetsUtil = (function() {
   };
 
   GoogleSpreadsheetsUtil.prototype.makeTitle = function(feedEntry) {
-    var cell, i, len, obj, titles;
+    var cell, j, len, obj, titles;
     titles = [];
-    for (i = 0, len = feedEntry.length; i < len; i++) {
-      obj = feedEntry[i];
+    for (j = 0, len = feedEntry.length; j < len; j++) {
+      obj = feedEntry[j];
       cell = obj.gs$cell;
       if (cell === null) {
         return titles;
@@ -61,15 +72,15 @@ GoogleSpreadsheetsUtil = (function() {
   };
 
   GoogleSpreadsheetsUtil.prototype.makeContents = function(feedEntry) {
-    var cell, columnCount, contents, i, len, obj, row, rowNumber;
+    var cell, columnCount, contents, j, len, obj, row, rowNumber;
     contents = [];
     if (!(feedEntry.length >= 1 && feedEntry[0].gs$cell)) {
       return contents;
     }
     columnCount = Number(feedEntry[feedEntry.length - 1].gs$cell.col);
     rowNumber = 0;
-    for (i = 0, len = feedEntry.length; i < len; i++) {
-      obj = feedEntry[i];
+    for (j = 0, len = feedEntry.length; j < len; j++) {
+      obj = feedEntry[j];
       cell = obj.gs$cell;
       if (Number(cell.row) !== 1) {
         if (cell.row !== rowNumber) {
@@ -91,14 +102,13 @@ GoogleSpreadsheetsUtil = (function() {
 })();
 
 GoogleSpreadsheetsParser = (function() {
-  function GoogleSpreadsheetsParser(publishedUrl, hasTitle) {
-    var _util, feedEntry, feeds, key, mtd;
-    if (hasTitle == null) {
-      hasTitle = false;
-    }
+  function GoogleSpreadsheetsParser(publishedUrl, option) {
+    var _util, feedEntry, feeds, hasTitle, key, mtd, sheetTitle;
+    sheetTitle = option.sheetTitle || null;
+    hasTitle = option.hasTitle || true;
     _util = new GoogleSpreadsheetsUtil();
     key = _util.extractKey(publishedUrl);
-    mtd = _util.getWorksheetId(key);
+    mtd = _util.getWorksheetId(key, sheetTitle);
     feeds = _util.getFeeds(key, mtd);
     feedEntry = feeds.feed.entry;
     if (hasTitle) {

dist/googleSpreadsheetsParser.min.js

@@ -4,7 +4,8 @@ describe GoogleSpreadsheetsUtil, ->
   beforeAll ->
     @publishedUrl = "https://docs.google.com/spreadsheets/d/1vyPu1EtzU1DvGXfthjrR-blJ8mGe75TL4BFNWtFMm0I/pubhtml"
     @key = "1vyPu1EtzU1DvGXfthjrR-blJ8mGe75TL4BFNWtFMm0I"
-    @worksheetId = "od6"
+    @firstWorksheetId = "od6"
+    @secondWorksheetId = "obeh737"
     @util = new GoogleSpreadsheetsUtil()
 
   describe '.extractKey', ->
@@ -30,16 +31,32 @@ describe GoogleSpreadsheetsUtil, ->
         jasmine.Ajax.stubRequest(requestUrl).andReturn
           status: 200
           responseText: JSON.stringify(mockedSampleDataBasicJson)
-      it 'should got worksheetId', ->
-        expect(@util.getWorksheetId(@key)).toEqual(@worksheetId)
+
+      describe 'without sheet name', ->
+        it 'should got worksheetId', ->
+          expect(@util.getWorksheetId(@key)).toEqual(@firstWorksheetId)
+
+      describe 'with sheet name (1st sheet)', ->
+        it 'should got worksheetId', ->
+          expect(@util.getWorksheetId(@key, 'Sample')).toEqual(@firstWorksheetId)
+
+      describe 'with sheet name (2nd sheet)', ->
+        it 'should got worksheetId', ->
+          expect(@util.getWorksheetId(@key, 'Sample2')).toEqual(@secondWorksheetId)
 
     describe 'Spreadsheet is not found', ->
       beforeEach ->
         requestUrl = "https://spreadsheets.google.com/feeds/worksheets/#{@key}/public/basic?alt=json"
         jasmine.Ajax.stubRequest(requestUrl).andReturn
           status: 404
-      it 'should got null', ->
-        expect(@util.getWorksheetId(@key)).toBeNull()
+
+      describe 'without sheet name', ->
+        it 'should got null', ->
+          expect(@util.getWorksheetId(@key)).toBeNull()
+
+      describe 'with sheet name (Invalid)', ->
+        it 'should got null', ->
+          expect(@util.getWorksheetId(@key, 'Invalid')).toBeNull()
 
   describe '.getFeeds', ->
     beforeEach ->
@@ -51,20 +68,20 @@ describe GoogleSpreadsheetsUtil, ->
       beforeEach ->
         mockedSampleDataFeedJson = window.__fixtures__['spec/fixtures/sampleDataFeed']
 
-        requestUrl = "https://spreadsheets.google.com/feeds/cells/#{@key}/#{@worksheetId}/public/values?alt=json"
+        requestUrl = "https://spreadsheets.google.com/feeds/cells/#{@key}/#{@firstWorksheetId}/public/values?alt=json"
         jasmine.Ajax.stubRequest(requestUrl).andReturn
           status: 200
           responseText: JSON.stringify(mockedSampleDataFeedJson)
       it 'should got feeds', ->
-        expect(@util.getFeeds(@key, @worksheetId)).not.toBeNull()
+        expect(@util.getFeeds(@key, @firstWorksheetId)).not.toBeNull()
 
     describe 'Spreadsheet is not found', ->
       beforeEach ->
-        requestUrl = "https://spreadsheets.google.com/feeds/cells/#{@key}/#{@worksheetId}/public/values?alt=json"
+        requestUrl = "https://spreadsheets.google.com/feeds/cells/#{@key}/#{@firstWorksheetId}/public/values?alt=json"
         jasmine.Ajax.stubRequest(requestUrl).andReturn
           status: 404
       it 'should got feeds', ->
-        expect(@util.getFeeds(@key, @worksheetId)).toBeNull()
+        expect(@util.getFeeds(@key, @firstWorksheetId)).toBeNull()
 
   describe '.makeTitle', ->
     beforeEach ->

spec/googleSpreadsheetsUtilSpec.coffee

@@ -1,10 +1,13 @@
 class GoogleSpreadsheetsParser
 
-  constructor: (publishedUrl, hasTitle = false) ->
+  constructor: (publishedUrl, option) ->
+    sheetTitle = option.sheetTitle || null
+    hasTitle = option.hasTitle || true
+
     _util = new GoogleSpreadsheetsUtil()
 
     key = _util.extractKey(publishedUrl)
-    mtd = _util.getWorksheetId(key)
+    mtd = _util.getWorksheetId(key, sheetTitle)
     feeds = _util.getFeeds(key, mtd)
 
     feedEntry = feeds.feed.entry

src/googleSpreadsheetsParser.coffee

@@ -5,7 +5,7 @@ class GoogleSpreadsheetsUtil
     return null if matched is null or matched.length isnt 2
     return matched[1]
 
-  getWorksheetId: (key) ->
+  getWorksheetId: (key, sheetTitle) ->
     url = "https://spreadsheets.google.com/feeds/worksheets/#{key}/public/basic?alt=json"
     xhr = new XMLHttpRequest()
     xhr.open("GET", url, false)
@@ -14,7 +14,13 @@ class GoogleSpreadsheetsUtil
     matched = []
     if xhr.status is 200
       basicInfo = JSON.parse(xhr.responseText)
-      matched = basicInfo.feed.entry[0].id.$t.match(/https:\/\/spreadsheets.google.com\/feeds\/worksheets\/.+\/public\/basic\/(.+)/)
+      if sheetTitle
+        for i, e of basicInfo.feed.entry
+          if e.title.$t is sheetTitle
+            matched = e.id.$t.match(/https:\/\/spreadsheets.google.com\/feeds\/worksheets\/.+\/public\/basic\/(.+)/)
+            break
+      else
+        matched = basicInfo.feed.entry[0].id.$t.match(/https:\/\/spreadsheets.google.com\/feeds\/worksheets\/.+\/public\/basic\/(.+)/)
 
     return null if matched is null or matched.length isnt 2
     return matched[1]