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.

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

Handle condition for slice of Renderer #31

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 24 additions & 5 deletions render.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,20 +70,39 @@ func renderer(w http.ResponseWriter, r *http.Request, v Renderer) error {
return nil
}

// For structs, we call Render on each field that implements Renderer
for i := 0; i < rv.NumField(); i++ {
f := rv.Field(i)
cr := func(f reflect.Value) error {
if f.Type().Implements(rendererType) {

if isNil(f) {
continue
return nil
}

fv := f.Interface().(Renderer)
if err := renderer(w, r, fv); err != nil {
return err
}
} else {
}
return nil
}

// For structs, we call Render on each field that implements Renderer
for i := 0; i < rv.NumField(); i++ {
f := rv.Field(i)

if f.Kind() == reflect.Slice {
for j := 0; j < f.Len(); j++ {
g := f.Index(j)

err := cr(g)
if err != nil {
return err
}
}
} else {
err := cr(f)
if err != nil {
return err
}
}
}

Expand Down
119 changes: 119 additions & 0 deletions render_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
package render

import (
"bufio"
"fmt"
"net/http"
"net/http/httptest"
"reflect"
"strings"
"testing"
)

type basicRenderInterface struct {
RenderStruct Renderer
}

func (h *basicRenderInterface) Render(w http.ResponseWriter, r *http.Request) error {
return nil
}

type baseRenderInterface struct {
PtrVal *string
NoRenderStruct interface{}
RenderList []Renderer
RenderStruct Renderer
}

func (h *baseRenderInterface) Render(w http.ResponseWriter, r *http.Request) error {
return nil
}

type otherRenderInterface struct {
Value int
}

func (o *otherRenderInterface) Render(w http.ResponseWriter, r *http.Request) error {
fmt.Fprintf(w, "%d", o.Value)
return nil
}

func TestRendererInterface(t *testing.T) {
rv := reflect.ValueOf(newTestStruct())
if !rv.Type().Implements(rendererType) {
t.Fatal("test element should implement Renderer interface")
}
}

func TestBasicRenderer(t *testing.T) {
h := &basicRenderInterface{
RenderStruct: &otherRenderInterface{Value: 2},
}

// declare the request
r := req(t, postReq("test"))

// create the response recorder
w := httptest.NewRecorder()

err := renderer(w, r, h)
if err != nil {
t.Errorf("error encountered: %s", err)
}

response := fmt.Sprintf("%s", w.Body)
if response != "2" {
t.Errorf("unexpected response %s; expected 2", response)
}
}

func TestRenderer(t *testing.T) {
h := newTestStruct()

// declare the request
r := req(t, postReq("test"))

// create the response recorder
w := httptest.NewRecorder()

err := renderer(w, r, h)
if err != nil {
t.Errorf("error encountered: %s", err)
}

response := fmt.Sprintf("%s", w.Body)
if response != "123" {
t.Errorf("unexpected response %s; expected 123", response)
}
}

func newTestStruct() *baseRenderInterface {
return &baseRenderInterface{
PtrVal: nil,
NoRenderStruct: otherRenderInterface{},
RenderList: []Renderer{
&otherRenderInterface{Value: 1},
&otherRenderInterface{Value: 2},
},
RenderStruct: &otherRenderInterface{Value: 3},
}
}

func req(t testing.TB, v string) *http.Request {
req, err := http.ReadRequest(bufio.NewReader(strings.NewReader(v)))
if err != nil {
t.Fatal(err)
}
return req
}

func postReq(cont string) string {
post :=
`POST / HTTP/1.1
Content-Type: application/vnd.api+json
User-Agent: mockagent
Content-Length: %d

%s`
return fmt.Sprintf(post, len(cont), cont)
}