filestack 2.8.1 → 2.9.6

data/filestack-ruby.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "typhoeus", "~> 1.1"
   spec.add_dependency "parallel", "~> 1.11", ">= 1.11.2"
-  spec.add_dependency "mimemagic", "~> 0.3.2"
+  spec.add_dependency "mini_mime", "~> 1.0"
   spec.add_dependency "progress_bar"
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/filestack/mixins/filestack_common.rb

@@ -1,7 +1,7 @@
 require 'filestack/config'
 require 'filestack/utils/utils'
 require 'filestack/utils/multipart_upload_utils'
-require 'mimemagic'
+require 'mini_mime'
 require 'json'
 
 # Module is mixin for common functionalities that all Filestack
@@ -58,7 +58,7 @@ module FilestackCommon
     return 'Overwrite requires security' if security.nil?
 
     file = File.open(filepath, 'r')
-    mimetype = MimeMagic.by_magic(file)
+    mimetype = MiniMime.lookup_by_filename(file).content_type
     content = file.read
 
     signature = security.signature

data/lib/filestack/models/filelink.rb

@@ -10,7 +10,7 @@ require 'filestack/mixins/filestack_common'
 class FilestackFilelink
   include FilestackCommon
   include UploadUtils
-  attr_reader :handle, :apikey, :security
+  attr_reader :handle, :apikey, :security, :upload_response
 
   # Initialize FilestackFilelink
   #
@@ -18,10 +18,11 @@ class FilestackFilelink
   # @param [String]             apikey        Your Filestack API Key (optional)
   # @param [FilestackSecurity]  security      Filestack security object, if
   #                                           security is enabled.
-  def initialize(handle, apikey: nil, security: nil)
+  def initialize(handle, apikey: nil, security: nil, upload_response: nil)
     @handle = handle
     @apikey = apikey
     @security = security
+    @upload_response = upload_response
   end
 
   # Get content of filelink

data/lib/filestack/models/filestack_client.rb

@@ -42,7 +42,7 @@ class FilestackClient
                 multipart_upload(@apikey, filepath, io, @security, options, timeout, storage, intelligent)
                end
 
-    FilestackFilelink.new(response['handle'], security: @security, apikey: @apikey)
+    FilestackFilelink.new(response['handle'], security: @security, apikey: @apikey, upload_response: response)
   end
   # Transform an external URL
   #

data/lib/filestack/ruby/version.rb

@@ -1,5 +1,5 @@
 module Filestack
   module Ruby
-    VERSION = '2.8.1'.freeze
+    VERSION = '2.9.6'.freeze
   end
 end

data/lib/filestack/utils/multipart_upload_utils.rb

@@ -1,7 +1,7 @@
 require 'base64'
 require 'timeout'
 require 'digest'
-require 'mimemagic'
+require 'mini_mime'
 require 'json'
 require 'parallel'
 require 'typhoeus'
@@ -16,7 +16,7 @@ module MultipartUploadUtils
 
   def get_file_attributes(file, options = {})
     filename = options[:filename] || File.basename(file)
-    mimetype = options[:mimetype] || MimeMagic.by_magic(File.open(file)) || FilestackConfig::DEFAULT_UPLOAD_MIMETYPE
+    mimetype = options[:mimetype] || get_mimetype_from_file(file) || FilestackConfig::DEFAULT_UPLOAD_MIMETYPE
     filesize = File.size(file)
 
     [filename, filesize, mimetype.to_s]
@@ -280,4 +280,12 @@ module MultipartUploadUtils
     end
     JSON.parse(response_complete.body)
   end
+
+  private
+
+  def get_mimetype_from_file(file)
+    file_info = MiniMime.lookup_by_filename(File.open(file))
+
+    file_info ? file_info.content_type : nil
+  end
 end

data/lib/filestack/utils/utils.rb

@@ -1,7 +1,7 @@
 require 'base64'
 require 'digest'
 require 'fiber'
-require 'mimemagic'
+require 'mini_mime'
 require 'json'
 require 'typhoeus'
 
@@ -58,7 +58,7 @@ module UploadUtils
                 FilestackConfig::HEADERS
               end
     Typhoeus.public_send(
-      action, url, params: parameters, headers: headers
+      action, URI.encode(url), params: parameters, headers: headers
     )
   end
 
@@ -102,8 +102,7 @@ module UploadUtils
     if response.code == 200
       begin
         response_body = JSON.parse(response.body)
-        handle = response_body['url'].split('/').last
-        return { 'handle' => handle }
+        return response_body
       rescue
         raise response.body
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filestack
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.9.6
 platform: ruby
 authors:
 - Filestack
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-02 00:00:00.000000000 Z
+date: 2021-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -45,19 +45,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.11.2
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: mini_mime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: progress_bar
   requirement: !ruby/object:Gem::Requirement