fixed issue with vars function

Author: KenWilliamson

coverage.out

@@ -1,4 +1,98 @@
 mode: set
+github.com/GolangToolKits/grrt/router.go:29.25,34.2 4 1
+github.com/GolangToolKits/grrt/router.go:37.46,39.49 2 1
+github.com/GolangToolKits/grrt/router.go:42.2,42.12 1 1
+github.com/GolangToolKits/grrt/router.go:39.49,41.3 1 1
+github.com/GolangToolKits/grrt/router.go:46.72,49.2 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:27.32,31.2 3 1
+github.com/GolangToolKits/grrt/reqRoute.go:34.56,35.14 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:38.2,38.10 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:35.14,37.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:42.82,44.2 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:47.41,48.20 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:55.2,55.10 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:48.20,50.31 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:53.3,53.18 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:50.31,52.4 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:59.48,60.23 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:65.2,65.10 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:60.23,64.3 3 1
+github.com/GolangToolKits/grrt/reqRoute.go:69.48,71.23 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:74.2,75.10 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:71.23,73.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:79.43,81.2 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:84.51,86.26 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:96.2,96.12 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:86.26,88.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:88.8,89.33 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:89.33,90.15 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:90.15,92.10 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:100.42,102.2 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:105.43,107.27 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:110.2,110.12 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:107.27,109.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:119.46,121.2 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:124.37,126.2 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:129.39,131.2 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:134.44,136.2 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:139.36,141.2 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:143.45,145.73 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:150.2,150.12 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:145.73,147.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:147.8,149.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:153.47,158.22 5 1
+github.com/GolangToolKits/grrt/reqRoute.go:165.2,165.13 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:170.2,170.12 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:158.22,159.16 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:159.16,161.4 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:161.9,161.25 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:161.25,163.4 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:165.13,167.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:167.8,169.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:173.55,180.22 6 1
+github.com/GolangToolKits/grrt/reqRoute.go:196.2,196.12 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:180.22,181.31 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:188.3,188.31 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:181.31,184.9 3 1
+github.com/GolangToolKits/grrt/reqRoute.go:185.9,185.21 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:185.21,187.4 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:188.31,191.9 3 1
+github.com/GolangToolKits/grrt/reqRoute.go:192.9,192.21 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:192.21,194.4 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:199.50,203.22 4 1
+github.com/GolangToolKits/grrt/reqRoute.go:221.2,221.12 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:203.22,204.24 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:204.24,207.9 3 1
+github.com/GolangToolKits/grrt/reqRoute.go:208.9,208.20 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:208.20,209.32 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:209.32,212.10 3 1
+github.com/GolangToolKits/grrt/reqRoute.go:213.10,213.39 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:213.39,215.5 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:215.10,215.39 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:215.39,218.5 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:224.47,228.22 4 1
+github.com/GolangToolKits/grrt/reqRoute.go:243.2,243.12 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:228.22,229.24 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:229.24,232.9 3 1
+github.com/GolangToolKits/grrt/reqRoute.go:233.9,233.20 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:233.20,234.32 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:234.32,237.10 3 1
+github.com/GolangToolKits/grrt/reqRoute.go:238.10,238.39 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:238.39,240.5 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:246.73,255.22 8 1
+github.com/GolangToolKits/grrt/reqRoute.go:272.2,272.14 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:280.2,280.19 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:255.22,256.14 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:262.3,262.14 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:265.3,265.30 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:256.14,258.17 2 1
+github.com/GolangToolKits/grrt/reqRoute.go:258.17,260.5 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:262.14,264.4 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:265.30,270.4 4 1
+github.com/GolangToolKits/grrt/reqRoute.go:272.14,273.41 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:273.41,275.4 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:277.8,279.3 1 1
+github.com/GolangToolKits/grrt/reqRoute.go:283.55,287.2 3 1
 github.com/GolangToolKits/grrt/reqRouter.go:36.71,40.53 1 1
 github.com/GolangToolKits/grrt/reqRouter.go:40.53,42.3 1 1
 github.com/GolangToolKits/grrt/reqRouter.go:42.8,45.16 3 1
@@ -59,97 +153,3 @@ github.com/GolangToolKits/grrt/reqRouter.go:214.96,216.36 2 1
 github.com/GolangToolKits/grrt/reqRouter.go:221.2,222.27 2 1
 github.com/GolangToolKits/grrt/reqRouter.go:216.36,217.32 1 1
 github.com/GolangToolKits/grrt/reqRouter.go:217.32,219.4 1 1
-github.com/GolangToolKits/grrt/router.go:29.25,34.2 4 1
-github.com/GolangToolKits/grrt/router.go:37.46,39.49 2 1
-github.com/GolangToolKits/grrt/router.go:42.2,42.12 1 1
-github.com/GolangToolKits/grrt/router.go:39.49,41.3 1 1
-github.com/GolangToolKits/grrt/router.go:46.72,49.2 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:28.32,32.2 3 1
-github.com/GolangToolKits/grrt/reqRoute.go:35.56,36.14 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:39.2,39.10 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:36.14,38.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:43.82,45.2 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:48.41,49.20 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:56.2,56.10 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:49.20,51.31 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:54.3,54.18 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:51.31,53.4 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:60.48,61.23 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:66.2,66.10 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:61.23,65.3 3 1
-github.com/GolangToolKits/grrt/reqRoute.go:70.48,72.23 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:75.2,76.10 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:72.23,74.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:80.43,82.2 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:85.51,87.26 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:97.2,97.12 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:87.26,89.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:89.8,90.33 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:90.33,91.15 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:91.15,93.10 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:101.42,103.2 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:106.43,108.27 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:111.2,111.12 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:108.27,110.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:120.46,122.2 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:125.37,127.2 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:130.39,132.2 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:135.44,137.2 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:140.36,142.2 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:144.45,146.73 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:151.2,151.12 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:146.73,148.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:148.8,150.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:154.47,159.22 5 1
-github.com/GolangToolKits/grrt/reqRoute.go:166.2,166.13 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:171.2,171.12 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:159.22,160.16 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:160.16,162.4 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:162.9,162.25 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:162.25,164.4 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:166.13,168.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:168.8,170.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:174.55,181.22 6 1
-github.com/GolangToolKits/grrt/reqRoute.go:197.2,197.12 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:181.22,182.31 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:189.3,189.31 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:182.31,185.9 3 1
-github.com/GolangToolKits/grrt/reqRoute.go:186.9,186.21 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:186.21,188.4 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:189.31,192.9 3 1
-github.com/GolangToolKits/grrt/reqRoute.go:193.9,193.21 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:193.21,195.4 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:200.50,204.22 4 1
-github.com/GolangToolKits/grrt/reqRoute.go:222.2,222.12 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:204.22,205.24 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:205.24,208.9 3 1
-github.com/GolangToolKits/grrt/reqRoute.go:209.9,209.20 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:209.20,210.32 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:210.32,213.10 3 1
-github.com/GolangToolKits/grrt/reqRoute.go:214.10,214.39 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:214.39,216.5 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:216.10,216.39 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:216.39,219.5 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:225.47,229.22 4 1
-github.com/GolangToolKits/grrt/reqRoute.go:244.2,244.12 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:229.22,230.24 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:230.24,233.9 3 1
-github.com/GolangToolKits/grrt/reqRoute.go:234.9,234.20 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:234.20,235.32 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:235.32,238.10 3 1
-github.com/GolangToolKits/grrt/reqRoute.go:239.10,239.39 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:239.39,241.5 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:247.73,256.22 8 1
-github.com/GolangToolKits/grrt/reqRoute.go:273.2,273.14 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:281.2,281.19 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:256.22,257.14 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:263.3,263.14 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:266.3,266.30 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:257.14,259.17 2 1
-github.com/GolangToolKits/grrt/reqRoute.go:259.17,261.5 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:263.14,265.4 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:266.30,271.4 4 1
-github.com/GolangToolKits/grrt/reqRoute.go:273.14,274.41 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:274.41,276.4 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:278.8,280.3 1 1
-github.com/GolangToolKits/grrt/reqRoute.go:284.55,288.2 3 1

reqRoute.go

@@ -12,7 +12,6 @@ import (
 
 // ReqRoute ReqRoute
 type ReqRoute struct {
-	//namedRoutes map[string]*Route
 	handler      http.Handler
 	host         string
 	path         string
@@ -172,7 +171,7 @@ func (t *ReqRoute) chechCurlys(p string) bool {
 }
 
 func (t *ReqRoute) chechCurlyPlacement(p string) bool {
-	//checks to make sure there are no {{ of }}
+	//checks to make sure there are no {{ or }} missmatch
 	var rtn = true
 	oc := rune('{')
 	cc := rune('}')

router.go

@@ -35,7 +35,7 @@ func NewRouter() Router {
 
 // Vars Vars returns the path variables for the current request
 func Vars(r *http.Request) map[string]string {
-	var rtn map[string]string
+	var rtn = make(map[string]string)
 	if rv := r.Context().Value(varsKey); rv != nil {
 		rtn = rv.(map[string]string)
 	}

router_test.go

@@ -42,6 +42,9 @@ func TestVars(t *testing.T) {
 	m1["param1"] = "p1"
 	m1["param2"] = "p2"
 
+	tr2, _ := http.NewRequest("GET", "/test/test1/p1/p2", nil)
+	m2 := make(map[string]string)
+
 	type args struct {
 		r *http.Request
 	}
@@ -58,6 +61,13 @@ func TestVars(t *testing.T) {
 			},
 			want: m1,
 		},
+		{
+			name: "test 2",
+			args: args{
+				r: tr2,
+			},
+			want: m2,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {