Merge branch 'release/4.7.0' into versions

FlineDev · Jul 30, 2021 · c16b219 · c16b219
2 parents e6a6dea + c5bcc03
commit c16b219
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 9 deletions.
diff --git a/BartyCrouch.podspec b/BartyCrouch.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "BartyCrouch"
-  s.version      = "4.6.0"
+  s.version      = "4.7.0"
   s.summary      = "Localization/I18n: Incrementally update/translate your Strings files from .swift, .h, .m(m), .storyboard or .xib files."
 
   s.description  = <<-DESC

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,11 @@ If needed, pluralize to `Tasks`, `PRs` or `Authors` and list multiple entries se
 ### Security
 - None.
 
+## [4.7.0] - 2021-07-31
+### Added
+- Add support for DeepL API Free  
+  PR: [#230](https://github.com/Flinesoft/BartyCrouch/pull/230) | Author: [Manabu Nakazawa](https://github.com/mshibanami)
+
 ## [4.6.0] - 2021-05-08
 ### Changed
 - Updated swift-syntax to match Swift 5.4 to support Xcode 12.5.  

diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@
     <img src="https://api.codacy.com/project/badge/Coverage/7b34ad9193c2438aa32aa29a0490451f"/>
   </a>
   <a href="https://github.com/Flinesoft/BartyCrouch/releases">
-    <img src="https://img.shields.io/badge/Version-4.6.0-blue.svg"
-         alt="Version: 4.6.0">
+    <img src="https://img.shields.io/badge/Version-4.7.0-blue.svg"
+         alt="Version: 4.7.0">
   </a>
   <img src="https://img.shields.io/badge/Swift-5.4-FFAC45.svg"
      alt="Swift: 5.4">

diff --git a/Sources/BartyCrouch/main.swift b/Sources/BartyCrouch/main.swift
@@ -5,7 +5,7 @@ import SwiftCLI
 // MARK: - CLI
 let cli = CLI(
     name: "bartycrouch",
-    version: "4.6.0",
+    version: "4.7.0",
     description: "Incrementally update & translate your Strings files from code or interface files."
 )
 

diff --git a/Sources/BartyCrouchTranslator/BartyCrouchTranslator.swift b/Sources/BartyCrouchTranslator/BartyCrouchTranslator.swift
@@ -20,13 +20,22 @@ public final class BartyCrouchTranslator {
     }
 
     private let microsoftProvider = ApiProvider<MicrosoftTranslatorApi>(baseUrl: MicrosoftTranslatorApi.baseUrl)
-    private let deepLProvider = ApiProvider<DeepLApi>(baseUrl: DeepLApi.baseUrl)
+    private let deepLProvider: ApiProvider<DeepLApi>
 
     private let translationService: TranslationService
 
     /// Creates a new translator object configured to use the specified translation service.
     public init(translationService: TranslationService) {
         self.translationService = translationService
+
+        let deepLApiType: DeepLApi.ApiType
+        if case let .deepL(apiKey) = translationService {
+            deepLApiType = apiKey.hasSuffix(":fx") ? .free : .pro
+        } else {
+            deepLApiType = .pro
+        }
+
+        deepLProvider = ApiProvider<DeepLApi>(baseUrl: DeepLApi.baseUrl(for: deepLApiType))
     }
 
     /// Translates the given text from a given language to one or multiple given other languages.

diff --git a/Sources/BartyCrouchTranslator/DeeplApi/DeepLApi.swift b/Sources/BartyCrouchTranslator/DeeplApi/DeepLApi.swift
@@ -33,8 +33,9 @@ enum DeepLApi {
 extension DeepLApi: Endpoint {
     typealias ClientErrorType = DeepLTranslateErrorResponse
 
-    static var baseUrl: URL {
-        URL(string: "https://api.deepl.com")!
+    enum ApiType {
+        case free
+        case pro
     }
 
     var decoder: JSONDecoder {
@@ -75,4 +76,14 @@ extension DeepLApi: Endpoint {
     var headers: [String: String] {
         ["Content-Type": "application/json"]
     }
+
+    static func baseUrl(for apiType: ApiType) -> URL {
+        switch apiType {
+        case .free:
+            return URL(string: "https://api-free.deepl.com")!
+
+        case .pro:
+            return URL(string: "https://api.deepl.com")!
+        }
+    }
 }
diff --git a/Sources/SupportingFiles/Info.plist b/Sources/SupportingFiles/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.6.0</string>
+	<string>4.7.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Tests/BartyCrouchTranslatorTests/DeepLTranslatorApiTests.swift b/Tests/BartyCrouchTranslatorTests/DeepLTranslatorApiTests.swift
@@ -15,7 +15,7 @@ class DeepLTranslatorApiTests: XCTestCase {
             apiKey: apiKey
         )
 
-        let apiProvider = ApiProvider<DeepLApi>(baseUrl: DeepLApi.baseUrl)
+        let apiProvider = ApiProvider<DeepLApi>(baseUrl: DeepLApi.baseUrl(for: .pro))
 
         switch apiProvider.performRequestAndWait(on: endpoint, decodeBodyTo: DeepLTranslateResponse.self) {
         case let .success(translateResponses):