remove QueryParams(...) function from RequestVars

- storing was no faster than reprising every time and now don't have to incur the memory to store; made the implementation simpler and a little faster.

Author: Dean Karn

README.md

@@ -1,6 +1,6 @@
 ##Pure
 <img align="right" src="https://raw.githubusercontent.com/go-playground/pure/master/logo.png">
-![Project status](https://img.shields.io/badge/version-2.7.0-green.svg)
+![Project status](https://img.shields.io/badge/version-3.0.0-green.svg)
 [![Build Status](https://semaphoreci.com/api/v1/joeybloggs/pure/branches/master/badge.svg)](https://semaphoreci.com/joeybloggs/pure)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/pure/badge.svg?branch=master)](https://coveralls.io/github/go-playground/pure?branch=master)
 [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/pure)](https://goreportcard.com/report/github.com/go-playground/pure)
@@ -166,22 +166,22 @@ go test -bench=. -benchmem=true
 #Static Routes: 157
    Pure: 21224 Bytes
 
-BenchmarkPure_Param        	10000000	       161 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_Param5       	10000000	       205 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_Param20      	 5000000	       356 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_ParamWrite   	10000000	       215 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_GithubStatic 	30000000	        47.1 ns/op	       0 B/op	       0 allocs/op
-BenchmarkPure_GithubParam  	10000000	       227 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_GithubAll    	   30000	     42284 ns/op	   40082 B/op	     167 allocs/op
-BenchmarkPure_GPlusStatic  	50000000	        31.7 ns/op	       0 B/op	       0 allocs/op
-BenchmarkPure_GPlusParam   	10000000	       178 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_GPlus2Params 	10000000	       193 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_GPlusAll     	 1000000	      2159 ns/op	    2640 B/op	      11 allocs/op
-BenchmarkPure_ParseStatic  	50000000	        30.9 ns/op	       0 B/op	       0 allocs/op
-BenchmarkPure_ParseParam   	10000000	       159 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_Parse2Params 	10000000	       174 ns/op	     240 B/op	       1 allocs/op
-BenchmarkPure_ParseAll     	  500000	      3290 ns/op	    3840 B/op	      16 allocs/op
-BenchmarkPure_StaticAll    	  200000	      9964 ns/op	       0 B/op	       0 allocs/op
+BenchmarkPure_Param        	10000000	       156 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_Param5       	10000000	       199 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_Param20      	 5000000	       349 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_ParamWrite   	10000000	       209 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_GithubStatic 	30000000	        45.4 ns/op	       0 B/op	       0 allocs/op
+BenchmarkPure_GithubParam  	10000000	       219 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_GithubAll    	   30000	     40244 ns/op	   40082 B/op	     167 allocs/op
+BenchmarkPure_GPlusStatic  	50000000	        30.4 ns/op	       0 B/op	       0 allocs/op
+BenchmarkPure_GPlusParam   	10000000	       173 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_GPlus2Params 	10000000	       190 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_GPlusAll     	 1000000	      2108 ns/op	    2640 B/op	      11 allocs/op
+BenchmarkPure_ParseStatic  	50000000	        29.9 ns/op	       0 B/op	       0 allocs/op
+BenchmarkPure_ParseParam   	10000000	       154 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_Parse2Params 	10000000	       167 ns/op	     240 B/op	       1 allocs/op
+BenchmarkPure_ParseAll     	  500000	      3209 ns/op	    3840 B/op	      16 allocs/op
+BenchmarkPure_StaticAll    	  200000	      9881 ns/op	       0 B/op	       0 allocs/op
 ```
 
 Package Versioning

helpers.go

@@ -15,7 +15,7 @@ func RequestVars(r *http.Request) ReqVars {
 
 	rv := r.Context().Value(defaultContextIdentifier)
 	if rv == nil {
-		return &requestVars{r: r}
+		return new(requestVars)
 	}
 
 	return rv.(*requestVars)

helpers_test.go

@@ -45,30 +45,6 @@ func TestNoRequestVars(t *testing.T) {
 	Equal(t, code, http.StatusOK)
 }
 
-func TestQueryParams(t *testing.T) {
-
-	qp1 := func(next http.HandlerFunc) http.HandlerFunc {
-		return func(w http.ResponseWriter, r *http.Request) {
-			rv := RequestVars(r)
-			w.Write([]byte(rv.QueryParams().Get("test")))
-			next(w, r)
-		}
-	}
-
-	qp2 := func(w http.ResponseWriter, r *http.Request) {
-		rv := RequestVars(r)
-		w.Write([]byte(rv.QueryParams().Get("test")))
-	}
-
-	p := New()
-	p.Use(qp1)
-	p.Get("/home/:test", qp2)
-
-	code, body := request(http.MethodGet, "/home/testval?test=val", p)
-	Equal(t, code, http.StatusOK)
-	Equal(t, body, "valval")
-}
-
 func TestDecode(t *testing.T) {
 
 	type TestStruct struct {

pure.go

@@ -303,7 +303,6 @@ END:
 	if rv != nil {
 
 		rv.formParsed = false
-		rv.r = r
 
 		// store on context
 		r = r.WithContext(rv.ctx)
@@ -312,8 +311,6 @@ END:
 	h(w, r)
 
 	if rv != nil {
-		rv.queryParams = nil
-		rv.r = nil
 		p.pool.Put(rv)
 	}
 }

request_vars.go

@@ -1,40 +1,20 @@
 package pure
 
-import (
-	"context"
-	"net/http"
-	"net/url"
-)
+import "context"
 
 // ReqVars is the interface of request scoped variables
 // tracked by pure
 type ReqVars interface {
 	URLParam(pname string) string
-	QueryParams() url.Values
 }
 
 type requestVars struct {
-	r           *http.Request
-	ctx         context.Context // holds a copy of it's parent requestVars
-	params      Params
-	queryParams url.Values
-	formParsed  bool
+	ctx        context.Context // holds a copy of it's parent requestVars
+	params     Params
+	formParsed bool
 }
 
 // Params returns the current routes Params
 func (r *requestVars) URLParam(pname string) string {
 	return r.params.Get(pname)
 }
-
-// QueryParams returns the http.Request.URL Query Params
-// reason for storing is if http.Request.URL.Query() is called
-// more than once, it reparses all over again creating a new map and all.
-// callin this will cache and on subsequent call will not reparse
-func (r *requestVars) QueryParams() url.Values {
-
-	if r.queryParams == nil {
-		r.queryParams = r.r.URL.Query()
-	}
-
-	return r.queryParams
-}