From d8286f642cfed32b0d648a33da514a689ca82e21 Mon Sep 17 00:00:00 2001 From: Steve Bazyl Date: Thu, 23 Jun 2016 12:44:06 -0700 Subject: [PATCH] Prefer mimetype columnar store if available to reduce mem footprint --- lib/google/apis/core/upload.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/google/apis/core/upload.rb b/lib/google/apis/core/upload.rb index 0661bccd1..4d97773d5 100644 --- a/lib/google/apis/core/upload.rb +++ b/lib/google/apis/core/upload.rb @@ -17,8 +17,14 @@ require 'google/apis/core/http_command' require 'google/apis/core/api_command' require 'google/apis/errors' require 'addressable/uri' -require 'mime-types' require 'tempfile' +begin + require 'mime/types/columnar' +rescue LoadError + # Temporary until next major bump when we can tighten + # dependency to mime-types >-=3.0 + require 'mime-types' +end module Google module Apis