Bumped v1

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

Author: vishr

.idea/workspace.xml

@@ -6,6 +6,7 @@ import (
 
 type (
 	Client struct {
+		key   string
 		resty *resty.Client
 	}
 
@@ -21,11 +22,42 @@ const (
 
 func New(key string) *Client {
 	return &Client{
+		key:   key,
 		resty: resty.New().SetHostURL(url).SetAuthToken(key),
 	}
 }
 
-func IsError(status int) bool {
+func (c *Client) Currency() *CurrencyService {
+	return &CurrencyService{
+		resty: resty.New().SetHostURL("https://currency.labstack.com/api/v1").SetAuthToken(c.key),
+	}
+}
+
+func (c *Client) Domain() *DomainService {
+	return &DomainService{
+		resty: resty.New().SetHostURL("https://domain.labstack.com/api/v1").SetAuthToken(c.key),
+	}
+}
+
+func (c *Client) Email() *EmailService {
+	return &EmailService{
+		resty: resty.New().SetHostURL("https://email.labstack.com/api/v1").SetAuthToken(c.key),
+	}
+}
+
+func (c *Client) IP() *IPService {
+	return &IPService{
+		resty: resty.New().SetHostURL("https://ip.labstack.com/api/v1").SetAuthToken(c.key),
+	}
+}
+
+func (c *Client) Webpage() *WebpageService {
+	return &WebpageService{
+		resty: resty.New().SetHostURL("https://webpage.labstack.com/api/v1").SetAuthToken(c.key),
+	}
+}
+
+func isError(status int) bool {
 	return status < 200 || status >= 300
 }
 

client.go

@@ -4,4 +4,9 @@ import "os"
 
 var (
 	client = New(os.Getenv("KEY"))
+	cs = client.Currency()
+	ds = client.Domain()
+	es = client.Email()
+	is = client.IP()
+	ws = client.Webpage()
 )

client_test.go

@@ -0,0 +1,54 @@
+package labstack
+
+import (
+	"github.com/go-resty/resty/v2"
+	"github.com/labstack/labstack-go/currency"
+	"strconv"
+)
+
+type (
+	CurrencyService struct {
+		resty *resty.Client
+	}
+)
+
+func (c *CurrencyService) Convert(req *currency.ConvertRequest) (*currency.ConvertResponse, error) {
+	res := new(currency.ConvertResponse)
+	err := new(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, &Error{
+			Message: e.Error(),
+		}
+	}
+	if isError(r.StatusCode()) {
+		return nil, err
+	}
+	return res, nil
+}
+
+func (c *CurrencyService) List(req *currency.ListRequest) (*currency.ListResponse, error) {
+	res := new(currency.ListResponse)
+	err := new(Error)
+	r, e := c.resty.R().
+		SetResult(res).
+		SetError(err).
+		Get("/list")
+	if e != nil {
+		return nil, &Error{
+			Message: e.Error(),
+		}
+	}
+	if isError(r.StatusCode()) {
+		return nil, err
+	}
+	return res, nil
+}

currency.go

@@ -1,17 +1,10 @@
 package currency
 
 import (
-	"github.com/go-resty/resty/v2"
-	"github.com/labstack/labstack-go"
-	"strconv"
 	"time"
 )
 
 type (
-	Client struct {
-		resty *resty.Client
-	}
-
 	Currency struct {
 		Name   string `json:"name"`
 		Code   string `json:"code"`
@@ -36,54 +29,3 @@ 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, error) {
-	res := new(ConvertResponse)
-	err := new(labstack.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, &labstack.Error{
-			Message: e.Error(),
-		}
-	}
-	if labstack.IsError(r.StatusCode()) {
-		return nil, err
-	}
-	return res, nil
-}
-
-func (c *Client) List(req *ListRequest) (*ListResponse, error) {
-	res := new(ListResponse)
-	err := new(labstack.Error)
-	r, e := c.resty.R().
-		SetResult(res).
-		SetError(err).
-		Get("/list")
-	if e != nil {
-		return nil, &labstack.Error{
-			Message: e.Error(),
-		}
-	}
-	if labstack.IsError(r.StatusCode()) {
-		return nil, err
-	}
-	return res, nil
-}

currency/currency.go

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