fog-google 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ae0e411797b763fe618dc2a8c158402aed604a7
-  data.tar.gz: a21e035486bcbe6da4af618860cc8615d6c0dae4
+  metadata.gz: b60274f37b6c27b7f7ca99c2e6da44c688e42de0
+  data.tar.gz: 334ebad30e1cc9c16148b5733c851ebef0bf4687
 SHA512:
-  metadata.gz: fb6af48903189df6ef655d479453d0b9a4bf114ba060d5127e8183e79a09f57786ca3d56817298719bd0c8434f88684c34e6450a9c68e576d6ced8473a66dde9
-  data.tar.gz: 71a91aba9e568dbc5f931f0619a0d432c147c97239bd017867d56d6b33a3330f665f8363b3272ce1439dc1ba303bea4a3bc1dafffbc040a085494c6a74958d80
+  metadata.gz: 26ccb1f592a38548a673c8424985f77b9fcdbaf8968d0bb7b76c02cb932afac3153686c24f084f7c84716654152ca4e71812183d791c406918d9b75212b7377b
+  data.tar.gz: 7a0ad20aa3c081a831596e7c546f58011523aa68a81dc56ff100c65a794f3abb0d5d003c49c4f2f3b0ca73a43f91b7e44892b271188a2593ab6d089c360c4378

data/CONTRIBUTORS.md

@@ -73,6 +73,7 @@ With also previous help from unnamed Google employees and [Fog contributors](htt
 * Romain Haenni <admin@zlabs.ch>
 * Romain Vrignaud <rvrignaud@gmail.com>
 * Sean Malloy <spinelli85@gmail.com>
+* Shinya Maeda <shinya@gitlab.com>
 * Stephen von Takach <steve@advancedcontrol.com.au>
 * Tim Downey <tdowney@pivotal.io>
 * Timur Alperovich <timur.alperovich@gmail.com>

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.3.2".freeze
+    VERSION = "1.3.3".freeze
   end
 end

data/lib/fog/storage/google_json/requests/put_object.rb

@@ -46,13 +46,11 @@ module Fog
                        kms_key_name: nil,
                        predefined_acl: nil,
                        **options)
-          unless options[:content_type]
-            if data.is_a?(String)
-              data = StringIO.new(data)
-              options[:content_type] = "text/plain"
-            elsif data.is_a?(::File)
-              options[:content_type] = Fog::Storage.parse_data(data)[:headers]["Content-Type"]
-            end
+          if data.is_a?(String)
+            data = StringIO.new(data)
+            options[:content_type] ||= "text/plain"
+          elsif data.is_a?(::File)
+            options[:content_type] ||= Fog::Storage.parse_data(data)[:headers]["Content-Type"]
           end
 
           # Paperclip::AbstractAdapter

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-google
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Nat Welch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -721,7 +721,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Google.