cloudconvert 1.0.2 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6dde202d9202295f93e2614fb19358b5c1f97a12679e51da3b837de71c68bcc
-  data.tar.gz: 99ec57ec28509a9a3f1231de3a74b09687185e7b3d4972365b6c655d4c43b243
+  metadata.gz: c673e3ee8e95029ba169554f076d54a63ccafeb2935708da8882babddba6f2dd
+  data.tar.gz: cae666dc7dda6a117cf0f81ba40086e35c135b63e478972aa082eabd631ae6c4
 SHA512:
-  metadata.gz: 6fef45ad6dc438ac6e7ac8efb99a3592180d95b01aafc02f1e19ae34029607894c41ffa16325e85a3612a84c361ba5cde0703c4859330b71ae983aaeeaa894af
-  data.tar.gz: 1239105391c68e937fa414c6224dc54ce838725d4108e9ecc2380bddfa90acb881592338a444fa6dde11957fe07523be1170a2886f28bf016f7252f387fae77e
+  metadata.gz: d571515f826da72d7334981057c0d4cf987d5c34abf05353ad5479a3e10a3554f3ff76ea040f6841bda769400b076be9a1aed07435197d516e26aa0a0b226508
+  data.tar.gz: fb6262513b578d91d6c65a1ba8bbe40e149b051ba684458fb025e81e07fcdcea127cbe361aca89d8d78a80e344d5b40b55b8a92cb1342e3f5b50603255545b0b

data/README.md

@@ -207,6 +207,26 @@ The `verify`/`verify_request` methods return `true`/`false`, use `verify!` or `v
 You can read the [full list of events](https://cloudconvert.com/api/v2/webhooks) CloudConvert can notify you about in our documentation.
 
 
+Signed URL
+--------
+
+Signed URLs allow converting files on demand only using URL query parameters. The Ruby SDK allows to generate such URLs. Therefore, you need to obtain a signed URL base and a signing secret on the [CloudConvert Dashboard](https://cloudconvert.com/dashboard/api/v2/signed-urls).
+
+```rb
+base = 'https://s.cloudconvert.com/...' # You can find it in your signed URL settings.
+signing_secret = '...' # You can find it in your signed URL settings.
+cache_key = 'cache-key' # Allows caching of the result file for 24h
+
+job = {
+  tasks: {
+    "import-it": { operation: "import/url", filename: "test.file", url: "http://invalid.url" },
+    "convert-it": { input: "import-it", operation: "convert", output_format: "pdf" },
+  }
+}
+
+url = CloudConvert::SignedUrl.sign(base, signing_secret, job, cache_key)
+```
+
 Development
 -----------
 

data/cloudconvert.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 4.0"
   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"

data/lib/cloudconvert/client.rb

@@ -75,21 +75,26 @@ module CloudConvert
       Down.download(url, *args, **options)
     end
 
-    private
-
     # @return [String]
     def api_host
       @api_host ||= sandbox ? SANDBOX_URL : API_URL
     end
 
+    # @return [String]
+    def api_sync_host
+      @api_sync_host ||= sandbox ? SANDBOX_SYNC_URL : API_SYNC_URL
+    end
+
+    private
+
     # @return [Faraday::Client]
     def connection
       @connection ||= Faraday.new(url: api_host, headers: headers) do |f|
         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/resources/jobs.rb

@@ -41,7 +41,7 @@ module CloudConvert
       # @param id [String]
       # @return [Job]
       def wait(id)
-        Job.result(client.get("/v2/jobs/#{id}/wait", {}))
+        Job.result(client.get(client.api_sync_host + "/v2/jobs/#{id}", {}))
       end
 
       # @param id [String]

data/lib/cloudconvert/resources/tasks.rb

@@ -51,7 +51,7 @@ module CloudConvert
       # @param id [String]
       # @return [Task]
       def wait(id)
-        Task.result(client.get("/v2/tasks/#{id}/wait"))
+        Task.result(client.get(client.api_sync_host + "/v2/tasks/#{id}"))
       end
 
       # @param file [File, String, IO] Either a String filename to a local file or an open IO object.

data/lib/cloudconvert/signed_url.rb

@@ -0,0 +1,24 @@
+module CloudConvert
+  class SignedUrl
+    class << self
+      # @param base [String] The base from for your signed URL settings.
+      # @param signing_secret [String] The signing secret from for your signed URL settings.
+      # @param job [Hash] The job to create the signed URL for
+      # @param cache_key [String] Allows caching of the result file for 24h
+      # @return [String] The signed URL
+      def sign(base, signing_secret, job, cache_key = nil)
+        url = base
+
+        url += "?job=" + Base64.urlsafe_encode64(job.to_json, padding: false)
+
+        unless cache_key.nil?
+          url += "&cache_key=" + cache_key
+        end
+
+        url += "&s=" + OpenSSL::HMAC.hexdigest("SHA256", signing_secret, url)
+
+        url
+      end
+    end
+  end
+end

data/lib/cloudconvert/version.rb

@@ -1,3 +1,3 @@
 module CloudConvert
-  VERSION = "1.0.2"
+  VERSION = "1.1.1"
 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

@@ -3,7 +3,8 @@ require "active_support/core_ext/hash/reverse_merge"
 require "down"
 require "equalizer"
 require "faraday"
-require "faraday_middleware"
+require "faraday/follow_redirects"
+require "faraday/multipart"
 require "forwardable"
 require "json"
 require "memoizable"
@@ -20,7 +21,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"
@@ -30,9 +30,12 @@ require "cloudconvert/user"
 require "cloudconvert/version"
 require "cloudconvert/webhook"
 require "cloudconvert/webhook/processor"
+require "cloudconvert/signed_url"
 
 module CloudConvert
   API_URL = "https://api.cloudconvert.com".freeze
   SANDBOX_URL = "https://api.sandbox.cloudconvert.com".freeze
+  API_SYNC_URL = "https://sync.api.cloudconvert.com".freeze
+  SANDBOX_SYNC_URL = "https://sync.api.sandbox.cloudconvert.com".freeze
   USER_AGENT = "CloudConvertRubyGem/#{CloudConvert::VERSION}".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cloudconvert
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.1
 platform: ruby
 authors:
 - Josias Montag
 - Steve Lacey
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -57,30 +57,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
@@ -353,11 +367,11 @@ 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
 - lib/cloudconvert/resources/users.rb
+- lib/cloudconvert/signed_url.rb
 - lib/cloudconvert/task.rb
 - lib/cloudconvert/user.rb
 - lib/cloudconvert/version.rb
@@ -370,7 +384,7 @@ 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:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -385,8 +399,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 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