Switch to v3 api

Author: laurynas

README.md

@@ -13,7 +13,7 @@ You can get it by signing up at https://detectlanguage.com
 ## Installation
 
 ```
-go get -u github.com/detectlanguage/detectlanguage-go@v1.0.1
+go get -u github.com/detectlanguage/detectlanguage-go@v2.0.0
 ```
 
 ### Configuration

user.go account.gouser.go renamed to account.go

@@ -1,7 +1,7 @@
 package detectlanguage
 
 // UserStatusResponse is the resource containing account status information
-type UserStatusResponse struct {
+type AccountStatusResponse struct {
 	Date               string `json:"date,omitempty"`
 	Requests           int    `json:"requests"`
 	Bytes              int    `json:"bytes"`
@@ -13,7 +13,7 @@ type UserStatusResponse struct {
 }
 
 // UserStatus fetches account status
-func (c *Client) UserStatus() (out *UserStatusResponse, err error) {
-	err = c.get(nil, "user/status", &out)
+func (c *Client) AccountStatus() (out *AccountStatusResponse, err error) {
+	err = c.get(nil, "account/status", &out)
 	return
 }

user_test.go account_test.gouser_test.go renamed to account_test.go

@@ -6,8 +6,8 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestUserStatus(t *testing.T) {
-	response, err := client.UserStatus()
+func TestAccountStatus(t *testing.T) {
+	response, err := client.AccountStatus()
 
 	if assert.NoError(t, err) {
 		assert.NotEmpty(t, response.Date)

client.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"net/url"
 	"time"
@@ -16,7 +15,7 @@ const defaultUserAgent = "detectlanguage-go/" + Version
 const defaultTimeout = 10 * time.Second
 
 var apiBaseURL = &url.URL{
-	Scheme: "https", Host: "ws.detectlanguage.com", Path: "/0.2/",
+	Scheme: "https", Host: "ws.detectlanguage.com", Path: "/v3/",
 }
 
 // A Client provides an HTTP client for DetectLanguage API operations.
@@ -70,9 +69,9 @@ func (c *Client) setBody(req *http.Request, in interface{}) error {
 		if err != nil {
 			return err
 		}
-		req.Body = ioutil.NopCloser(bytes.NewReader(buf))
+		req.Body = io.NopCloser(bytes.NewReader(buf))
 		req.GetBody = func() (io.ReadCloser, error) {
-			return ioutil.NopCloser(bytes.NewReader(buf)), nil
+			return io.NopCloser(bytes.NewReader(buf)), nil
 		}
 		req.Header.Set("Content-Type", "application/json")
 		req.ContentLength = int64(len(buf))
@@ -107,7 +106,7 @@ func (c *Client) do(ctx context.Context, method, path string, in, out interface{
 		return nil
 	}
 
-	buf, _ := ioutil.ReadAll(res.Body)
+	buf, _ := io.ReadAll(res.Body)
 	apiErr := &APIError{Status: res.Status, StatusCode: res.StatusCode}
 	if json.Unmarshal(buf, &apiErrorResponse{Error: apiErr}) != nil {
 		apiErr.Message = string(buf)

detect.go

@@ -1,52 +1,33 @@
 package detectlanguage
 
+import "context"
+
 // DetectRequest contains language detection request params
 type DetectRequest struct {
 	Query string `json:"q"`
 }
 
-// DetectResponse is a resource containing language detection response
-type DetectResponse struct {
-	Data *DetectResponseData `json:"data"`
-}
-
-// DetectResponseData contains language detection response data
-type DetectResponseData struct {
-	Detections []*DetectionResult `json:"detections"`
-}
-
 // DetectionResult is single language detection result
 type DetectionResult struct {
-	Language   string  `json:"language"`
-	Reliable   bool    `json:"isReliable"`
-	Confidence float32 `json:"confidence"`
+	Language string  `json:"language"`
+	Score    float64 `json:"score"`
 }
 
 // DetectBatchRequest contains batch language detection request params
 type DetectBatchRequest struct {
 	Query []string `json:"q"`
 }
 
-// DetectBatchResponse is a resource batch containing language detection response
-type DetectBatchResponse struct {
-	Data *DetectBatchResponseData `json:"data"`
-}
-
-// DetectBatchResponseData contains batch language detection response data
-type DetectBatchResponseData struct {
-	Detections [][]*DetectionResult `json:"detections"`
-}
-
 // Detect executes language detection for a single text
 func (c *Client) Detect(in string) (out []*DetectionResult, err error) {
-	var response DetectResponse
-	err = c.post(nil, "detect", &DetectRequest{Query: in}, &response)
+	var response []*DetectionResult
+	err = c.post(context.TODO(), "detect", &DetectRequest{Query: in}, &response)
 
 	if err != nil {
 		return nil, err
 	}
 
-	return response.Data.Detections, err
+	return response, err
 }
 
 // DetectCode executes language detection for a single text and returns detected language code
@@ -67,12 +48,12 @@ func (c *Client) DetectCode(in string) (out string, err error) {
 // DetectBatch executes language detection with multiple texts.
 // It is significantly faster than doing a separate request for each text indivdually.
 func (c *Client) DetectBatch(in []string) (out [][]*DetectionResult, err error) {
-	var response DetectBatchResponse
-	err = c.post(nil, "detect", &DetectBatchRequest{Query: in}, &response)
+	var response [][]*DetectionResult
+	err = c.post(nil, "detect-batch", &DetectBatchRequest{Query: in}, &response)
 
 	if err != nil {
 		return nil, err
 	}
 
-	return response.Data.Detections, err
+	return response, err
 }

detect_test.go

@@ -11,8 +11,7 @@ func TestDetect(t *testing.T) {
 
 	if assert.NoError(t, err) {
 		assert.Equal(t, "lt", detections[0].Language)
-		assert.True(t, detections[0].Reliable)
-		assert.Greater(t, detections[0].Confidence, float32(0))
+		assert.Greater(t, detections[0].Score, float64(0))
 	}
 }
 
@@ -25,7 +24,7 @@ func TestDetectCode(t *testing.T) {
 }
 
 func TestDetectCodeFailure(t *testing.T) {
-	code, err := client.DetectCode("")
+	code, err := client.DetectCode(" ")
 
 	assert.EqualError(t, err, "Language not detected")
 	assert.Equal(t, code, "")

languages.go

@@ -1,5 +1,7 @@
 package detectlanguage
 
+import "context"
+
 // Language is the resource representing language
 type Language struct {
 	Code string `json:"code"`
@@ -8,6 +10,6 @@ type Language struct {
 
 // Languages retrieves the list of supported languages
 func (c *Client) Languages() (out []*Language, err error) {
-	err = c.get(nil, "languages", &out)
+	err = c.get(context.TODO(), "languages", &out)
 	return
 }

version.go

@@ -1,4 +1,4 @@
 package detectlanguage
 
 // Version is the API client version
-const Version = "1.0.1"
+const Version = "2.0.0"