Simplified

test/gocli/cli.go

@@ -1,25 +1,33 @@
 package goapi
 
+import "time"
+import "crypto"
 import (
 	"bytes"
-	"crypto"
 	"encoding/json"
 	"errors"
 	"io/ioutil"
 	"net/http"
-	"time"
 )
 
 var Basepath string = ""
 var Host string = ""
 var ExtraHeaders map[string]string = make(map[string]string)
 
+var Ver string = ""
+var cli http.Client
+
+func SetCli(nc http.Client) {
+	cli = nc
+}
+
 func invoke(m string, path string, bodyo interface{}) (*json.Decoder, error) {
 	b := &bytes.Buffer{}
 	err := json.NewEncoder(b).Encode(bodyo)
 	if err != nil {
 		return nil, err
 	}
+
 	body := bytes.NewReader(b.Bytes())
 	req, err := http.NewRequest(m, Host+Basepath+path, body)
 	if err != nil {
@@ -32,19 +40,19 @@ func invoke(m string, path string, bodyo interface{}) (*json.Decoder, error) {
 		req.Header.Set(k, v)
 	}
 
-	cli := http.Client{}
 	res, err := cli.Do(req)
 
 	if err != nil {
 		return nil, err
 	}
 
+	defer res.Body.Close()
+
 	if res.StatusCode >= 400 {
 		bs, err := ioutil.ReadAll(res.Body)
 		if err != nil {
-			panic(err)
+			return nil, err
 		}
-
 		return nil, errors.New(string(bs))
 	}
 
@@ -53,65 +61,24 @@ func invoke(m string, path string, bodyo interface{}) (*json.Decoder, error) {
 }
 
 type AStr struct {
-	Arrofpstr []string
-
-	City string
-
-	Country string
-
-	HouseNumber int64
-
-	IsCondo bool
-
-	Recursive map[string]AStr
-
-	Some crypto.Decrypter
-
+	HouseNumber   int64
 	SomeWeirdTest string
-
-	When time.Time
+	Recursive     map[string]AStr
+	When          time.Time
+	Some          crypto.Decrypter
+	Country       string
+	City          string
+	IsCondo       bool
+	Arrofpstr     []string
 }
 
-func SomeAPI(req string) (res string, err error) {
+func SomeAPI(req *AStr) (res *AStr, err error) {
 	var dec *json.Decoder
 	dec, err = invoke("POST", "/someapi", req)
 	if err != nil {
 		return
 	}
-	var ret string
-	err = dec.Decode(ret)
-	return ret, err
-}
-
-func SomeAPI2(req crypto.Hash) (res []string, err error) {
-	var dec *json.Decoder
-	dec, err = invoke("DELETE", "/someapi", req)
-	if err != nil {
-		return
-	}
-	var ret []string
-	err = dec.Decode(ret)
-	return ret, err
-}
-
-func SomeGET(req string) (res string, err error) {
-	var dec *json.Decoder
-	dec, err = invoke("GET", "/someapi", req)
-	if err != nil {
-		return
-	}
-	var ret string
-	err = dec.Decode(ret)
-	return ret, err
-}
-
-func SomePUT(req string) (res string, err error) {
-	var dec *json.Decoder
-	dec, err = invoke("PUT", "/someapi", req)
-	if err != nil {
-		return
-	}
-	var ret string
+	var ret *AStr = &AStr{}
 	err = dec.Decode(ret)
 	return ret, err
 }