Strip upload object and xml support

Author: stevelacey

cloudconvert.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json"
   spec.add_dependency "memoizable", "~> 0.4.0"
   spec.add_dependency "mimemagic", "~> 0.3.5"
-  spec.add_dependency "multi_xml"
   spec.add_dependency "openssl"
   spec.add_dependency "ostruct"
   spec.add_dependency "schemacop", "~> 2.4"

lib/cloudconvert.rb

@@ -25,7 +25,6 @@
 require "cloudconvert/resources/tasks"
 require "cloudconvert/resources/users"
 require "cloudconvert/task"
-require "cloudconvert/upload"
 require "cloudconvert/user"
 require "cloudconvert/version"
 require "cloudconvert/webhook"

lib/cloudconvert/client.rb

@@ -92,7 +92,6 @@ def connection
         f.request :json
         f.request :multipart
         f.use CloudConvert::Middleware::ParseJson, content_type: /\bjson$/
-        f.use CloudConvert::Middleware::ParseXml, content_type: /\bxml$/
       end
     end
 

lib/cloudconvert/middleware.rb

@@ -5,7 +5,5 @@ class ParseJson < FaradayMiddleware::ParseJson
         JSON.parse(body, object_class: OpenStruct) unless body.blank?
       end
     end
-
-    ParseXml = Class.new(FaradayMiddleware::ParseXml)
   end
 end

lib/cloudconvert/resources/tasks.rb

@@ -56,7 +56,7 @@ def wait(id)
 
       # @param file [File, String, IO] Either a String filename to a local file or an open IO object.
       # @param task [Task] The "import/upload" Task to upload the file to.
-      # @return [Upload]
+      # @return [void]
       def upload(file, task)
         unless task.operation == "import/upload"
           raise ArgumentError.new("The task operation is not import/upload")
@@ -68,12 +68,12 @@ def upload(file, task)
 
         file = File.new(file) unless file.is_a? File
 
-        response = client.post(task.result.form.url, task.result.form.parameters.to_h.merge(file: file)) do |request|
+        client.post(task.result.form.url, task.result.form.parameters.to_h.merge(file: file)) do |request|
           request.headers.delete("Authorization")
           request.headers["Content-Type"] = "multipart/form-data"
         end
 
-        Upload.new Hash[*response["PostResponse"].flat_map { |k, v| [k.downcase.to_sym, v] }]
+        nil
       end
     end
   end

lib/cloudconvert/upload.rb

@@ -31,8 +31,7 @@
     import_task = cloudconvert.tasks.find(import_task.id)
 
     # do upload
-    upload = cloudconvert.tasks.upload(File.expand_path("files/input.pdf", __dir__), import_task)
-    expect(upload.location).to match %r{^https://storage.cloudconvert.com/tasks-sandbox}
+    cloudconvert.tasks.upload(File.expand_path("files/input.pdf", __dir__), import_task)
 
     # fetch the finished export task
     export_task = cloudconvert.tasks.wait(export_task.id)

spec/fixtures/responses/upload_completed.xml

@@ -15,8 +15,7 @@
     })
 
     # upload file
-    upload = cloudconvert.tasks.upload(File.expand_path("files/input.pdf", __dir__), @task)
-    expect(upload.location).to match %r{^https://storage.cloudconvert.com/tasks-sandbox}
+    cloudconvert.tasks.upload(File.expand_path("files/input.pdf", __dir__), @task)
 
     # wait for the task
     @task = cloudconvert.tasks.wait(@task.id)

spec/integration/jobs_spec.rb

@@ -199,15 +199,11 @@
       })
 
       stub_post(form_url)
-        # .with({
-        #   WebMock does not support matching body for multipart/form-data requests yet :(
-        #   body: form_parameters.merge(file: Faraday::FilePart.new(file, content_type)),
-        #   headers: { content_type: "multipart/form-data" },
-        # })
-        .to_return({
-          body: fixture("responses/upload_completed.xml"),
-          headers: { content_type: "application/xml" },
-        })
+      # .with({
+      #   WebMock does not support matching body for multipart/form-data requests yet :(
+      #   body: form_parameters.merge(file: CloudConvert::File.new(file)),
+      #   headers: { content_type: "multipart/form-data" },
+      # })
     end
 
     let(:form_url) do
@@ -238,14 +234,7 @@
     it "requests the correct resource" do
       expect(a_post("/v2/import/upload")).to have_been_made
       expect(a_post(form_url)).to have_been_made
-    end
-
-    it "returns the upload" do
-      expect(upload).to be_a CloudConvert::Upload
-      expect(upload.bucket).to eq "tasks-sandbox"
-      expect(upload.key).to eq "ff745ae9-5352-4b34-8c18-c2f23a583f1a/input.pdf"
-      expect(upload.etag).to eq '"53d6fe6b688c31c565907c81de625046"'
-      expect(upload.location).to eq "https://storage.cloudconvert.com/tasks-sandbox/ff745ae9-5352-4b34-8c18-c2f23a583f1a/input.pdf"
+      expect(upload).to be nil
     end
   end