imagekitio 2.0.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f16b0137caabb312f3f4dea41a5558075f6ee24032b733fd4ce986807f695fbf
-  data.tar.gz: 50bc622d4cd9042275cbb1c21920fb371f28ba046fcbd76b74099b288a74227a
+  metadata.gz: c04894bf6eaea4759ee2ba7f6cee915f70a5608a37e8ded7537f6a1dcd7b06a3
+  data.tar.gz: bcfa613b654bfc45c9a04ef97565754dba6ab19f0c7654ecc508e79d9b7ab24f
 SHA512:
-  metadata.gz: e73e581e5709d7ac0de28d6ca9276fea1931b47a1e88595a67fcdb51ee654deed3e6b3aac208198432385c5e2f64c3ea765f366033dd678017fc9fda73d80933
-  data.tar.gz: 0aad82e39f813c480edfeffaf10401bf90aa935b09cc313ddd48a05dc4f51b666074d1e28033398255a807ed40a0f2ac4d42d4b9bfa3571cdc2e706b70f0a846
+  metadata.gz: ed9fd632ab0ede984b852ec87320c851b4238aadd0a7c2fa7c00a89daa699923d9bea1a36e9c0960fa5d142a985b0d68a1ce8dbed4e70e100811ef242376090c
+  data.tar.gz: 83b14958b9c405f4e333e52ed9bb8f946c65649ae56c3209848b47d29af075f5f192bcd1b3145955710319592e8c4e75161df16168f04b1ea533208596faeb00

data/README.md

@@ -13,14 +13,14 @@ ImageKit gem for Ruby on Rails that allows you to use real-time [image resizing]
 Table of contents -
  * [Installation](#Installation)
  * [Initialization](#Initialization)
-    - [CarrierWave](#Carrierwave-config)
-    - [ActiveStorage](#ActiveStorage-config)
+    - [CarrierWave](#Carrierwave)
+    - [ActiveStorage](#activeStorage)
  * [URL Generation](#URL-generation)
  * [File Upload](#File-Upload)
  * [File Management](#File-Management)
  * [Utility Functions](#Utility-functions)
  * [Sample applications](#Sample-Application)
- * [Upgrade to 2.0.0](#Upgrade)
+ * [Upgrade to 2.x](#upgrade-to-2.x)
  * [Support](#Support)
  * [Links](#Links)
 
@@ -715,9 +715,9 @@ There are three sample apps:
 
 Please see the sample applications in [here](https://github.com/imagekit-samples/quickstart).
 
-## Upgrade to 2.0.0
+## Upgrade to 2.x
 
-If you are upgrading to 2.0.0 from version 1.x, make the following changes  in your application:
+If you are upgrading to 2.x from version 1.x, make the following changes  in your application:
 
 - Remove config from environment file to initializer file as described [here](#Initialization).
 - Include `ImageKitIo::CarrierWave` in uploader class(for Carrierwave).

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
@@ -132,7 +134,7 @@ if defined? Rails
       end
 
       def url(key, filename: nil, content_type: '', **options)
-        image_kit_file(key).url
+        generate_url(key, filename: filename, content_type: content_type, path: image_kit_file(key).path, **options)
       end
 
       def open(*args, **options, &block)
@@ -141,13 +143,14 @@ if defined? Rails
 
       private
 
-      def private_url(key, expires_in:, filename:, disposition:, content_type:, **)
-        generate_url(key, expires_in: expires_in, filename: filename, disposition: disposition, content_type: content_type)
+      def private_url(key, expires_in:, filename:, disposition:, content_type:, **options)
+        generate_url(key, expires_in: expires_in, filename: filename, disposition: disposition, content_type: content_type, path: image_kit_file(key).path, **options)
       end
 
-      def generate_url(key, expires_in:, filename:, content_type:, disposition:)
-        filename = '/' + filename.to_s if filename.is_a? ActiveStorage::Filename
-        client.url(path: filename, url_endpoint: config.url_endpoint)
+      def generate_url(key, expires_in:, filename:, content_type:, disposition:, **options)
+        # filename = filename.to_s if filename.is_a? ActiveStorage::Filename
+        # options[:filename] = filename if filename
+        client.url(url_endpoint: config.url_endpoint, **options)
       end
 
       def client

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 && payload.is_a?(Hash) && payload[:multipart])
+          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.0'
+    VERSION = '2.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagekitio
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.1
 platform: ruby
 authors:
 - ImageKit.io team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-06 00:00:00.000000000 Z
+date: 2022-04-01 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