Remove NewClientFromURL and replace with NewClientConfigFromURL to better parallel NewHandler / DefaultHandlerConfig behavior (issue #3).

Author: nathan-osman

README.md

@@ -31,10 +31,11 @@ import "github.com/lampctl/go-sse"
 Create a client using:
 
 ```golang
-c, err := sse.NewClientFromURL("http://example.com/sse")
+cfg, err := sse.NewClientConfigFromURL("http://example.com/sse")
 if err != nil {
     // ...
 }
+c := sse.NewClient(cfg)
 ```
 
 You can now read events directly from the `c.Events` channel as they are received:

client.go

@@ -23,6 +23,18 @@ type ClientConfig struct {
 	Context context.Context
 }
 
+// NewClientConfigFromURL creates a ClientConfig for the provided URL, which
+// can then be passed along to NewClient.
+func NewClientConfigFromURL(url string) (*ClientConfig, error) {
+	r, err := http.NewRequest(http.MethodGet, url, nil)
+	if err != nil {
+		return nil, err
+	}
+	return &ClientConfig{
+		Request: r,
+	}, nil
+}
+
 const defaultReconnectionTime = time.Second * 3
 
 var errConnectionClosed = errors.New("connection was closed by the server")
@@ -137,18 +149,6 @@ func NewClient(cfg *ClientConfig) *Client {
 	return c
 }
 
-// NewClientFromURL creates a new SSE client for the provided URL. By default,
-// GET request is made by http.DefaultClient.
-func NewClientFromURL(url string) (*Client, error) {
-	r, err := http.NewRequest(http.MethodGet, url, nil)
-	if err != nil {
-		return nil, err
-	}
-	return NewClient(&ClientConfig{
-		Request: r,
-	}), nil
-}
-
 // Close disconnects and shuts down the client.
 func (c *Client) Close() {
 	c.cancel()

client_test.go

@@ -147,10 +147,11 @@ func TestClient(t *testing.T) {
 					t.Fatalf("%s: %s", v.Name, serverErr)
 				}
 			}()
-			c, err := NewClientFromURL(s.URL)
+			cfg, err := NewClientConfigFromURL(s.URL)
 			if err != nil {
 				t.Fatalf("%s: %s", v.Name, err)
 			}
+			c := NewClient(cfg)
 			defer c.Close()
 			if err := v.Client(c); err != nil {
 				t.Fatalf("%s: %s", v.Name, err)

handler_test.go

@@ -39,10 +39,11 @@ func (h *testHandlerServerAndClient) CloseHandlerAndServer() {
 }
 
 func (h *testHandlerServerAndClient) CreateClient() error {
-	c, err := NewClientFromURL(h.Server.URL)
+	cfg, err := NewClientConfigFromURL(h.Server.URL)
 	if err != nil {
 		return err
 	}
+	c := NewClient(cfg)
 	h.Client = c
 	return nil
 }