deepl-rb 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c3fdd20441317600a911a02659531c6595949ac
-  data.tar.gz: 54818a5de28df31e33f2cf8434834177fbe71989
+  metadata.gz: 00b65dd648e7d29dc160d9e8b66c2eecc15dccdc
+  data.tar.gz: 47a4e9cd8476b801b617f1290a020e017aa80bb4
 SHA512:
-  metadata.gz: e389b2270f9cc4584bbe5e77cf6d1f7f6aa087d23a4aa649afe8507c3f0be484685813c161e72d9b30acba49a67277e116ec141b7943216cc1eef399d703edd6
-  data.tar.gz: 1dc00e5ba9ab6622f1bcd0fad1b4df2eef7258dcf1ee667ad6c9b7d647975c4eced8f4a37db192c96df020a395124bc48ab599f5dd2a05da23fa8452907bf12f
+  metadata.gz: 3ef63e90c6708751fffd2229c0e3ba96951932b2a520f66f566856b2990466bb1dc876c815f224495ae642fba9266591af74d1029fadf4abc2263f8ba25a570b
+  data.tar.gz: a017cc9b56ee7c10cba7e41c59bb17e5969f2e285d8293493ef1dff02947cfdb508684901dd0891ae3c1e17cce1511273ed9f758074607f5e9066c590adffd0d

data/README.md

@@ -2,7 +2,7 @@
 
 # DeepL for ruby
 
-A simple ruby wrapper for the [DeepL translation API (v1)](https://www.deepl.com/api.html).
+A simple ruby wrapper for the [DeepL translation API (v2)](https://www.deepl.com/api.html).
 
 ## Installation
 
@@ -35,12 +35,13 @@ DeepL.configure do |config|
 end
 ```
 
-You can also configure the api host:
+You can also configure the API host and the API version:
 
 ```rb
 DeepL.configure do |config|
   config.auth_key = 'your-api-token'
   config.host = 'https://test-api.deepl.com' # Default value is 'https://api.deepl.com'
+  config.version = 'v1' # Default value is 'v2'
 end
 ```
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/deepl-rb.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: deepl-rb 2.1.0 ruby lib
+# stub: deepl-rb 2.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "deepl-rb".freeze
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Daniel Herzog".freeze]
-  s.date = "2018-07-24"
+  s.date = "2018-11-28"
   s.description = "A simple ruby wrapper for the DeepL translation API (v1). For more information, check this: https://www.deepl.com/docs/api-reference.html".freeze
   s.email = "info@danielherzog.es".freeze
   s.extra_rdoc_files = [

data/lib/deepl/configuration.rb

@@ -1,6 +1,6 @@
 module DeepL
   class Configuration
-    ATTRIBUTES = %i[auth_key host].freeze
+    ATTRIBUTES = %i[auth_key host version].freeze
 
     attr_accessor(*ATTRIBUTES)
 
@@ -8,6 +8,7 @@ module DeepL
       data.each { |key, value| send("#{key}=", value) }
       @auth_key ||= ENV['DEEPL_AUTH_KEY']
       @host ||= 'https://api.deepl.com'
+      @version ||= 'v2'
     end
 
     def validate!

data/lib/deepl/requests/base.rb

@@ -1,8 +1,6 @@
 module DeepL
   module Requests
     class Base
-      API_VERSION = 'v1'.freeze
-
       attr_reader :api, :response, :options
 
       def initialize(api, options = {})
@@ -73,7 +71,7 @@ module DeepL
       end
 
       def url
-        "#{host}/#{API_VERSION}/#{path}"
+        "#{host}/#{api.configuration.version}/#{path}"
       end
 
       def uri

data/spec/api/configuration_spec.rb

@@ -9,15 +9,17 @@ describe DeepL::Configuration do
       it 'should use default attributes' do
         expect(subject.auth_key).to eq(ENV['DEEPL_AUTH_KEY'])
         expect(subject.host).to eq('https://api.deepl.com')
+        expect(subject.version).to eq('v2')
       end
     end
 
     context 'When using custom configuration attributes' do
-      let(:attributes) { { auth_key: 'SAMPLE', host: 'http://www.example.org' } }
+      let(:attributes) { { auth_key: 'SAMPLE', host: 'http://www.example.org', version: 'v1' } }
 
       it 'should use custom attributes' do
         expect(subject.auth_key).to eq(attributes[:auth_key])
         expect(subject.host).to eq(attributes[:host])
+        expect(subject.version).to eq(attributes[:version])
       end
     end
   end

data/spec/api/deepl_spec.rb

@@ -15,12 +15,13 @@ describe DeepL do
 
     context 'When providing a valid configuration' do
       let(:configuration) do
-        DeepL::Configuration.new(auth_key: 'VALID', host: 'http://www.example.org')
+        DeepL::Configuration.new(auth_key: 'VALID', host: 'http://www.example.org', version: 'v1')
       end
       before do
         subject.configure do |config|
           config.auth_key = configuration.auth_key
           config.host = configuration.host
+          config.version = configuration.version
         end
       end
 

data/spec/fixtures/vcr_cassettes/deepl_translate.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://api.deepl.com/v1/translate?auth_key=VALID_TOKEN&param=fake
+    uri: https://api.deepl.com/v2/translate?auth_key=VALID_TOKEN&param=fake
     body:
       encoding: US-ASCII
       string: text=Sample&source_lang=EN&target_lang=ES
@@ -35,6 +35,6 @@ http_interactions:
     body:
       encoding: UTF-8
       string: '{"translations":[{"detected_source_language":"EN","text":"Muestra"}]}'
-    http_version: 
+    http_version:
   recorded_at: Tue, 08 May 2018 16:31:33 GMT
 recorded_with: VCR 4.0.0

data/spec/fixtures/vcr_cassettes/deepl_usage.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.deepl.com/v1/usage?auth_key=VALID_TOKEN
+    uri: https://api.deepl.com/v2/usage?auth_key=VALID_TOKEN
     body:
       encoding: US-ASCII
       string: ''

data/spec/fixtures/vcr_cassettes/translate_texts.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://api.deepl.com/v1/translate?auth_key=VALID_TOKEN
+    uri: https://api.deepl.com/v2/translate?auth_key=VALID_TOKEN
     body:
       encoding: US-ASCII
       string: text=Sample+text&source_lang=EN&target_lang=ES
@@ -40,7 +40,7 @@ http_interactions:
   recorded_at: Tue, 08 May 2018 16:31:34 GMT
 - request:
     method: post
-    uri: https://api.deepl.com/v1/translate?auth_key=VALID_TOKEN
+    uri: https://api.deepl.com/v2/translate?auth_key=VALID_TOKEN
     body:
       encoding: US-ASCII
       string: text=Sample&text=Word&source_lang=EN&target_lang=ES
@@ -77,7 +77,7 @@ http_interactions:
   recorded_at: Tue, 08 May 2018 16:31:35 GMT
 - request:
     method: post
-    uri: https://api.deepl.com/v1/translate?auth_key=VALID_TOKEN
+    uri: https://api.deepl.com/v2/translate?auth_key=VALID_TOKEN
     body:
       encoding: US-ASCII
       string: text=%3Cp%3ESample+text%3C%2Fp%3E&source_lang=EN&target_lang=ES
@@ -115,7 +115,7 @@ http_interactions:
   recorded_at: Tue, 08 May 2018 16:31:36 GMT
 - request:
     method: post
-    uri: https://api.deepl.com/v1/translate?auth_key=invalid
+    uri: https://api.deepl.com/v2/translate?auth_key=invalid
     body:
       encoding: US-ASCII
       string: text=Sample+text&source_lang=EN&target_lang=ES
@@ -148,7 +148,7 @@ http_interactions:
   recorded_at: Tue, 08 May 2018 16:31:37 GMT
 - request:
     method: post
-    uri: https://api.deepl.com/v1/translate?auth_key=VALID_TOKEN
+    uri: https://api.deepl.com/v2/translate?auth_key=VALID_TOKEN
     body:
       encoding: US-ASCII
       string: source_lang=EN&target_lang=ES
@@ -181,7 +181,7 @@ http_interactions:
   recorded_at: Tue, 08 May 2018 16:31:37 GMT
 - request:
     method: post
-    uri: https://api.deepl.com/v1/translate?auth_key=VALID_TOKEN
+    uri: https://api.deepl.com/v2/translate?auth_key=VALID_TOKEN
     body:
       encoding: US-ASCII
       string: text=Sample+text&source_lang=EN
@@ -214,7 +214,7 @@ http_interactions:
   recorded_at: Tue, 08 May 2018 16:31:37 GMT
 - request:
     method: post
-    uri: https://api.deepl.com/v1/translate?auth_key=VALID_TOKEN&ignore_tags=code,%20span
+    uri: https://api.deepl.com/v2/translate?auth_key=VALID_TOKEN&ignore_tags=code,%20span
     body:
       encoding: US-ASCII
       string: text=Welcome+and+%3Ccode%3EHello+great+World%3C%2Fcode%3E+Good+Morning%21&source_lang=EN&target_lang=ES

data/spec/fixtures/vcr_cassettes/usage.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.deepl.com/v1/usage?auth_key=VALID_TOKEN
+    uri: https://api.deepl.com/v2/usage?auth_key=VALID_TOKEN
     body:
       encoding: US-ASCII
       string: ''

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deepl-rb
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Daniel Herzog
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: juwelier