convert_api 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c19d784a48c22fedfcb2f00b4d150cc638b99b4688bae2d6f5bb13e28af08d
-  data.tar.gz: 775a9a90934f9447acde26c05a004f9106541603b6a2fb3fcb458dbb426cca98
+  metadata.gz: 9000b9daea1645e115548fbbb17edcdbcb52cdd179fda838ea40f17df85f4adc
+  data.tar.gz: 8d43ea9df0273824b2f90489e0c3f6a74403045f627161dfdc11958dbea14800
 SHA512:
-  metadata.gz: c15b8d712d8ce29cb11ad915d11676b1ff13f064c3df3655611f085f958c8ca9502352300b940bffea2ce2ccfc5f64bfc177f6b7a70262e5c43236b3f02a3b10
-  data.tar.gz: 24ad1374796432ed6a3e332676b3421e183a9224b70bea09fe2bd1c2dfa0eea86fc6c9f1ca496a0ec2a134fcb5b6fed9ead4a2edf10b1b5aee2e1342c19110ee
+  metadata.gz: cff4a0ba9aa76cfaf50c03403b8c8376665d4bcb3c5490ab0fbf5fbbac9f88523241d383e834b9e01246be5e0a05b4cf473b8c6bcbd2196e5afdd5fd4780625c
+  data.tar.gz: 0430d681bd169f0765166b4009697488c5ba585023f64c6f83ec8bfc84177519b52319230aba6f13a8cfe52ac954cfd9ac2e17c1105a88a5009f19f355b11ece

data/.github/workflows/main.yml

@@ -9,8 +9,8 @@ jobs:
           - 2.0
           - 2.6
           - 2.7
-          - 3.0
-          - ruby-head
+          - 3.1
+          - 3.2
           - jruby-9.1
           - jruby-head
     name: Ruby ${{ matrix.ruby-version }} sample

data/README.md

@@ -37,7 +37,7 @@ Example to convert file to PDF. All supported formats and options can be found
 [here](https://www.convertapi.com/doc/supported-formats).
 
 ```ruby
-result = ConvertApi.convert('pdf', File: '/path/to/my_file.docx')
+result = ConvertApi.convert('pdf', { File: '/path/to/my_file.docx' })
 
 # save to file
 result.file.save('/path/to/save/file.pdf')
@@ -59,7 +59,7 @@ conversion_cost = result.conversion_cost
 #### Convert file url
 
 ```ruby
-result = ConvertApi.convert('pdf', File: 'https://website/my_file.docx')
+result = ConvertApi.convert('pdf', { File: 'https://website/my_file.docx' })
 ```
 
 #### Specifying from format
@@ -67,7 +67,7 @@ result = ConvertApi.convert('pdf', File: 'https://website/my_file.docx')
 ```ruby
 result = ConvertApi.convert(
   'pdf', 
-  { File: /path/to/my_file' }, 
+  {File: /path/to/my_file'}, 
   from_format: 'docx'
 )
 ```
@@ -75,14 +75,14 @@ result = ConvertApi.convert(
 #### Additional conversion parameters
 
 ConvertAPI accepts extra conversion parameters depending on converted formats. All conversion 
-parameters and explanations can be found [here](https://www.convertapi.com).
+parameters and explanations can be found [here](https://www.convertapi.com/doc/supported-formats).
 
 ```ruby
 result = ConvertApi.convert(
   'pdf', 
-  File: /path/to/my_file.docx',
+  {File: /path/to/my_file.docx',
   PageRange: '1-10',
-  PdfResolution: '150',
+  PdfResolution: '150'}
 )
 ```
 
@@ -91,7 +91,7 @@ result = ConvertApi.convert(
 You can access result file collection like this:
 
 ```ruby
-result = ConvertApi.convert('pdf', File: 'https://website/my_file.docx')
+result = ConvertApi.convert('pdf', { File: 'https://website/my_file.docx' })
 
 puts result.files[0].url
 puts result.files[0].size
@@ -107,6 +107,17 @@ user_info = ConvertApi.user
 puts user_info['SecondsLeft']
 ```
 
+### Alternative domain
+
+Set config `base_uri` attribute to use other service domains. Dedicated to the region [domain list](https://www.convertapi.com/doc/servers-location).
+
+```ruby
+ConvertApi.configure do |config|
+  config.base_uri = URI('https://eu-v2.convertapi.com/')
+end
+```
+
+
 ### More examples
 
 Find more advanced examples in the [examples/](https://github.com/ConvertAPI/convertapi-ruby/tree/master/examples) folder.

data/lib/convert_api/task.rb

@@ -15,10 +15,11 @@ module ConvertApi
 
       from_format = @from_format || detect_format(params)
       read_timeout = @conversion_timeout + config.conversion_timeout_delta if @conversion_timeout
-      converter = params[:converter] ? "/converter/#{params[:converter]}" : ''
+      converter = detect_converter(params)
+      converter_path = converter ? "/converter/#{converter}" : ''
 
       response = ConvertApi.client.post(
-        "convert/#{from_format}/to/#{@to_format}#{converter}",
+        "convert/#{from_format}/to/#{@to_format}#{converter_path}",
         params,
         read_timeout: read_timeout,
       )
@@ -32,10 +33,10 @@ module ConvertApi
       result = {}
 
       symbolize_keys(params).each do |key, value|
-        case key
-        when :File
-          result[:File] = FileParam.build(value)
-        when :Files
+        case
+        when key != :StoreFile && key.to_s.end_with?('File')
+          result[key] = FileParam.build(value)
+        when key == :Files
           result[:Files] = files_batch(value)
         else
           result[key] = value
@@ -69,6 +70,14 @@ module ConvertApi
       FormatDetector.new(resource, @to_format).run
     end
 
+    def detect_converter(params)
+      params.each do |key, value|
+        return value if key.to_s.downcase == 'converter'
+      end
+
+      nil
+    end
+
     def config
       ConvertApi.config
     end

data/lib/convert_api/version.rb

@@ -1,3 +1,3 @@
 module ConvertApi
-  VERSION = '1.3.2'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convert_api
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Tomas Rutkauskas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-18 00:00:00.000000000 Z
+date: 2023-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler