arvados-google-api-client 0.8.7.3 → 0.8.7.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4a511fbbb93423a287e471c9545d4908c62307a9a296faa83538b2840c4ecf77
4
- data.tar.gz: 3123be70f8e427ca5072c66387bdb290454e30d77677c38afd0f40ab53aaa84d
3
+ metadata.gz: dd751a365b72440d5a16351517a9f7ec7d4d66693c0a6f58ad016f4e52a66d77
4
+ data.tar.gz: d5322f288a12e01607bd9b34f690547137d20e8a80f19a6f26259ea79abbeb64
5
5
  SHA512:
6
- metadata.gz: db4f1f8a83173ae9c748fecf53d2ec8ff8632f35e217aca1c9fd310aa2f63d5e07c7f2b6d0e14be014dfa31f015a4b0f35a909afd18c733dfc9e995097f353f0
7
- data.tar.gz: 339f668ac65a4ea96e67bb2b05c713daa0ce550ea034838c9c3e8f61cee7ce96ea71cac92626d6eb1e172acb8095bea58e00c85d9bdad98660db6e4b6393c6e7
6
+ metadata.gz: bb9678214cb4d03bde9f26c4640146a07dabd29cfab0620c02e055023b4d6fa8c0e151a3cbbcc5cbb6d2d1903493f9d5a55e37ff449c28525ff59bf47859884b
7
+ data.tar.gz: 33814d57bce05a2789a2791407f6c158d9c38cbe4285e953481660b2526ec940b17ca8a504ee345a358cc41339e1c52964ed074d82e43bcd7f46f7ba0e406982
@@ -5,34 +5,37 @@ Gem::Specification.new do |s|
5
5
  s.name = "arvados-google-api-client"
6
6
  s.version = Google::APIClient::VERSION::STRING
7
7
 
8
+ s.required_ruby_version = '>= 2.5.0'
8
9
  s.required_rubygems_version = ">= 1.3.5"
9
10
  s.require_paths = ["lib"]
10
11
  s.authors = ["Bob Aman", "Steven Bazyl"]
11
12
  s.license = "Apache-2.0"
12
- s.description = "The Google API Ruby Client makes it trivial to discover and access supported APIs."
13
- s.email = "sbazyl@google.com"
13
+ s.description = "Fork of google-api-client used by Ruby-based Arvados components."
14
+ s.email = "dev@arvados.org"
14
15
  s.extra_rdoc_files = ["README.md"]
15
- s.files = %w(google-api-client.gemspec Rakefile LICENSE CHANGELOG.md README.md Gemfile)
16
+ s.files = %w(arvados-google-api-client.gemspec Rakefile LICENSE CHANGELOG.md README.md Gemfile)
16
17
  s.files += Dir.glob("lib/**/*.rb")
17
18
  s.files += Dir.glob("lib/cacerts.pem")
18
19
  s.files += Dir.glob("spec/**/*.{rb,opts}")
19
20
  s.files += Dir.glob("vendor/**/*.rb")
20
21
  s.files += Dir.glob("tasks/**/*")
21
22
  s.files += Dir.glob("website/**/*")
22
- s.homepage = "https://github.com/curoverse/google-api-ruby-client/"
23
+ s.homepage = "https://github.com/arvados/google-api-ruby-client/"
23
24
  s.rdoc_options = ["--main", "README.md"]
24
- s.summary = "The Google API Ruby Client makes it trivial to discover and access Google's REST APIs."
25
+ s.summary = "Fork of google-api-client used by Ruby-based Arvados components."
25
26
 
26
27
  s.add_runtime_dependency 'addressable', '~> 2.3'
27
- s.add_runtime_dependency 'signet', '~> 0.6'
28
- s.add_runtime_dependency 'faraday', '~> 0.9'
29
- s.add_runtime_dependency 'googleauth', '~> 0.3'
28
+ s.add_runtime_dependency 'signet', '~> 0.16.0'
29
+ s.add_runtime_dependency 'faraday', '~> 2.0'
30
+ s.add_runtime_dependency 'faraday-multipart', '~> 1.0'
31
+ s.add_runtime_dependency 'faraday-gzip', '~> 2.0'
32
+ s.add_runtime_dependency 'googleauth', '~> 1.0'
30
33
  s.add_runtime_dependency 'multi_json', '~> 1.10'
31
34
  s.add_runtime_dependency 'autoparse', '~> 0.3'
32
35
  s.add_runtime_dependency 'extlib', '~> 0.9'
33
36
  s.add_runtime_dependency 'launchy', '~> 2.4'
34
37
  s.add_runtime_dependency 'retriable', '~> 1.4'
35
- s.add_runtime_dependency 'activesupport', '>= 3.2', '< 5.1'
38
+ s.add_runtime_dependency 'activesupport', '>= 3.2', '< 8.0'
36
39
 
37
40
  s.add_development_dependency 'rake', '~> 10.0'
38
41
  s.add_development_dependency 'yard', '~> 0.8'
@@ -3,7 +3,7 @@ require 'zlib'
3
3
 
4
4
  module Google
5
5
  class APIClient
6
- class Charset < Faraday::Response::Middleware
6
+ class Charset < Faraday::Middleware
7
7
  include Google::APIClient::Logging
8
8
 
9
9
  def charset_for_content_type(type)
@@ -30,4 +30,4 @@ module Google
30
30
  end
31
31
  end
32
32
 
33
- Faraday::Response.register_middleware :charset => Google::APIClient::Charset
33
+ Faraday::Response.register_middleware :charset => Google::APIClient::Charset
@@ -12,6 +12,7 @@
12
12
  # See the License for the specific language governing permissions and
13
13
  # limitations under the License.
14
14
  require 'google/api_client/reference'
15
+ require 'faraday/multipart'
15
16
 
16
17
  module Google
17
18
  class APIClient
@@ -21,7 +22,7 @@ module Google
21
22
  # @see Faraday::UploadIO
22
23
  # @example
23
24
  # media = Google::APIClient::UploadIO.new('mymovie.m4v', 'video/mp4')
24
- class UploadIO < Faraday::UploadIO
25
+ class UploadIO < Faraday::Multipart::FilePart
25
26
 
26
27
  # @return [Fixnum] Size of chunks to upload. Default is nil, meaning upload the entire file in a single request
27
28
  attr_accessor :chunk_size
@@ -256,4 +257,4 @@ module Google
256
257
 
257
258
  end
258
259
  end
259
- end
260
+ end
@@ -13,7 +13,6 @@
13
13
  # limitations under the License.
14
14
 
15
15
  require 'faraday'
16
- require 'faraday/request/multipart'
17
16
  require 'compat/multi_json'
18
17
  require 'addressable/uri'
19
18
  require 'stringio'
@@ -279,32 +278,7 @@ module Google
279
278
  # @option options [#read, #to_str] :body
280
279
  # Raw body to send in POST/PUT requests
281
280
  def initialize_media_upload(options)
282
- self.media = options[:media]
283
- case self.upload_type
284
- when "media"
285
- if options[:body] || options[:body_object]
286
- raise ArgumentError, "Can not specify body & body object for simple uploads"
287
- end
288
- self.headers['Content-Type'] ||= self.media.content_type
289
- self.headers['Content-Length'] ||= self.media.length.to_s
290
- self.body = self.media
291
- when "multipart"
292
- unless options[:body_object]
293
- raise ArgumentError, "Multipart requested but no body object"
294
- end
295
- metadata = StringIO.new(serialize_body(options[:body_object]))
296
- build_multipart([Faraday::UploadIO.new(metadata, 'application/json', 'file.json'), self.media])
297
- when "resumable"
298
- file_length = self.media.length
299
- self.headers['X-Upload-Content-Type'] = self.media.content_type
300
- self.headers['X-Upload-Content-Length'] = file_length.to_s
301
- if options[:body_object]
302
- self.headers['Content-Type'] ||= 'application/json'
303
- self.body = serialize_body(options[:body_object])
304
- else
305
- self.body = ''
306
- end
307
- end
281
+ raise "media upload not supported by arvados-google-api-client"
308
282
  end
309
283
 
310
284
  ##
@@ -319,13 +293,7 @@ module Google
319
293
  # @param [String] boundary
320
294
  # Boundary for separating each part of the message
321
295
  def build_multipart(parts, mime_type = 'multipart/related', boundary = MULTIPART_BOUNDARY)
322
- env = Faraday::Env.new
323
- env.request = Faraday::RequestOptions.new
324
- env.request.boundary = boundary
325
- env.request_headers = {'Content-Type' => "#{mime_type};boundary=#{boundary}"}
326
- multipart = Faraday::Request::Multipart.new
327
- self.body = multipart.create_multipart(env, parts.map {|part| [nil, part]})
328
- self.headers.update(env[:request_headers])
296
+ raise "multipart upload not supported by arvados-google-api-client"
329
297
  end
330
298
 
331
299
  ##
@@ -19,7 +19,7 @@ module Google
19
19
  MAJOR = 0
20
20
  MINOR = 8
21
21
  TINY = 7
22
- PATCH = 3
22
+ PATCH = 5
23
23
  STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
24
24
  end
25
25
  end
@@ -14,6 +14,7 @@
14
14
 
15
15
 
16
16
  require 'faraday'
17
+ require 'faraday/gzip'
17
18
  require 'multi_json'
18
19
  require 'compat/multi_json'
19
20
  require 'stringio'
@@ -30,7 +31,6 @@ require 'google/api_client/result'
30
31
  require 'google/api_client/media'
31
32
  require 'google/api_client/service_account'
32
33
  require 'google/api_client/batch'
33
- require 'google/api_client/gzip'
34
34
  require 'google/api_client/charset'
35
35
  require 'google/api_client/client_secrets'
36
36
  require 'google/api_client/railtie' if defined?(Rails)
@@ -130,8 +130,8 @@ module Google
130
130
  @discovered_apis = {}
131
131
  ca_file = options[:ca_file] || File.expand_path('../../cacerts.pem', __FILE__)
132
132
  self.connection = Faraday.new do |faraday|
133
+ faraday.request :gzip
133
134
  faraday.response :charset if options[:force_encoding]
134
- faraday.response :gzip
135
135
  faraday.options.params_encoder = Faraday::FlatParamsEncoder
136
136
  faraday.ssl.ca_file = ca_file
137
137
  faraday.ssl.verify = true
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: arvados-google-api-client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.7.3
4
+ version: 0.8.7.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bob Aman
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-10-04 00:00:00.000000000 Z
12
+ date: 2023-08-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: addressable
@@ -31,42 +31,70 @@ dependencies:
31
31
  requirements:
32
32
  - - "~>"
33
33
  - !ruby/object:Gem::Version
34
- version: '0.6'
34
+ version: 0.16.0
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - "~>"
40
40
  - !ruby/object:Gem::Version
41
- version: '0.6'
41
+ version: 0.16.0
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: faraday
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
46
  - - "~>"
47
47
  - !ruby/object:Gem::Version
48
- version: '0.9'
48
+ version: '2.0'
49
49
  type: :runtime
50
50
  prerelease: false
51
51
  version_requirements: !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - "~>"
54
54
  - !ruby/object:Gem::Version
55
- version: '0.9'
55
+ version: '2.0'
56
+ - !ruby/object:Gem::Dependency
57
+ name: faraday-multipart
58
+ requirement: !ruby/object:Gem::Requirement
59
+ requirements:
60
+ - - "~>"
61
+ - !ruby/object:Gem::Version
62
+ version: '1.0'
63
+ type: :runtime
64
+ prerelease: false
65
+ version_requirements: !ruby/object:Gem::Requirement
66
+ requirements:
67
+ - - "~>"
68
+ - !ruby/object:Gem::Version
69
+ version: '1.0'
70
+ - !ruby/object:Gem::Dependency
71
+ name: faraday-gzip
72
+ requirement: !ruby/object:Gem::Requirement
73
+ requirements:
74
+ - - "~>"
75
+ - !ruby/object:Gem::Version
76
+ version: '2.0'
77
+ type: :runtime
78
+ prerelease: false
79
+ version_requirements: !ruby/object:Gem::Requirement
80
+ requirements:
81
+ - - "~>"
82
+ - !ruby/object:Gem::Version
83
+ version: '2.0'
56
84
  - !ruby/object:Gem::Dependency
57
85
  name: googleauth
58
86
  requirement: !ruby/object:Gem::Requirement
59
87
  requirements:
60
88
  - - "~>"
61
89
  - !ruby/object:Gem::Version
62
- version: '0.3'
90
+ version: '1.0'
63
91
  type: :runtime
64
92
  prerelease: false
65
93
  version_requirements: !ruby/object:Gem::Requirement
66
94
  requirements:
67
95
  - - "~>"
68
96
  - !ruby/object:Gem::Version
69
- version: '0.3'
97
+ version: '1.0'
70
98
  - !ruby/object:Gem::Dependency
71
99
  name: multi_json
72
100
  requirement: !ruby/object:Gem::Requirement
@@ -146,7 +174,7 @@ dependencies:
146
174
  version: '3.2'
147
175
  - - "<"
148
176
  - !ruby/object:Gem::Version
149
- version: '5.1'
177
+ version: '8.0'
150
178
  type: :runtime
151
179
  prerelease: false
152
180
  version_requirements: !ruby/object:Gem::Requirement
@@ -156,7 +184,7 @@ dependencies:
156
184
  version: '3.2'
157
185
  - - "<"
158
186
  - !ruby/object:Gem::Version
159
- version: '5.1'
187
+ version: '8.0'
160
188
  - !ruby/object:Gem::Dependency
161
189
  name: rake
162
190
  requirement: !ruby/object:Gem::Requirement
@@ -241,9 +269,8 @@ dependencies:
241
269
  - - "~>"
242
270
  - !ruby/object:Gem::Version
243
271
  version: 0.7.11
244
- description: The Google API Ruby Client makes it trivial to discover and access supported
245
- APIs.
246
- email: sbazyl@google.com
272
+ description: Fork of google-api-client used by Ruby-based Arvados components.
273
+ email: dev@arvados.org
247
274
  executables: []
248
275
  extensions: []
249
276
  extra_rdoc_files:
@@ -254,7 +281,7 @@ files:
254
281
  - LICENSE
255
282
  - README.md
256
283
  - Rakefile
257
- - google-api-client.gemspec
284
+ - arvados-google-api-client.gemspec
258
285
  - lib/cacerts.pem
259
286
  - lib/compat/multi_json.rb
260
287
  - lib/google/api_client.rb
@@ -278,7 +305,6 @@ files:
278
305
  - lib/google/api_client/discovery/schema.rb
279
306
  - lib/google/api_client/environment.rb
280
307
  - lib/google/api_client/errors.rb
281
- - lib/google/api_client/gzip.rb
282
308
  - lib/google/api_client/logging.rb
283
309
  - lib/google/api_client/media.rb
284
310
  - lib/google/api_client/railtie.rb
@@ -309,7 +335,7 @@ files:
309
335
  - spec/google/api_client/simple_file_store_spec.rb
310
336
  - spec/google/api_client_spec.rb
311
337
  - spec/spec_helper.rb
312
- homepage: https://github.com/curoverse/google-api-ruby-client/
338
+ homepage: https://github.com/arvados/google-api-ruby-client/
313
339
  licenses:
314
340
  - Apache-2.0
315
341
  metadata: {}
@@ -323,17 +349,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
323
349
  requirements:
324
350
  - - ">="
325
351
  - !ruby/object:Gem::Version
326
- version: '0'
352
+ version: 2.5.0
327
353
  required_rubygems_version: !ruby/object:Gem::Requirement
328
354
  requirements:
329
355
  - - ">="
330
356
  - !ruby/object:Gem::Version
331
357
  version: 1.3.5
332
358
  requirements: []
333
- rubyforge_project:
334
- rubygems_version: 2.7.6.2
359
+ rubygems_version: 3.1.6
335
360
  signing_key:
336
361
  specification_version: 4
337
- summary: The Google API Ruby Client makes it trivial to discover and access Google's
338
- REST APIs.
362
+ summary: Fork of google-api-client used by Ruby-based Arvados components.
339
363
  test_files: []
@@ -1,28 +0,0 @@
1
- require 'faraday'
2
- require 'zlib'
3
-
4
- module Google
5
- class APIClient
6
- class Gzip < Faraday::Response::Middleware
7
- include Google::APIClient::Logging
8
-
9
- def on_complete(env)
10
- encoding = env[:response_headers]['content-encoding'].to_s.downcase
11
- case encoding
12
- when 'gzip'
13
- logger.debug { "Decompressing gzip encoded response (#{env[:body].length} bytes)" }
14
- env[:body] = Zlib::GzipReader.new(StringIO.new(env[:body])).read
15
- env[:response_headers].delete('content-encoding')
16
- logger.debug { "Decompressed (#{env[:body].length} bytes)" }
17
- when 'deflate'
18
- logger.debug{ "Decompressing deflate encoded response (#{env[:body].length} bytes)" }
19
- env[:body] = Zlib::Inflate.inflate(env[:body])
20
- env[:response_headers].delete('content-encoding')
21
- logger.debug { "Decompressed (#{env[:body].length} bytes)" }
22
- end
23
- end
24
- end
25
- end
26
- end
27
-
28
- Faraday::Response.register_middleware :gzip => Google::APIClient::Gzip