use new sync API endpoints for job/task wait()

Author: josiasmontag

lib/cloudconvert.rb

@@ -34,5 +34,7 @@
 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

lib/cloudconvert/client.rb

@@ -75,13 +75,18 @@ def download(url, *args, **options)
       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|

lib/cloudconvert/resources/jobs.rb

@@ -41,7 +41,7 @@ def create(params)
       # @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]

lib/cloudconvert/resources/tasks.rb

@@ -51,7 +51,7 @@ def retry(id)
       # @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.

spec/integration/vcr/CloudConvert_Resources_Jobs/performs_upload_and_download_of_file.yml

@@ -45,7 +45,7 @@ http_interactions:
   recorded_at: Thu, 17 Dec 2020 04:36:09 GMT
 - request:
     method: get
-    uri: https://api.sandbox.cloudconvert.com/v2/tasks/52977752-7cfd-43d1-8800-3ae55d7cbc97/wait
+    uri: https://sync.api.sandbox.cloudconvert.com/v2/tasks/52977752-7cfd-43d1-8800-3ae55d7cbc97
     body:
       encoding: US-ASCII
       string: ''
@@ -218,7 +218,7 @@ http_interactions:
   recorded_at: Thu, 17 Dec 2020 05:07:34 GMT
 - request:
     method: get
-    uri: https://api.sandbox.cloudconvert.com/v2/tasks/e219a38a-4431-4787-bb68-25d17809422b/wait
+    uri: https://sync.api.sandbox.cloudconvert.com/v2/tasks/e219a38a-4431-4787-bb68-25d17809422b
     body:
       encoding: US-ASCII
       string: ''
@@ -489,7 +489,7 @@ http_interactions:
   recorded_at: Thu, 17 Dec 2020 05:33:58 GMT
 - request:
     method: get
-    uri: https://api.sandbox.cloudconvert.com/v2/tasks/304f5007-baae-4013-8d79-5d005413349b/wait
+    uri: https://sync.api.sandbox.cloudconvert.com/v2/tasks/304f5007-baae-4013-8d79-5d005413349b
     body:
       encoding: US-ASCII
       string: ''

spec/integration/vcr/CloudConvert_Resources_Tasks/performs_import_upload_task.yml

@@ -170,7 +170,7 @@
 
   describe "#wait" do
     before do
-      stub_get("/v2/jobs/cd82535b-0614-4b23-bbba-b24ab0e892f7/wait").to_return({
+      stub_get(CloudConvert::API_SYNC_URL + "/v2/jobs/cd82535b-0614-4b23-bbba-b24ab0e892f7").to_return({
         body: fixture("responses/job.json"),
         headers: { content_type: "application/json" },
       })
@@ -181,7 +181,7 @@
     end
 
     it "requests the correct resource" do
-      expect(a_get("/v2/jobs/cd82535b-0614-4b23-bbba-b24ab0e892f7/wait")).to have_been_made
+      expect(stub_request(:get, CloudConvert::API_SYNC_URL + "/v2/jobs/cd82535b-0614-4b23-bbba-b24ab0e892f7")).to have_been_made
     end
 
     it "returns the job" do

spec/integration/vcr/CloudConvert_Resources_Tasks/performs_import_url_task.yml

@@ -240,7 +240,7 @@
 
   describe "#wait" do
     before do
-      stub_get("/v2/tasks/4c80f1ae-5b3a-43d5-bb58-1a5c4eb4e46b/wait").to_return({
+      stub_get(CloudConvert::API_SYNC_URL + "/v2/tasks/4c80f1ae-5b3a-43d5-bb58-1a5c4eb4e46b").to_return({
         body: fixture("responses/task.json"),
         headers: { content_type: "application/json" },
       })
@@ -251,7 +251,7 @@
     end
 
     it "requests the correct resource" do
-      expect(a_get("/v2/tasks/4c80f1ae-5b3a-43d5-bb58-1a5c4eb4e46b/wait")).to have_been_made
+      expect(stub_request(:get, CloudConvert::API_SYNC_URL + "/v2/tasks/4c80f1ae-5b3a-43d5-bb58-1a5c4eb4e46b")).to have_been_made
     end
 
     it "returns the task" do

spec/resources/jobs_spec.rb

@@ -80,7 +80,7 @@ def webhook_secret(event)
       let(:controller) { ControllerWithoutMethod.new(request) }
 
       it "raises an error" do
-        expect { controller.create }.to raise_error(NoMethodError, "ControllerWithoutMethod#job_finished not implemented")
+        expect { controller.create }.to raise_error(NoMethodError)
       end
     end