refactor: Breaking changes to translate options implementation and ap…

…i call methods

api/document.go

@@ -10,6 +10,7 @@ import (
 	"net/url"
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 type DocumentInfo struct {
@@ -27,7 +28,7 @@ type DocumentStatus struct {
 	Message          string `json:"message"`
 }
 
-func (t *Translator) TranslateDocumentUpload(filePath string, targetLang string, options ...TranslateOption) (*DocumentInfo, error) {
+func (t *Translator) TranslateDocumentUpload(filePath string, targetLang string, opts ...TranslateOptionFunc) (*DocumentInfo, error) {
 	var (
 		err error
 		f   *os.File
@@ -41,6 +42,11 @@ func (t *Translator) TranslateDocumentUpload(filePath string, targetLang string,
 		log.Fatal(err)
 	}
 
+	options := TranslateOptions{}
+	if err := options.Gather(opts...); err != nil {
+		return nil, fmt.Errorf("error gathering options: %w", err)
+	}
+
 	r, w := io.Pipe()
 	mpw := multipart.NewWriter(w)
 	go func() {
@@ -52,10 +58,10 @@ func (t *Translator) TranslateDocumentUpload(filePath string, targetLang string,
 		mpw.WriteField("filename", filepath.Base(filePath))
 		mpw.WriteField("target_lang", targetLang)
 
-		for _, opt := range options {
-			switch opt.Key {
+		for name, value := range options {
+			switch name {
 			case "source_lang", "formality", "glossary_id":
-				mpw.WriteField(opt.Key, opt.Value)
+				mpw.WriteField(name, value)
 			}
 		}
 
@@ -71,17 +77,10 @@ func (t *Translator) TranslateDocumentUpload(filePath string, targetLang string,
 		}
 	}()
 
-	url := fmt.Sprintf("%s/%s", t.serverURL, "document")
+	headers := make(http.Header)
+	headers.Set("Content-Type", mpw.FormDataContentType())
 
-	req, err := http.NewRequest("POST", url, r)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	req.Header.Set("Authorization", fmt.Sprintf("DeepL-Auth-Key %s", t.authKey))
-	req.Header.Add("Content-Type", mpw.FormDataContentType())
-
-	res, err := t.client.Do(req)
+	res, err := t.callAPI(http.MethodPost, "document", headers, r)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusOK {
@@ -103,7 +102,9 @@ func (t *Translator) TranslateDocumentStatus(id string, key string) (*DocumentSt
 	vals := make(url.Values)
 	vals.Set("document_key", key)
 
-	res, err := t.callAPI("POST", endpoint, vals, nil)
+	body := strings.NewReader(vals.Encode())
+
+	res, err := t.callAPI(http.MethodPost, endpoint, nil, body)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusOK {
@@ -125,7 +126,9 @@ func (t *Translator) TranslateDocumentDownload(id string, key string) (*io.PipeR
 	vals := make(url.Values)
 	vals.Set("document_key", key)
 
-	res, err := t.callAPI("POST", endpoint, vals, nil)
+	body := strings.NewReader(vals.Encode())
+
+	res, err := t.callAPI(http.MethodPost, endpoint, nil, body)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusOK {

api/glossaries.go

@@ -38,7 +38,12 @@ func (t *Translator) CreateGlossary(name string, sourceLang string, targetLang s
 	}
 	vals.Set("entries", strings.Join(entriesTSV, "\n"))
 
-	res, err := t.callAPI("POST", "glossaries", vals, nil)
+	headers := make(http.Header)
+	headers.Set("Content-Type", "application/x-www-form-urlencoded")
+
+	body := strings.NewReader(vals.Encode())
+
+	res, err := t.callAPI(http.MethodPost, "glossaries", headers, body)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusCreated {
@@ -55,7 +60,7 @@ func (t *Translator) CreateGlossary(name string, sourceLang string, targetLang s
 }
 
 func (t *Translator) ListGlossaries() ([]GlossaryInfo, error) {
-	res, err := t.callAPI("GET", "glossaries", nil, nil)
+	res, err := t.callAPI(http.MethodGet, "glossaries", nil, nil)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusOK {
@@ -76,7 +81,7 @@ func (t *Translator) ListGlossaries() ([]GlossaryInfo, error) {
 func (t *Translator) GetGlossary(glossaryId string) (*GlossaryInfo, error) {
 	endpoint := fmt.Sprintf("glossaries/%s", glossaryId)
 
-	res, err := t.callAPI("GET", endpoint, nil, nil)
+	res, err := t.callAPI(http.MethodGet, endpoint, nil, nil)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusOK {
@@ -95,7 +100,7 @@ func (t *Translator) GetGlossary(glossaryId string) (*GlossaryInfo, error) {
 func (t *Translator) DeleteGlossary(glossaryId string) error {
 	endpoint := fmt.Sprintf("glossaries/%s", glossaryId)
 
-	res, err := t.callAPI("DELETE", endpoint, nil, nil)
+	res, err := t.callAPI(http.MethodDelete, endpoint, nil, nil)
 	if err != nil {
 		return err
 	} else if res.StatusCode != http.StatusNoContent {
@@ -112,7 +117,7 @@ func (t *Translator) GetGlossaryEntries(glossaryId string) ([]GlossaryEntry, err
 	headers := http.Header{}
 	headers.Set("Accept", "text/tab-separated-values")
 
-	res, err := t.callAPI("GET", endpoint, nil, headers)
+	res, err := t.callAPI(http.MethodGet, endpoint, headers, nil)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusOK {

api/languages.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 	"net/url"
+	"strings"
 )
 
 type Language struct {
@@ -24,7 +25,10 @@ func (t *Translator) GetLanguages(langType string) ([]Language, error) {
 		vals.Set("type", langType)
 	}
 
-	res, err := t.callAPI("GET", "languages", vals, nil)
+	data := vals.Encode()
+	body := strings.NewReader(data)
+
+	res, err := t.callAPI(http.MethodGet, "languages", nil, body)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusOK {
@@ -41,7 +45,7 @@ func (t *Translator) GetLanguages(langType string) ([]Language, error) {
 }
 
 func (t *Translator) GetGlossaryLanguagePairs() ([]LanguagePair, error) {
-	res, err := t.callAPI("GET", "glossary-language-pairs", nil, nil)
+	res, err := t.callAPI(http.MethodGet, "glossary-language-pairs", nil, nil)
 	if err != nil {
 		return nil, err
 	} else if res.StatusCode != http.StatusOK {