Bumped version

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

Author: vishr

README.md

@@ -24,9 +24,7 @@ import (
 func main() {
   client := labstack.NewClient("<API_KEY>")
   geocode := client.Geocode()
-  res, err := geocode.Address(&labstack.GeocodeAddressRequest{
-    Location:  "eiffel tower",
-  })
+  res, err := geocode.Address("eiffel tower")
   if err != nil {
     fmt.Println(err)
   } else {

currency.go

@@ -10,35 +10,25 @@ type (
 		*Client
 	}
 
-	CurrencyConvertRequest struct {
-		From  string
-		To    string
-		Value float64
-	}
-
 	CurrencyConvertResponse struct {
 		Value     float64   `json:"value"`
 		UpdatedAt time.Time `json:"updated_at"`
 	}
 
-	CurrencyRatesRequest struct {
-		Base string
-	}
-
 	CurrencyRatesResponse struct {
 		Rates     map[string]float64 `json:"rates"`
 		UpdatedAt time.Time          `json:"updated_at"`
 	}
 )
 
-func (c *Currency) Convert(req *CurrencyConvertRequest) (*CurrencyConvertResponse, *APIError) {
+func (c *Currency) Convert(from, to string, value float64) (*CurrencyConvertResponse, *APIError) {
 	res := new(CurrencyConvertResponse)
 	err := new(APIError)
 	r, e := c.resty.R().
 		SetQueryParams(map[string]string{
-			"from":  req.From,
-			"to":    req.To,
-			"value": strconv.FormatFloat(req.Value, 'f', -1, 64),
+			"from":  from,
+			"to":    to,
+			"value": strconv.FormatFloat(value, 'f', -1, 64),
 		}).
 		SetResult(res).
 		SetError(err).
@@ -54,12 +44,12 @@ func (c *Currency) Convert(req *CurrencyConvertRequest) (*CurrencyConvertRespons
 	return res, nil
 }
 
-func (c *Currency) Rates(req *CurrencyRatesRequest) (*CurrencyRatesResponse, *APIError) {
+func (c *Currency) Rates(base string) (*CurrencyRatesResponse, *APIError) {
 	res := new(CurrencyRatesResponse)
 	err := new(APIError)
 	r, e := c.resty.R().
 		SetQueryParams(map[string]string{
-			"base": req.Base,
+			"base": base,
 		}).
 		SetResult(res).
 		SetError(err).

geocode.go

@@ -7,24 +7,16 @@ type (
 		*Client
 	}
 
-	GeocodeAddressRequest struct {
-		Location  string
+	GeocodeAddressOptions struct {
 		Longitude float64
 		Latitude  float64
 		OSMTag    string
 		Language  string
 		Limit     int
 	}
 
-	GeocodeIPRequest struct {
-		IP string
-	}
-
-	GeocodeReverseRequest struct {
-		Longitude float64
-		Latitude  float64
-		Language  string
-		Limit     int
+	GeocodeReverseOptions struct {
+		Limit int
 	}
 
 	GeocodeGeometry struct {
@@ -44,17 +36,17 @@ type (
 	}
 )
 
-func (g *Geocode) Address(req *GeocodeAddressRequest) (*GeocodeResponse, *APIError) {
+func (g *Geocode) Address(location string, options GeocodeAddressOptions) (*GeocodeResponse, *APIError) {
 	res := new(GeocodeResponse)
 	err := new(APIError)
 	r, e := g.resty.R().
 		SetQueryParams(map[string]string{
-			"location":  req.Location,
-			"longitude": strconv.FormatFloat(req.Longitude, 'f', -1, 64),
-			"latitude":  strconv.FormatFloat(req.Latitude, 'f', -1, 64),
-			"osm_tag":   req.OSMTag,
-			"language":  req.Language,
-			"limit":     strconv.Itoa(req.Limit),
+			"location":  location,
+			"longitude": strconv.FormatFloat(options.Longitude, 'f', -1, 64),
+			"latitude":  strconv.FormatFloat(options.Latitude, 'f', -1, 64),
+			"osm_tag":   options.OSMTag,
+			"language":  options.Language,
+			"limit":     strconv.Itoa(options.Limit),
 		}).
 		SetResult(res).
 		SetError(err).
@@ -70,12 +62,12 @@ func (g *Geocode) Address(req *GeocodeAddressRequest) (*GeocodeResponse, *APIErr
 	return res, nil
 }
 
-func (g *Geocode) IP(req *GeocodeIPRequest) (*GeocodeResponse, *APIError) {
+func (g *Geocode) IP(ip string) (*GeocodeResponse, *APIError) {
 	res := new(GeocodeResponse)
 	err := new(APIError)
 	r, e := g.resty.R().
 		SetQueryParams(map[string]string{
-			"ip": req.IP,
+			"ip": ip,
 		}).
 		SetResult(res).
 		SetError(err).
@@ -91,15 +83,14 @@ func (g *Geocode) IP(req *GeocodeIPRequest) (*GeocodeResponse, *APIError) {
 	return res, nil
 }
 
-func (g *Geocode) Reverse(req *GeocodeReverseRequest) (*GeocodeResponse, *APIError) {
+func (g *Geocode) Reverse(longitude, latitude float64, options GeocodeReverseOptions) (*GeocodeResponse, *APIError) {
 	res := new(GeocodeResponse)
 	err := new(APIError)
 	r, e := g.resty.R().
 		SetQueryParams(map[string]string{
-			"longitude": strconv.FormatFloat(req.Longitude, 'f', -1, 64),
-			"latitude":  strconv.FormatFloat(req.Latitude, 'f', -1, 64),
-			"language":  req.Language,
-			"limit":     strconv.Itoa(req.Limit),
+			"longitude": strconv.FormatFloat(longitude, 'f', -1, 64),
+			"latitude":  strconv.FormatFloat(latitude, 'f', -1, 64),
+			"limit":     strconv.Itoa(options.Limit),
 		}).
 		SetResult(res).
 		SetError(err).

post.go

@@ -5,10 +5,6 @@ type (
 		*Client
 	}
 
-	PostVerifyRequest struct {
-		Email string
-	}
-
 	PostVerifyResponse struct {
 		ValidSyntax bool `json:"valid_syntax"`
 		Deliverable bool `json:"deliverable"`
@@ -19,12 +15,12 @@ type (
 	}
 )
 
-func (p *Post) Verify(req *PostVerifyRequest) (*PostVerifyResponse, *APIError) {
+func (p *Post) Verify(email string) (*PostVerifyResponse, *APIError) {
 	res := new(PostVerifyResponse)
 	err := new(APIError)
 	r, e := p.resty.R().
 		SetQueryParams(map[string]string{
-			"email": req.Email,
+			"email": email,
 		}).
 		SetResult(res).
 		SetError(err).

watermark.go

@@ -7,7 +7,7 @@ type (
 		*Client
 	}
 
-	WatermarkImageRequest struct {
+	WatermarkImageOptions struct {
 		File     string
 		Text     string
 		Font     string
@@ -23,19 +23,19 @@ type (
 	}
 )
 
-func (w *Watermark) Image(req *WatermarkImageRequest) (*WatermarkImageResponse, *APIError) {
+func (w *Watermark) Image(file, text string, options WatermarkImageOptions) (*WatermarkImageResponse, *APIError) {
 	res := new(WatermarkImageResponse)
 	err := new(APIError)
 	r, e := w.resty.R().
-		SetFile("file", req.File).
+		SetFile("file", file).
 		SetFormData(map[string]string{
-			"text":     req.Text,
-			"font":     req.Font,
-			"size":     strconv.Itoa(req.Size),
-			"color":    req.Color,
-			"opacity":  strconv.Itoa(req.Opacity),
-			"position": req.Position,
-			"margin":   strconv.Itoa(req.Margin),
+			"text":     text,
+			"font":     options.Font,
+			"size":     strconv.Itoa(options.Size),
+			"color":    options.Color,
+			"opacity":  strconv.Itoa(options.Opacity),
+			"position": options.Position,
+			"margin":   strconv.Itoa(options.Margin),
 		}).
 		SetResult(res).
 		SetError(err).

webpage.go

@@ -5,8 +5,7 @@ type (
 		*Client
 	}
 
-	WebpagePDFRequest struct {
-		URL    string
+	WebpagePDFOptions struct {
 		Layout string
 		Format string
 	}
@@ -16,14 +15,14 @@ type (
 	}
 )
 
-func (w *Webpage) PDF(req *WebpagePDFRequest) (*WebpagePDFResponse, *APIError) {
+func (w *Webpage) PDF(url string, options WebpagePDFOptions) (*WebpagePDFResponse, *APIError) {
 	res := new(WebpagePDFResponse)
 	err := new(APIError)
 	r, e := w.resty.R().
 		SetQueryParams(map[string]string{
-			"url":    req.URL,
-			"layout": req.Layout,
-			"foramt": req.Format,
+			"url":    url,
+			"layout": options.Layout,
+			"foramt": options.Format,
 		}).
 		SetResult(res).
 		SetError(err).