uploadcare-ruby 3.0.5 → 3.2.0

data/lib/uploadcare/entity/uploader.rb

@@ -18,7 +18,7 @@ module Uploadcare
       # @option options [Boolean] :store (false) whether to store file on servers.
       def self.upload(object, **options)
         if big_file?(object)
-          upload_big_file(object, **options)
+          multipart_upload(object, **options)
         elsif file?(object)
           upload_file(object, **options)
         elsif object.is_a?(Array)
@@ -43,8 +43,8 @@ module Uploadcare
       end
 
       # upload file of size above 10mb (involves multipart upload)
-      def self.upload_big_file(file, **_options)
-        response = MultipartUploaderClient.new.upload(file)
+      def self.multipart_upload(file, **options, &block)
+        response = MultipartUploaderClient.new.upload(file, **options, &block)
         Uploadcare::Entity::File.new(response.success)
       end
 
@@ -52,9 +52,17 @@ module Uploadcare
       # @param url [String]
       def self.upload_from_url(url, **options)
         response = UploaderClient.new.upload_from_url(url, **options)
+        return response.success[:token] unless response.success[:files]
+
         response.success[:files].map { |file_data| Uploadcare::Entity::File.new(file_data) }
       end
 
+      # gets a status of upload from url
+      # @param url [String]
+      def self.get_upload_from_url_status(token)
+        UploaderClient.new.get_upload_from_url_status(token)
+      end
+
       class << self
         private
 

data/lib/uploadcare/exception/conversion_error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Uploadcare
+  module Exception
+    # Standard error for invalid API conversion responses
+    class ConversionError < StandardError; end
+  end
+end

data/lib/uploadcare/exception/throttle_error.rb

@@ -5,8 +5,10 @@ module Uploadcare
     # Exception for throttled requests
     class ThrottleError < StandardError
       attr_reader :timeout
+
       # @param timeout [Float] Amount of seconds the request have been throttled for
       def initialize(timeout = 10.0)
+        super
         @timeout = timeout
       end
     end

data/lib/uploadcare/param/conversion/document/processing_job_url_builder.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Uploadcare
+  module Param
+    module Conversion
+      module Document
+        class ProcessingJobUrlBuilder
+          class << self
+            def call(uuid:, format: nil, page: nil)
+              [
+                uuid_part(uuid),
+                format_part(format),
+                page_part(page)
+              ].compact.join('-')
+            end
+
+            private
+
+            def uuid_part(uuid)
+              "#{uuid}/document/"
+            end
+
+            def format_part(format)
+              return if format.nil?
+
+              "/format/#{format}/"
+            end
+
+            def page_part(page)
+              return if page.nil?
+
+              "/page/#{page}/"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/uploadcare/param/conversion/video/processing_job_url_builder.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Uploadcare
+  module Param
+    module Conversion
+      module Video
+        class ProcessingJobUrlBuilder
+          class << self
+            # rubocop:disable Metrics/ParameterLists
+            def call(uuid:, size: {}, quality: nil, format: nil, cut: {}, thumbs: {})
+              [
+                uuid_part(uuid),
+                size_part(size),
+                quality_part(quality),
+                format_part(format),
+                cut_part(cut),
+                thumbs_part(thumbs)
+              ].compact.join('-')
+            end
+            # rubocop:enable Metrics/ParameterLists
+
+            private
+
+            def uuid_part(uuid)
+              "#{uuid}/video/"
+            end
+
+            def size_part(size)
+              return if size.empty?
+
+              dimensions = "#{size[:width]}x#{size[:height]}" if size[:width] || size[:height]
+              resize_mode = (size[:resize_mode]).to_s
+              "/size/#{dimensions}/#{resize_mode}/".squeeze('/')
+            end
+
+            def quality_part(quality)
+              return if quality.nil?
+
+              "/quality/#{quality}/"
+            end
+
+            def format_part(format)
+              return if format.nil?
+
+              "/format/#{format}/"
+            end
+
+            def cut_part(cut)
+              return if cut.empty?
+
+              "/cut/#{cut[:start_time]}/#{cut[:length]}/"
+            end
+
+            def thumbs_part(thumbs)
+              return if thumbs.empty?
+
+              "/thumbs~#{thumbs[:N]}/#{thumbs[:number]}/".squeeze('/')
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/uploadcare/param/user_agent.rb

@@ -12,7 +12,7 @@ module Uploadcare
       #   UploadcareRuby/3.0.0-dev/Pubkey_(Ruby/2.6.3;UploadcareRuby)
       def self.call
         framework_data = Uploadcare.config.framework_data || ''
-        framework_data_string = '; ' + Uploadcare.config.framework_data unless framework_data.empty?
+        framework_data_string = "; #{Uploadcare.config.framework_data}" unless framework_data.empty?
         public_key = Uploadcare.config.public_key
         "UploadcareRuby/#{VERSION}/#{public_key} (Ruby/#{RUBY_VERSION}#{framework_data_string})"
       end

data/lib/uploadcare/param/webhook_signature_verifier.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'digest/md5'
+
+module Uploadcare
+  module Param
+    # This object verifies a signature received along with webhook headers
+    class WebhookSignatureVerifier
+      # @see https://uploadcare.com/docs/security/secure-webhooks/
+      def self.valid?(options = {})
+        webhook_body_json = options[:webhook_body]
+        signing_secret = options[:signing_secret] || ENV['UC_SIGNING_SECRET']
+        x_uc_signature_header = options[:x_uc_signature_header]
+
+        digest = OpenSSL::Digest.new('sha256')
+
+        calculated_signature = "v1=#{OpenSSL::HMAC.hexdigest(digest, signing_secret, webhook_body_json)}"
+
+        calculated_signature == x_uc_signature_header
+      end
+    end
+  end
+end

data/lib/uploadcare/ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uploadcare
-  VERSION = '3.0.5'
+  VERSION = '3.2.0'
 end

data/lib/uploadcare.rb

@@ -17,6 +17,9 @@ require 'entity/project'
 require 'entity/uploader'
 require 'entity/webhook'
 
+# Param
+require 'param/webhook_signature_verifier'
+
 # General api
 require 'api/api'
 

data/uploadcare-ruby.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib', 'lib/uploadcare', 'lib/uploadcare/rest']
 
   spec.add_dependency 'api_struct', '~> 1.0.1'
-  spec.add_dependency 'dry-configurable', '~> 0.9.0'
+  spec.add_dependency 'dry-configurable', '~> 0.9'
   spec.add_dependency 'parallel'
   spec.add_dependency 'retries'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uploadcare-ruby
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.2.0
 platform: ruby
 authors:
 - Stepan Redka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-15 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: api_struct
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -173,6 +173,9 @@ files:
 - bin/setup
 - lib/uploadcare.rb
 - lib/uploadcare/api/api.rb
+- lib/uploadcare/client/conversion/base_conversion_client.rb
+- lib/uploadcare/client/conversion/document_conversion_client.rb
+- lib/uploadcare/client/conversion/video_conversion_client.rb
 - lib/uploadcare/client/file_client.rb
 - lib/uploadcare/client/file_list_client.rb
 - lib/uploadcare/client/group_client.rb
@@ -187,6 +190,9 @@ files:
 - lib/uploadcare/concern/error_handler.rb
 - lib/uploadcare/concern/throttle_handler.rb
 - lib/uploadcare/concern/upload_error_handler.rb
+- lib/uploadcare/entity/conversion/base_converter.rb
+- lib/uploadcare/entity/conversion/document_converter.rb
+- lib/uploadcare/entity/conversion/video_converter.rb
 - lib/uploadcare/entity/decorator/paginator.rb
 - lib/uploadcare/entity/entity.rb
 - lib/uploadcare/entity/file.rb
@@ -196,15 +202,19 @@ files:
 - lib/uploadcare/entity/project.rb
 - lib/uploadcare/entity/uploader.rb
 - lib/uploadcare/entity/webhook.rb
+- lib/uploadcare/exception/conversion_error.rb
 - lib/uploadcare/exception/request_error.rb
 - lib/uploadcare/exception/throttle_error.rb
 - lib/uploadcare/param/authentication_header.rb
+- lib/uploadcare/param/conversion/document/processing_job_url_builder.rb
+- lib/uploadcare/param/conversion/video/processing_job_url_builder.rb
 - lib/uploadcare/param/param.rb
 - lib/uploadcare/param/secure_auth_header.rb
 - lib/uploadcare/param/simple_auth_header.rb
 - lib/uploadcare/param/upload/signature_generator.rb
 - lib/uploadcare/param/upload/upload_params_generator.rb
 - lib/uploadcare/param/user_agent.rb
+- lib/uploadcare/param/webhook_signature_verifier.rb
 - lib/uploadcare/ruby/version.rb
 - uploadcare-ruby.gemspec
 homepage: https://github.com/uploadcare/uploadcare-ruby