Manually recreated changes

from edwinv710#10
neuzebeoneclass · Jun 20, 2018 · 993c566 · 993c566
1 parent 9d0a903
commit 993c566
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/cloud_convert/process.rb b/lib/cloud_convert/process.rb
@@ -42,14 +42,27 @@ def create
     def convert(opts)
         raise CloudConvert::InvalidStep if @step == :awaiting_creation
         url = process_url()
-        multi = opts[:file].respond_to?("read")
+        if opts[:file].response_to?("read")
+          file_to_upload = opts[:file]
+          opts.delete(:file)
+        end
         response = send_request(http_method: :post, 
                                 url: url, 
                                 params: opts,
-                                multi: multi) do |response|
+                                multi: false) do |response|
             response.parsed_response[:success] = true
             create_parsed_response(:conversion_response, response.parsed_response)
             @step = @conversion_response[:step].to_sym
+
+          if(file_to_upload)
+            send_request(http_method: :post,
+                         url: "#{CloudConvert::PROTOCOL}:#{@conversion_response[:upload][:url]}",
+                         params: {
+                                 "file": file_to_upload
+                         },
+                         multi: true)
+          end
+
         end
         return convert_response response
     end

diff --git a/lib/cloud_convert/version.rb b/lib/cloud_convert/version.rb
@@ -2,7 +2,7 @@ module CloudConvert
   module VERSION_VALUES #:nodoc:
       MAJOR    = '0'
       MINOR    = '1'
-      TINY     = '8'
+      TINY     = '9'
       BETA     = nil # Time.now.to_i.to_s
     end