refactored and test fixed

Author: bishosilwal

lib/imagekitio/api_service/file.rb

@@ -33,22 +33,19 @@ def upload(file: nil, file_name: nil, **options)
         raise ArgumentError, constants.MISSING_UPLOAD_FILE_PARAMETER unless file
         raise ArgumentError, constants.MISSING_UPLOAD_FILE_PARAMETER unless file_name
 
-        content_type = options.delete(:content_type)
+        content_type = options.delete(:content_type) || ''
         options = format_to_json(options, :extensions, Array)
         options = format_to_json(options, :custom_metadata, Hash)
         options = validate_upload_options(options || {})
         if options.is_a?(FalseClass)
           raise ArgumentError, "Invalid Upload option"
         else
           headers = @req_obj.create_headers
-          if(content_type && image_format?(content_type))
-            payload = { multipart: true, file: file, fileName: file_name }.merge(options)
-          else
-            payload =  {
-              'file' => ::UploadIO.new(file, content_type, file_name),
-              'fileName' => file_name
-            }
-          end
+          payload =  {
+            multipart: true,
+            file: file.is_a?(String) ? file : ::UploadIO.new(file, content_type, file_name),
+            fileName: file_name
+          }
           payload.merge!(options)
           url = "#{constants.BASE_URL}#{constants.UPLOAD}"
           @req_obj.request("post", url, headers, payload)

lib/imagekitio/request.rb

@@ -34,7 +34,7 @@ def auth_headers
     # request method communicates with server
     def request(method, url, headers = create_headers, payload = nil)
       headers ||= create_headers
-      response = {response: nil, error: nil}
+      response = {}
       begin
         if(method.downcase.to_sym == :post)
           uri = URI.parse(url)
@@ -43,7 +43,7 @@ def request(method, url, headers = create_headers, payload = nil)
           req = Net::HTTP::Post::Multipart.new uri.path, payload, headers
           resp = http.request(req)
           if resp.code.to_i == 400
-            raise RestClient::ExceptionWithResponse, OpenStruct.new(http_code: 400, body: resp.body)
+            raise RestClient::ExceptionWithResponse, OpenStruct.new(code: 400, body: resp.body)
           end
         else
           resp = RestClient::Request.new(method: method,
@@ -56,14 +56,14 @@ def request(method, url, headers = create_headers, payload = nil)
           if (content_type.include? "application/json")
             response[:response] = JSON.parse(resp.body.to_s)
           else
-            raise =RestClient::ExceptionWithResponse
+            raise RestClient::ExceptionWithResponse, OpenStruct.new(code: 404, body: resp.body)
           end
         elsif resp.code.to_i == 204
           response[:response] = {'success': true}
         end
 
       rescue RestClient::ExceptionWithResponse => err
-        response[:error] = if err.http_code == 404
+        response[:error] = if err.http_code.to_i == 404
                              {'message': err.response.to_s}
                            else
                              err.response.is_a?(OpenStruct) ? JSON.parse(err.response.body) : JSON.parse(err.response)

test/imagekit/api_service/file_test.rb

@@ -76,7 +76,7 @@
       file = open("test/imagekit/dummy_data/sample.jpg", "rb")
       upload = SUT.upload(file: file, file_name: "my_file_name")
       expect(@ac[:payload].keys).to eq([:multipart, :file, :fileName])
-      expect(@ac[:payload][:file]).to eq(file)
+      expect(@ac[:payload][:file].io).to eq(file)
       expect(@ac[:payload][:fileName]).to eq('my_file_name')
       expect(upload[:code]).to eq(200)
 

test/imagekit/request_test.rb

@@ -49,7 +49,21 @@
 
     it "test_request_method_204" do
       response = @request_obj.request(:get, "https://www.example204.com")
+      expect(response[:response]).to have_key(:success)
+      expect(response).to_not have_key(:error)
+    end
+
+    it 'test_request_method_non_JSON_fail_with_post' do
+      stub_request(:post, 'https://www.exampleservererror/upload').to_return(status: 400, body: '{"message": "Server failed"}', headers: {content_type: 'application/json'})
+      response = @request_obj.request(:post, 'https://www.exampleservererror/upload', nil, [])
       expect(response).to have_key(:error)
     end
+
+    it 'test_request_method_JSON_success_with_post' do
+      stub_request(:post, 'https://www.exampleservererror/upload').to_return(status: 200, body: '{"id": "1"}', headers: {content_type: 'application/json'})
+      response = @request_obj.request(:post, 'https://www.exampleservererror/upload', nil, [])
+      expect(response).to_not have_key(:error)
+      expect(response).to have_key(:response)
+    end
   end
 end