cloudconvert 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89b916bcf6d9efb3b86d1def064e3b6bb50970466db82b7fdcd3342050c639d8
-  data.tar.gz: 68d95fcc22a697704661bb8aa0926b36afabcf1edb41620d1c71c7fc8412959e
+  metadata.gz: f05a16c577e0b30ddf30f9e73a087e1b79d40570f11b5a6013d98d9c372494c0
+  data.tar.gz: 7252a59fffb66d0797a04014251a3825a976a3470c8ca0d1adcd10865950512f
 SHA512:
-  metadata.gz: df53fc7aff33f2d745a1ff53d840fa4c8ada45e8ea77bce1a10b3b4cd18de594f777b5c77f5dd43e13efd9754abe3ac4cdb5332ccd247ff918fd6822da0ef5bd
-  data.tar.gz: 2fbed2d93cf5c8ed525ebbabc4950e9139fefd7513fadd256b33c6f607505820b2c44009cf9c01b92c1baab69e636c2cb825dc7b40a7a2bbb421fcb8322a29f5
+  metadata.gz: bf3531174c00eb2b7ea64fac80e91a40a497ffdaed32f834fd9edb497b6fadf4514a6a6ada0e50fdd0e1d7e83f763d982408e4e883b9625bfcfcdda1bf2c3ead
+  data.tar.gz: a9a5b932ebf1eee1ada6a1d779bdf73ee6e1572fcaccfb2430496746d2ed8c83b8798e7e38fd61dea16b3a356d9391f05379a8d5137965d7281f5aed23690f3d

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

@@ -8,6 +8,11 @@ Gem::Specification.new do |spec|
   spec.description = "A Ruby interface to the CloudConvert API v2."
   spec.summary = spec.description
   spec.homepage = "https://cloudconvert.com/api/v2"
+  spec.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"
+  }
   spec.files = %w[cloudconvert.gemspec LICENSE.txt README.md] + Dir["lib/**/*.rb"]
   spec.license = "MIT"
   spec.require_paths = %w[lib]
@@ -20,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "forwardable"
   spec.add_dependency "json"
   spec.add_dependency "memoizable", "~> 0.4"
-  spec.add_dependency "mimemagic", "~> 0.3.5"
+  spec.add_dependency "marcel", "~> 1.0.0"
   spec.add_dependency "openssl"
   spec.add_dependency "ostruct"
   spec.add_dependency "schemacop", "~> 2.4"

data/lib/cloudconvert/client.rb

@@ -75,13 +75,18 @@ 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|

data/lib/cloudconvert/file.rb

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

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.0"
+  VERSION = "1.1.0"
 end

data/lib/cloudconvert.rb

@@ -7,7 +7,7 @@ require "faraday_middleware"
 require "forwardable"
 require "json"
 require "memoizable"
-require "mimemagic"
+require "marcel"
 require "openssl"
 require "ostruct"
 require "schemacop"
@@ -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.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Josias Montag
 - Steve Lacey
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -124,19 +124,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: mimemagic
+  name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +358,7 @@ files:
 - 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
@@ -366,8 +367,11 @@ files:
 homepage: https://cloudconvert.com/api/v2
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+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
@@ -382,8 +386,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: A Ruby interface to the CloudConvert API v2.
 test_files: []