Merge pull request #6 from bzimmer/with-baseurl

improved library testability

cyclinganalytics/cyclinganalytics.go

@@ -14,13 +14,14 @@ import (
 	"golang.org/x/oauth2"
 )
 
-const baseURL = "https://www.cyclinganalytics.com/api"
+const _baseURL = "https://www.cyclinganalytics.com/api"
 
 // Client for accessing Cycling Analytics' API
 type Client struct {
-	config oauth2.Config
-	token  *oauth2.Token
-	client *http.Client
+	config  oauth2.Config
+	token   *oauth2.Token
+	client  *http.Client
+	baseURL string
 
 	User  *UserService
 	Rides *RidesService
@@ -39,6 +40,17 @@ func withServices() Option {
 	return func(c *Client) error {
 		c.User = &UserService{client: c}
 		c.Rides = &RidesService{client: c}
+		if c.baseURL == "" {
+			c.baseURL = _baseURL
+		}
+		return nil
+	}
+}
+
+// WithBaseURL specifies the base url
+func WithBaseURL(baseURL string) Option {
+	return func(c *Client) error {
+		c.baseURL = baseURL
 		return nil
 	}
 }
@@ -47,7 +59,7 @@ func (c *Client) newAPIRequest(ctx context.Context, method, uri string, values *
 	if c.token.AccessToken == "" {
 		return nil, errors.New("accessToken required")
 	}
-	q := fmt.Sprintf("%s/%s", baseURL, uri)
+	q := fmt.Sprintf("%s/%s", c.baseURL, uri)
 	if values != nil {
 		q = fmt.Sprintf("%s?%s", q, values.Encode())
 	}

cyclinganalytics/encoding.go

@@ -55,7 +55,7 @@ func (r *Ride) GPX() (*gpx.GPX, error) {
 	}
 
 	trk := gpx.NewTrkType(mls)
-	trk.Src = baseURL
+	trk.Src = _baseURL
 
 	return &gpx.GPX{
 		Creator: activity.UserAgent,

cyclinganalytics/model.go

@@ -8,6 +8,7 @@ import (
 
 // Fault represents an error response
 type Fault struct {
+	Code    int    `json:"code"`
 	Message string `json:"error"`
 }
 

rwgps/encoding.go

@@ -30,7 +30,7 @@ func (t *Trip) GeoJSON() (*geojson.Feature, error) {
 		Properties: map[string]interface{}{
 			"type":   t.Type,
 			"name":   t.Name,
-			"source": baseURL,
+			"source": _baseURL,
 		},
 	}
 	return g, nil

rwgps/model.go

@@ -28,6 +28,7 @@ const (
 
 // Fault is an error
 type Fault struct {
+	Code    int    `json:"code"`
 	Message string `json:"message"`
 }
 

rwgps/rwgps.go

@@ -17,14 +17,15 @@ import (
 
 const (
 	apiVersion = "2"
-	baseURL    = "https://ridewithgps.com"
+	_baseURL   = "https://ridewithgps.com"
 )
 
 // Client for communicating with RWGPS
 type Client struct {
-	config oauth2.Config
-	token  *oauth2.Token
-	client *http.Client
+	config  oauth2.Config
+	token   *oauth2.Token
+	client  *http.Client
+	baseURL string
 
 	Users *UsersService
 	Trips *TripsService
@@ -38,12 +39,23 @@ func withServices() Option {
 	return func(c *Client) error {
 		c.Users = &UsersService{client: c}
 		c.Trips = &TripsService{client: c}
+		if c.baseURL == "" {
+			c.baseURL = _baseURL
+		}
+		return nil
+	}
+}
+
+// WithBaseURL specifies the base url
+func WithBaseURL(baseURL string) Option {
+	return func(c *Client) error {
+		c.baseURL = baseURL
 		return nil
 	}
 }
 
 func (c *Client) newAPIRequest(ctx context.Context, uri string, params map[string]string) (*http.Request, error) {
-	u, err := url.Parse(fmt.Sprintf("%s/%s", baseURL, uri))
+	u, err := url.Parse(fmt.Sprintf("%s/%s", c.baseURL, uri))
 	if err != nil {
 		return nil, err
 	}

rwgps/trips.go

@@ -153,7 +153,7 @@ func (s *TripsService) Upload(ctx context.Context, file *activity.File) (*Upload
 		return nil, err
 	}
 
-	uri := fmt.Sprintf("%s/trips.json", baseURL)
+	uri := fmt.Sprintf("%s/trips.json", s.client.baseURL)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, uri, &b)
 	if err != nil {
 		return nil, err

strava/model.go

@@ -18,6 +18,7 @@ type Error struct {
 
 // Fault contains errors
 type Fault struct {
+	Code    int      `json:"code"`
 	Message string   `json:"message"`
 	Errors  []*Error `json:"errors"`
 }

zwift/model.go

@@ -9,6 +9,7 @@ const datetimeFormat = `"2006-01-02T15:04:05+0000"`
 
 // Fault represents a Zwift error
 type Fault struct {
+	Code    int    `json:"code"`
 	Message string `json:"message"`
 }
 

zwift/profile.go

@@ -22,9 +22,9 @@ func (s *ProfileService) Profile(ctx context.Context, profileID string) (*Profil
 	if err != nil {
 		return nil, err
 	}
-	var profile *Profile
+	var profile Profile
 	if err = s.client.do(req, &profile); err != nil {
 		return nil, err
 	}
-	return profile, err
+	return &profile, err
 }

zwift/zwift.go

@@ -13,7 +13,7 @@ import (
 
 //go:generate genwith --do --client --token --ratelimit --package zwift
 
-const baseURL = "https://us-or-rly101.zwift.com"
+const _baseURL = "https://us-or-rly101.zwift.com"
 const userAgent = "CNL/3.4.1 (Darwin Kernel 20.3.0) zwift/1.0.61590 curl/7.64.1"
 
 // Endpoint is Zwifts's OAuth 2.0 endpoint
@@ -26,8 +26,9 @@ func Endpoint() oauth2.Endpoint {
 
 // Client for communicating with Zwift
 type Client struct {
-	token  *oauth2.Token
-	client *http.Client
+	token   *oauth2.Token
+	client  *http.Client
+	baseURL string
 
 	Auth     *AuthService
 	Activity *ActivityService
@@ -44,6 +45,17 @@ func withServices() Option {
 		c.Profile = &ProfileService{c}
 		c.Activity = &ActivityService{c}
 		c.token.TokenType = "bearer"
+		if c.baseURL == "" {
+			c.baseURL = _baseURL
+		}
+		return nil
+	}
+}
+
+// WithBaseURL specifies the base url
+func WithBaseURL(baseURL string) Option {
+	return func(c *Client) error {
+		c.baseURL = baseURL
 		return nil
 	}
 }
@@ -52,7 +64,7 @@ func (c *Client) newAPIRequest(ctx context.Context, method, uri string) (*http.R
 	if c.token.AccessToken == "" {
 		return nil, errors.New("accessToken required")
 	}
-	q := fmt.Sprintf("%s/%s", baseURL, uri)
+	q := fmt.Sprintf("%s/%s", c.baseURL, uri)
 	u, err := url.Parse(q)
 	if err != nil {
 		return nil, err