google_spreadsheet_fetcher 0.2.0 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +5 -5
  2. data/google_spreadsheet_fetcher.gemspec +3 -3
  3. data/lib/google_spreadsheet_fetcher/fetcher.rb +12 -22
  4. data/lib/google_spreadsheet_fetcher/version.rb +1 -1
  5. metadata +15 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 827587e277f42c7d004d94267bda0a2f843cc31a
4
- data.tar.gz: 4edea0e53c1a8b3ff7300c84acac9f6ba052a12a
2
+ SHA256:
3
+ metadata.gz: 2fd96c831d8647c6b4c6d03e2ab5b638a1cbcdc0898b09e41cf009b0f8641540
4
+ data.tar.gz: 230ae8888e6c43f225da7d7e02a6c711d118838f25800c0317351cb932e1b6c6
5
5
  SHA512:
6
- metadata.gz: 6fae7fb39bded59baadb1e173f34730cb0e33d2d7be9f5172ad750dce45f9710ab61f86b5baa0b94b4cc6f86bf5e7ecbfa28ed8788452d400c7567448caac9f3
7
- data.tar.gz: 31e8a6d6562452ffddd45056f98d3c242e0feaad9ba5bd262aa9d823b3cea1f3063cd8e977c7f2744ad7eba3817403d896ddbf6e558019b424aabb8bbda123fc
6
+ metadata.gz: 8ce5c1465561f4178c5e9169a18c6e7bbaab425c70dae8c92012fe68cb2d49286ea179ea457d403f09d82d7f067624865319f9e8c2bd4015c3000f542f6851b0
7
+ data.tar.gz: ab06f820814367235871b12845d06b39487ef745a78619064d2dc2a35b6acafef0ae02db2da9519699800bec0052c493f2ddc2257d53eb201ca72a2629338d8d
data/google_spreadsheet_fetcher.gemspec CHANGED
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.add_dependency 'google-api-client', '~> 0.9'
26
26
  spec.add_dependency 'google_drive', '~> 2.1.3'
27
27
 
28
- spec.add_development_dependency "bundler", "~> 1.14"
29
- spec.add_development_dependency "rake", "~> 10.0"
30
- spec.add_development_dependency "rspec", "~> 3.0"
28
+ spec.add_development_dependency "bundler"
29
+ spec.add_development_dependency "rake"
30
+ spec.add_development_dependency "rspec"
31
31
  end
data/lib/google_spreadsheet_fetcher/fetcher.rb CHANGED
@@ -1,18 +1,18 @@
1
1
  require 'googleauth'
2
2
  require 'googleauth/stores/file_token_store'
3
- require 'google/apis/drive_v2'
4
- require 'google_drive'
3
+ require "google/apis/sheets_v4"
5
4
  require 'shellwords'
6
5
 
7
6
  module GoogleSpreadsheetFetcher
8
7
  class Fetcher
9
8
  OOB_URI = 'urn:ietf:wg:oauth:2.0:oob'
10
9
 
11
- def initialize(credential_store_file, user_id, sheet_key)
10
+ def initialize(credential_store_file, user_id, sheet_key, application_name: nil)
12
11
  @client_secret_file = GoogleSpreadsheetFetcher.config.client_secrets_file_path
13
12
  @credential_store_file = credential_store_file
14
13
  @user_id = user_id
15
14
  @sheet_key = sheet_key
15
+ @application_name = application_name
16
16
  end
17
17
 
18
18
  def fetch_by_index(index)
@@ -32,23 +32,15 @@ module GoogleSpreadsheetFetcher
32
32
  def fetch_worksheet_by(index: nil, title: nil, gid: nil)
33
33
  credentials = fetch_credentials
34
34
 
35
- drive = Google::Apis::DriveV2::DriveService.new
36
- drive.authorization = credentials
37
- session = GoogleDrive::Session.login_with_oauth(credentials)
35
+ service = Google::Apis::SheetsV4::SheetsService.new
36
+ service.client_options.application_name = @application_name if @application_name
37
+ service.authorization = credentials
38
38
 
39
- spreadsheet = session.spreadsheet_by_key(@sheet_key)
39
+ spreadsheet = service.get_spreadsheet(@sheet_key)
40
40
 
41
- unless index.nil?
42
- return spreadsheet.worksheets[index]
43
- end
44
-
45
- unless title.nil?
46
- return spreadsheet.worksheet_by_title(title)
47
- end
48
-
49
- unless gid.nil?
50
- return spreadsheet.worksheet_by_gid(gid)
51
- end
41
+ return spreadsheet.worksheets[index] unless index.nil?
42
+ return spreadsheet.worksheet_by_title(title) unless title.nil?
43
+ return spreadsheet.worksheet_by_gid(gid) unless gid.nil?
52
44
 
53
45
  raise
54
46
  end
@@ -75,10 +67,8 @@ module GoogleSpreadsheetFetcher
75
67
  end
76
68
 
77
69
  def scopes
78
- %w[
79
- https://spreadsheets.google.com/feeds/
80
- https://www.googleapis.com/auth/drive
81
- https://www.googleapis.com/auth/userinfo.profile
70
+ [
71
+ Google::Apis::SheetsV4::AUTH_SPREADSHEETS_READONLY
82
72
  ]
83
73
  end
84
74
  end
data/lib/google_spreadsheet_fetcher/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module GoogleSpreadsheetFetcher
2
- VERSION = "0.2.0"
2
+ VERSION = "0.3.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: google_spreadsheet_fetcher
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Takahiro Ooishi
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-06-23 00:00:00.000000000 Z
11
+ date: 2019-10-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: google-api-client
@@ -42,44 +42,44 @@ dependencies:
42
42
  name: bundler
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - "~>"
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '1.14'
47
+ version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - "~>"
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
- version: '1.14'
54
+ version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rake
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - "~>"
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
- version: '10.0'
61
+ version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - "~>"
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
- version: '10.0'
68
+ version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: '3.0'
75
+ version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: '3.0'
82
+ version: '0'
83
83
  description: Google Spreadsheet fetcher
84
84
  email:
85
85
  - taka0125@gmail.com
@@ -118,8 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
118
118
  - !ruby/object:Gem::Version
119
119
  version: '0'
120
120
  requirements: []
121
- rubyforge_project:
122
- rubygems_version: 2.6.11
121
+ rubygems_version: 3.0.3
123
122
  signing_key:
124
123
  specification_version: 4
125
124
  summary: Google Spreadsheet fetcher