uploadcare-ruby 3.3.2 → 4.3.0

data/lib/uploadcare/param/secure_auth_header.rb

@@ -8,15 +8,15 @@ module Uploadcare
     # This authentication method is more secure, but more tedious
     class SecureAuthHeader
       # @see https://uploadcare.com/docs/api_reference/rest/requests_auth/#auth-uploadcare
-      def self.call(**options)
+      def self.call(options = {})
         @method = options[:method]
         @body = options[:content] || ''
         @content_type = options[:content_type]
         @uri = options[:uri]
         @date_for_header = timestamp
         {
-          'Date': @date_for_header,
-          'Authorization': "Uploadcare #{Uploadcare.config.public_key}:#{signature}"
+          Date: @date_for_header,
+          Authorization: "Uploadcare #{Uploadcare.config.public_key}:#{signature}"
         }
       end
 

data/lib/uploadcare/param/simple_auth_header.rb

@@ -7,7 +7,7 @@ module Uploadcare
     class SimpleAuthHeader
       # @see https://uploadcare.com/docs/api_reference/rest/requests_auth/#auth-simple
       def self.call
-        { 'Authorization': "Uploadcare.Simple #{Uploadcare.config.public_key}:#{Uploadcare.config.secret_key}" }
+        { Authorization: "Uploadcare.Simple #{Uploadcare.config.public_key}:#{Uploadcare.config.secret_key}" }
       end
     end
   end

data/lib/uploadcare/param/upload/signature_generator.rb

@@ -14,8 +14,8 @@ module Uploadcare
           to_sign = Uploadcare.config.secret_key + expires_at.to_s
           signature = Digest::MD5.hexdigest(to_sign)
           {
-            'signature': signature,
-            'expire': expires_at
+            signature: signature,
+            expire: expires_at
           }
         end
       end

data/lib/uploadcare/param/upload/upload_params_generator.rb

@@ -8,14 +8,31 @@ module Uploadcare
       # This class generates body params for uploads
       class UploadParamsGenerator
         # @see https://uploadcare.com/docs/api_reference/upload/request_based/
-        def self.call(store = 'auto')
-          store = '1' if store == true
-          store = '0' if store == false
-          {
-            'UPLOADCARE_PUB_KEY' => Uploadcare.config.public_key,
-            'UPLOADCARE_STORE' => store,
-            'signature' => (Upload::SignatureGenerator.call if Uploadcare.config.sign_uploads)
-          }.reject { |_k, v| v.nil? }
+        class << self
+          def call(options = {})
+            {
+              'UPLOADCARE_PUB_KEY' => Uploadcare.config.public_key,
+              'UPLOADCARE_STORE' => store(options[:store]),
+              'signature' => (Upload::SignatureGenerator.call if Uploadcare.config.sign_uploads)
+            }.merge(metadata(options)).compact
+          end
+
+          private
+
+          def store(store)
+            store = 'auto' if store.nil?
+            store = '0'    if store == false
+            store = '1'    if store == true
+            store
+          end
+
+          def metadata(options = {})
+            return {} if options[:metadata].nil?
+
+            options[:metadata].each_with_object({}) do |(k, v), res|
+              res.merge!("metadata[#{k}]" => v)
+            end
+          end
         end
       end
     end

data/lib/uploadcare/param/webhook_signature_verifier.rb

@@ -9,7 +9,7 @@ module Uploadcare
       # @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']
+        signing_secret = options[:signing_secret] || ENV.fetch('UC_SIGNING_SECRET', nil)
         x_uc_signature_header = options[:x_uc_signature_header]
 
         digest = OpenSSL::Digest.new('sha256')

data/lib/uploadcare/ruby/version.rb

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

data/lib/uploadcare.rb

@@ -59,4 +59,5 @@ module Uploadcare
   setting :max_throttle_attempts,     default: 5
   setting :upload_threads,            default: 2 # used for multiupload only ATM
   setting :framework_data,            default: ''
+  setting :file_chunk_size,           default: 100
 end

data/uploadcare-ruby.gemspec

@@ -7,8 +7,7 @@ require 'uploadcare/ruby/version'
 Gem::Specification.new do |spec|
   spec.name          = 'uploadcare-ruby'
   spec.version       = Uploadcare::VERSION
-  spec.authors       = ['Stepan Redka']
-  spec.email         = ['stepan.redka@railsmuffin.com']
+  spec.authors       = ['@dmitrijivanchenko (Dmitrij Ivanchenko), @T0mbery (Andrey Aksenov)']
 
   spec.summary       = 'Ruby wrapper for uploadcare API'
   spec.description   = spec.summary
@@ -23,9 +22,10 @@ Gem::Specification.new do |spec|
     spec.metadata['homepage_uri'] = spec.homepage
     spec.metadata['source_code_uri'] = 'https://github.com/uploadcare/uploadcare-ruby'
     spec.metadata['changelog_uri'] = 'https://github.com/uploadcare/uploadcare-ruby/CHANGELOG.md'
+    spec.metadata['rubygems_mfa_required'] = 'true'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -37,15 +37,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib', 'lib/uploadcare', 'lib/uploadcare/rest']
 
-  spec.add_dependency 'api_struct', '~> 1.0.1'
-  spec.add_dependency 'dry-configurable', '~> 0.9'
-  spec.add_dependency 'parallel'
-  spec.add_dependency 'retries'
+  spec.add_dependency 'mimemagic', '~> 0.4'
+  spec.add_dependency 'parallel', '~> 1.22'
+  spec.add_dependency 'retries', '~> 0.0'
+  spec.add_dependency 'uploadcare-api_struct', '>= 1.1', '< 2'
 
-  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'byebug', '~> 11.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'rubocop', '~> 1.48'
+  spec.add_development_dependency 'vcr', '~> 6.1'
+  spec.add_development_dependency 'webmock', '~> 3.18'
 end

metadata

@@ -1,85 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: uploadcare-ruby
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 4.3.0
 platform: ruby
 authors:
-- Stepan Redka
+- "@dmitrijivanchenko (Dmitrij Ivanchenko), @T0mbery (Andrey Aksenov)"
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2023-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: api_struct
+  name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
-  name: parallel
+  name: retries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: retries
+  name: uploadcare-api_struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,47 +118,46 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.48'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.18'
 description: Ruby wrapper for uploadcare API
-email:
-- stepan.redka@railsmuffin.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -173,11 +178,13 @@ files:
 - bin/setup
 - lib/uploadcare.rb
 - lib/uploadcare/api/api.rb
+- lib/uploadcare/client/addons_client.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/file_metadata_client.rb
 - lib/uploadcare/client/group_client.rb
 - lib/uploadcare/client/multipart_upload/chunks_client.rb
 - lib/uploadcare/client/multipart_upload_client.rb
@@ -190,6 +197,7 @@ files:
 - lib/uploadcare/concern/error_handler.rb
 - lib/uploadcare/concern/throttle_handler.rb
 - lib/uploadcare/concern/upload_error_handler.rb
+- lib/uploadcare/entity/addons.rb
 - lib/uploadcare/entity/conversion/base_converter.rb
 - lib/uploadcare/entity/conversion/document_converter.rb
 - lib/uploadcare/entity/conversion/video_converter.rb
@@ -197,6 +205,7 @@ files:
 - lib/uploadcare/entity/entity.rb
 - lib/uploadcare/entity/file.rb
 - lib/uploadcare/entity/file_list.rb
+- lib/uploadcare/entity/file_metadata.rb
 - lib/uploadcare/entity/group.rb
 - lib/uploadcare/entity/group_list.rb
 - lib/uploadcare/entity/project.rb
@@ -227,6 +236,7 @@ metadata:
   homepage_uri: https://github.com/uploadcare/uploadcare-ruby
   source_code_uri: https://github.com/uploadcare/uploadcare-ruby
   changelog_uri: https://github.com/uploadcare/uploadcare-ruby/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -244,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for uploadcare API