mirror
/
websocket
mirror of https://github.com/gorilla/websocket.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Use WriteJSON and ReadJSON on Conn struct.

This commit is contained in:
Craig Jackson 2013-10-26 01:13:32 -07:00
parent 273ecadfca
commit bc91df87fe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
json.go
View File

@ -12,7 +12,7 @@ import (
// //
// See the documentation for encoding/json Marshal for details about the // See the documentation for encoding/json Marshal for details about the
// conversion of Go values to JSON. // conversion of Go values to JSON.
func WriteJSON(c *Conn, v interface{}) error { func (c *Conn) WriteJSON(v interface{}) error {
w, err := c.NextWriter(TextMessage) w, err := c.NextWriter(TextMessage)
if err != nil { if err != nil {
return err return err
@ -30,7 +30,7 @@ func WriteJSON(c *Conn, v interface{}) error {
// //
// See the documentation for the encoding/json Marshal function for details // See the documentation for the encoding/json Marshal function for details
// about the conversion of JSON to a Go value. // about the conversion of JSON to a Go value.
func ReadJSON(c *Conn, v interface{}) error { func (c *Conn) ReadJSON(v interface{}) error {
_, r, err := c.NextReader() _, r, err := c.NextReader()
if err != nil { if err != nil {
return err return err

4
json_test.go
View File

@ -23,11 +23,11 @@ func TestJSON(t *testing.T) {
expect.A = 1 expect.A = 1
expect.B = "hello" expect.B = "hello"
if err := WriteJSON(wc, &expect); err != nil { if err := wc.WriteJSON(&expect); err != nil {
t.Fatal("write", err) t.Fatal("write", err)
} }
if err := ReadJSON(rc, &actual); err != nil { if err := rc.ReadJSON(&actual); err != nil {
t.Fatal("read", err) t.Fatal("read", err)
} }