convert_api 1.0.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 579e24496742c1b5f949eff206edc7807aed4de0
-  data.tar.gz: 0e112e384ada532f85e05f21b06165fb65dc9ef5
+SHA256:
+  metadata.gz: ea28c6a952160cc868c1cb6096caaf70b5abc1a6fb0c3f70dbac395e51c1007a
+  data.tar.gz: ac977fc1f46e0a73a1f0f8ae4f3ca8e8b86fccd1e9233eee9c86848d56639385
 SHA512:
-  metadata.gz: 358043b516746c62338ae6033a4a9720dadb5016bbf1d769a340ab251ba190984dadb0e8131ba47e57135341d54061d748adc6d5a8ad01680debf834aaca3e06
-  data.tar.gz: f9e9b78218d3342e713132d4f31adf42740162204b2a5222f3f6abcca558f55cb697a068fcdcd1a31a572ffc02d6e0aaf60e8d8acff3a833dd4d0e69c13019a9
+  metadata.gz: d21d85dea222a35c40f42fcc8a215b55de8c02df961820e77b2b010f25f1f4899ee68e105ec3684fa0aa499f74db551c1f33056c4e5f96c9c3543ac70ba02ec6
+  data.tar.gz: '0893b1517f36116d60631e1707f6af23cdc838167754c9864e6997bcd0d7c418487916191eedd144a9d53a2e5ae98348eb43acfcffb84f45c15a3fc2eb5b08e4'

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+Gemfile.lock
 
 # rspec failure tracking
 .rspec_status

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

@@ -15,9 +15,10 @@ module ConvertApi
 
       from_format = @from_format || detect_format(params)
       read_timeout = @conversion_timeout + config.conversion_timeout_delta
+      converter = params[:converter] ? "/converter/#{params[:converter]}" : ''
 
       response = ConvertApi.client.post(
-        "#{from_format}/to/#{@to_format}",
+        "convert/#{from_format}/to/#{@to_format}#{converter}",
         params,
         read_timeout: read_timeout
       )
@@ -72,4 +73,4 @@ module ConvertApi
       ConvertApi.config
     end
   end
-end
+end

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.2'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: convert_api
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.1
 platform: ruby
 authors:
 - Tomas Rutkauskas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-15 00:00:00.000000000 Z
+date: 2020-08-23 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
@@ -67,7 +67,6 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -102,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

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    convert_api (1.0.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.3)
-    rake (10.5.0)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  convert_api!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1