Require context

Author: laurynas

account.go

@@ -1,6 +1,8 @@
 package detectlanguage
 
-// UserStatusResponse is the resource containing account status information
+import "context"
+
+// AccountStatusResponse is the resource containing account status information
 type AccountStatusResponse struct {
 	Date               string `json:"date,omitempty"`
 	Requests           int    `json:"requests"`
@@ -12,8 +14,8 @@ type AccountStatusResponse struct {
 	Status             string `json:"status"`
 }
 
-// UserStatus fetches account status
-func (c *Client) AccountStatus() (out *AccountStatusResponse, err error) {
-	err = c.get(nil, "account/status", &out)
+// AccountStatus fetches account status
+func (c *Client) AccountStatus(ctx context.Context) (out *AccountStatusResponse, err error) {
+	err = c.get(ctx, "account/status", &out)
 	return
 }

account_test.go

@@ -1,13 +1,14 @@
 package detectlanguage_test
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestAccountStatus(t *testing.T) {
-	response, err := client.AccountStatus()
+	response, err := client.AccountStatus(context.TODO())
 
 	if assert.NoError(t, err) {
 		assert.NotEmpty(t, response.Date)

detect.go

@@ -19,9 +19,9 @@ type DetectBatchRequest struct {
 }
 
 // Detect executes language detection for a single text
-func (c *Client) Detect(in string) (out []*DetectionResult, err error) {
+func (c *Client) Detect(ctx context.Context, in string) (out []*DetectionResult, err error) {
 	var response []*DetectionResult
-	err = c.post(context.TODO(), "detect", &DetectRequest{Query: in}, &response)
+	err = c.post(ctx, "detect", &DetectRequest{Query: in}, &response)
 
 	if err != nil {
 		return nil, err
@@ -31,8 +31,8 @@ func (c *Client) Detect(in string) (out []*DetectionResult, err error) {
 }
 
 // DetectCode executes language detection for a single text and returns detected language code
-func (c *Client) DetectCode(in string) (out string, err error) {
-	detections, err := c.Detect(in)
+func (c *Client) DetectCode(ctx context.Context, in string) (out string, err error) {
+	detections, err := c.Detect(ctx, in)
 
 	if err != nil {
 		return "", err
@@ -47,9 +47,9 @@ 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) {
+func (c *Client) DetectBatch(ctx context.Context, in []string) (out [][]*DetectionResult, err error) {
 	var response [][]*DetectionResult
-	err = c.post(nil, "detect-batch", &DetectBatchRequest{Query: in}, &response)
+	err = c.post(ctx, "detect-batch", &DetectBatchRequest{Query: in}, &response)
 
 	if err != nil {
 		return nil, err

detect_test.go

@@ -1,13 +1,14 @@
 package detectlanguage_test
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestDetect(t *testing.T) {
-	detections, err := client.Detect("labas rytas")
+	detections, err := client.Detect(context.TODO(), "labas rytas")
 
 	if assert.NoError(t, err) {
 		assert.Equal(t, "lt", detections[0].Language)
@@ -16,23 +17,23 @@ func TestDetect(t *testing.T) {
 }
 
 func TestDetectCode(t *testing.T) {
-	code, err := client.DetectCode("labas rytas")
+	code, err := client.DetectCode(context.TODO(), "labas rytas")
 
 	if assert.NoError(t, err) {
 		assert.Equal(t, "lt", code)
 	}
 }
 
 func TestDetectCodeFailure(t *testing.T) {
-	code, err := client.DetectCode(" ")
+	code, err := client.DetectCode(context.TODO(), " ")
 
 	assert.EqualError(t, err, "Language not detected")
 	assert.Equal(t, code, "")
 }
 
 func TestDetectBatch(t *testing.T) {
 	query := []string{"labas rytas", "good morning"}
-	detections, err := client.DetectBatch(query)
+	detections, err := client.DetectBatch(context.TODO(), query)
 
 	if assert.NoError(t, err) {
 		assert.Equal(t, "lt", detections[0][0].Language)

languages.go

@@ -9,7 +9,7 @@ type Language struct {
 }
 
 // Languages retrieves the list of supported languages
-func (c *Client) Languages() (out []*Language, err error) {
-	err = c.get(context.TODO(), "languages", &out)
+func (c *Client) Languages(ctx context.Context) (out []*Language, err error) {
+	err = c.get(ctx, "languages", &out)
 	return
 }

languages_test.go

@@ -1,13 +1,14 @@
 package detectlanguage_test
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
 func TestLanguages(t *testing.T) {
-	languages, err := client.Languages()
+	languages, err := client.Languages(context.TODO())
 
 	if assert.NoError(t, err) {
 		assert.NotEmpty(t, languages[0].Code)