convert_api 1.0.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 903aa18e8de24c90508710a41d4d5002771b3c7d
-  data.tar.gz: 206db6d436f6d427bc939373ee1e32cb59625196
+SHA256:
+  metadata.gz: 9824a625f3ec5b42ce47ea1730fca1ee3b7c93328b80dfffb14837c66462e881
+  data.tar.gz: 3202cc2beb89b94779bf1db6b10208c9b49a3882060139d7f3c6cdd11bce7616
 SHA512:
-  metadata.gz: 81be92484ff9f5fd66e7a1a9d39e55e2800ccf6991801e39d4f213e8642f35cb212a7d841f86154e6aa47e99af4e49b8e9f8a397c2c76df2e94bd00f90fb993d
-  data.tar.gz: d7bb82ee4b271d858fb2ad258c136de60b0917800a02ebcd12411cf81e6ea505e067300855793800bbbbaf291add92af3f8190a5819c751a9f1ada693288a05b
+  metadata.gz: 5029ec5772731a0fc7c738a0eb7be491c7edae9d8599380b1ca24a71e3106d793b5d2d45c2a73102cd2bbb2fafb755b0caba5a30bf88901c11cecb59a97336af
+  data.tar.gz: '09038006737a8e5ad3e47da2e818623de96ac0e42ffb208bbc5e74434258f213c52b7c143daa4c88011e16c1a8126fd889d268666a24eba3b9be1fbe3254000b'

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.6.3

data/.travis.yml

@@ -6,8 +6,8 @@ rvm:
 - 2.3.0
 - 2.4.1
 - 2.5.1
-- ruby-head
-- ruby-head-clang
+- 2.6.5
+- 2.7.0
 - jruby-head
 bundler_args: --jobs=3 --retry=3 --binstubs
 env:

data/README.md

@@ -25,14 +25,14 @@ You can get your secret at https://www.convertapi.com/a
 
 ```ruby
 ConvertApi.configure do |config|
-  config.api_secret = 'your api secret'
+  config.api_secret = 'your-api-secret'
 end
 ```
 
 ### File conversion
 
 Example to convert file to PDF. All supported formats and options can be found 
-[here](https://www.convertapi.com).
+[here](https://www.convertapi.com/doc/supported-formats).
 
 ```ruby
 result = ConvertApi.convert('pdf', File: '/path/to/my_file.docx')
@@ -84,6 +84,17 @@ result = ConvertApi.convert(
 )
 ```
 
+#### Accessing result file properties
+
+You can access result file collection like this:
+
+```ruby
+result = ConvertApi.convert('pdf', File: 'https://website/my_file.docx')
+
+puts result.files[0].url
+puts result.files[0].size
+```
+
 ### User information
 
 You can always check remaining seconds amount by fetching [user information](https://www.convertapi.com/doc/user).
@@ -96,7 +107,7 @@ puts user_info['SecondsLeft']
 
 ### More examples
 
-You can find more advanced examples in the [examples/](examples) folder.
+You can find more advanced examples in the [examples/](https://github.com/ConvertAPI/convertapi-ruby/tree/master/examples) folder.
 
 
 ## Development

data/convert_api.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/convert_api/client.rb

@@ -21,7 +21,7 @@ module ConvertApi
       Zlib::GzipFile::Error,
     ]
 
-    USER_AGENT = "convertapi-ruby-#{VERSION}"
+    USER_AGENT = "ConvertAPI-Ruby/#{VERSION}"
 
     DEFAULT_HEADERS = {
       'User-Agent' => USER_AGENT,
@@ -48,7 +48,7 @@ module ConvertApi
     def upload(io, filename)
       handle_response do
         request_uri = base_uri.path + 'upload'
-        encoded_filename = URI.encode(filename)
+        encoded_filename = CGI.escape(filename)
 
         headers = DEFAULT_HEADERS.merge(
           'Content-Type' => 'application/octet-stream',
@@ -91,10 +91,10 @@ module ConvertApi
       raise(TimeoutError, e)
     end
 
-    def http(read_timeout: nil)
+    def http(options = {})
       http = Net::HTTP.new(base_uri.host, base_uri.port)
       http.open_timeout = config.connect_timeout
-      http.read_timeout = read_timeout || config.read_timeout
+      http.read_timeout = options.fetch(:read_timeout, config.read_timeout)
       http.use_ssl = base_uri.scheme == 'https'
       # http.set_debug_output $stderr
       http

data/lib/convert_api/configuration.rb

@@ -13,10 +13,9 @@ module ConvertApi
       @base_uri = URI('https://v2.convertapi.com/')
       @connect_timeout = 5
       @read_timeout = 60
-      @conversion_timeout = 180
       @conversion_timeout_delta = 10
-      @upload_timeout = 600
-      @download_timeout = 600
+      @upload_timeout = 1800
+      @download_timeout = 1800
     end
   end
 end

data/lib/convert_api/format_detector.rb

@@ -5,24 +5,25 @@ module ConvertApi
     end
 
     def run
-      extension = File.extname(path).downcase
-      format = extension[1..-1]
+      return @resource.file_ext.downcase if @resource.is_a?(UploadIO)
 
-      raise(FormatError, 'Unable to detect format') if format.nil?
-
-      format
+      format_from_path
     end
 
     private
 
+    def format_from_path
+      extension = File.extname(path).downcase
+      format = extension[1..-1]
+      format || raise(FormatError, 'Unable to detect format')
+    end
+
     def path
       case @resource
       when String
         URI(@resource).path
       when File
         @resource.path
-      when UploadIO
-        @resource.filename
       else
         ''
       end

data/lib/convert_api/result_file.rb

@@ -21,7 +21,7 @@ module ConvertApi
     end
 
     def io
-      @io ||= open(url, download_options)
+      @io ||= URI.parse(url).open(download_options)
     end
 
     def save(path)

data/lib/convert_api/task.rb

@@ -14,12 +14,13 @@ module ConvertApi
       )
 
       from_format = @from_format || detect_format(params)
-      read_timeout = @conversion_timeout + config.conversion_timeout_delta
+      read_timeout = @conversion_timeout + config.conversion_timeout_delta if @conversion_timeout
+      converter = params[:converter] ? "/converter/#{params[:converter]}" : ''
 
       response = ConvertApi.client.post(
-        "convert/#{from_format}/to/#{@to_format}",
+        "convert/#{from_format}/to/#{@to_format}#{converter}",
         params,
-        read_timeout: read_timeout
+        read_timeout: read_timeout,
       )
 
       Result.new(response)

data/lib/convert_api/upload_io.rb

@@ -2,8 +2,6 @@ require 'uri'
 
 module ConvertApi
   class UploadIO
-    attr_reader :io, :filename
-
     def initialize(io, filename = nil)
       @io = io
       @filename = filename || io_filename || raise(FileNameError, 'IO filename must be provided')
@@ -14,18 +12,30 @@ module ConvertApi
     end
 
     def file_id
-      @file_id ||= upload_file['FileId']
+      result['FileId']
+    end
+
+    def file_name
+      result['FileName']
+    end
+
+    def file_ext
+      result['FileExt']
     end
 
     private
 
+    def result
+      @result ||= upload_file
+    end
+
     def upload_file
-      ConvertApi.client.upload(io, filename)
+      ConvertApi.client.upload(@io, @filename)
     end
 
     def io_filename
-      return unless io.respond_to?(:path)
-      File.basename(io.path)
+      return unless @io.respond_to?(:path)
+      File.basename(@io.path)
     end
   end
 end

data/lib/convert_api/version.rb

@@ -1,3 +1,3 @@
 module ConvertApi
-  VERSION = '1.0.3'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: convert_api
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Tomas Rutkauskas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ConvertAPI client library