Merge pull request #311 from dosuken123/fix-json-api-no-work-with-content_type

Fix JSON API not work with Content type text/plain

Author: icco

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

@@ -46,13 +46,11 @@ def put_object(bucket_name,
                        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