Skip to content

Commit 81d4837

Browse files
vishrvishr
committed
Bumped v0.18.3
Signed-off-by: Vishal Rana <[email protected]>
1 parent 1ebc378 commit 81d4837

File tree

10 files changed

+174
-96
lines changed

10 files changed

+174
-96
lines changed

‎barcode.go

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,40 @@ type (
2323
}
2424
)
2525

26-
func (c *Client) BarcodeGenerate(req *BarcodeGenerateRequest) (res *BarcodeGenerateResponse, err *APIError) {
27-
res = new(BarcodeGenerateResponse)
28-
_, e := c.resty.R().
26+
func (c *Client) BarcodeGenerate(req *BarcodeGenerateRequest) (*BarcodeGenerateResponse, *APIError) {
27+
res := new(BarcodeGenerateResponse)
28+
err := new(APIError)
29+
r, e := c.resty.R().
2930
SetBody(req).
3031
SetResult(res).
3132
SetError(err).
3233
Post("/barcode/generate")
3334
if e != nil {
34-
err = new(APIError)
35-
err.Message = e.Error()
35+
return nil, &APIError{
36+
Message: e.Error(),
37+
}
3638
}
37-
return
39+
if success(r) {
40+
return res, nil
41+
}
42+
return nil, err
3843
}
3944

40-
func (c *Client) BarcodeScan(req *BarcodeScanRequest) (res *BarcodeScanResponse, err *APIError) {
41-
res = new(BarcodeScanResponse)
42-
_, e := c.resty.R().
45+
func (c *Client) BarcodeScan(req *BarcodeScanRequest) (*BarcodeScanResponse, *APIError) {
46+
res := new(BarcodeScanResponse)
47+
err := new(APIError)
48+
r, e := c.resty.R().
4349
SetFile("file", req.File).
4450
SetResult(res).
4551
SetError(err).
4652
Post("/barcode/scan")
4753
if e != nil {
48-
err = new(APIError)
49-
err.Message = e.Error()
54+
return nil, &APIError{
55+
Message: e.Error(),
56+
}
57+
}
58+
if success(r) {
59+
return res, nil
5060
}
51-
return
61+
return nil, err
5262
}

‎client.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ const (
3030
apiURL = "https://api.labstack.com"
3131
)
3232

33+
func success(r *resty.Response) bool {
34+
return r.StatusCode() >= 200 && r.StatusCode() < 300
35+
}
36+
3337
// NewClient creates a new client for the LabStack API.
3438
func NewClient(apiKey string) *Client {
3539
return &Client{

‎currency.go

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,31 @@ package labstack
33
import "time"
44

55
type (
6-
CurrencyExchangeRequest struct {
6+
CurrencyConvertRequest struct {
77
Base string `json:"base"`
88
}
99

10-
CurrencyExchangeResponse struct {
10+
CurrencyConvertResponse struct {
1111
Rates map[string]float64 `json:"rates"`
1212
UpdatedAt time.Time `json:"updated_at"`
1313
}
1414
)
1515

16-
func (c *Client) CurrencyExchange(req *CurrencyExchangeRequest) (res *CurrencyExchangeResponse, err *APIError) {
17-
res = new(CurrencyExchangeResponse)
18-
_, e := c.resty.R().
16+
func (c *Client) CurrencyConvert(req *CurrencyConvertRequest) (*CurrencyConvertResponse, *APIError) {
17+
res := new(CurrencyConvertResponse)
18+
err := new(APIError)
19+
r, e := c.resty.R().
1920
SetBody(req).
2021
SetResult(res).
2122
SetError(err).
2223
Post("/currency/exchange")
2324
if e != nil {
24-
err = new(APIError)
25-
err.Message = e.Error()
25+
return nil, &APIError{
26+
Message: e.Error(),
27+
}
2628
}
27-
return
29+
if success(r) {
30+
return res, nil
31+
}
32+
return nil, err
2833
}

‎dns.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,21 @@ type (
3535
}
3636
)
3737

38-
func (c *Client) DNSLookup(req *DNSLookupRequest) (res *DNSLookupResponse, err *APIError) {
39-
res = new(DNSLookupResponse)
40-
_, e := c.resty.R().
38+
func (c *Client) DNSLookup(req *DNSLookupRequest) (*DNSLookupResponse, *APIError) {
39+
res := new(DNSLookupResponse)
40+
err := new(APIError)
41+
r, e := c.resty.R().
4142
SetBody(req).
4243
SetResult(res).
4344
SetError(err).
4445
Post("/dns/lookup")
4546
if e != nil {
46-
err = new(APIError)
47-
err.Message = e.Error()
47+
return nil, &APIError{
48+
Message: e.Error(),
49+
}
4850
}
49-
return
51+
if success(r) {
52+
return res, nil
53+
}
54+
return nil, err
5055
}

‎email.go

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,21 @@ type (
1414
}
1515
)
1616

17-
func (c *Client) EmailVerify(req *EmailVerifyRequest) (res *EmailVerifyResponse, err *APIError) {
18-
res = new(EmailVerifyResponse)
19-
_, e := c.resty.R().
17+
func (c *Client) EmailVerify(req *EmailVerifyRequest) (*EmailVerifyResponse, *APIError) {
18+
res := new(EmailVerifyResponse)
19+
err := new(APIError)
20+
r, e := c.resty.R().
2021
SetBody(req).
2122
SetResult(res).
2223
SetError(err).
2324
Post("/email/verify")
2425
if e != nil {
25-
err = new(APIError)
26-
err.Message = e.Error()
26+
return nil, &APIError{
27+
Message: e.Error(),
28+
}
2729
}
28-
return
30+
if success(r) {
31+
return res, nil
32+
}
33+
return nil, err
2934
}

‎image.go

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,29 @@ type (
3939
}
4040
)
4141

42-
func (c *Client) ImageCompress(req *ImageCompressRequest) (res *ImageCompressResponse, err *APIError) {
43-
res = new(ImageCompressResponse)
44-
_, e := c.resty.R().
42+
func (c *Client) ImageCompress(req *ImageCompressRequest) (*ImageCompressResponse, *APIError) {
43+
res := new(ImageCompressResponse)
44+
err := new(APIError)
45+
r, e := c.resty.R().
4546
SetFile("file", req.File).
4647
SetResult(res).
4748
SetError(err).
4849
Post("/image/compress")
4950
if e != nil {
50-
err = new(APIError)
51-
err.Message = e.Error()
51+
return nil, &APIError{
52+
Message: e.Error(),
53+
}
5254
}
53-
return
55+
if success(r) {
56+
return res, nil
57+
}
58+
return nil, err
5459
}
5560

56-
func (c *Client) ImageResize(req *ImageResizeRequest) (res *ImageResizeResponse, err *APIError) {
57-
res = new(ImageResizeResponse)
58-
_, e := c.resty.R().
61+
func (c *Client) ImageResize(req *ImageResizeRequest) (*ImageResizeResponse, *APIError) {
62+
res := new(ImageResizeResponse)
63+
err := new(APIError)
64+
r, e := c.resty.R().
5965
SetFile("file", req.File).
6066
SetFormData(map[string]string{
6167
"width": strconv.Itoa(req.Width),
@@ -66,15 +72,20 @@ func (c *Client) ImageResize(req *ImageResizeRequest) (res *ImageResizeResponse,
6672
SetError(err).
6773
Post("/image/resize")
6874
if e != nil {
69-
err = new(APIError)
70-
err.Message = e.Error()
75+
return nil, &APIError{
76+
Message: e.Error(),
77+
}
78+
}
79+
if success(r) {
80+
return res, nil
7181
}
72-
return
82+
return nil, err
7383
}
7484

75-
func (c *Client) ImageWatermark(req *ImageWatermarkRequest) (res *ImageWatermarkResponse, err *APIError) {
76-
res = new(ImageWatermarkResponse)
77-
_, e := c.resty.R().
85+
func (c *Client) ImageWatermark(req *ImageWatermarkRequest) (*ImageWatermarkResponse, *APIError) {
86+
res := new(ImageWatermarkResponse)
87+
err := new(APIError)
88+
r, e := c.resty.R().
7889
SetFile("file", req.File).
7990
SetFormData(map[string]string{
8091
"text": req.Text,
@@ -89,8 +100,12 @@ func (c *Client) ImageWatermark(req *ImageWatermarkRequest) (res *ImageWatermark
89100
SetError(err).
90101
Post("/image/watermark")
91102
if e != nil {
92-
err = new(APIError)
93-
err.Message = e.Error()
103+
return nil, &APIError{
104+
Message: e.Error(),
105+
}
106+
}
107+
if success(r) {
108+
return res, nil
94109
}
95-
return
110+
return nil, err
96111
}

‎pdf.go

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,25 @@ type (
3131
}
3232
)
3333

34-
func (c *Client) PDFCompress(req *PDFCompressRequest) (res *PDFCompressResponse, err *APIError) {
35-
res = new(PDFCompressResponse)
34+
func (c *Client) PDFCompress(req *PDFCompressRequest) (*PDFCompressResponse, *APIError) {
35+
res := new(PDFCompressResponse)
36+
err := new(APIError)
3637
_, e := c.resty.R().
3738
SetFile("file", req.File).
3839
SetResult(res).
3940
SetError(err).
4041
Post("/pdf/compress")
4142
if e != nil {
42-
err = new(APIError)
43-
err.Message = e.Error()
43+
return nil, &APIError{
44+
Message: e.Error(),
45+
}
4446
}
45-
return
47+
return res, err
4648
}
4749

48-
func (c *Client) PDFImage(req *PDFImageRequest) (res *PDFImageResponse, err *APIError) {
49-
res = new(PDFImageResponse)
50+
func (c *Client) PDFImage(req *PDFImageRequest) (*PDFImageResponse, *APIError) {
51+
res := new(PDFImageResponse)
52+
err := new(APIError)
5053
_, e := c.resty.R().
5154
SetFile("file", req.File).
5255
SetFormData(map[string]string{
@@ -56,15 +59,17 @@ func (c *Client) PDFImage(req *PDFImageRequest) (res *PDFImageResponse, err *API
5659
SetError(err).
5760
Post("/pdf/image")
5861
if e != nil {
59-
err = new(APIError)
60-
err.Message = e.Error()
62+
return nil, &APIError{
63+
Message: e.Error(),
64+
}
6165
}
62-
return
66+
return res, err
6367
}
6468

65-
func (c *Client) PDFSplit(req *PDFSplitRequest) (res *PDFSplitResponse, err *APIError) {
66-
res = new(PDFSplitResponse)
67-
_, e := c.resty.R().
69+
func (c *Client) PDFSplit(req *PDFSplitRequest) (*PDFSplitResponse, *APIError) {
70+
res := new(PDFSplitResponse)
71+
err := new(APIError)
72+
r, e := c.resty.R().
6873
SetFile("file", req.File).
6974
SetFormData(map[string]string{
7075
"pages": req.Pages,
@@ -73,8 +78,12 @@ func (c *Client) PDFSplit(req *PDFSplitRequest) (res *PDFSplitResponse, err *API
7378
SetError(err).
7479
Post("/pdf/split")
7580
if e != nil {
76-
err = new(APIError)
77-
err.Message = e.Error()
81+
return nil, &APIError{
82+
Message: e.Error(),
83+
}
84+
}
85+
if success(r) {
86+
return res, nil
7887
}
79-
return
88+
return nil, err
8089
}

‎text.go

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -36,44 +36,59 @@ type (
3636
}
3737
)
3838

39-
func (c *Client) TextSummary(req *TextSummaryRequest) (res *TextSummaryResponse, err *APIError) {
40-
res = new(TextSummaryResponse)
41-
_, e := c.resty.R().
39+
func (c *Client) TextSummary(req *TextSummaryRequest) (*TextSummaryResponse, *APIError) {
40+
res := new(TextSummaryResponse)
41+
err := new(APIError)
42+
r, e := c.resty.R().
4243
SetBody(req).
4344
SetResult(res).
4445
SetError(err).
4546
Post("/text/summary")
4647
if e != nil {
47-
err = new(APIError)
48-
err.Message = e.Error()
48+
return nil, &APIError{
49+
Message: e.Error(),
50+
}
4951
}
50-
return
52+
if success(r) {
53+
return res, nil
54+
}
55+
return nil, err
5156
}
5257

53-
func (c *Client) TextSentiment(req *TextSentimentRequest) (res *TextSentimentResponse, err *APIError) {
54-
res = new(TextSentimentResponse)
55-
_, e := c.resty.R().
58+
func (c *Client) TextSentiment(req *TextSentimentRequest) (*TextSentimentResponse, *APIError) {
59+
res := new(TextSentimentResponse)
60+
err := new(APIError)
61+
r, e := c.resty.R().
5662
SetBody(req).
5763
SetResult(res).
5864
SetError(err).
5965
Post("/text/sentiment")
6066
if e != nil {
61-
err = new(APIError)
62-
err.Message = e.Error()
67+
return nil, &APIError{
68+
Message: e.Error(),
69+
}
70+
}
71+
if success(r) {
72+
return res, nil
6373
}
64-
return
74+
return nil, err
6575
}
6676

67-
func (c *Client) TextSpellcheck(req *TextSpellcheckRequest) (res *TextSpellcheckResponse, err *APIError) {
68-
res = new(TextSpellcheckResponse)
69-
_, e := c.resty.R().
77+
func (c *Client) TextSpellcheck(req *TextSpellcheckRequest) (*TextSpellcheckResponse, *APIError) {
78+
res := new(TextSpellcheckResponse)
79+
err := new(APIError)
80+
r, e := c.resty.R().
7081
SetBody(req).
7182
SetResult(res).
7283
SetError(err).
7384
Post("/text/spellcheck")
7485
if e != nil {
75-
err = new(APIError)
76-
err.Message = e.Error()
86+
return nil, &APIError{
87+
Message: e.Error(),
88+
}
89+
}
90+
if success(r) {
91+
return res, nil
7792
}
78-
return
93+
return nil, err
7994
}

0 commit comments

Comments
 (0)