Merge pull request #72 from filestack/fix/response

Add rescue JSON::ParserError and raises body message on upload

lib/filestack/utils/utils.rb

@@ -63,7 +63,7 @@ def make_call(url, action, parameters: nil, headers: nil)
   end
 
   def build_store_task(options = {})
-    return 'store' if options.empty?
+    return 'store' if options.nil? || options.empty?
     tasks = []
     options.each do |key, value|
       value = case key
@@ -100,9 +100,13 @@ def send_upload(apikey, external_url = nil, security = nil, options = nil)
     response = Typhoeus.post("#{base}/#{external_url}", headers: FilestackConfig::HEADERS)
 
     if response.code == 200
-      response_body = JSON.parse(response.body)
-      handle = response_body['url'].split('/').last
-      return { 'handle' => handle }
+      begin
+        response_body = JSON.parse(response.body)
+        handle = response_body['url'].split('/').last
+        return { 'handle' => handle }
+      rescue
+        raise response.body
+      end
     end
     raise response.body
   end

spec/filestack/ruby_spec.rb

@@ -606,6 +606,24 @@ def code
     expect(UploadUtils.build_store_task).to eq("store")
   end
 
+  it 'handles non json response' do
+    class UploadResponse
+      def code
+        200
+      end
+
+      def body
+        "docs provider error: conversion was taking too long (idx 0)"
+      end
+    end
+
+    allow(Typhoeus).to receive(:post)
+      .and_return(UploadResponse.new)
+    expect {
+      lamdba UploadUtils.send_upload("fakekey")
+    }.to raise_error(RuntimeError, "docs provider error: conversion was taking too long (idx 0)")
+  end
+
   ###################
   ## TRANFORM TESTS #
   ###################