diff options
author | Doug Black <dblack@twilio.com> | 2014-01-26 09:31:03 -0800 |
---|---|---|
committer | Doug Black <dblack@twilio.com> | 2014-01-26 09:31:03 -0800 |
commit | f20e28cf6057f85316d3241346d88f500cca2adc (patch) | |
tree | 61af163ad2588e6c8d24d6286646c16aeaae3aa8 | |
parent | cleaner (diff) | |
download | sleepy-f20e28cf6057f85316d3241346d88f500cca2adc.tar.gz sleepy-f20e28cf6057f85316d3241346d88f500cca2adc.tar.bz2 sleepy-f20e28cf6057f85316d3241346d88f500cca2adc.zip |
fixes from comments
-rw-r--r-- | core.go | 20 | ||||
-rw-r--r-- | http.go | 8 | ||||
-rw-r--r-- | tests/items.go | 2 | ||||
-rw-r--r-- | tests/test.go | 2 |
4 files changed, 15 insertions, 17 deletions
@@ -15,10 +15,10 @@ const ( ) type Resource interface { - Get(values ...url.Values) (int, interface{}) - Post(values ...url.Values) (int, interface{}) - Put(values ...url.Values) (int, interface{}) - Delete(values ...url.Values) (int, interface{}) + Get(values url.Values) (int, interface{}) + Post(values url.Values) (int, interface{}) + Put(values url.Values) (int, interface{}) + Delete(values url.Values) (int, interface{}) } type Api struct{} @@ -56,14 +56,12 @@ func (api *Api) requestHandler(resource Resource) HandleFunc { return } - content, err := json.Marshal(data) - if err != nil { - api.Abort(rw, 500) - return - } - + responseWriter := json.NewEncoder(rw) rw.WriteHeader(code) - rw.Write(content) + if responseWriter.Encode(data) != nil { + api.Abort(rw, 500) + return + } } } @@ -11,18 +11,18 @@ type ( DeleteNotSupported struct{} ) -func (GetNotSupported) Get(values ...url.Values) (int, interface{}) { +func (GetNotSupported) Get(values url.Values) (int, interface{}) { return 405, "" } -func (PostNotSupported) Post(values ...url.Values) (int, interface{}) { +func (PostNotSupported) Post(values url.Values) (int, interface{}) { return 405, "" } -func (PutNotSupported) Put(values ...url.Values) (int, interface{}) { +func (PutNotSupported) Put(values url.Values) (int, interface{}) { return 405, "" } -func (DeleteNotSupported) Delete(values ...url.Values) (int, interface{}) { +func (DeleteNotSupported) Delete(values url.Values) (int, interface{}) { return 405, "" } diff --git a/tests/items.go b/tests/items.go index ee86c3e..d39cae9 100644 --- a/tests/items.go +++ b/tests/items.go @@ -11,7 +11,7 @@ type Item struct { sleepy.DeleteNotSupported } -func (item Item) Get(values ...url.Values) (int, interface{}) { +func (item Item) Get(values url.Values) (int, interface{}) { items := []string{"item1", "item2"} data := map[string][]string{"items": items} diff --git a/tests/test.go b/tests/test.go index d225072..070d4b6 100644 --- a/tests/test.go +++ b/tests/test.go @@ -11,7 +11,7 @@ type Bar struct { sleepy.DeleteNotSupported } -func (b Bar) Get(values ...url.Values) (int, interface{}) { +func (b Bar) Get(values url.Values) (int, interface{}) { return 200, map[string]string{"hello": "goodbye"} } |