imagekitio 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db316e0a4525fa5a4f72d3f993da7fdb12480e18957cf40f0a84ec40c255ab2e
-  data.tar.gz: f24d4d783f368bb5ba90807f3dec82f677f943a9ccff4373dd6d56471e524517
+  metadata.gz: 0e277c2a9acd03cb3c09568a169a4634e7d67a6aa6e1950530f3c0c520912b2a
+  data.tar.gz: 3b937a53d53b95dda07d35a8161e6fa46a2a0d66246183b1cbc40d92f73f948f
 SHA512:
-  metadata.gz: 5cd39012d46c350b0cbaefce9dfe60fc7bdf5e8fd110fc01e05b06fa95c9bff171c679dc0d724cc41ddf1b968ea2f3fef3dd30e867d6f2da1935d0e4cd02afd8
-  data.tar.gz: 360f33ade97be7c1c72e7c6be026008688dfced40b4201ba17d33b180f93270070a77e23718072fb779386f1707abb3c7f1b2ba6ba4ff5102cc03ca4747ad809
+  metadata.gz: 7856a96dabd8e21f0ac68e519f2dbca74c20a9fbe9d6915b4ba74ba965609856bfe7ba6e15a96d6d92ab7692fa4002c2b9bd90794369e7436b54735358718cc9
+  data.tar.gz: 8d221bbef283cdd2c9578dfd590a2e7f570b6de0c29643b5b8b6cf86e36001227dbfb4aa89e0c35e5da5e6e0821da484581305780087a44bfc09b2658a614431

data/lib/active_storage/service/image_kit_io_service.rb

@@ -3,7 +3,7 @@ require_relative './ik_file'
 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 @@ if defined? Rails
       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

data/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,6 +33,7 @@ module ImageKitIo
         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 || {})
@@ -39,7 +41,12 @@ module ImageKitIo
           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 @@ module ImageKitIo
         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

data/lib/imagekitio/constants/file.rb

@@ -5,7 +5,7 @@ module ImageKitIo
 
       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

data/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 @@ module ImageKitIo
     # 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

data/lib/imagekitio/sdk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagekitio
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - ImageKit.io team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -78,6 +78,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement