arvados-google-api-client 0.8.7.4 → 0.8.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 603082e16cf1ccdb12bf91379ccacd79d467b45cb0658b60eecca536161f10be
-  data.tar.gz: 7fc6860b945e1ed4e2d232d2109cefbb10ce5b157d8d1975f37fc5657bcf9ba6
+  metadata.gz: dd751a365b72440d5a16351517a9f7ec7d4d66693c0a6f58ad016f4e52a66d77
+  data.tar.gz: d5322f288a12e01607bd9b34f690547137d20e8a80f19a6f26259ea79abbeb64
 SHA512:
-  metadata.gz: 125567c7f26cc16b5193009efeefcf01055221dffbbe93e2f8cc3703ca34f2c822a6451a43c9c4b37f8e798598338b96d5e70d7ac6ce7d5df5393ab24edbf871
-  data.tar.gz: d97cc580edbae2d6a592da8ef9c56796e50f5c7639ed63da256731e203fb4c1a44a673d91a6fce0126b7a30b2a0b0590fb016491b4ea5eb2d8017fcc8466d5b5
+  metadata.gz: bb9678214cb4d03bde9f26c4640146a07dabd29cfab0620c02e055023b4d6fa8c0e151a3cbbcc5cbb6d2d1903493f9d5a55e37ff449c28525ff59bf47859884b
+  data.tar.gz: 33814d57bce05a2789a2791407f6c158d9c38cbe4285e953481660b2526ec940b17ca8a504ee345a358cc41339e1c52964ed074d82e43bcd7f46f7ba0e406982

data/{google-api-client.gemspec → arvados-google-api-client.gemspec}

@@ -5,14 +5,15 @@ Gem::Specification.new do |s|
   s.name = "arvados-google-api-client"
   s.version = Google::APIClient::VERSION::STRING
 
+  s.required_ruby_version = '>= 2.5.0'
   s.required_rubygems_version = ">= 1.3.5"
   s.require_paths = ["lib"]
   s.authors = ["Bob Aman", "Steven Bazyl"]
   s.license = "Apache-2.0"
-  s.description = "The Google API Ruby Client makes it trivial to discover and access supported APIs."
-  s.email = "sbazyl@google.com"
+  s.description = "Fork of google-api-client used by Ruby-based Arvados components."
+  s.email = "dev@arvados.org"
   s.extra_rdoc_files = ["README.md"]
-  s.files = %w(google-api-client.gemspec Rakefile LICENSE CHANGELOG.md README.md Gemfile)
+  s.files = %w(arvados-google-api-client.gemspec Rakefile LICENSE CHANGELOG.md README.md Gemfile)
   s.files += Dir.glob("lib/**/*.rb")
   s.files += Dir.glob("lib/cacerts.pem")
   s.files += Dir.glob("spec/**/*.{rb,opts}")
@@ -21,18 +22,20 @@ Gem::Specification.new do |s|
   s.files += Dir.glob("website/**/*")
   s.homepage = "https://github.com/arvados/google-api-ruby-client/"
   s.rdoc_options = ["--main", "README.md"]
-  s.summary = "The Google API Ruby Client makes it trivial to discover and access Google's REST APIs."
+  s.summary = "Fork of google-api-client used by Ruby-based Arvados components."
 
   s.add_runtime_dependency 'addressable', '~> 2.3'
-  s.add_runtime_dependency 'signet', '~> 0.6'
-  s.add_runtime_dependency 'faraday', '~> 0.9'
-  s.add_runtime_dependency 'googleauth', '~> 0.3'
+  s.add_runtime_dependency 'signet', '~> 0.16.0'
+  s.add_runtime_dependency 'faraday', '~> 2.0'
+  s.add_runtime_dependency 'faraday-multipart', '~> 1.0'
+  s.add_runtime_dependency 'faraday-gzip', '~> 2.0'
+  s.add_runtime_dependency 'googleauth', '~> 1.0'
   s.add_runtime_dependency 'multi_json', '~> 1.10'
   s.add_runtime_dependency 'autoparse', '~> 0.3'
   s.add_runtime_dependency 'extlib', '~> 0.9'
   s.add_runtime_dependency 'launchy', '~> 2.4'
   s.add_runtime_dependency 'retriable', '~> 1.4'
-  s.add_runtime_dependency 'activesupport', '>= 3.2', '< 5.3'
+  s.add_runtime_dependency 'activesupport', '>= 3.2', '< 8.0'
 
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'yard', '~> 0.8'

data/lib/google/api_client/charset.rb

@@ -3,7 +3,7 @@ require 'zlib'
  
 module Google
   class APIClient
-    class Charset < Faraday::Response::Middleware
+    class Charset < Faraday::Middleware
       include Google::APIClient::Logging
 
       def charset_for_content_type(type)
@@ -30,4 +30,4 @@ module Google
   end
 end
  
-Faraday::Response.register_middleware :charset => Google::APIClient::Charset
+Faraday::Response.register_middleware :charset => Google::APIClient::Charset

data/lib/google/api_client/media.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 require 'google/api_client/reference'
+require 'faraday/multipart'
 
 module Google
   class APIClient
@@ -21,7 +22,7 @@ module Google
     # @see Faraday::UploadIO
     # @example
     #   media = Google::APIClient::UploadIO.new('mymovie.m4v', 'video/mp4')
-    class UploadIO < Faraday::UploadIO
+    class UploadIO < Faraday::Multipart::FilePart
       
       # @return [Fixnum] Size of chunks to upload. Default is nil, meaning upload the entire file in a single request
       attr_accessor :chunk_size
@@ -256,4 +257,4 @@ module Google
       
     end
   end
-end
+end

data/lib/google/api_client/request.rb

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 require 'faraday'
-require 'faraday/request/multipart'
 require 'compat/multi_json'
 require 'addressable/uri'
 require 'stringio'
@@ -279,32 +278,7 @@ module Google
       # @option options [#read, #to_str] :body
       #   Raw body to send in POST/PUT requests
       def initialize_media_upload(options)
-        self.media = options[:media]
-        case self.upload_type
-        when "media"
-          if options[:body] || options[:body_object]
-            raise ArgumentError, "Can not specify body & body object for simple uploads"
-          end
-          self.headers['Content-Type'] ||= self.media.content_type
-          self.headers['Content-Length'] ||= self.media.length.to_s
-          self.body = self.media
-        when "multipart"
-          unless options[:body_object]
-            raise ArgumentError, "Multipart requested but no body object"
-          end
-          metadata = StringIO.new(serialize_body(options[:body_object]))
-          build_multipart([Faraday::UploadIO.new(metadata, 'application/json', 'file.json'), self.media])
-        when "resumable"
-          file_length = self.media.length
-          self.headers['X-Upload-Content-Type'] = self.media.content_type
-          self.headers['X-Upload-Content-Length'] = file_length.to_s
-          if options[:body_object]
-            self.headers['Content-Type'] ||= 'application/json'
-            self.body = serialize_body(options[:body_object])
-          else
-            self.body = ''
-          end
-        end
+        raise "media upload not supported by arvados-google-api-client"
       end
 
       ##
@@ -319,13 +293,7 @@ module Google
       # @param [String] boundary
       #   Boundary for separating each part of the message
       def build_multipart(parts, mime_type = 'multipart/related', boundary = MULTIPART_BOUNDARY)
-        env = Faraday::Env.new
-        env.request = Faraday::RequestOptions.new
-        env.request.boundary = boundary
-        env.request_headers = {'Content-Type' => "#{mime_type};boundary=#{boundary}"}
-        multipart = Faraday::Request::Multipart.new
-        self.body = multipart.create_multipart(env, parts.map {|part| [nil, part]})
-        self.headers.update(env[:request_headers])
+        raise "multipart upload not supported by arvados-google-api-client"
       end
 
       ##

data/lib/google/api_client/version.rb

@@ -19,7 +19,7 @@ module Google
       MAJOR = 0
       MINOR = 8
       TINY  = 7
-      PATCH = 4
+      PATCH = 5
       STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')
     end
   end

data/lib/google/api_client.rb

@@ -14,6 +14,7 @@
 
 
 require 'faraday'
+require 'faraday/gzip'
 require 'multi_json'
 require 'compat/multi_json'
 require 'stringio'
@@ -30,7 +31,6 @@ require 'google/api_client/result'
 require 'google/api_client/media'
 require 'google/api_client/service_account'
 require 'google/api_client/batch'
-require 'google/api_client/gzip'
 require 'google/api_client/charset'
 require 'google/api_client/client_secrets'
 require 'google/api_client/railtie' if defined?(Rails)
@@ -130,8 +130,8 @@ module Google
       @discovered_apis = {}
       ca_file = options[:ca_file] || File.expand_path('../../cacerts.pem', __FILE__)
       self.connection = Faraday.new do |faraday|
+        faraday.request :gzip
         faraday.response :charset if options[:force_encoding]
-        faraday.response :gzip
         faraday.options.params_encoder = Faraday::FlatParamsEncoder
         faraday.ssl.ca_file = ca_file
         faraday.ssl.verify = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-google-api-client
 version: !ruby/object:Gem::Version
-  version: 0.8.7.4
+  version: 0.8.7.5
 platform: ruby
 authors:
 - Bob Aman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -31,42 +31,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: faraday-gzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +174,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -156,7 +184,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -241,9 +269,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.11
-description: The Google API Ruby Client makes it trivial to discover and access supported
-  APIs.
-email: sbazyl@google.com
+description: Fork of google-api-client used by Ruby-based Arvados components.
+email: dev@arvados.org
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -254,7 +281,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- google-api-client.gemspec
+- arvados-google-api-client.gemspec
 - lib/cacerts.pem
 - lib/compat/multi_json.rb
 - lib/google/api_client.rb
@@ -278,7 +305,6 @@ files:
 - lib/google/api_client/discovery/schema.rb
 - lib/google/api_client/environment.rb
 - lib/google/api_client/errors.rb
-- lib/google/api_client/gzip.rb
 - lib/google/api_client/logging.rb
 - lib/google/api_client/media.rb
 - lib/google/api_client/railtie.rb
@@ -323,16 +349,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
-summary: The Google API Ruby Client makes it trivial to discover and access Google's
-  REST APIs.
+summary: Fork of google-api-client used by Ruby-based Arvados components.
 test_files: []

data/lib/google/api_client/gzip.rb

@@ -1,28 +0,0 @@
-require 'faraday'
-require 'zlib'
- 
-module Google
-  class APIClient
-    class Gzip < Faraday::Response::Middleware
-      include Google::APIClient::Logging
- 
-      def on_complete(env)
-        encoding = env[:response_headers]['content-encoding'].to_s.downcase
-        case encoding
-        when 'gzip'
-          logger.debug { "Decompressing gzip encoded response (#{env[:body].length} bytes)" }        
-          env[:body] = Zlib::GzipReader.new(StringIO.new(env[:body])).read
-          env[:response_headers].delete('content-encoding')
-          logger.debug { "Decompressed (#{env[:body].length} bytes)" }        
-        when 'deflate'
-          logger.debug{ "Decompressing deflate encoded response (#{env[:body].length} bytes)" }        
-          env[:body] = Zlib::Inflate.inflate(env[:body])
-          env[:response_headers].delete('content-encoding')
-          logger.debug { "Decompressed (#{env[:body].length} bytes)" }        
-        end
-      end
-    end
-  end
-end
- 
-Faraday::Response.register_middleware :gzip => Google::APIClient::Gzip