cloudconvert 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fbd33992f2bb0eb736b817259e26ff729b3f3066
+  data.tar.gz: b3452c6677786aba313a97c260eb13e8d83c306a
+SHA512:
+  metadata.gz: 2904f73386d4f1110fa1f95b9f239270bb223b492f0d86f2a71ae7cbfc53b009c2c65ec0125a1c537560f0c042c53806a163d1a1815003ec3a6ca9c784099dc8
+  data.tar.gz: 97550957b2be2e493e131359d90aaf16c22e0444a190a0a6bda8a0040011a7a60ea1e3cc79807d983ca683a007f310c86db62db7dac44827901126a55fecd870

data/.gitignore

@@ -15,3 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.xml
+.idea/.name
+.idea/.rakeTasks
+*.iml

data/README.md

@@ -33,8 +33,8 @@ Start a Conversion on Cloud convert
 
 	conversion = Cloudconvert::Conversion.new
 
-	# to start file conversion (options parameter is optional)
-	conversion.convert(inputformat, outputformat, file_path, options)  
+	# to start file conversion (options & callback_url parameters are optional)
+	conversion.convert(inputformat, outputformat, file_path, callback_url, options)
 
 	# options parameter is Conversion type specific options , which you can get from, 
 	conversion.converter_options(inputformat, outputformat)

data/lib/cloudconvert/conversion.rb

@@ -1,112 +1,105 @@
 module Cloudconvert
 	class Conversion
-    	attr_accessor :convert_request_url, :conn , :request_connection, :process_id, :conversion_connection
-
-        #request_connection => specific to file conversion
-
-    	def initialize 
-            raise Cloudconvert::API_KEY_ERROR if Cloudconvert.configuration.api_key == nil
-    		@conversion_connection = Faraday.new(:url => Cloudconvert::CONVERSION_URL)
-    	end
-
-        #convert request for file 
-    	def convert(inputformat, outputformat, file_path = nil, options = {})
-            raise "File path cant be blank" if file_path == nil
-            @convert_request_url = start_conversion(inputformat, outputformat)
-            #initiate connection with new response host
-    		initiate_connection(@convert_request_url)
-            upload(build_upload_params(file_path, outputformat, options))
-    	end
-
-        #lists all conversions
-    	def list_conversions
-    	   response = @conversion_connection.get '/processes', {:apikey => api_key } 
-    	   parse_response(response.body)
-    	end
-    		
-
-    	#cancels current conversion
-    	def cancel_conversion
-    	   response = @request_connection.get "/process/#{@process_id.to_s}/cancel"
-           parse_response(response.body)
-    	end
-
-    	#deletes finished conversion
-		def delete_conversion
-    		response = @request_connection.get "/process/#{@process_id.to_s}/delete" 
-            parse_response(response.body)
-    	end
-
-        #upload request
-        def upload(upload_params)
-            response = @request_connection.post "/process/#{@process_id.to_s}", upload_params
-            parse_response(response.body)
-        end
-
-
-        # checks if conversion finished for process id and returns download link
-        def download_link
-            response = status
-            response["step"] == "finished" ? "http:#{response['output']['url']}" : nil
-        end 
-
-        # checks status of conversion with process_id
-        def status
-            response = @request_connection.get "/process/#{@process_id.to_s}"
-            parse_response(response.body)
-        end
-
-    	#returns all possible conversions and options
-    	def converter_options(inputformat ="", outputformat = "")
-    		response = @conversion_connection.get "conversiontypes", {:inputformat => inputformat,:outputformat => outputformat } 
-            parse_response(response.body)
-    	end
-
-
-        #######################################################################################################
-        #######################################################################################################
-        def api_key
-            raise Cloudconvert::API_KEY_ERROR if Cloudconvert.configuration.api_key == nil
-            Cloudconvert.configuration.api_key
-        end
-
-        def callback
-            Cloudconvert.configuration.callback
-        end
-
-    	#send conversion http request
-    	def conversion_post_request(inputformat, outputformat)
-            @conversion_connection.post "https://api.cloudconvert.org/process?inputformat=#{inputformat}&outputformat=#{outputformat}&apikey=#{api_key}"
-    	end
-
-        def start_conversion(inputformat, outputformat)
-            response = conversion_post_request(inputformat,outputformat)
-
-            parsed_response = parse_response(response.body)
-            @process_id = parsed_response["id"]
-
-            "https://#{parsed_response['host']}"
-        end
-
-        def initiate_connection(url)
-            @request_connection = Faraday.new(:url => url)
-        end
-
-        #building params for local file
-        def build_upload_params(file_path, outputformat, options = {})
-            upload_params = { :format => outputformat}
-            upload_params.merge!(:callback => callback) if callback != nil
-            upload_params.merge!(:input => "download",:link => file_path ) 
-            upload_params.merge!(options)
-        end
-
-    	def parse_response(response)
-    		JSON.parse(response)
-    	end
-
-        #######################################################################################################
-        #######################################################################################################
+    attr_accessor :convert_request_url, :conn , :request_connection, :process_id, :conversion_connection
+
+    #request_connection => specific to file conversion
+
+    def initialize
+          raise Cloudconvert::API_KEY_ERROR if Cloudconvert.configuration.api_key == nil
+      @conversion_connection = Faraday.new(:url => Cloudconvert::CONVERSION_URL)
+    end
+
+      #convert request for file
+    def convert(inputformat, outputformat, file_path, callback_url = nil, options = {})
+      raise "File path cant be blank" if file_path.nil?
+      @convert_request_url = start_conversion(inputformat, outputformat)
+      #initiate connection with new response host
+      initiate_connection(@convert_request_url)
+      upload(build_upload_params(file_path, outputformat, callback_url, options))
+    end
+
+      #lists all conversions
+    def list_conversions
+       response = @conversion_connection.get '/processes', {:apikey => api_key }
+       parse_response(response.body)
+    end
+
+
+    #cancels current conversion
+    def cancel_conversion
+      response = @request_connection.get "/process/#{@process_id.to_s}/cancel"
+      parse_response(response.body)
+    end
+
+    #deletes finished conversion
+    def delete_conversion
+      response = @request_connection.get "/process/#{@process_id.to_s}/delete"
+      parse_response(response.body)
+    end
+
+    #upload request
+    def upload(upload_params)
+      response = @request_connection.post "/process/#{@process_id.to_s}", upload_params
+      parse_response(response.body)
+    end
+
+
+    # checks if conversion finished for process id and returns download link
+    def download_link
+      response = status
+      response["step"] == "finished" ? "http:#{response['output']['url']}" : nil
+    end
+
+    # checks status of conversion with process_id
+    def status
+      response = @request_connection.get "/process/#{@process_id.to_s}"
+      parse_response(response.body)
+    end
+
+    #returns all possible conversions and options
+    def converter_options(inputformat ="", outputformat = "")
+      response = @conversion_connection.get "conversiontypes", {:inputformat => inputformat,:outputformat => outputformat }
+      parse_response(response.body)
+    end
+
+    def api_key
+      raise Cloudconvert::API_KEY_ERROR if Cloudconvert.configuration.api_key == nil
+      Cloudconvert.configuration.api_key
+    end
+
+    def callback(callback_url = nil)
+      callback_url || Cloudconvert.configuration.callback
+    end
+
+    #send conversion http request
+    def conversion_post_request(inputformat, outputformat)
+        @conversion_connection.post "https://api.cloudconvert.org/process?inputformat=#{inputformat}&outputformat=#{outputformat}&apikey=#{api_key}"
+    end
+
+    def start_conversion(inputformat, outputformat)
+      response = conversion_post_request(inputformat,outputformat)
+
+      parsed_response = parse_response(response.body)
+      @process_id = parsed_response["id"]
+
+      "https://#{parsed_response['host']}"
+    end
+
+    def initiate_connection(url)
+      @request_connection = Faraday.new(:url => url)
+    end
+
+    #building params for local file
+    def build_upload_params(file_path, outputformat, callback_url = nil, options = {})
+      upload_params = { :format => outputformat}
+      upload_params.merge!(:callback => callback(callback_url)) if callback(callback_url).present?
+      upload_params.merge!(:input => "download",:link => file_path )
+      upload_params.merge!(options)
+    end
+
+    def parse_response(response)
+      JSON.parse(response)
+    end
 
 	end
-	
 end

data/lib/cloudconvert/version.rb

@@ -1,3 +1,3 @@
 module Cloudconvert
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: cloudconvert
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Pandurang Waghulde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby wrapper for Cloud Convert
@@ -82,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -95,26 +86,25 @@ files:
 homepage: https://github.com/pandurang90/cloudconvert
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby wrapper for Cloud Convert
 test_files: []