Decouple http client

.gitignore

@@ -16,3 +16,4 @@ gravo
 /grafana-storage
 seihon
 manifest.json
+dist

main.go

@@ -31,7 +31,8 @@ func main() {
 		os.Exit(0)
 	}
 
-	client := volkszaehler.NewClient(*apiURL, apiTimeout, *verbose)
+	httpClient := http.Client{Timeout: *apiTimeout}
+	client := volkszaehler.NewClient(*apiURL, &httpClient, *verbose)
 	server := newServer(client)
 
 	http.HandleFunc("/", handler(server.rootHandler, *verbose))

volkszaehler/client.go

@@ -13,6 +13,11 @@ import (
 	"time"
 )
 
+// HTTPDoer is the http client Do() interface
+type HTTPDoer interface {
+	Do(req *http.Request) (*http.Response, error)
+}
+
 // Client is the volkszaehler API client
 type Client interface {
 	Get(endpoint string) (io.ReadCloser, error)
@@ -25,18 +30,16 @@ type Client interface {
 
 type client struct {
 	url    string
-	client http.Client
+	client HTTPDoer
 	debug  bool
 }
 
 // NewClient creates new volkszaehler api client
-func NewClient(url string, timeout *time.Duration, debug bool) Client {
+func NewClient(url string, httpClient HTTPDoer, debug bool) Client {
 	return &client{
-		url: url,
-		client: http.Client{
-			Timeout: *timeout,
-		},
-		debug: debug,
+		url:    url,
+		client: httpClient,
+		debug:  debug,
 	}
 }