google_spreadsheet_fetcher 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8931e371e571bd4765be2b63a647d8028d4ed763abddd82dacf9f6d70f30a987
-  data.tar.gz: ce41e8fa0daf651ea25ffecb195a74dad258d4a9ad6b5abde05c80999de3609a
+  metadata.gz: 5a1d4d60f1365915f18a079381ea39c070746355c7e1311c4ec5e82ad2fe1787
+  data.tar.gz: 752b32a2a75a0861961a9e88ac1346d053f8d6afb8cb8c21356d947bcdcfeca5
 SHA512:
-  metadata.gz: 325db541542d87960f7bd388be44f6d4977bb6e74df8804bfdeb152fd8b82f1079d1c0387bd8e1e878a629e2266aa3baad58264e5c4696056158b9d1f6e34377
-  data.tar.gz: 9e297605b02343a4f688df0790b1c1e980689c74e092477967f385687dc36773f17ca1326a2521d0c9196a04c4c21dfc42e23b3127cc209cda88809eefae33ff
+  metadata.gz: b1868fe75af23fdda5750b7cf89e7ace9662d782b94de1d9a6eef6e28b92db459532ead2afb430a127dfdc814c5d451911dbd8a6cd806b58d59536920666301e
+  data.tar.gz: db9ae90340519957cabdea6bf25b686b243312d23ba541443e15cfb14a3c7576f0e9f5b1c185a6185194a7af11eeed64002ce4643b738775aa7972039de3733e

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.zip(r).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,43 @@ 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:Z"
+      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) }
+        # rows.map { |r| items = Array.new(count, ""); items[0..r.count - 1] = r; items }
+        #    def fill_array(items, count, fill: "")
+      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
@@ -80,5 +92,12 @@ module GoogleSpreadsheetFetcher
     def spreadsheet
       service.get_spreadsheet(@spreadsheet_id)
     end
+
+    def fill_array(items, count, fill: "")
+      max_count = [count, items.count].max
+      results = Array.new(max_count, fill)
+      results[0..items.count - 1] = items
+      results
+    end
   end
 end

data/lib/google_spreadsheet_fetcher/version.rb

@@ -1,3 +1,3 @@
 module GoogleSpreadsheetFetcher
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_spreadsheet_fetcher
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Takahiro Ooishi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client