Merge pull request #7 from issmirnov/optimizations

convert loop to map lookup

text.go

@@ -51,24 +51,23 @@ func expand(c *gabs.Container, token *list.Element, res *bytes.Buffer) {
  }
  res.WriteString("/")
  children, _ := c.ChildrenMap()
- for key, child := range children {
- if key == token.Value {
- p, skip, err := getPrefix(child)
- if err != nil {
- fmt.Println(err.Error())
+ child, ok := children[token.Value.(string)]
+ if ok {
+ p, skip, err := getPrefix(child)
+ if err != nil {
+ fmt.Println(err.Error())
+ return
+ }
+ res.WriteString(p)
+ if skip {
+ token = token.Next()
+ if token == nil {
  return
  }
- res.WriteString(p)
- if skip {
- token = token.Next()
- if token == nil {
- return
- }
- res.WriteString(token.Value.(string))
- }
- expand(child, token.Next(), res)
- return
+ res.WriteString(token.Value.(string))
  }
+ expand(child, token.Next(), res)
+ return
  }
  // handle base case if no keys matched
  res.WriteString(token.Value.(string))

web_test.go

@@ -133,8 +133,8 @@ func BenchmarkIndexHandler(b *testing.B) {
  context := &context{config: c}
  appHandler := &ctxWrapper{context, IndexHandler}
  handler := http.Handler(appHandler)
- req, _ := http.NewRequest("GET", "/p", nil)
- req.Host = "sd"
+ req, _ := http.NewRequest("GET", "/z", nil)
+ req.Host = "g"
  rr := httptest.NewRecorder()
  for n := 0; n < b.N; n++ {
  handler.ServeHTTP(rr, req)