cloudconvert-ruby 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e87726c769907828cc989d6b3b54aff32cec743
-  data.tar.gz: 759538325d05443155f2455cef3a3b23b735308d
+  metadata.gz: f55415d6ade196eae24ad851254e7590fac23fb5
+  data.tar.gz: 92a6bba134f98c32af7d6ebaaa7ed360226240d9
 SHA512:
-  metadata.gz: f2d764f221f9de63b3938ad817646a233752b05e75764003d9a14235287c744e7944e48d9a07bdf411b3ddabfbd8420c9b5f59d99b031b2989f3392b8611e39c
-  data.tar.gz: cc644015cbdf9fc62b499ae72ee8d35298f99bea2f73f02595900112ef7519603a6e7e205fdcf2996c5fcd64bb3b4a218f39a447a32708039d3fb0b306cf6e52
+  metadata.gz: 45420245a687159591c3f6e72faa7c9d88dd39edbae4f7e9066ae685f701106e30eb9944b954b51ec19223b6bc4d7dc50eeb0218c70b05fbfb9516f4bc085256
+  data.tar.gz: 8881389fcfb8d6588b130ed22ea2d0aa046c2febe022005d358d896392af2fe960b52c267300ea7acc6c282fa0d3f1ca1593cc7acbe0be65819ea064958944c1

data/README.md

@@ -20,12 +20,12 @@ And then execute:
 
 ```ruby
 @client = CloudConvert::Client.new(api_key: "Your API Key")
-@process = @client.build_process(input_format: "jpg", output_format: "pdf")
+@process = @client.build_process(input_format: :jpg, output_format: :pdf)
 @process_response = @process.create
 if @process_response[:success]
     @conversion_response = @process.convert(
         input: "download",
-        outputformat: "pdf",
+        outputformat: :pdf,
         file: "link to image",
         download: "false"
     )
@@ -48,7 +48,7 @@ Once the client object is created, we can build a process for our conversion. In
 Note: You can build as many processes as you want, just make sure that you are aware of any limitations placed on your account by Cloud Convert before you start converting files.
 
 ```ruby
-@process = @client.build_process(input_format: "jpg", output_format: "pdf")
+@process = @client.build_process(input_format: :jpg, output_format: :pdf)
 ```
 
 We now need to tell Cloud Convert that we are creating a process. To do this, we will use the `create` method.
@@ -66,7 +66,7 @@ To start a conversion, you can execute the `convert` method. For all the paramet
 ```ruby
 @conversion_response = @process.convert(
           input: "download",
-          outputformat: "pdf",
+          outputformat: :pdf,
           file: "link to image",
           download: "false"
         )

data/lib/cloud_convert/client.rb

@@ -41,7 +41,7 @@ module CloudConvert
     ##
     # Returns an array of hash with the results from the Cloud Convert list endpoint.
     def list
-        url = "#{CloudConvert::PROTOCOL}://api.#{CloudConvert::DOMAIN}/processes"
+        url = "#{CloudConvert::PROTOCOL}://#{CloudConvert::API_DOMAIN}/processes"
         response = CloudConvert::Client.send(:get, url, {query: {apikey: self.api_key}})
         return convert_response response
     end  

data/lib/cloud_convert/exceptions.rb

@@ -1,4 +1,4 @@
 module CloudConvert
-   class InvalidStep < Exception
+   class InvalidStep < StandardError
    end
-end
+end

data/lib/cloud_convert/process.rb

@@ -24,7 +24,7 @@ module CloudConvert
 
     def create
         raise CloudConvert::InvalidStep unless @step == :awaiting_creation
-        url = construct_url("api", "process")
+        url = construct_url("process")
         response = send_request(http_method: :post, 
                                 url: url, 
                                 params: {
@@ -35,29 +35,41 @@ module CloudConvert
             @step = :awaiting_conversion
             response.parsed_response[:success] = true
             create_parsed_response(:process_response, response.parsed_response)
-            @process_response[:subdomain] = extract_subdomain_from_url(@process_response[:url])
         end
         return convert_response response
     end
 
     def convert(opts)
         raise CloudConvert::InvalidStep if @step == :awaiting_creation
-        url = process_url(include_process_id: true)
-        multi = opts[:file].respond_to?("read")
+        url = process_url()
+        if opts[:file].respond_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
 
     def status
         raise CloudConvert::InvalidStep if @step == :awaiting_creation
-        url = process_url(include_process_id: true)
+        url = process_url()
         response = send_request(http_method: :get,
                                 url: url) do |response|
             create_parsed_response(:status_response, response.parsed_response)
@@ -90,7 +102,7 @@ module CloudConvert
     def download_url(file = "")
         raise CloudConvert::InvalidStep if @step == :awaiting_creation
         file = "/#{file}" unless file.nil? or file.strip.empty?
-        return "https://#{@process_response[:subdomain]}.cloudconvert.com/download/#{@process_response[:id]}#{file}"
+        return "#{CloudConvert::PROTOCOL}:#{@conversion_response[:output][:url]}#{file}"
     end
 
     
@@ -105,14 +117,13 @@ module CloudConvert
         return response
     end
 
-    def construct_url(subdomain, action, id="")
-        id = "/#{id}" if id.length > 0
-        return "#{CloudConvert::PROTOCOL}://#{subdomain}.#{CloudConvert::DOMAIN}/#{action}#{id}"
+    def construct_url(action, id="")
+      id = "/#{id}" if id.length > 0
+      return "#{CloudConvert::PROTOCOL}://#{CloudConvert::API_DOMAIN}/#{action}#{id}"
     end
 
-    def process_url(opts = {})
-        action = (opts[:include_process_id] ? "process/#{@process_response[:id]}" : "process")
-        return construct_url(@process_response[:subdomain], action)
+    def process_url()
+        return "#{CloudConvert::PROTOCOL}:#{@process_response[:url]}"
     end
 
 
@@ -121,9 +132,6 @@ module CloudConvert
         return self.instance_variable_set("@#{variable_symbol.to_s}", symbolized_response)
     end
 
-    def extract_subdomain_from_url(url)
-        return url.split(".")[0].tr('/','')
-    end
 
     def convert_response(response)
         case @client.return_type

data/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
 

data/lib/cloudconvert-ruby.rb

@@ -10,5 +10,5 @@ require "cloud_convert/lib/deep_symbolize"
 module CloudConvert
   # Your code goes here...
   PROTOCOL = "https"
-  DOMAIN = "cloudconvert.com"
+  API_DOMAIN = "api.cloudconvert.com"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudconvert-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Edwin Velasquez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler