Towards v1 (2)

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

.idea/workspace.xml

@@ -1,9 +1,13 @@
 package labstack
 
-import "github.com/go-resty/resty/v2"
+import (
+	"github.com/go-resty/resty/v2"
+	"github.com/labstack/labstack-go/currency"
+)
 
 type (
 	Client struct {
+		key           string
 		apiResty      *resty.Client
 		currencyResty *resty.Client
 		domainResty   *resty.Client
@@ -12,14 +16,11 @@ type (
 		webpageResty  *resty.Client
 	}
 
-	Error struct {
-		Code    int    `json:"code"`
-		Message string `json:"message"`
-	}
 )
 
 func New(key string) *Client {
 	return &Client{
+		key:           key,
 		apiResty:      resty.New().SetHostURL("https://api.labstack.com").SetAuthToken(key),
 		currencyResty: resty.New().SetHostURL("https://currency.labstack.com/api/v1").SetAuthToken(key),
 		domainResty:   resty.New().SetHostURL("https://domain.labstack.com/api/v1").SetAuthToken(key),
@@ -29,10 +30,7 @@ func New(key string) *Client {
 	}
 }
 
-func isError(r *resty.Response) bool {
-	return r.StatusCode() < 200 || r.StatusCode() >= 300
+func (c *Client) Currency() *currency.Client {
+	return currency.New(c.key)
 }
 
-func (e *Error) Error() string {
-	return e.Message
-}

labstack.go renamed to client.go

@@ -0,0 +1,18 @@
+package common
+
+import "github.com/go-resty/resty/v2"
+
+type (
+	Error struct {
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	}
+)
+
+func IsError(r *resty.Response) bool {
+	return r.StatusCode() < 200 || r.StatusCode() >= 300
+}
+
+func (e *Error) Error() string {
+	return e.Message
+}

labstack_test.go renamed to client_test.go

@@ -1,6 +1,16 @@
 package currency
 
+import (
+	"github.com/go-resty/resty/v2"
+	"github.com/labstack/labstack-go/common"
+	"strconv"
+)
+
 type (
+	Client struct {
+		resty *resty.Client
+	}
+
 	Currency struct {
 		Name   string `json:"name"`
 		Code   string `json:"code"`
@@ -25,3 +35,54 @@ type (
 		Currencies []*Currency `json:"currencies"`
 	}
 )
+
+const (
+	url = "https://currency.labstack.com/api/v1"
+)
+
+func New(key string) *Client {
+	return &Client{
+		resty: resty.New().SetHostURL(url).SetAuthToken(key),
+	}
+}
+
+func (c *Client) Convert(req *ConvertRequest) (*ConvertResponse, *common.Error) {
+	res := new(ConvertResponse)
+	err := new(common.Error)
+	r, e := c.resty.R().
+		SetPathParams(map[string]string{
+			"amount": strconv.FormatFloat(req.Amount, 'f', -1, 64),
+			"from":   req.From,
+			"to":     req.To,
+		}).
+		SetResult(res).
+		SetError(err).
+		Get("/convert/{amount}/{from}/{to}")
+	if e != nil {
+		return nil, &common.Error{
+			Message: e.Error(),
+		}
+	}
+	if common.IsError(r) {
+		return nil, err
+	}
+	return res, nil
+}
+
+func (c *Client) List(req *ListRequest) (*ListResponse, *common.Error) {
+	res := new(ListResponse)
+	err := new(common.Error)
+	r, e := c.resty.R().
+		SetResult(res).
+		SetError(err).
+		Get("/list")
+	if e != nil {
+		return nil, &common.Error{
+			Message: e.Error(),
+		}
+	}
+	if common.IsError(r) {
+		return nil, err
+	}
+	return res, nil
+}

common/common.go

@@ -1,13 +1,17 @@
-package labstack
+package currency
 
 import (
-	"github.com/labstack/labstack-go/currency"
 	"github.com/stretchr/testify/assert"
+	"os"
 	"testing"
 )
 
+var (
+	client = New(os.Getenv("KEY"))
+)
+
 func TestClient_CurrencyConvert(t *testing.T) {
-	res, err := client.CurrencyConvert(&currency.ConvertRequest{
+	res, err := client.Convert(&ConvertRequest{
 		Amount: 10,
 		From:   "USD",
 		To:     "INR",
@@ -18,7 +22,7 @@ func TestClient_CurrencyConvert(t *testing.T) {
 }
 
 func TestClient_CurrencyList(t *testing.T) {
-	res, err := client.CurrencyList(&currency.ListRequest{})
+	res, err := client.List(&ListRequest{})
 	if assert.Nil(t, err) {
 		assert.NotZero(t, len(res.Currencies))
 	}

currency.go

@@ -1,6 +1,15 @@
 package email
 
+import (
+	"github.com/go-resty/resty/v2"
+	"github.com/labstack/labstack-go/common"
+)
+
 type (
+	Client struct {
+		resty *resty.Client
+	}
+
 	VerifyRequest struct {
 		Email string
 	}
@@ -13,3 +22,34 @@ type (
 		Flags    []string `json:"flags"`
 	}
 )
+
+const (
+	url = "https://email.labstack.com/api/v1"
+)
+
+func New(key string) *Client {
+	return &Client{
+		resty: resty.New().SetHostURL(url).SetAuthToken(key),
+	}
+}
+
+func (c *Client) Verify(req *VerifyRequest) (*VerifyResponse, *common.Error) {
+	res := new(VerifyResponse)
+	err := new(common.Error)
+	r, e := c.resty.R().
+		SetPathParams(map[string]string{
+			"email": req.Email,
+		}).
+		SetResult(res).
+		SetError(err).
+		Get("/verify/{email}")
+	if e != nil {
+		return nil, &common.Error{
+			Message: err.Error(),
+		}
+	}
+	if common.IsError(r) {
+		return nil, err
+	}
+	return res, nil
+}

currency/currency.go

@@ -1,13 +1,17 @@
-package labstack
+package email
 
 import (
-	"github.com/labstack/labstack-go/email"
 	"github.com/stretchr/testify/assert"
+	"os"
 	"testing"
 )
 
+var (
+	client = New(os.Getenv("KEY"))
+)
+
 func TestClient_EmailVerify(t *testing.T) {
-	res, err := client.EmailVerify(&email.VerifyRequest{
+	res, err := client.Verify(&VerifyRequest{
 		Email: "[email protected]",
 	})
 	if assert.Nil(t, err) {