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

Add fetch package (breaking change)

Author: spiegel-im-spiegel

README.md

@@ -17,15 +17,15 @@ import "github.com/spiegel-im-spiegel/openbd-api"
 
 ### Lookup openBD Book Data
 
-```
+```go
 books, err := openbd.DefaultClient().LookupBook([]string{"9784797369915", "9784274069321"})
 ```
 
 ## Entities for openBD
 
 ### Book type
 
-```
+```go
 //Book is entity class of book info.
 type Book struct {
     Onix    Onix    `json:"onix"`

cli/openbd/facade/facade.go

@@ -1,7 +1,10 @@
 package facade
 
 import (
+	"context"
 	"fmt"
+	"os"
+	"os/signal"
 	"runtime"
 
 	"github.com/spf13/cobra"
@@ -70,13 +73,15 @@ func Execute(ui *rwi.RWI, args []string) (exit exitcode.ExitCode) {
 
 	//execution
 	exit = exitcode.Normal
-	if err := newRootCmd(ui, args).Execute(); err != nil {
+	ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt)
+	defer cancel()
+	if err := newRootCmd(ui, args).ExecuteContext(ctx); err != nil {
 		exit = exitcode.Abnormal
 	}
 	return
 }
 
-/* Copyright 2019 Spiegel
+/* Copyright 2019-2021 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

cli/openbd/facade/lookup.go

@@ -21,14 +21,14 @@ func newLookupCmd(ui *rwi.RWI) *cobra.Command {
 			}
 
 			if rawFlag {
-				resp, err := openbd.DefaultClient().LookupBooksRaw(args)
+				resp, err := openbd.DefaultClient().LookupBooksRawContext(cmd.Context(), args)
 				if err != nil {
 					return debugPrint(ui, err)
 				}
 				return debugPrint(ui, ui.OutputBytes(resp))
 			}
 
-			bks, err := openbd.DefaultClient().LookupBooks(args)
+			bks, err := openbd.DefaultClient().LookupBooksContext(cmd.Context(), args)
 			if err != nil {
 				return debugPrint(ui, err)
 			}
@@ -44,7 +44,7 @@ func newLookupCmd(ui *rwi.RWI) *cobra.Command {
 	return lookupCmd
 }
 
-/* Copyright 2019,2020 Spiegel
+/* Copyright 2019-2021 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

client.go

@@ -3,12 +3,11 @@ package openbd
 import (
 	"context"
 	"fmt"
-	"io"
-	"net/http"
 	"net/url"
 	"strings"
 
 	"github.com/spiegel-im-spiegel/errs"
+	"github.com/spiegel-im-spiegel/fetch"
 )
 
 const (
@@ -18,21 +17,30 @@ const (
 //Client is http.Client for Aozora API Server
 type Client struct {
 	server *Server
-	client *http.Client
-	ctx    context.Context
+	client fetch.Client
 }
 
 //LookupBooksRaw gets books data (raw data)
 func (c *Client) LookupBooksRaw(ids []string) ([]byte, error) {
+	return c.LookupBooksRawContext(context.Background(), ids)
+}
+
+//LookupBooks gets books data (struct data)
+func (c *Client) LookupBooks(ids []string) ([]Book, error) {
+	return c.LookupBooksContext(context.Background(), ids)
+}
+
+//LookupBooksRawContext gets books data with context.Context. (raw data)
+func (c *Client) LookupBooksRawContext(ctx context.Context, ids []string) ([]byte, error) {
 	params := url.Values{}
 	params.Set("isbn", strings.Join(ids, ","))
-	b, err := c.get(c.makeLookupCommand(params))
+	b, err := c.get(ctx, c.makeLookupCommand(params))
 	return b, errs.Wrap(err)
 }
 
-//LookupBooks gets books data (struct data)
-func (c *Client) LookupBooks(ids []string) ([]Book, error) {
-	b, err := c.LookupBooksRaw(ids)
+//LookupBooksRawContext gets books data with context.Context. (struct data)
+func (c *Client) LookupBooksContext(ctx context.Context, ids []string) ([]Book, error) {
+	b, err := c.LookupBooksRawContext(ctx, ids)
 	if err != nil {
 		return nil, errs.Wrap(err)
 	}
@@ -41,6 +49,9 @@ func (c *Client) LookupBooks(ids []string) ([]Book, error) {
 }
 
 func (c *Client) makeLookupCommand(v url.Values) *url.URL {
+	if c == nil {
+		return nil
+	}
 	u := c.server.URL()
 	u.Path = fmt.Sprintf("/%v/%v", c.apiDir(), "get")
 	u.RawQuery = v.Encode()
@@ -51,28 +62,18 @@ func (c *Client) apiDir() string {
 	return defaultAPIVersion
 }
 
-func (c *Client) get(u *url.URL) ([]byte, error) {
-	req, err := http.NewRequestWithContext(c.ctx, "GET", u.String(), nil)
-	if err != nil {
-		return nil, errs.Wrap(err, errs.WithContext("url", u.String()))
+func (c *Client) get(ctx context.Context, u *url.URL) ([]byte, error) {
+	if c == nil {
+		return nil, errs.Wrap(fetch.ErrNullPointer)
 	}
-	resp, err := c.client.Do(req)
+	resp, err := c.client.Get(u, fetch.WithContext(ctx))
 	if err != nil {
 		return nil, errs.Wrap(err, errs.WithContext("url", u.String()))
 	}
-	defer resp.Body.Close()
-
-	if !(resp.StatusCode != 0 && resp.StatusCode < http.StatusBadRequest) {
-		return nil, errs.Wrap(ErrHTTPStatus, errs.WithContext("url", u.String()), errs.WithContext("status", resp.Status))
-	}
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return body, errs.Wrap(err, errs.WithContext("url", u.String()))
-	}
-	return body, nil
+	return resp.DumpBodyAndClose()
 }
 
-/* Copyright 2019 Spiegel
+/* Copyright 2019-2021 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

go.mod

@@ -1,9 +1,10 @@
 module github.com/spiegel-im-spiegel/openbd-api
 
-go 1.15
+go 1.16
 
 require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spiegel-im-spiegel/errs v1.0.2
+	github.com/spiegel-im-spiegel/fetch v0.2.3
 	github.com/spiegel-im-spiegel/gocli v0.10.4
 )

go.sum

@@ -156,6 +156,8 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spiegel-im-spiegel/errs v1.0.2 h1:v4amEwRDqRWjKHOILQnJSovYhZ4ZttEnBBXNXEzS6Sc=
 github.com/spiegel-im-spiegel/errs v1.0.2/go.mod h1:UoasJYYujMcdkbT9USv8dfZWoMyaY3btqQxoLJImw0A=
+github.com/spiegel-im-spiegel/fetch v0.2.3 h1:Zh5rHvOjfC81rxKvtUD21JT609smds+BRh+H84s8qEw=
+github.com/spiegel-im-spiegel/fetch v0.2.3/go.mod h1:ePIXxdC9OvSarXEO6HW1MgQwtBaKQo0qgDLOhKFXkQ0=
 github.com/spiegel-im-spiegel/gocli v0.10.4 h1:aoAWdiQ4hjNxmEod4EeTZTcjdCJcrNOwgHBs5BQYnEQ=
 github.com/spiegel-im-spiegel/gocli v0.10.4/go.mod h1:ffI3zoggRyLOZ+IIgaVN8WVMUwfIwfvCEd/0Yl/PZ98=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

server.go

@@ -4,6 +4,8 @@ import (
 	"context"
 	"net/http"
 	"net/url"
+
+	"github.com/spiegel-im-spiegel/fetch"
 )
 
 const (
@@ -63,37 +65,26 @@ func (s *Server) CreateClient(opts ...ClientOptFunc) *Client {
 	if s == nil {
 		s = New()
 	}
-	cli := &Client{
-		server: s,
-		client: nil,
-		ctx:    nil,
-	}
+	cli := &Client{server: s}
 	for _, opt := range opts {
 		opt(cli)
 	}
 	if cli.client == nil {
-		cli.client = http.DefaultClient
-	}
-	if cli.ctx == nil {
-		cli.ctx = context.Background()
+		cli.client = fetch.New()
 	}
 	return cli
 }
 
-//WithContext returns function for setting context.Context
+//WithContext is dummy function. Because this function is deprecated.
 func WithContext(ctx context.Context) ClientOptFunc {
-	return func(c *Client) {
-		if c != nil {
-			c.ctx = ctx
-		}
-	}
+	return func(c *Client) {}
 }
 
 //WithHttpClient returns function for setting http.Client
 func WithHttpClient(client *http.Client) ClientOptFunc {
 	return func(c *Client) {
 		if c != nil {
-			c.client = client
+			c.client = fetch.New(fetch.WithHTTPClient(client))
 		}
 	}
 }
@@ -103,7 +94,7 @@ func DefaultClient() *Client {
 	return New().CreateClient()
 }
 
-/* Copyright 2019 Spiegel
+/* Copyright 2019-2021 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

test-all.sh

@@ -2,5 +2,5 @@
 go mod verify || exit 1
 go mod tidy -v || exit 1
 depm list --json | docker run --rm -i sonatypecommunity/nancy:latest sleuth -n || exit 1
-docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.37.1 golangci-lint run --enable gosec ./... || exit 1
+docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.38.0 golangci-lint run --enable gosec ./... || exit 1
 go test ./...