cloudconvert 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f05a16c577e0b30ddf30f9e73a087e1b79d40570f11b5a6013d98d9c372494c0
-  data.tar.gz: 7252a59fffb66d0797a04014251a3825a976a3470c8ca0d1adcd10865950512f
+  metadata.gz: 8c46faca8539027bde61511b20021157975e70c1f94809900566bf8d0c704c4a
+  data.tar.gz: e2512b37e5323a0c4bc86995737f5c2dd81b2ababd7581d1d6cc9adb5c4e3562
 SHA512:
-  metadata.gz: bf3531174c00eb2b7ea64fac80e91a40a497ffdaed32f834fd9edb497b6fadf4514a6a6ada0e50fdd0e1d7e83f763d982408e4e883b9625bfcfcdda1bf2c3ead
-  data.tar.gz: a9a5b932ebf1eee1ada6a1d779bdf73ee6e1572fcaccfb2430496746d2ed8c83b8798e7e38fd61dea16b3a356d9391f05379a8d5137965d7281f5aed23690f3d
+  metadata.gz: e93e2e759a74b381dc792dc73bf851bc6e4e3fe99ab7b46139da0423f3621af8f6478d7052c0a7eac3f280e4ece1d009621ea61794c5e1b052f3359ca85ff20f
+  data.tar.gz: 5478c05ce746cc2740b8f1a38bb259fd936eaa40fda5b37c382c94e99fdadb34bf5b8fe3523a3b1a5767dd4ed412bbab54db0460057353f0c26f176e4b4c0b1d

data/cloudconvert.gemspec

@@ -18,14 +18,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
   spec.required_ruby_version = ">= 2.7"
   spec.add_dependency "activesupport", ">= 4.0"
+  spec.add_dependency "base64"
   spec.add_dependency "down", "~> 5.0"
   spec.add_dependency "equalizer"
-  spec.add_dependency "faraday", "~> 1.0"
-  spec.add_dependency "faraday_middleware", "~> 1.0"
+  spec.add_dependency "faraday", ">= 2.0.1"
+  spec.add_dependency "faraday-multipart"
+  spec.add_dependency "faraday-follow_redirects"
   spec.add_dependency "forwardable"
   spec.add_dependency "json"
   spec.add_dependency "memoizable", "~> 0.4"
-  spec.add_dependency "marcel", "~> 1.0.0"
+  spec.add_dependency "marcel", ">= 1.0", "< 3"
   spec.add_dependency "openssl"
   spec.add_dependency "ostruct"
   spec.add_dependency "schemacop", "~> 2.4"

data/lib/cloudconvert/client.rb

@@ -93,8 +93,8 @@ module CloudConvert
         f.adapter Faraday.default_adapter
         f.request :json
         f.request :multipart
-        f.use CloudConvert::Middleware::ParseJson, content_type: /\bjson$/
-        f.use FaradayMiddleware::FollowRedirects, callback: lambda { |response, redirect|
+        f.response :json, content_type: /\bjson$/, parser_options: { object_class: OpenStruct }
+        f.response :follow_redirects, callback: lambda { |response, redirect|
           redirect.request_headers.delete("Content-Length")
           redirect.request_headers.delete("Content-Type")
         }

data/lib/cloudconvert/file.rb

@@ -1,5 +1,5 @@
 module CloudConvert
-  class File < Faraday::FilePart
+  class File < Faraday::Multipart::FilePart
     def initialize(file, content_type = nil, *parts)
       content_type ||= "text/plain" if file.is_a? StringIO
       content_type ||= Marcel::Magic.by_magic(file) || Marcel::Magic.by_path(file)

data/lib/cloudconvert/version.rb

@@ -1,3 +1,3 @@
 module CloudConvert
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/cloudconvert/webhook/processor.rb

@@ -11,7 +11,7 @@ module CloudConvert::Webhook::Processor
 
   def create
     method = event.name.gsub(".", "_")
-    raise NoMethodError.new("#{name}##{method} not implemented") unless respond_to?(method, true)
+    raise NoMethodError.new("#{self.class.name}##{method} not implemented") unless respond_to?(method, true)
     send(method, event)
     head(:ok)
   end

data/lib/cloudconvert.rb

@@ -1,9 +1,11 @@
 require "active_support/concern"
 require "active_support/core_ext/hash/reverse_merge"
+require "base64"
 require "down"
 require "equalizer"
 require "faraday"
-require "faraday_middleware"
+require "faraday/follow_redirects"
+require "faraday/multipart"
 require "forwardable"
 require "json"
 require "memoizable"
@@ -20,7 +22,6 @@ require "cloudconvert/error"
 require "cloudconvert/event"
 require "cloudconvert/file"
 require "cloudconvert/job"
-require "cloudconvert/middleware"
 require "cloudconvert/resource"
 require "cloudconvert/resources/jobs"
 require "cloudconvert/resources/tasks"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudconvert
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Josias Montag
 - Steve Lacey
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  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'
 - !ruby/object:Gem::Dependency
   name: down
   requirement: !ruby/object:Gem::Requirement
@@ -57,30 +70,44 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  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'
 - !ruby/object:Gem::Dependency
   name: forwardable
   requirement: !ruby/object:Gem::Requirement
@@ -127,16 +154,22 @@ dependencies:
   name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -353,7 +386,6 @@ files:
 - lib/cloudconvert/event.rb
 - lib/cloudconvert/file.rb
 - lib/cloudconvert/job.rb
-- lib/cloudconvert/middleware.rb
 - lib/cloudconvert/resource.rb
 - lib/cloudconvert/resources/jobs.rb
 - lib/cloudconvert/resources/tasks.rb
@@ -371,7 +403,6 @@ metadata:
   bug_tracker_uri: https://github.com/cloudconvert/cloudconvert-ruby/issues
   documentation_uri: https://cloudconvert.com/api/v2
   source_code_uri: https://github.com/cloudconvert/cloudconvert-ruby
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -386,8 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A Ruby interface to the CloudConvert API v2.
 test_files: []

data/lib/cloudconvert/middleware.rb

@@ -1,9 +0,0 @@
-module CloudConvert
-  module Middleware
-    class ParseJson < FaradayMiddleware::ParseJson
-      define_parser do |body, parser_options|
-        JSON.parse(body, object_class: OpenStruct) unless body.blank?
-      end
-    end
-  end
-end