convert_api 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c441da8556b69bd1bf36136cde284ccb9993e30ea2bfaf92b925d658f130ea4
-  data.tar.gz: 810216361dab674fd1d12bf4ed43f65fe6ee913d56346560a6ad7a573ffdee27
+  metadata.gz: a32b7ed931b291534f117094b1e4ae376bd85435bdd4da624f491db402a873c8
+  data.tar.gz: 3da43e3aefecb611eece8f304dcba9a2392bfa290654244d057d0454258b1dff
 SHA512:
-  metadata.gz: b83cb7d0701b146ab3b571fb19e7b721092b5a294a66e169b37144cf98a2dc0d7619a8a6233aa06bc3142bb77a0f2b3febacb8d07bf9d106d9b7f3604a13c0c7
-  data.tar.gz: 46d1d4fa6b3010fd81868833d4c4d0fa7dac89960bf34a6986bbc0de61c289e2246465440230487aa768adddefcb7c321e85a8a86435a34b87a5f8084cb7b991
+  metadata.gz: eb00e76bf1cb9ff0635b25be1d105048d300a15846b2c2672e523e6fcf3ce8b3d97cac3e6ef184ef044b26d51176b35e42618fec788c9f3bcb479efe18e0faff
+  data.tar.gz: 1893489362ed8dad54b8e9909f4435e687878e9fb03ecb84aebc46f9e728f1eac06a1dbc999332a95e3b6173c21f4e45bfa58517294060c1162be29edc317738

data/.github/workflows/main.yml

@@ -0,0 +1,26 @@
+name: Build
+on: [push,pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version:
+          - 2.0
+          - 2.6
+          - 2.7
+          - 3.0
+          - ruby-head
+          - jruby-9.1
+          - jruby-head
+    name: Ruby ${{ matrix.ruby-version }} sample
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+#          bundler-cache: true
+      - run: bundle install
+      - env:
+          CONVERT_API_SECRET: ${{ secrets.CONVERTAPI_SECRET }}
+        run: bundle exec rake spec

data/.ruby-version

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

data/README.md

@@ -2,11 +2,13 @@
 
 
 [![Gem](https://img.shields.io/gem/v/convert_api.svg)](https://rubygems.org/gems/convert_api)
-[![Build Status](https://secure.travis-ci.org/ConvertAPI/convertapi-ruby.svg)](http://travis-ci.org/ConvertAPI/convertapi-ruby)
+[![Build Status](https://github.com/ConvertAPI/convertapi-ruby/actions/workflows/main.yml/badge.svg)](https://github.com/ConvertAPI/convertapi-ruby/actions)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
+
 
 ## Convert your files with our online file conversion API
 
-The ConvertAPI helps converting various file formats. Creating PDF and Images from various sources like Word, Excel, Powerpoint, images, web pages or raw HTML codes. Merge, Encrypt, Split, Repair and Decrypt PDF files. And many others files manipulations. In just few minutes you can integrate it into your application and use it easily.
+ConvertAPI helps in converting various file formats. Creating PDF and Images from various sources like Word, Excel, Powerpoint, images, web pages or raw HTML codes. Merge, Encrypt, Split, Repair and Decrypt PDF files and many other file manipulations. You can integrate it into your application in just a few minutes and use it easily.
 
 
 ## Installation
@@ -32,7 +34,7 @@ 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,9 +86,20 @@ 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).
+You can always check your remaining seconds programmatically by fetching [user information](https://www.convertapi.com/doc/user).
 
 ```ruby
 user_info = ConvertApi.user
@@ -96,7 +109,7 @@ puts user_info['SecondsLeft']
 
 ### More examples
 
-You can find more advanced examples in the [examples/](https://github.com/ConvertAPI/convertapi-ruby/tree/master/examples) folder.
+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

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

@@ -1,21 +1,28 @@
 module ConvertApi
   class FormatDetector
-    def initialize(resource)
+    ANY_FORMAT = 'any'
+
+    def initialize(resource, to_format)
       @resource = resource
+      @to_format = to_format
     end
 
     def run
+      return ANY_FORMAT if archive?
       return @resource.file_ext.downcase if @resource.is_a?(UploadIO)
 
-      format_from_path
+      format_from_path || raise(FormatError, 'Unable to detect format')
     end
 
     private
 
+    def archive?
+      @to_format.to_s.downcase == 'zip'
+    end
+
     def format_from_path
       extension = File.extname(path).downcase
-      format = extension[1..-1]
-      format || raise(FormatError, 'Unable to detect format')
+      extension[1..-1]
     end
 
     def path

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,13 +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}#{converter}",
         params,
-        read_timeout: read_timeout
+        read_timeout: read_timeout,
       )
 
       Result.new(response)
@@ -66,11 +66,11 @@ module ConvertApi
 
       resource = params[:File] || Array(params[:Files]).first
 
-      FormatDetector.new(resource).run
+      FormatDetector.new(resource, @to_format).run
     end
 
     def config
       ConvertApi.config
     end
   end
-end
+end

data/lib/convert_api/version.rb

@@ -1,3 +1,3 @@
 module ConvertApi
-  VERSION = '1.2.0'
-end
+  VERSION = '1.3.1'
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: convert_api
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Tomas Rutkauskas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-21 00:00:00.000000000 Z
+date: 2022-09-11 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
@@ -62,10 +62,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -101,8 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ConvertAPI client library

data/.travis.yml

@@ -1,15 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-- 2.1.0
-- 2.2.0
-- 2.3.0
-- 2.4.1
-- 2.5.1
-- ruby-head
-- ruby-head-clang
-- jruby-head
-bundler_args: --jobs=3 --retry=3 --binstubs
-env:
-  global:
-    secure: Pri+nCT6ayGYkjGO/WfMGkqk4DBKseJjQuWHWdft9YH2G+5dc7UKypDqmlfZvqwLPw2kybepKfh/utRGYsL5nfbET+3Ml8+2Bgaf0IT4Ej/3B5KIdFbivHmRp/NP/Dgh64M+5u1wKEEnw1NIMHwcanQDzPUDtaxqsw1xwowUL5Axr+UnJtWL2bP/RCED2JEgwhBQBFSMBXXwpSK2yFT7X1pInPWX2S0hELxj1UDefLDjp6kEnkrU/u+FjC9RhmYhusx2muXC4pHiqdNL0fDZStgginAQAd92FsMHQyzwewefCGRAg0g25ZmSGx5cHL4BZORdUnxaG9+AS9Wt17tZI2WS9eUBc9yyRU+R76aSo79uJj4RKi1Ljd3+4fyI/9BDz9a2koEgeDbYUHHf0dYaFSLXcOpnLBBPtr0qD02SUP1EcYTOe1/sNMweDLfN67E70YV69+ZqQeb+xgCbAeeoTOGJ9uKR2c91wSZwDjpTXXSLrNeNw98FPRyWxpfRRFQV29ZDPx/cfHt9gAVQVnd+ZBCAFwr353nqE8Ux1wtrxkexPkT8G+TXIgTvvYDfu2WmaO7qrZR2D6427jc4sgndwWfSPgiLw4eW1u3hCyaCnPBsviugtj1sTs2NfnLPdgtSUcKBd4xNbbVQoqZM1qTL139HvpZFB+jD8uoVtgWigUA=