lib/filestack/utils/multipart_upload_utils.rb in filestack-2.4.0 vs lib/filestack/utils/multipart_upload_utils.rb in filestack-2.5.0

- old
+ new

@@ -1,6 +1,7 @@ require 'base64' +require 'timeout' require 'digest' require 'mimemagic' require 'json' require 'parallel' require 'typhoeus' @@ -55,11 +56,11 @@ response = Typhoeus.post( FilestackConfig::MULTIPART_START_URL, body: params, headers: FilestackConfig::HEADERS ) if response.code == 200 - response.body + JSON.parse(response.body) else raise RuntimeError.new(response.body) end end @@ -142,10 +143,11 @@ data = data.merge!(options) if options fs_response = Typhoeus.post( FilestackConfig::MULTIPART_UPLOAD_URL, body: data, headers: FilestackConfig::HEADERS ).body + fs_response = JSON.parse(fs_response) Typhoeus.put( fs_response['url'], headers: fs_response['headers'], body: chunk ) end # Runs all jobs in parallel @@ -259,10 +261,10 @@ apikey, filename, filesize, mimetype, start_response, parts_and_etags, options ) end begin - Timeout::timeout(timeout){ + Timeout::timeout(timeout) { while response_complete.code == 202 response_complete = multipart_complete( apikey, filename, filesize, mimetype, start_response, nil, options, intelligent )