chiu
/
google-api-ruby-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace mime-types dependency with mini_mime (#789)

This commit is contained in:
Bruno Bornsztein 2019-05-13 14:21:53 -05:00 committed by Graham Paye
parent dc13fa66cd
commit c1a26e0e37
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
google-api-client.gemspec
View File

@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency 'representable', '~> 3.0' spec.add_runtime_dependency 'representable', '~> 3.0'
spec.add_runtime_dependency 'retriable', '>= 2.0', '< 4.0' spec.add_runtime_dependency 'retriable', '>= 2.0', '< 4.0'
spec.add_runtime_dependency 'addressable', '~> 2.5', '>= 2.5.1' spec.add_runtime_dependency 'addressable', '~> 2.5', '>= 2.5.1'
spec.add_runtime_dependency 'mime-types', '~> 3.0' spec.add_runtime_dependency 'mini_mime', '~> 1.0'
spec.add_runtime_dependency 'signet', '~> 0.10' spec.add_runtime_dependency 'signet', '~> 0.10'
spec.add_runtime_dependency 'googleauth', '>= 0.5', '< 0.10.0' spec.add_runtime_dependency 'googleauth', '>= 0.5', '< 0.10.0'
spec.add_runtime_dependency 'httpclient', '>= 2.8.1', '< 3.0' spec.add_runtime_dependency 'httpclient', '>= 2.8.1', '< 3.0'

6
lib/google/apis/core/upload.rb
View File

@ -18,7 +18,7 @@ require 'google/apis/core/api_command'
require 'google/apis/errors' require 'google/apis/errors'
require 'addressable/uri' require 'addressable/uri'
require 'tempfile' require 'tempfile'
require 'mime-types' require 'mini_mime'
module Google module Google
module Apis module Apis
@ -55,8 +55,8 @@ module Google
elsif self.upload_source.is_a?(String) elsif self.upload_source.is_a?(String)
self.upload_io = File.new(upload_source, 'r') self.upload_io = File.new(upload_source, 'r')
if self.upload_content_type.nil? if self.upload_content_type.nil?
type = MIME::Types.of(upload_source) type = MiniMime.lookup_by_filename(upload_source)
self.upload_content_type = type.first.content_type unless type.nil? || type.empty? self.upload_content_type = type && type.content_type
end end
@close_io_on_finish = true @close_io_on_finish = true
else else