filestack 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b7d3ba72df49cc4fd9149008f780ada8d2e0aa4
-  data.tar.gz: 82c84956bbedf392a56c4ef5a2ba160ed69f0a8a
+  metadata.gz: df82fcab255164aa2495b536833524af2dc53a88
+  data.tar.gz: 63e1a01506b9b407f9e616835aa3a86c50dd38ff
 SHA512:
-  metadata.gz: d51fc97148fc3f95c82d57102b8662fdd8489da4d61ff52c395cef2a7b0df064e3bdc53567a5fd2fbdff88a5af171013e94e428c5f49db78eb7d18aa0b9a2250
-  data.tar.gz: f9737bbf117c1f5919fd945e6aef60e3ed1888b12a171789f16d25871f249494b557429c1e7668e7bda718477bb1353e7e5231ca30d01228d86507529395f8c5
+  metadata.gz: a4df97fd84c2044647fcb82bbfeeaedb185725fb1d3bc1b6018b358c6ff1124c06d69471b4777ba9f05c760d9db36b0be089e458043b244a65bea28a754801a4
+  data.tar.gz: d524e4b2f95f5d8b4e61884e738991c96658f2e9fa233261904e51708a99152fbce4d4828cf9d09394d23e04ea51798538598b2673f097be211b98829f592576

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Filestack-Ruby Changelog
 
+## 2.5.4 (February 12, 2019)
+- Fixed issue with multipart upload
+
 ## 2.5.3 (January 18, 2019)
 - Fixed issue with upload with passed params (mimetype, path, etc.) for external url
 

data/README.md

@@ -52,11 +52,28 @@ Filestack uses multipart uploading by default, which is faster for larger files.
 ```ruby
 filelink = client.upload(filepath: '/path/to/file')
 
+filelink = client.upload(filepath: '/path/to/file', multipart: false)
+
 # OR
 
 filelink = client.upload(external_url: 'http://someurl.com')
 ```
 
+To upload a local and an external file with query parameters:
+```ruby
+filelink = client.upload(filepath: '/path/to/file', options: {mimetype: 'image/png'})
+
+filelink = client.upload(external_url: 'http://someurl.com/image.png', options: {mimetype: 'image/jpeg'})
+```
+
+To store file on `dropbox`, `azure`, `gcs` or `rackspace`, you must have the chosen provider configured in the developer portal to enable this feature. By default the file is stored on `s3`. You can add more details of the storage in `options`.
+
+```ruby
+filelink = client.upload(filepath: '/path/to/file', storage: 'dropbox', options: {path: 'folder_name/'})
+
+filelink = client.upload(external_url: 'http://someurl.com/image.png', storage: 'dropbox', options: {path: 'folder_name/'})
+```
+
 ### Security
 If security is enabled on your account, or if you are using certain actions that require security (delete, overwrite and certain transformations), you will need to create a security object and pass it into the client on instantiation.
 

data/VERSION

@@ -1 +1 @@
-2.5.3
+2.5.4

data/lib/filestack/models/filestack_client.rb

@@ -31,12 +31,12 @@ class FilestackClient
   # @param [Hash]                 options          User-supplied upload options
   #
   # return [Filestack::FilestackFilelink]
-  def upload(filepath: nil, external_url: nil, multipart: true, options: nil, storage: 's3', intelligent: false, timeout: 60)
+  def upload(filepath: nil, external_url: nil, multipart: true, options: {}, storage: 's3', intelligent: false, timeout: 60)
     if filepath && external_url
       return 'You cannot upload a URL and file at the same time'
     end
     response = if filepath && multipart
-                 multipart_upload(@apikey, filepath, @security, options, timeout, intelligent: intelligent)
+                 multipart_upload(@apikey, filepath, @security, options, timeout, storage, intelligent: intelligent)
                else
                  send_upload(
                    @apikey,
@@ -49,20 +49,20 @@ class FilestackClient
                end
     FilestackFilelink.new(response['handle'], security: @security, apikey: @apikey)
   end
-  # Transform an external URL 
+  # Transform an external URL
   #
-  # @param [string]    external_url   A valid URL 
+  # @param [string]    external_url   A valid URL
   #
   # @return [Filestack::Transform]
   def transform_external(external_url)
     Transform.new(external_url: external_url, security: @security, apikey: @apikey)
-  end  
+  end
 
-  def zip(destination, files)    
+  def zip(destination, files)
     encoded_files = JSON.generate(files).gsub('"', '')
     zip_url = "#{FilestackConfig::CDN_URL}/#{@apikey}/zip/#{encoded_files}"
     escaped_zip_url = zip_url.gsub("[","%5B").gsub("]","%5D")
-    response = UploadUtils.make_call(escaped_zip_url, 'get')    
+    response = UploadUtils.make_call(escaped_zip_url, 'get')
     File.write(destination, response.body)
   end
 end

data/lib/filestack/ruby/version.rb

@@ -1,5 +1,5 @@
 module Filestack
   module Ruby
-    VERSION = '2.5.3'.freeze
+    VERSION = '2.5.4'.freeze
   end
 end

data/lib/filestack/utils/multipart_upload_utils.rb

@@ -23,6 +23,16 @@ module MultipartUploadUtils
     [filename, filesize, mimetype.to_s]
   end
 
+  def multipart_options(options)
+    [:region, :container, :path, :access].each do |key|
+      if options.has_key?(key)
+        options[:"store_#{key}"] = options[key]
+        options.delete(key)
+      end
+    end
+    return options
+  end
+
   # Send start response to multipart endpoint
   #
   # @param [String]             apikey        Filestack API key
@@ -35,17 +45,17 @@ module MultipartUploadUtils
   #                                           multipart uploads
   #
   # @return [Typhoeus::Response]
-  def multipart_start(apikey, filename, filesize, mimetype, security, options)
+  def multipart_start(apikey, filename, filesize, mimetype, security, storage, options = {})
     params = {
       apikey: apikey,
       filename: filename,
       mimetype: mimetype,
       size: filesize,
-      store_location: options.nil? ? 's3' : options[:store_location],
+      store_location: storage,
       file: Tempfile.new(filename),
-      options: options,
       'multipart' => 'true'
     }
+    options = multipart_options(options)
     params = params.merge!(options) if options
 
     unless security.nil?
@@ -76,7 +86,7 @@ module MultipartUploadUtils
   #                                            multipart uploads
   #
   # @return [Array]
-  def create_upload_jobs(apikey, filename, filepath, filesize, start_response, options)
+  def create_upload_jobs(apikey, filename, filepath, filesize, start_response, storage, options)
     jobs = []
     part = 1
     seek_point = 0
@@ -93,9 +103,11 @@ module MultipartUploadUtils
         upload_id: start_response['upload_id'],
         location_url: start_response['location_url'],
         start_response: start_response,
-        options: options,
-        store_location: options.nil? ? 's3' : options[:store_location]
+        store_location: storage
       }
+      options = multipart_options(options)
+      part_info = part_info.merge!(options) if options
+
       if seek_point + FilestackConfig::DEFAULT_CHUNK_SIZE > filesize
         size = filesize - (seek_point)
       else
@@ -191,7 +203,7 @@ module MultipartUploadUtils
   #                                             multipart uploads
   #
   # @return [Typhoeus::Response]
-  def multipart_complete(apikey, filename, filesize, mimetype, start_response, parts_and_etags, options, intelligent = false)
+  def multipart_complete(apikey, filename, filesize, mimetype, start_response, parts_and_etags, options, storage, intelligent = false)
     if !intelligent
       data = {
         apikey: apikey,
@@ -202,7 +214,7 @@ module MultipartUploadUtils
         size: filesize,
         mimetype: mimetype,
         parts: parts_and_etags.join(';'),
-        store_location: options.nil? ? 's3' : options[:store_location],
+        store_location: storage,
         file: Tempfile.new(filename)
       }
     else
@@ -214,11 +226,12 @@ module MultipartUploadUtils
         filename: filename,
         size: filesize,
         mimetype: mimetype,
-        store_location: options.nil? ? 's3' : options[:store_location],
+        store_location: storage,
         file: Tempfile.new(filename),
         'multipart' => 'true'
       }
     end
+    options = multipart_options(options)
     data = data.merge!(options) if options
 
     Typhoeus.post(
@@ -237,29 +250,32 @@ module MultipartUploadUtils
   #                                             multipart uploads
   #
   # @return [Hash]
-  def multipart_upload(apikey, filepath, security, options, timeout, intelligent: false)
+  def multipart_upload(apikey, filepath, security, options, timeout, storage, intelligent: false)
     filename, filesize, mimetype = get_file_info(filepath)
     start_response = multipart_start(
-      apikey, filename, filesize, mimetype, security, options
+      apikey, filename, filesize, mimetype, security, storage, options
     )
+
     unless start_response['upload_type'].nil?
       intelligent_enabled = ((start_response['upload_type'].include? 'intelligent_ingestion')) && intelligent
     end
+
     jobs = create_upload_jobs(
-      apikey, filename, filepath, filesize, start_response, options
+      apikey, filename, filepath, filesize, start_response, storage, options
     )
+
     if intelligent_enabled
       state = IntelligentState.new
       run_intelligent_upload_flow(jobs, state)
       response_complete = multipart_complete(
         apikey, filename, filesize, mimetype,
-        start_response, nil, options, intelligent
+        start_response, nil, options, storage, intelligent
       )
     else
       parts_and_etags = run_uploads(jobs, apikey, filepath, options)
       response_complete = multipart_complete(
         apikey, filename, filesize, mimetype,
-        start_response, parts_and_etags, options
+        start_response, parts_and_etags, options, storage
       )
     end
     begin
@@ -267,7 +283,7 @@ module MultipartUploadUtils
         while response_complete.code == 202
           response_complete = multipart_complete(
             apikey, filename, filesize, mimetype,
-            start_response, nil, options, intelligent
+            start_response, nil, options, storage, intelligent
           )
         end
       }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filestack
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Filestack
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus