convert_api 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e87ee021afbce241b24e28e70245ec318a6c6ae799c1ff769cd6437a4065536f
-  data.tar.gz: b385c3030e308d7dde8d711f3b2f30d48303f5af6bc5208437b09ae329b50519
+  metadata.gz: a03a5db74661e761e600143a2156eb8b123cbd24a7b2a1f965f04cc78df567c5
+  data.tar.gz: da3d99dcba730103b6545ac4700a1e4d0d859be7c3c47fc92032e49274bcf94f
 SHA512:
-  metadata.gz: 0447ac667edc5df34913612ff81003dfbcdea39a345b1fc111ecfd28dd123651d0fa2218b4942258e4aecd32266438ae2768e593ceb5c0ff7573fbb4f389d26e
-  data.tar.gz: 57a409748204a607373d4b1d2a6db8b8d7ad68a02f4da5a6aab1bf023358e6d727972f29113c606d940686c854b3a261f2e690921a3345785c394f321364a32c
+  metadata.gz: 1196c45816646b1f2b58acb79598c69cf9706a333f92c0d47e0bdd94f1b336a813963b8c7e84db2c3d7e0cfb39f8016626ed35eac8c144d8ab88397e0b7fadad
+  data.tar.gz: 434915e2525a5b3cf5fadd8ed2af3177844ca9aca29160efefb17d5ae2dd45485ee45075fc0f1b7a052e09513dd168a8ef94aacec7612f40068b54d7f3c25418

data/.github/workflows/main.yml

@@ -24,5 +24,4 @@ jobs:
       - run: bundle install
       - env:
           CONVERT_API_SECRET: ${{ secrets.CONVERTAPI_SECRET }}
-          CONVERT_API_TOKEN: ${{ secrets.CONVERTAPI_TOKEN }}
         run: bundle exec rake spec

data/README.md

@@ -23,20 +23,11 @@ gem 'convert_api'
 
 ### Configuration
 
-You can get your secret at https://www.convertapi.com/a/auth
+You can get your credentials at https://www.convertapi.com/a/auth
 
 ```ruby
 ConvertApi.configure do |config|
-  config.api_secret = 'your-api-secret'
-end
-```
-
-Or
-
-You can get your token at https://www.convertapi.com/a/access-tokens
-```ruby
-ConvertApi.configure do |config|
-  config.token = 'your-token'
+  config.api_credentials = 'your-api-secret-or-token'
 end
 ```
 
@@ -108,7 +99,7 @@ puts result.files[0].size
 
 ### User information
 
-You can always check your remaining seconds programmatically by fetching [user information](https://www.convertapi.com/doc/user).
+You can always check your usage by fetching [user information](https://www.convertapi.com/doc/user).
 
 ```ruby
 user_info = ConvertApi.user
@@ -136,10 +127,6 @@ Find more advanced examples in the [examples/](https://github.com/ConvertAPI/con
 
 Run `CONVERT_API_SECRET=your_secret rake spec` to run the tests.
 
-Or
-
-Run `CONVERT_API_TOKEN=your_token rake spec` to run the tests.
-
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/lib/convert_api/client.rb

@@ -30,7 +30,7 @@ module ConvertApi
 
     def get(path, params = {}, options = {})
       handle_response do
-        request = Net::HTTP::Get.new(request_uri(path, params), DEFAULT_HEADERS)
+        request = Net::HTTP::Get.new(request_uri(path, params), headers_with_auth)
 
         http(options).request(request)
       end
@@ -38,7 +38,7 @@ module ConvertApi
 
     def post(path, params, options = {})
       handle_response do
-        request = Net::HTTP::Post.new(request_uri(path), DEFAULT_HEADERS)
+        request = Net::HTTP::Post.new(request_uri(path), headers_with_auth)
         request.form_data = build_form_data(params)
 
         http(options).request(request)
@@ -101,12 +101,7 @@ module ConvertApi
     end
 
     def request_uri(path, params = {})
-      raise(AuthenticationError, 'API secret or Token not configured') if authentication.nil?
-
-      params_with_authentication = params.merge(authentication)
-      query = URI.encode_www_form(params_with_authentication)
-
-      base_uri.path + path + '?' + query
+      base_uri.path + path + '?' + URI.encode_www_form(params)
     end
 
     def build_form_data(params)
@@ -123,11 +118,16 @@ module ConvertApi
       data
     end
 
-    def authentication
-      return { Secret: config.api_secret } unless config.api_secret.nil?
-      return { Token: config.token } unless config.token.nil?
+    def headers_with_auth
+      DEFAULT_HEADERS.merge(auth_headers)
+    end
+
+    def auth_headers
+      { 'Authorization' => "Bearer #{api_credentials}" }
+    end
 
-      nil
+    def api_credentials
+      config.api_credentials || raise(AuthenticationError, 'API credentials not configured')
     end
 
     def base_uri

data/lib/convert_api/configuration.rb

@@ -1,7 +1,6 @@
 module ConvertApi
   class Configuration
-    attr_accessor :api_secret
-    attr_accessor :token
+    attr_accessor :api_credentials
     attr_accessor :base_uri
     attr_accessor :connect_timeout
     attr_accessor :read_timeout

data/lib/convert_api/task.rb

@@ -15,11 +15,9 @@ module ConvertApi
 
       from_format = @from_format || detect_format(params)
       read_timeout = @conversion_timeout + config.conversion_timeout_delta if @conversion_timeout
-      converter = detect_converter(params)
-      converter_path = converter ? "/converter/#{converter}" : ''
 
       response = ConvertApi.client.post(
-        "convert/#{from_format}/to/#{@to_format}#{converter_path}",
+        "convert/#{from_format}/to/#{@to_format}",
         params,
         read_timeout: read_timeout,
       )
@@ -70,14 +68,6 @@ 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 = '2.0.0'
+  VERSION = '3.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convert_api
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Tomas Rutkauskas
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-04 00:00:00.000000000 Z
+date: 2024-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,7 @@ homepage: https://github.com/ConvertAPI/convertapi-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.11
-signing_key:
+signing_key: 
 specification_version: 4
 summary: ConvertAPI client library
 test_files: []