Use net/url .String()

README.md

@@ -12,6 +12,7 @@ Based on the [wikipedia paper][wiki] and the [RFC 3986 document][rfc].
 
 ## Changelog
 
+*    **v1.2.0** : Switch to `net/url` url escaping.
 *    **v1.1.1** : Fix failing test due to Go1.12 changes (thanks to @ianlancetaylor).
 *    **2016-11-14 (v1.1.0)** : IDN: Conform to RFC 5895: Fold character width (thanks to @beeker1121).
 *    **2016-07-27 (v1.0.0)** : Normalize IDN to ASCII (thanks to @zenovich).

purell.go

@@ -90,8 +90,8 @@ var rxHostInteriorDots = regexp.MustCompile(`\.+`)
 var rxEmptyPort = regexp.MustCompile(`:+$`)
 
 // Map of flags to implementation function.
-// FlagDecodeUnnecessaryEscapes has no action, since it is done automatically
-// by parsing the string as an URL. Same for FlagUppercaseEscapes and FlagRemoveEmptyQuerySeparator.
+// FlagDecodeUnnecessaryEscapes, FlagEncodeNecessaryEscapes, and FlagUppercaseEscapes
+// have no action, since they are done automatically by parsing the string as an URL.
 
 // Since maps have undefined traversing order, make a slice of ordered keys
 var flagsOrder = []NormalizationFlags{
@@ -105,6 +105,7 @@ var flagsOrder = []NormalizationFlags{
 	FlagRemoveDuplicateSlashes,
 	FlagRemoveWWW,
 	FlagAddWWW,
+	FlagRemoveEmptyQuerySeparator,
 	FlagSortQuery,
 	FlagDecodeDWORDHost,
 	FlagDecodeOctalHost,
@@ -127,6 +128,7 @@ var flags = map[NormalizationFlags]func(*url.URL){
 	FlagRemoveDuplicateSlashes:    removeDuplicateSlashes,
 	FlagRemoveWWW:                 removeWWW,
 	FlagAddWWW:                    addWWW,
+	FlagRemoveEmptyQuerySeparator: removeEmptyQuerySeparator,
 	FlagSortQuery:                 sortQuery,
 	FlagDecodeDWORDHost:           decodeDWORDHost,
 	FlagDecodeOctalHost:           decodeOctalHost,
@@ -175,12 +177,14 @@ func NormalizeURLString(u string, f NormalizationFlags) (string, error) {
 // NormalizeURL returns the normalized string.
 // It takes a parsed URL object as input, as well as the normalization flags.
 func NormalizeURL(u *url.URL, f NormalizationFlags) string {
+	u.RawPath = ""
 	for _, k := range flagsOrder {
 		if f&k == k {
 			flags[k](u)
 		}
 	}
-	return escapeURL(u)
+
+	return u.String()
 }
 
 func lowercaseScheme(u *url.URL) {
@@ -225,9 +229,7 @@ func addTrailingSlash(u *url.URL) {
 			u.Path += "/"
 		}
 	} else if l = len(u.Host); l > 0 {
-		if !strings.HasSuffix(u.Host, "/") {
-			u.Host += "/"
-		}
+		u.Path = "/"
 	}
 }
 
@@ -293,6 +295,10 @@ func addWWW(u *url.URL) {
 	}
 }
 
+func removeEmptyQuerySeparator(u *url.URL) {
+	u.ForceQuery = false
+}
+
 func sortQuery(u *url.URL) {
 	q := u.Query()
 

purell_test.go

@@ -1,10 +1,8 @@
 package purell
 
 import (
-	"fmt"
 	"net/url"
 	"testing"
-	"unicode"
 )
 
 type testCase struct {
@@ -748,6 +746,11 @@ func runCase(tc *testCase, t *testing.T) {
 	}
 }
 
+/*
+* NOTE: these tests as written do not test URL path escaping, since they include chars
+* read as query strings &c. We recommend using the default net/url escaping code; if you
+* need something more permissive, you'll need to rely on urlesc.
+
 func TestDecodeUnnecessaryEscapesAll(t *testing.T) {
 	var url = "http://host/"
 
@@ -787,3 +790,4 @@ func TestEncodeNecessaryEscapesAll(t *testing.T) {
 		t.Errorf("EncodeNecessaryEscapesAll:\nwant\n%s\ngot\n%s", want, s)
 	}
 }
+*/