uploadcare-ruby 4.2.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed47599fddd9c9b01dc434fffcffc0a323231396105fb028c6c6234ff0faaa6a
-  data.tar.gz: a9c20611bc482f6ee7454616dfdc54995d00a31f5159e943b60af71de4982792
+  metadata.gz: b5a41f0e682da0993059311f280acd2b5e1121de5cdc7815646ee209b6dedbd8
+  data.tar.gz: 37ec4e95272358faf14c597569cf10045fc3982935685c265a90a0f8cf70c2f1
 SHA512:
-  metadata.gz: dba20c7fc6fea99e6b487e77dcec4477ec613f925d1dc2e4a1fd33caa6e8ba8844db2e7c579ac7e40427d24c4c88a4742967086face3c1a9d638815ed3d5c3e4
-  data.tar.gz: a4303e9e5b7584b3e5db4f346aff6e1a4bb44be843a762a95edaceec1b04a0400f2ceeb9945b0cfecd03a9ebceb855cc2b126b89f789987d40088f3ecf00eae3
+  metadata.gz: d03e62ad958c06e2695f77a9cb2d2d521efd56b056b09ed6aa3c8fc99015e486dacdf96923fccc191995b75d1caeaa549b751f60de0068a197854ecc4353af45
+  data.tar.gz: 7f14a80dc1c2408ec652feb37183f90c36c12799facec201b7f6076195669367bc4fa5487c051f19ecd4a6a50751fd39426a7e2906e75415eeeec421f17a548c

data/.github/workflows/gem-push.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: Release Gem
         if: contains(github.ref, 'refs/tags/v')
-        uses: cadwallion/publish-rubygems-action@v1.0.0
+        uses: cadwallion/publish-rubygems-action@master
         env:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           RUBYGEMS_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}

data/.github/workflows/ruby.yml

@@ -12,20 +12,21 @@ on: [push, pull_request]
 jobs:
   test:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: [
-          '2.4', '2.5', # eol
-          '2.6', '2.7', # maintained
-        ]
+        ruby-version:
+          - 2.7
+          - 3.0
+          - 3.1
+          - 3.2
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        bundler: 1.17.3
+        bundler: 2.4
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true
     - name: Run tests
@@ -39,9 +40,11 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        ruby-version: ['2.7',]
+        ruby-version:
+          - 2.7
+          - 3.2
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/.gitignore

@@ -14,3 +14,7 @@
 
 .idea
 Gemfile.lock
+
+.ruby-version
+project_files
+*.gem

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  NewCops: enable
   TargetRubyVersion: 2.7
 
 Metrics/LineLength:

data/CHANGELOG.md

@@ -1,6 +1,33 @@
 # Changelog
 
-## 4.0.0
+## 4.3.1 — 2023-03-17
+
+### Changed
+
+- Update the gem description
+- Allow ENV keys to be configured after the gem load
+
+## 4.3.0 — 2023-03-15
+
+Add support of new ruby versions
+
+### Breaking Сhanges
+
+- Drop support of unmaintainable Ruby versions (2.4, 2.5, 2.6).
+- Replace unmaintainable `api_struct` with `uploadcare-api_struct` 
+
+### Added
+
+- Add support for Ruby 3+ (3.0, 3.1, 3.2).
+
+## 4.0.0 — 2022-12-29
+
+This version supports latest Uploadcare REST API — [v0.7](https://uploadcare.com/api-refs/rest-api/v0.7.0/), which introduces new file management features:
+* [File metadata](https://uploadcare.com/docs/file-metadata/)
+* New [add-ons API](https://uploadcare.com/api-refs/rest-api/v0.7.0/#tag/Add-Ons):
+  * [Background removal](https://uploadcare.com/docs/remove-bg/)
+  * [Virus checking](https://uploadcare.com/docs/security/malware-protection/)
+  * [Object recognition](https://uploadcare.com/docs/intelligence/object-recognition/)
 
 ### Breaking Сhanges
 

data/README.md

@@ -35,7 +35,7 @@ wrapping Upload and REST APIs.
 * [Useful links](#useful-links)
 
 ## Requirements
-* ruby 2.4+
+* ruby 2.7+
 
 ## Compatibility
 
@@ -54,14 +54,9 @@ And then execute:
 
     $ bundle
 
-If you have Ruby version >= 3, then you probably will get error:
-```
-ArgumentError: wrong number of arguments (given 2, expected 1)
-```
-
-To fix this errors, add this line to your application's Gemfile:
+If you use `api_struct` gem in your project, replace it with `uploadcare-api_struct`:
 ```ruby
-gem 'dry-configurable', '0.13.0'
+gem 'uploadcare-api_struct'
 ```
 and run `bundle install`
 

data/lib/uploadcare/client/conversion/base_conversion_client.rb

@@ -15,7 +15,7 @@ module Uploadcare
         def headers
           {
             'Content-Type': 'application/json',
-            'Accept': API_VERSION_HEADER_VALUE,
+            Accept: API_VERSION_HEADER_VALUE,
             'User-Agent': Uploadcare::Param::UserAgent.call
           }
         end

data/lib/uploadcare/client/group_client.rb

@@ -21,7 +21,7 @@ module Uploadcare
       # Get group info
       # @see https://uploadcare.com/api-refs/upload-api/#operation/filesGroupInfo
       def info(group_id)
-        get(path: 'group/info/', params: { 'pub_key': Uploadcare.config.public_key, 'group_id': group_id })
+        get(path: 'group/info/', params: { pub_key: Uploadcare.config.public_key, group_id: group_id })
       end
 
       private

data/lib/uploadcare/client/multipart_upload/chunks_client.rb

@@ -20,7 +20,7 @@ module Uploadcare
         def self.upload_chunks(object, links)
           Parallel.each(0...links.count, in_threads: Uploadcare.config.upload_threads) do |link_id|
             offset = link_id * CHUNK_SIZE
-            chunk = IO.read(object, CHUNK_SIZE, offset)
+            chunk = File.read(object, CHUNK_SIZE, offset)
             new.upload_chunk(chunk, links[link_id])
             next unless block_given?
 

data/lib/uploadcare/client/multipart_upload_client.rb

@@ -57,8 +57,8 @@ module Uploadcare
       end
 
       alias api_struct_post post
-      def post(args = {})
-        handle_throttling { api_struct_post(args) }
+      def post(**args)
+        handle_throttling { api_struct_post(**args) }
       end
     end
   end

data/lib/uploadcare/client/rest_client.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'rest_client'
 require 'dry/monads'
 require 'api_struct'
 require 'uploadcare/concern/error_handler'
@@ -56,7 +55,7 @@ module Uploadcare
       def headers
         {
           'Content-Type': 'application/json',
-          'Accept': 'application/vnd.uploadcare-v0.7+json',
+          Accept: 'application/vnd.uploadcare-v0.7+json',
           'User-Agent': Uploadcare::Param::UserAgent.call
         }
       end

data/lib/uploadcare/client/uploader_client.rb

@@ -73,10 +73,10 @@ module Uploadcare
 
       # Prepares body for upload_many method
       def upload_many_body(arr, options = {})
-        files_formdata = arr.map do |file|
+        files_formdata = arr.to_h do |file|
           [HTTP::FormData::File.new(file).filename,
            form_data_for(file)]
-        end.to_h
+        end
         HTTP::FormData::Multipart.new(
           Param::Upload::UploadParamsGenerator.call(options).merge(files_formdata)
         )

data/lib/uploadcare/client/webhook_client.rb

@@ -11,11 +11,11 @@ module Uploadcare
       # @see https://uploadcare.com/docs/api_reference/rest/webhooks/#subscribe
       def create(options = {})
         body = {
-          'target_url': options[:target_url],
-          'event': options[:event] || 'file.uploaded',
-          'is_active': options[:is_active].nil? ? true : options[:is_active]
+          target_url: options[:target_url],
+          event: options[:event] || 'file.uploaded',
+          is_active: options[:is_active].nil? ? true : options[:is_active]
         }.merge(
-          { 'signing_secret': options[:signing_secret] }.compact
+          { signing_secret: options[:signing_secret] }.compact
         ).to_json
         post(uri: '/webhooks/', content: body)
       end
@@ -29,7 +29,7 @@ module Uploadcare
       # Permanently deletes subscription
       # @see https://uploadcare.com/docs/api_reference/rest/webhooks/#unsubscribe
       def delete(target_url)
-        body = { 'target_url': target_url }.to_json
+        body = { target_url: target_url }.to_json
         request(method: 'DELETE', uri: '/webhooks/unsubscribe/', content: body)
       end
 

data/lib/uploadcare/concern/error_handler.rb

@@ -36,7 +36,7 @@ module Uploadcare
 
       # Raise ThrottleError. Also, tells in error when server will be ready for next request
       def raise_throttling_error(response)
-        retry_after = response.headers['Retry-After'].to_i + 1 || 11
+        retry_after = (response.headers['Retry-After'].to_i + 1) || 11
         raise ThrottleError.new(retry_after), "Response throttled, retry #{retry_after} seconds later"
       end
 

data/lib/uploadcare/concern/upload_error_handler.rb

@@ -24,7 +24,7 @@ module Uploadcare
       def catch_throttling_error(response)
         return unless response.code == 429
 
-        retry_after = response.headers['Retry-After'].to_i + 1 || 11
+        retry_after = (response.headers['Retry-After'].to_i + 1) || 11
         raise ThrottleError.new(retry_after), "Response throttled, retry #{retry_after} seconds later"
       end
     end

data/lib/uploadcare/entity/decorator/paginator.rb

@@ -26,7 +26,7 @@ module Uploadcare
           return unless url
 
           query = URI.decode_www_form(URI(url).query).to_h
-          query = query.map { |k, v| [k.to_sym, v] }.to_h
+          query = query.to_h { |k, v| [k.to_sym, v] }
           self.class.list(**query)
         end
 
@@ -36,7 +36,7 @@ module Uploadcare
           return unless url
 
           query = URI.decode_www_form(URI(url).query).to_h
-          query = query.map { |k, v| [k.to_sym, v] }.to_h
+          query = query.to_h { |k, v| [k.to_sym, v] }
           self.class.list(**query)
         end
 

data/lib/uploadcare/entity/file.rb

@@ -89,7 +89,7 @@ module Uploadcare
       def convert_file(params, converter, options = {})
         raise Uploadcare::Exception::ConversionError, 'The first argument must be a Hash' unless params.is_a?(Hash)
 
-        params_with_symbolized_keys = params.map { |k, v| [k.to_sym, v] }.to_h
+        params_with_symbolized_keys = params.to_h { |k, v| [k.to_sym, v] }
         params_with_symbolized_keys[:uuid] = uuid
         result = converter.convert(params_with_symbolized_keys, options)
         result.success? ? File.info(result.value![:result].first[:uuid]) : result

data/lib/uploadcare/param/secure_auth_header.rb

@@ -15,8 +15,8 @@ module Uploadcare
         @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/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 = '4.2.0'
+  VERSION = '4.3.1'
 end

data/lib/uploadcare.rb

@@ -45,8 +45,8 @@ module Uploadcare
     end
   end
 
-  setting :public_key,                default: ENV.fetch('UPLOADCARE_PUBLIC_KEY')
-  setting :secret_key,                default: ENV.fetch('UPLOADCARE_SECRET_KEY')
+  setting :public_key,                default: ENV.fetch('UPLOADCARE_PUBLIC_KEY', '')
+  setting :secret_key,                default: ENV.fetch('UPLOADCARE_SECRET_KEY', '')
   setting :auth_type,                 default: 'Uploadcare'
   setting :multipart_size_threshold,  default: 100 * 1024 * 1024
   setting :rest_api_root,             default: 'https://api.uploadcare.com'

data/uploadcare-ruby.gemspec

@@ -7,10 +7,12 @@ require 'uploadcare/ruby/version'
 Gem::Specification.new do |spec|
   spec.name          = 'uploadcare-ruby'
   spec.version       = Uploadcare::VERSION
-  spec.authors       = ['@dmitrijivanchenko (Dmitrij Ivanchenko), @T0mbery (Andrey Aksenov)']
+  spec.authors       = ['@dmitrijivanchenko (Dmitrij Ivanchenko), @T0mbery (Andrey Aksenov)',
+                        'kraft001 (Konstantin Rafalskii)']
 
   spec.summary       = 'Ruby wrapper for uploadcare API'
-  spec.description   = spec.summary
+  spec.description   = 'Ruby API client that handles uploads and further operations with files ' \
+                       'by wrapping Uploadcare Upload and REST APIs.'
   spec.homepage      = 'https://github.com/uploadcare/uploadcare-ruby'
   spec.license       = 'MIT'
 
@@ -22,9 +24,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.
@@ -36,23 +39,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 'mimemagic'
-  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'
 
-  # rubocop:disable Gemspec/RubyVersionGlobalsUsage
-  if RUBY_VERSION.start_with?('3')
-    spec.add_development_dependency 'dry-configurable', '0.13.0'
-  else
-    spec.add_development_dependency 'dry-configurable'
-  end
-  # rubocop:enable Gemspec/RubyVersionGlobalsUsage
-
-  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,99 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: uploadcare-ruby
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.1
 platform: ruby
 authors:
 - "@dmitrijivanchenko (Dmitrij Ivanchenko), @T0mbery (Andrey Aksenov)"
+- kraft001 (Konstantin Rafalskii)
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-25 00:00:00.000000000 Z
+date: 2023-03-17 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
-- !ruby/object:Gem::Dependency
-  name: mimemagic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.22'
 - !ruby/object:Gem::Dependency
   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: dry-configurable
+  name: uploadcare-api_struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        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
@@ -126,45 +119,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'
-description: Ruby wrapper for uploadcare API
+        version: '3.18'
+description: Ruby API client that handles uploads and further operations with files
+  by wrapping Uploadcare Upload and REST APIs.
 email: 
 executables: []
 extensions: []
@@ -244,6 +238,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:
@@ -261,7 +256,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