Merge pull request #2 from spiegel-im-spiegel/fix-bugs

Update CreateClient() function

Author: spiegel-im-spiegel

client_test.go

@@ -1,75 +1,12 @@
 package openbd
 
 import (
+	"context"
 	"net/http"
 	"net/url"
 	"testing"
 )
 
-// func TestLookupBooksRaw(t *testing.T) {
-// 	testCases := []struct {
-// 		ids []string
-// 	}{
-// 		{ids: nil},
-// 		{ids: []string{}},
-// 		{ids: []string{"foo"}},
-// 		{ids: []string{"9784535585744"}},
-// 		{ids: []string{"9784535585744", "9784797369915"}},
-// 		{ids: []string{"9784535585744", "foo"}},
-// 		{ids: []string{"9784535585744&isbn=9784797369915"}},
-// 	}
-//
-// 	for _, tc := range testCases {
-// 		b, err := DefaultClient().LookupBooksRaw(tc.ids)
-// 		if err != nil {
-// 			t.Errorf("Client.LookupBooksRaw() is \"%v\", want nil", err)
-// 			fmt.Printf("error info: %+v\n", err)
-// 			continue
-// 		}
-// 		fmt.Printf("response: %+v\n", string(b))
-// 	}
-// }
-//
-// func TestLookupBooks(t *testing.T) {
-// 	testCases := []struct {
-// 		ids   []string
-// 		valid []bool
-// 	}{
-// 		{ids: nil, valid: []bool{false}},
-// 		{ids: []string{}, valid: []bool{false}},
-// 		{ids: []string{"foo"}, valid: []bool{false}},
-// 		{ids: []string{"9784535585744"}, valid: []bool{true}},
-// 		{ids: []string{"9784535585744", "9784797369915"}, valid: []bool{true, true}},
-// 		{ids: []string{"9784535585744", "foo"}, valid: []bool{true, false}},
-// 		{ids: []string{"9784535585744&isbn=9784797369915"}, valid: []bool{false}},
-// 	}
-//
-// 	for _, tc := range testCases {
-// 		bks, err := DefaultClient().LookupBooks(tc.ids)
-// 		if err != nil {
-// 			t.Errorf("Client.LookupBooks() is \"%v\", want nil", err)
-// 			fmt.Printf("error info: %+v\n", err)
-// 			continue
-// 		}
-// 		if len(bks) != len(tc.valid) {
-// 			t.Errorf("Count of Client.LookupBooks() is %v, want %v", len(bks), len(tc.valid))
-// 			continue
-// 		}
-// 		for i, bk := range bks {
-// 			if bk.Valid() != tc.valid[i] {
-// 				t.Errorf("Book[%d] is %v, want %v", i, bk.Valid(), tc.valid[i])
-// 				continue
-// 			}
-// 			if bk.Valid() {
-// 				id := bk.Id()
-// 				if id != tc.ids[i] {
-// 					t.Errorf("Book[%d] is %v, want %v", i, id, tc.ids[i])
-// 				}
-// 			}
-// 		}
-// 	}
-// }
-
 func TestMakeLookupCommand(t *testing.T) {
 	testCases := []struct {
 		v   url.Values
@@ -87,7 +24,7 @@ func TestMakeLookupCommand(t *testing.T) {
 		if u.String() != tc.str {
 			t.Errorf("Client.MakeLookupCommand() is \"%v\", want \"%v\"", u.String(), tc.str)
 		}
-		u = (*Server)(nil).CreateClient(nil, &http.Client{}).MakeLookupCommand(tc.v)
+		u = (*Server)(nil).CreateClient(WithContext(context.Background()), WithHttpCilent(&http.Client{})).MakeLookupCommand(tc.v)
 		if u.String() != tc.str {
 			t.Errorf("Client.MakeLookupCommand() is \"%v\", want \"%v\"", u.String(), tc.str)
 		}

server.go

@@ -54,23 +54,52 @@ func (s *Server) URL() *url.URL {
 	return &url.URL{Scheme: s.scheme, Host: s.name}
 }
 
+//ClientOptFunc is self-referential function for functional options pattern
+type ClientOptFunc func(*Client)
+
 //CreateClient returns new Client instance
-func (s *Server) CreateClient(ctx context.Context, client *http.Client) *Client {
+func (s *Server) CreateClient(opts ...ClientOptFunc) *Client {
 	if s == nil {
 		s = New()
 	}
-	if client == nil {
-		client = http.DefaultClient
+	cli := &Client{
+		server: s,
+		client: nil,
+		ctx:    nil,
+	}
+	for _, opt := range opts {
+		opt(cli)
+	}
+	if cli.client == nil {
+		cli.client = http.DefaultClient
+	}
+	if cli.ctx == nil {
+		cli.ctx = context.Background()
+	}
+	return cli
+}
+
+//WithContext returns function for setting context.Context
+func WithContext(ctx context.Context) ClientOptFunc {
+	return func(c *Client) {
+		if c != nil {
+			c.ctx = ctx
+		}
 	}
-	if ctx == nil {
-		ctx = context.Background()
+}
+
+//WithHttpCilent returns function for setting http.Client
+func WithHttpCilent(client *http.Client) ClientOptFunc {
+	return func(c *Client) {
+		if c != nil {
+			c.client = client
+		}
 	}
-	return &Client{server: s, client: client, ctx: ctx}
 }
 
 //DefaultClient returns new Client instance with default setting
 func DefaultClient() *Client {
-	return New().CreateClient(nil, nil)
+	return New().CreateClient()
 }
 
 /* Copyright 2019 Spiegel