Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add context support, ErrUnauthorized and Doer interface for http.Client #4

Merged
merged 13 commits into from
Oct 15, 2016
Merged

Add context support, ErrUnauthorized and Doer interface for http.Client #4

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6b4902a
Add Doer interface, DoerFunc type and replace http.Client with Doer
Sep 20, 2016
9a6f5cb
Add Errors type and made it error instance to return all errors from …
Sep 20, 2016
d3f78fd
Add ErrUnauthorized on 401 response status code and test it
Sep 20, 2016
6db1851
Add context.Context support for all operations and fix tests
Sep 20, 2016
e210494
Extend request function to allow do x-www-form-urlencoded requests
Sep 20, 2016
549df79
Add CreateTask function and test it
Sep 20, 2016
98380c1
Change go version to 1.7 in travis.yml
Sep 20, 2016
12d49ff
Add DueOn and DueAt fields to Task struct
Sep 20, 2016
4ad4491
Add space after two slashes for all godocs
Sep 25, 2016
5a94976
Add godoc for Errors type
Sep 25, 2016
67b650e
Improve godoc for request function, add info about form argument
Sep 25, 2016
84ac3b0
Remove global context in tests
Sep 25, 2016
84152d5
Add missing periods to end of sentences.
dmitshur Sep 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions asana/asana.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"io"
"net/http"
"net/url"
"strings"
"time"

"github.com/google/go-querystring/query"
Expand Down Expand Up @@ -124,13 +125,15 @@ type (

Response struct {
Data interface{} `json:"data,omitempty"`
Errors []Error `json:"errors,omitempty"`
Errors Errors `json:"errors,omitempty"`
}

Error struct {
Phrase string `json:"phrase,omitempty"`
Message string `json:"message,omitempty"`
}

Errors []Error
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any restrictions on Errors? Can it contain 0 elements? 1 element?

)

func (f DoerFunc) Do(req *http.Request) (resp *http.Response, err error) {
Expand All @@ -141,6 +144,14 @@ func (e Error) Error() string {
return fmt.Sprintf("%v - %v", e.Message, e.Phrase)
}

func (e Errors) Error() string {
var sErrs []string
for _, err := range e {
sErrs = append(sErrs, err.Error())
}
return strings.Join(sErrs, ", ")
}

//NewClient created new asana client with doer.
//If doer is nil then http.DefaultClient used intead.
func NewClient(doer Doer) *Client {
Expand Down Expand Up @@ -272,7 +283,7 @@ func (c *Client) request(method string, path string, data interface{}, opt *Filt
res := &Response{Data: v}
err = json.NewDecoder(resp.Body).Decode(res)
if len(res.Errors) > 0 {
return res.Errors[0]
return res.Errors
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to this, at least 1 element. I think it's worth documenting that for the Errors type, so users will know to always expect either at least one error there.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are correct, add godoc for Errors type

}
return err
}
Expand Down