Merge pull request #39 from bishosilwal/fix-issue-with-video-upload

Fixes issue with video upload

Author: imagekitio

imagekitio.gemspec

@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rest-client', '~> 2.1', ">=2.1"
   spec.add_dependency 'addressable', '~> 2.8'
   spec.add_dependency 'activestorage', '>= 5.2.0'
-  # spec.add_development_dependency "sqlite3"
+  spec.add_dependency 'multipart-post', '>= 2.1.0'
   spec.add_development_dependency "rails", "~> 5.2.0", ">= 5.2.0"
 end

lib/active_storage/service/image_kit_io_service.rb

@@ -3,7 +3,7 @@
 if defined? Rails
   # Overwrite the ActiveStorage::Downloader's open method and remove the file integrity check constraint method verify_integrity_of
   class DownloaderExtension < ::ActiveStorage::Downloader
-    def open(key, checksum:, name: "ActiveStorage-", tmpdir: nil)
+    def open(key, checksum:, name: "ActiveStorage-", tmpdir: nil, **options)
       open_tempfile(name, tmpdir) do |file|
         download key, file
         # verify_integrity_of file, checksum: checksum
@@ -71,9 +71,11 @@ def initialize(**options)
       def upload(key, io, checksum: nil, **options)
         instrument :upload, key: key, checksum: checksum do
           blob = storage_blob(key)
-          response = client.upload_file(file: io, file_name: blob.filename.to_s)
+          response = client.upload_file(file: io, file_name: blob.filename.to_s, content_type: blob.content_type)
           if response[:error].nil?
             blob.update_columns(metadata: response[:response].transform_keys(&:to_sym))
+          else
+            raise Exception.new response[:error]
           end
         end
       end

lib/imagekitio/api_service/file.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require_relative '../constant'
 require_relative '../utils/option_validator'
+require 'net/http/post/multipart'
 
 module ImageKitIo
   module ApiService
@@ -32,14 +33,20 @@ 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) || ''
         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
-          payload = {multipart: true, file: file, fileName: file_name}.merge(options)
+          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)
         end
@@ -157,6 +164,12 @@ def rename(file_path: nil, new_file_name: nil, **options)
         payload = { 'filePath': file_path, 'newFileName': new_file_name }.merge(request_formatter(options)).to_json
         @req_obj.request('put', url, @req_obj.create_headers, payload)
       end
+
+
+      private
+      def image_format?(type)
+        %(image/jpeg image/bmp image/apng image/avif image/gif image/ief image/svg+xml image/tiff image/x-icon image/rgb image/webp).include?(type)
+      end
     end
   end
 end

lib/imagekitio/constants/file.rb

@@ -5,7 +5,7 @@ module File
 
       VALID_FILE_DETAIL_OPTIONS = ["fileID"]
 
-      VALID_UPLOAD_OPTIONS = %w[file file_name use_unique_file_name tags folder is_private_file custom_coordinates response_fields extensions webhook_url overwrite_file overwrite_AI_tags overwrite_custom_metadata custom_metadata mime overwrite_tags  ]
+      VALID_UPLOAD_OPTIONS = %w[file file_name use_unique_file_name tags folder is_private_file custom_coordinates response_fields extensions webhook_url overwrite_file overwrite_AI_tags overwrite_custom_metadata custom_metadata mime overwrite_tags content_type  ]
     end
   end
 end

lib/imagekitio/request.rb

@@ -3,6 +3,7 @@
 require "base64"
 require "rest-client"
 require "json"
+require 'net/http/post/multipart'
 require_relative './constant'
 # Request requests and sends data from server
 module ImageKitIo
@@ -33,28 +34,39 @@ 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
-        resp = RestClient::Request.new(method: method,
-                                       url: url,
-                                       headers: headers,
-                                       payload: payload).execute
-
-        if (resp.code >= 200) && (resp.code < 204)
-          if (resp.headers[:content_type].include? "application/json")
+        if(method.downcase.to_sym == :post)
+          uri = URI.parse(url)
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = (uri.scheme == 'https')
+          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(code: 400, body: resp.body)
+          end
+        else
+          resp = RestClient::Request.new(method: method,
+                                         url: url,
+                                         headers: headers,
+                                         payload: payload).execute
+        end
+        if (resp.code.to_i >= 200) && (resp.code.to_i < 204)
+          content_type = resp.respond_to?(:headers) ? resp.headers[:content_type] : resp.content_type
+          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 == 204
+        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
-                             JSON.parse(err.response)
+                             err.response.is_a?(OpenStruct) ? JSON.parse(err.response.body) : JSON.parse(err.response)
                            end
       end
       response

lib/imagekitio/sdk/version.rb

@@ -1,5 +1,5 @@
 module ImageKitIo
   module Sdk
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
   end
 end

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/client_test.rb

@@ -69,7 +69,7 @@
       SUT = ImageKitIo::Client.new(private_key, public_key, url_endpoint)
       SUT.set_ik_request(request_obj)
 
-      upload = SUT.upload_file(file: "fakefile.jpg", file_name: "fake")
+      upload = SUT.upload_file(file: "fakefile.jpg", file_name: "fake", content_type: 'image/jpeg')
 
       expect(upload[:code]).to eq(200)
     end

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