google_spreadsheet_fetcher 1.1.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf51e7e9a7e8375b321cff2bb3398cfe2234ca57af2c1952ea2fb1a272a9de27
-  data.tar.gz: 9e83feb58028dbe9344834f1067dc188fbd01b273bc25f8c1847a40119f8a2cf
+  metadata.gz: 484a5652add269569653176f0362c21e7490a90e7207cef09fc0b9337514ac9e
+  data.tar.gz: 5c506fdb046946b261e345e82f26c2c07eb9bd4ef4f55f1fd0936376c7404f0b
 SHA512:
-  metadata.gz: 9a7b5a6bc218f915bd4f987e7679157e0db5c89018b434f8ad76c9f4e647cfd0dc32c66e40053d07366165926b6638d37254fddf5043ffed8b7de5b55b035fa4
-  data.tar.gz: 0476d4f615072e193077a59855ad6236ee7ec1d52a0fc6eb0838284cbdb1e47e96236fde5e6aad4e4ffa41d2dee733be32e948ee3a443141fe0903110243d56f
+  metadata.gz: 79a4a84c92f1405e04482804c93d8746616aac842ecc4151332ac4a6f10a8e9ffbde8a41e1792e875bc4f9fcd712153afa136ec50695fa208332108a007ef759
+  data.tar.gz: c82292382ef20832fd6ec8ccd6b686c677d2aaec9afabc86e96a0023a4be8243ddd3f7bf06d28c5abc40e8142f1d50de060e52a3f009fae26ed40998dfe61bda

data/lib/google_spreadsheet_fetcher.rb

@@ -1,3 +1,4 @@
+require "active_support/json"
 require "active_support/core_ext"
 require "google_spreadsheet_fetcher/version"
 require "google_spreadsheet_fetcher/config"

data/lib/google_spreadsheet_fetcher/config.rb

@@ -1,3 +1,5 @@
+require 'active_support/configurable'
+
 module GoogleSpreadsheetFetcher
   class Config
     include ActiveSupport::Configurable

data/lib/google_spreadsheet_fetcher/fetcher.rb

@@ -1,6 +1,6 @@
+require 'google/apis/sheets_v4'
 require 'googleauth'
 require 'googleauth/stores/file_token_store'
-require "google/apis/sheets_v4"
 require 'shellwords'
 
 module GoogleSpreadsheetFetcher
@@ -18,27 +18,9 @@ module GoogleSpreadsheetFetcher
       @application_name = application_name
     end
 
-    # @param [String] range(https://developers.google.com/sheets/api/guides/concepts#a1_notation)
-    # @param [Integer] skip
-    def fetch_all_rows(range, skip: 0, structured: false)
-      rows = service.batch_get_spreadsheet_values(@spreadsheet_id, ranges: [range])&.value_ranges&.first&.values
-      return [] if rows.blank?
-
-      if structured
-        headers = rows.delete_at(0)
-        rows.slice!(0, skip)
-        rows.map { |r| [headers, r].transpose.to_h }
-      else
-        rows.slice!(0, skip)
-        rows
-      end
-    end
-
     def fetch_all_rows_by!(index: nil, sheet_id: nil, title: nil, skip: 0, structured: false)
       sheet = fetch_sheet_by!(index: index, sheet_id: sheet_id, title: title)
-
-      range = "#{sheet.properties.title}!A:Z"
-      fetch_all_rows(range, skip: skip, structured: structured)
+      fetch_all_rows(sheet, skip: skip, structured: structured)
     end
 
     def service
@@ -50,13 +32,41 @@ module GoogleSpreadsheetFetcher
 
     private
 
+    # @param [Google::Apis::SheetsV4::Sheet] sheet
+    # @param [Integer] skip
+    # @param [Boolean] structured
+    def fetch_all_rows(sheet, skip: 0, structured: false)
+      # https://developers.google.com/sheets/api/guides/concepts#a1_notation
+      range = "#{sheet.properties.title}!A:ZZ"
+      rows = service.get_spreadsheet_values(@spreadsheet_id, range)&.values
+      return [] if rows.blank?
+
+      headers = rows.first
+      count = headers.count
+
+      if structured
+        rows.delete_at(0)
+        rows.slice!(0, skip)
+        rows.map { |r| headers.zip(r).to_h }
+      else
+        rows.slice!(0, skip)
+        rows.map { |r| fill_array(r, count) }
+      end
+    end
+
     def fetch_sheet_by!(index: nil, sheet_id: nil, title: nil)
       sheets = spreadsheet.sheets
       raise SheetNotFound if sheets.blank?
 
-      return sheets[index] if index.present?
-      return sheets.find { |s| s.properties.sheet_id == sheet_id } if sheet_id.present?
-      return sheets.find { |s| s.properties.title == title } if title.present?
+      sheet = if index.present?
+                sheets[index]
+              elsif sheet_id.present?
+                sheets.find { |s| s.properties.sheet_id == sheet_id }
+              elsif title.present?
+                sheets.find { |s| s.properties.title == title }
+              end
+
+      return sheet if sheet.present?
 
       raise SheetNotFound
     end
@@ -78,7 +88,11 @@ module GoogleSpreadsheetFetcher
     end
 
     def spreadsheet
-      service.get_spreadsheet(@spreadsheet_id)
+      @spreadsheet ||= service.get_spreadsheet(@spreadsheet_id)
+    end
+
+    def fill_array(items, count, fill: "")
+      items + (count - items.count).times.map { fill }
     end
   end
 end

data/lib/google_spreadsheet_fetcher/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheetFetcher
-  VERSION = "1.1.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_spreadsheet_fetcher
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Google Spreadsheet fetcher