v1.15.3

FIXED:
* Properly parse into map, add *All* variants

remap/funcs_remap_test.go

@@ -1,9 +1,9 @@
 package remap
 
 import (
-	`fmt`
-	`reflect`
-	`regexp`
+	"fmt"
+	"reflect"
+	"regexp"
 	"testing"
 )
 
@@ -12,6 +12,7 @@ type (
 		Nm                     string
 		S                      string
 		M                      *ReMap
+		All                    bool
 		Expected               map[string][][]byte
 		ExpectedStr            map[string][]string
 		ParamInclNoMatch       bool
@@ -25,12 +26,14 @@ func TestRemap(t *testing.T) {
 	var matches map[string][][]byte
 
 	for midx, m := range []testMatcher{
+		// 1
 		testMatcher{
 			Nm:       "No matches",
 			S:        "this is a test",
 			M:        &ReMap{regexp.MustCompile(``)},
 			Expected: nil,
 		},
+		// 2
 		testMatcher{
 			Nm: "Single mid match",
 			S:  "This contains a single match in the middle of a string",
@@ -39,6 +42,7 @@ func TestRemap(t *testing.T) {
 				"g1": [][]byte{[]byte("match")},
 			},
 		},
+		// 3
 		testMatcher{
 			Nm: "multi mid match",
 			S:  "This contains a single match and another match in the middle of a string",
@@ -50,6 +54,7 @@ func TestRemap(t *testing.T) {
 				},
 			},
 		},
+		// 4
 		testMatcher{
 			Nm: "line match",
 			S:  "This\ncontains a\nsingle\nmatch\non a dedicated line",
@@ -60,10 +65,12 @@ func TestRemap(t *testing.T) {
 				},
 			},
 		},
+		// 5
 		testMatcher{
-			Nm: "multiline match",
-			S:  "This\ncontains a\nsingle match and another\nmatch\nin the middle of a string",
-			M:  &ReMap{regexp.MustCompile(`\s+(?P<g1>match) and another\s+(?P<g1>match)\s+`)},
+			Nm:  "multiline match",
+			S:   "This\ncontains a\nsingle match and another\nmatch\nin the middle of a string",
+			M:   &ReMap{regexp.MustCompile(`\s+(?P<g1>match) and another\s+(?P<g1>match)\s+`)},
+			All: true,
 			Expected: map[string][][]byte{
 				"g1": [][]byte{
 					[]byte("match"),
@@ -71,8 +78,32 @@ func TestRemap(t *testing.T) {
 				},
 			},
 		},
+		// 6
+		// More closely mirrors something closer to real-life
+		testMatcher{
+			Nm: "mixed match",
+			S: "        # No longer log hits/reqs/resps to file.\n" +
+				"        #access_log /mnt/nginx_logs/vhost/tenant/site/access.log main;\n" +
+				"        #error_log /mnt/nginx_logs/vhost/tenant/site/error.log;\n" +
+				"        access_log off;\n" +
+				"        error_log /dev/null;\n\n" +
+				"        ssl_certificate /etc/nginx/tls/crt/tenant.pem;\n" +
+				"        ssl_certificate_key /etc/nginx/tls/key/tenant.pem;\n\n",
+			M:   &ReMap{regexp.MustCompile(`(?m)^\s*(?:error|access)_log\s+(?P<logpath>.+);\s*$`)},
+			All: true,
+			Expected: map[string][][]byte{
+				"logpath": [][]byte{
+					[]byte("off"),
+					[]byte("/dev/null"),
+				},
+			},
+		},
 	} {
-		matches = m.M.Map([]byte(m.S), false, false, false)
+		if m.All {
+			matches = m.M.MapAll([]byte(m.S), false, false, false)
+		} else {
+			matches = m.M.Map([]byte(m.S), false, false, false)
+		}
 		t.Logf(
 			"#%d:\n\tsrc:\t'%s'\n\tptrn:\t'%s'\n\tmatch:\t%s\n",
 			midx+1,
@@ -81,7 +112,7 @@ func TestRemap(t *testing.T) {
 			testBmapToStrMap(matches),
 		)
 		if !reflect.DeepEqual(matches, m.Expected) {
-			t.Fatalf("Case #%d (\"%s\"): '%#v' != '%#v'", midx+1, m.Nm, m.Expected, matches)
+			t.Fatalf("Case #%d (\"%s\"): expected '%#v' != received '%#v'", midx+1, m.Nm, m.Expected, matches)
 		}
 	}
 
@@ -165,7 +196,11 @@ func TestRemapParams(t *testing.T) {
 			ParamInclMustMatch:     true,
 		},
 	} {
-		matches = m.M.Map([]byte(m.S), m.ParamInclNoMatch, m.ParamInclNoMatchStrict, m.ParamInclMustMatch)
+		if m.All {
+			matches = m.M.MapAll([]byte(m.S), m.ParamInclNoMatch, m.ParamInclNoMatchStrict, m.ParamInclMustMatch)
+		} else {
+			matches = m.M.Map([]byte(m.S), m.ParamInclNoMatch, m.ParamInclNoMatchStrict, m.ParamInclMustMatch)
+		}
 		t.Logf(
 			"%d: %v/%v/%v: %#v\n",
 			midx+1, m.ParamInclNoMatch, m.ParamInclNoMatchStrict, m.ParamInclMustMatch, matches,
@@ -182,12 +217,14 @@ func TestRemapString(t *testing.T) {
 	var matches map[string][]string
 
 	for midx, m := range []testMatcher{
+		// 1
 		testMatcher{
 			Nm:          "No matches",
 			S:           "this is a test",
 			M:           &ReMap{regexp.MustCompile(``)},
 			ExpectedStr: nil,
 		},
+		// 2
 		testMatcher{
 			Nm: "Single mid match",
 			S:  "This contains a single match in the middle of a string",
@@ -196,6 +233,7 @@ func TestRemapString(t *testing.T) {
 				"g1": []string{"match"},
 			},
 		},
+		// 3
 		testMatcher{
 			Nm: "multi mid match",
 			S:  "This contains a single match and another match in the middle of a string",
@@ -207,6 +245,7 @@ func TestRemapString(t *testing.T) {
 				},
 			},
 		},
+		// 4
 		testMatcher{
 			Nm: "line match",
 			S:  "This\ncontains a\nsingle\nmatch\non a dedicated line",
@@ -217,10 +256,12 @@ func TestRemapString(t *testing.T) {
 				},
 			},
 		},
+		// 5
 		testMatcher{
-			Nm: "multiline match",
-			S:  "This\ncontains a\nsingle match and another\nmatch\nin the middle of a string",
-			M:  &ReMap{regexp.MustCompile(`\s+(?P<g1>match) and another\s+(?P<g1>match)\s+`)},
+			Nm:  "multiline match",
+			S:   "This\ncontains a\nsingle match and another\nmatch\nin the middle of a string",
+			M:   &ReMap{regexp.MustCompile(`\s+(?P<g1>match) and another\s+(?P<g1>match)\s+`)},
+			All: true,
 			ExpectedStr: map[string][]string{
 				"g1": []string{
 					"match",
@@ -228,8 +269,32 @@ func TestRemapString(t *testing.T) {
 				},
 			},
 		},
+		// 6
+		// More closely mirrors something closer to real-life
+		testMatcher{
+			Nm: "mixed match",
+			S: "        # No longer log hits/reqs/resps to file.\n" +
+				"        #access_log /mnt/nginx_logs/vhost/tenant/site/access.log main;\n" +
+				"        #error_log /mnt/nginx_logs/vhost/tenant/site/error.log;\n" +
+				"        access_log off;\n" +
+				"        error_log /dev/null;\n\n" +
+				"        ssl_certificate /etc/nginx/tls/crt/tenant.pem;\n" +
+				"        ssl_certificate_key /etc/nginx/tls/key/tenant.pem;\n\n",
+			M:   &ReMap{regexp.MustCompile(`(?m)^\s*(?:error|access)_log\s+(?P<logpath>.+);\s*$`)},
+			All: true,
+			ExpectedStr: map[string][]string{
+				"logpath": []string{
+					"off",
+					"/dev/null",
+				},
+			},
+		},
 	} {
-		matches = m.M.MapString(m.S, false, false, false)
+		if m.All {
+			matches = m.M.MapStringAll(m.S, false, false, false)
+		} else {
+			matches = m.M.MapString(m.S, false, false, false)
+		}
 		t.Logf(
 			"#%d:\n\tsrc:\t'%s'\n\tptrn:\t'%s'\n\tmatch:\t%s\n",
 			midx+1,