-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(problems): improve the problems responses and controls
- Loading branch information
1 parent
4caac61
commit 9a78f7b
Showing
4 changed files
with
252 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| package utils | ||
|
|
||
| import ( | ||
| "mime" | ||
| "net/http" | ||
| "sort" | ||
| "strconv" | ||
| "strings" | ||
| ) | ||
|
|
||
| type acceptPair struct { | ||
| media string | ||
| quality float64 | ||
| } | ||
|
|
||
| type Accept struct { | ||
| values []acceptPair | ||
| } | ||
|
|
||
| func ParseAccept(request *http.Request) Accept { | ||
| accept := Accept{ | ||
| values: make([]acceptPair, 0), | ||
| } | ||
|
|
||
| for _, header := range request.Header.Values("Accept") { | ||
| for _, line := range strings.Split(header, ",") { | ||
| media, parameters, err := mime.ParseMediaType(line) | ||
|
|
||
| if err != nil { | ||
| continue | ||
| } | ||
|
|
||
| quality := 1.0 | ||
|
|
||
| if param, ok := parameters["q"]; ok { | ||
| if q, err := strconv.ParseFloat(param, 64); err == nil { | ||
| quality = q | ||
| } | ||
| } | ||
|
|
||
| accept.values = append(accept.values, acceptPair{ | ||
| media: media, | ||
| quality: quality, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| return accept | ||
| } | ||
|
|
||
| func (accept Accept) find(media string) (acceptPair, bool) { | ||
| for _, pair := range accept.values { | ||
| if media == pair.media { | ||
| return pair, true | ||
| } | ||
|
|
||
| // Test for wildcard in media type | ||
| if strings.Contains(media, "/*") { | ||
| // Compare only the first part. | ||
| if trimmed := strings.TrimSuffix(media, "/*"); strings.HasPrefix(pair.media, trimmed) { | ||
| return pair, true | ||
| } | ||
| } | ||
|
|
||
| // Test for wildcard in accept media type | ||
| if strings.Contains(pair.media, "/*") { | ||
| // Compare only the first part. | ||
| if trimmed := strings.TrimSuffix(pair.media, "/*"); strings.HasPrefix(media, trimmed) { | ||
| return pair, true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return acceptPair{}, false | ||
| } | ||
|
|
||
| func (accept Accept) Accepts(media string) bool { | ||
| _, found := accept.find(media) | ||
|
|
||
| return found | ||
| } | ||
|
|
||
| func (accept Accept) Quality(media string) float64 { | ||
| if pair, found := accept.find(media); found { | ||
| return pair.quality | ||
| } | ||
|
|
||
| return 0 | ||
| } | ||
|
|
||
| func (accept Accept) Order() []string { | ||
| keys := make([]string, len(accept.values)) | ||
|
|
||
| for i, pair := range accept.values { | ||
| keys[i] = pair.media | ||
| } | ||
|
|
||
| sort.SliceStable(keys, func(i, j int) bool { | ||
| return accept.values[i].quality > accept.values[j].quality | ||
| }) | ||
|
|
||
| return keys | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| package utils_test | ||
|
|
||
| import ( | ||
| "net/http" | ||
| "testing" | ||
|
|
||
| "github.com/studiolambda/akumu/utils" | ||
| ) | ||
|
|
||
| func TestAcceptAccepts(t *testing.T) { | ||
| request, err := http.NewRequest("GET", "/", nil) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("failed to create request: %s", err) | ||
| } | ||
|
|
||
| request.Header.Add("Accept", "application/json, text/*") | ||
|
|
||
| accept := utils.ParseAccept(request) | ||
|
|
||
| if expected := "application/json"; !accept.Accepts(expected) { | ||
| t.Fatalf("failed to accept media type: %s", expected) | ||
| } | ||
|
|
||
| if expected := "text/html"; !accept.Accepts(expected) { | ||
| t.Fatalf("failed to accept media type: %s", expected) | ||
| } | ||
|
|
||
| if expected := "text/*"; !accept.Accepts(expected) { | ||
| t.Fatalf("failed to accept media type: %s", expected) | ||
| } | ||
|
|
||
| if expected := "foo/bar"; accept.Accepts(expected) { | ||
| t.Fatalf("failed to not accept media type: %s", expected) | ||
| } | ||
| } | ||
|
|
||
| func TestAcceptAcceptsWithMultipleHeaderValues(t *testing.T) { | ||
| request, err := http.NewRequest("GET", "/", nil) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("failed to create request: %s", err) | ||
| } | ||
|
|
||
| request.Header.Add("Accept", "application/json") | ||
| request.Header.Add("Accept", "text/*") | ||
|
|
||
| accept := utils.ParseAccept(request) | ||
|
|
||
| if expected := "application/json"; !accept.Accepts(expected) { | ||
| t.Fatalf("failed to accept media type: %s", expected) | ||
| } | ||
|
|
||
| if expected := "text/html"; !accept.Accepts(expected) { | ||
| t.Fatalf("failed to accept media type: %s", expected) | ||
| } | ||
|
|
||
| if expected := "text/*"; !accept.Accepts(expected) { | ||
| t.Fatalf("failed to accept media type: %s", expected) | ||
| } | ||
|
|
||
| if expected := "foo/bar"; accept.Accepts(expected) { | ||
| t.Fatalf("failed to not accept media type: %s", expected) | ||
| } | ||
| } | ||
|
|
||
| func TestAcceptOrder(t *testing.T) { | ||
| request, err := http.NewRequest("GET", "/", nil) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("failed to create request: %s", err) | ||
| } | ||
|
|
||
| request.Header.Add("Accept", "application/json, text/*, foo/bar;q=0.3, another/*;q=0.4, bar/baz;q=0.5") | ||
|
|
||
| accept := utils.ParseAccept(request) | ||
| order := accept.Order() | ||
|
|
||
| if expected := 5; expected != len(order) { | ||
| t.Fatalf("failed order len: %d, expected %d", len(order), expected) | ||
| } | ||
|
|
||
| if expected := "application/json"; expected != order[0] { | ||
| t.Fatalf("failed order element: %s, expected %s", order[0], expected) | ||
| } | ||
|
|
||
| if expected := "text/*"; expected != order[1] { | ||
| t.Fatalf("failed order element: %s, expected %s", order[1], expected) | ||
| } | ||
|
|
||
| if expected := "bar/baz"; expected != order[2] { | ||
| t.Fatalf("failed order element: %s, expected %s", order[2], expected) | ||
| } | ||
|
|
||
| if expected := "another/*"; expected != order[3] { | ||
| t.Fatalf("failed order element: %s, expected %s", order[3], expected) | ||
| } | ||
|
|
||
| if expected := "foo/bar"; expected != order[4] { | ||
| t.Fatalf("failed order element: %s, expected %s", order[4], expected) | ||
| } | ||
| } |