From 04996b2850c0f84a2e230abcf8ee233e160a3bf1 Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Thu, 29 Jan 2015 22:06:53 -0700
Subject: [PATCH] Exported NewReplacer and NewRecorder
---
middleware/util_recorder.go | 4 ++--
middleware/util_replacer.go | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/middleware/util_recorder.go b/middleware/util_recorder.go
index b66b48529..ef5b69bf1 100644
--- a/middleware/util_recorder.go
+++ b/middleware/util_recorder.go
@@ -14,13 +14,13 @@ type responseRecorder struct {
size int
}
-// newResponseRecorder makes and returns a new responseRecorder,
+// NewResponseRecorder makes and returns a new responseRecorder,
// which captures the HTTP Status code from the ResponseWriter
// and also the length of the response body written through it.
// Because a status is not set unless WriteHeader is called
// explicitly, this constructor initializes with a status code
// of 200 to cover the default case.
-func newResponseRecorder(w http.ResponseWriter) *responseRecorder {
+func NewResponseRecorder(w http.ResponseWriter) *responseRecorder {
return &responseRecorder{
ResponseWriter: w,
status: http.StatusOK,
diff --git a/middleware/util_replacer.go b/middleware/util_replacer.go
index 32a24dd19..b7369abc5 100644
--- a/middleware/util_replacer.go
+++ b/middleware/util_replacer.go
@@ -10,14 +10,14 @@ import (
// replacer is a type which can replace placeholder
// substrings in a string with actual values from a
// http.Request and responseRecorder. Always use
-// newReplacer to get one of these.
+// NewReplacer to get one of these.
type replacer map[string]string
-// newReplacer makes a new replacer based on r and rw.
+// NewReplacer makes a new replacer based on r and rw.
// Do not create a new replacer until r and rw have all
// the needed values, because this function copies those
// values into the replacer.
-func newReplacer(r *http.Request, rw *responseRecorder) replacer {
+func NewReplacer(r *http.Request, rw *responseRecorder) replacer {
rep := replacer{
"{method}": r.Method,
"{scheme}": func() string {
@@ -62,10 +62,10 @@ func newReplacer(r *http.Request, rw *responseRecorder) replacer {
// replace performs a replacement of values on s and returns
// the string with the replaced values.
-func (r replacer) replace(s string) string {
+func (r replacer) Replace(s string) string {
for placeholder, replacement := range r {
if replacement == "" {
- replacement = emptyStringReplacer
+ replacement = EmptyStringReplacer
}
s = strings.Replace(s, placeholder, replacement, -1)
}
@@ -76,7 +76,7 @@ func (r replacer) replace(s string) string {
endOffset := idxStart + len(headerReplacer)
idxEnd := strings.Index(s[endOffset:], "}")
if idxEnd > -1 {
- s = s[:idxStart] + emptyStringReplacer + s[endOffset+idxEnd+1:]
+ s = s[:idxStart] + EmptyStringReplacer + s[endOffset+idxEnd+1:]
} else {
break
}
@@ -87,5 +87,5 @@ func (r replacer) replace(s string) string {
const (
timeFormat = "02/Jan/2006:15:04:05 -0700"
headerReplacer = "{>"
- emptyStringReplacer = "-"
+ EmptyStringReplacer = "-"
)