Update to use new generic API

flyingmutant · Sep 25, 2022 · 1499ace · 1499ace
1 parent 4846a6a
commit 1499ace
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 92 deletions.
diff --git a/ip_addr.go b/ip_addr.go
@@ -1,4 +1,4 @@
-// Copyright 2020 Walter Scheper <walter.scheper@gmail.com>
+// Copyright 2022 Walter Scheper <walter.scheper@gmail.com>
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,7 +9,6 @@ package rapid
 import (
 	"fmt"
 	"net"
-	"reflect"
 )
 
 const (
@@ -18,8 +17,6 @@ const (
 )
 
 var (
-	ipType = reflect.TypeOf(net.IP{})
-
 	ipv4Gen = SliceOfN(Byte(), ipv4Len, ipv4Len)
 	ipv6Gen = SliceOfN(Byte(), ipv6Len, ipv6Len)
 )
@@ -32,30 +29,26 @@ func (g *ipGen) String() string {
 	return fmt.Sprintf("IP(ipv6=%v)", g.ipv6)
 }
 
-func (*ipGen) type_() reflect.Type {
-	return ipType
-}
-
-func (g *ipGen) value(t *T) value {
-	var gen *Generator
+func (g *ipGen) value(t *T) net.IP {
+	var gen *Generator[[]byte]
 	if g.ipv6 {
 		gen = ipv6Gen
 	} else {
 		gen = ipv4Gen
 	}
 
-	b := gen.Draw(t, g.String()).([]byte)
+	b := gen.Draw(t, g.String())
 	return net.IP(b)
 }
 
-func IPv4() *Generator {
-	return newGenerator(&ipGen{
+func IPv4() *Generator[net.IP] {
+	return newGenerator[net.IP](&ipGen{
 		ipv6: false,
 	})
 }
 
-func IPv6() *Generator {
-	return newGenerator(&ipGen{
+func IPv6() *Generator[net.IP] {
+	return newGenerator[net.IP](&ipGen{
 		ipv6: true,
 	})
 }
diff --git a/ip_addr_example_test.go b/ip_addr_example_test.go
@@ -8,7 +8,6 @@ package rapid_test
 
 import (
 	"fmt"
-	"net"
 
 	"pgregory.net/rapid"
 )
@@ -17,7 +16,7 @@ func ExampleIPv4() {
 	gen := rapid.IPv4()
 
 	for i := 0; i < 5; i++ {
-		addr := gen.Example(i).(net.IP)
+		addr := gen.Example(i)
 		fmt.Println(addr.String())
 	}
 
@@ -33,7 +32,7 @@ func ExampleIPv6() {
 	gen := rapid.IPv6()
 
 	for i := 0; i < 5; i++ {
-		addr := gen.Example(i).(net.IP)
+		addr := gen.Example(i)
 		fmt.Println(addr.String())
 	}
 

diff --git a/tld.go b/tld.go
@@ -9,7 +9,7 @@ package rapid
 import "strings"
 
 // sourced from https://data.iana.org/TLD/tlds-alpha-by-domain.txt
-// Version 2021090100, Last Updated Thu Sep  2 02:57:25 UTC 2021
+// Version 2022092400, Last Updated Sun Sep 25 02:07:59 UTC 2022
 const tldsByAlpha = `
 AAA
 AARP
@@ -37,7 +37,6 @@ AEG
 AERO
 AETNA
 AF
-AFAMILYCOMPANY
 AFL
 AFRICA
 AG
@@ -189,7 +188,6 @@ BROTHER
 BRUSSELS
 BS
 BT
-BUDAPEST
 BUGATTI
 BUILD
 BUILDERS
@@ -313,7 +311,6 @@ CROWN
 CRS
 CRUISE
 CRUISES
-CSC
 CU
 CUISINELLA
 CV
@@ -372,7 +369,6 @@ DOWNLOAD
 DRIVE
 DTV
 DUBAI
-DUCK
 DUNLOP
 DUPONT
 DURBAN
@@ -506,7 +502,6 @@ GIFTS
 GIVES
 GIVING
 GL
-GLADE
 GLASS
 GLE
 GLOBAL
@@ -670,6 +665,7 @@ KG
 KH
 KI
 KIA
+KIDS
 KIM
 KINDER
 KINDLE
@@ -732,7 +728,6 @@ LINK
 LIPSY
 LIVE
 LIVING
-LIXIL
 LK
 LLC
 LLP
@@ -833,6 +828,7 @@ MTN
 MTR
 MU
 MUSEUM
+MUSIC
 MUTUAL
 MV
 MW
@@ -889,7 +885,6 @@ NYC
 NZ
 OBI
 OBSERVER
-OFF
 OFFICE
 OKINAWA
 OLAYAN
@@ -988,10 +983,8 @@ QA
 QPON
 QUEBEC
 QUEST
-QVC
 RACING
 RADIO
-RAID
 RE
 READ
 REALESTATE
@@ -1023,7 +1016,6 @@ RICOH
 RIL
 RIO
 RIP
-RMIT
 RO
 ROCHER
 ROCKS
@@ -1069,7 +1061,6 @@ SCHOOL
 SCHULE
 SCHWARZ
 SCIENCE
-SCJOHNSON
 SCOT
 SD
 SE
@@ -1162,7 +1153,6 @@ SURGERY
 SUZUKI
 SV
 SWATCH
-SWIFTCOVER
 SWISS
 SX
 SY
@@ -1341,7 +1331,6 @@ XN--3BST00M
 XN--3DS443G
 XN--3E0B707E
 XN--3HCRJ9C
-XN--3OQ18VL8PN36A
 XN--3PXU8K
 XN--42C2D9A
 XN--45BR5CYL

diff --git a/update_tld.sh b/update_tld.sh
@@ -17,7 +17,7 @@ package rapid
 import "strings"
 
 // sourced from https://data.iana.org/TLD/tlds-alpha-by-domain.txt
-// Version $(date +%Y%m%d00), Last Updated $(date --utc)
+// Version $(date +%Y%m%d00), Last Updated $(date -u)
 const tldsByAlpha = \`
 ${TLD}
 \`

diff --git a/url.go b/url.go
@@ -8,7 +8,6 @@ package rapid
 
 import (
 	"fmt"
-	"net"
 	"net/url"
 	"reflect"
 	"strings"
@@ -31,29 +30,17 @@ func (*domainNameGen) String() string {
 	return "Domain()"
 }
 
-func (*domainNameGen) type_() reflect.Type {
-	return domainType
-}
-
 var tldGenerator = SampledFrom(tlds)
 
-func (g *domainNameGen) value(t *T) value {
+func (g *domainNameGen) value(t *T) string {
 	domain := tldGenerator.
 		Filter(func(s string) bool { return len(s)+2 <= domainMaxLength }).
-		Map(func(s string) string {
-			var n string
-			for _, ch := range s {
-				n += string(SampledFrom([]rune{unicode.ToLower(ch), unicode.ToUpper(ch)}).Draw(t, "").(rune))
-			}
-
-			return n
-		}).
-		Draw(t, "domain").(string)
+		Draw(t, "domain")
 
 	expr := fmt.Sprintf(`[a-zA-Z]([a-zA-Z0-9\-]{0,%d}[a-zA-Z0-9])?`, domainMaxElementLength-2)
-	elements := newRepeat(1, 126, 1)
-	for elements.more(t.s, g.String()) {
-		subDomain := StringMatching(expr).Draw(t, "subdomain").(string)
+	elements := newRepeat(1, 126, 1, g.String())
+	for elements.more(t.s) {
+		subDomain := StringMatching(expr).Draw(t, "subdomain")
 		if len(domain)+len(subDomain) >= domainMaxLength {
 			break
 		}
@@ -64,8 +51,8 @@ func (g *domainNameGen) value(t *T) value {
 }
 
 // Domain generates an RFC 1035 compliant domain name.
-func Domain() *Generator {
-	return newGenerator(&domainNameGen{})
+func Domain() *Generator[string] {
+	return newGenerator[string](&domainNameGen{})
 }
 
 type urlGenerator struct {
@@ -76,38 +63,42 @@ func (g *urlGenerator) String() string {
 	return "URL()"
 }
 
-func (g *urlGenerator) type_() reflect.Type {
-	return urlType
-}
-
 var printableGen = StringOf(RuneFrom(nil, unicode.PrintRanges...))
 
-func (g *urlGenerator) value(t *T) value {
-	scheme := SampledFrom(g.schemes).Draw(t, "scheme").(string)
+func (g *urlGenerator) value(t *T) url.URL {
+	scheme := SampledFrom(g.schemes).Draw(t, "scheme")
 	var domain string
-	switch SampledFrom([]int{0, 1, 2}).Draw(t, "g").(int) {
+	switch SampledFrom([]int{0, 1, 2}).Draw(t, "g") {
 	case 2:
-		domain = Domain().Draw(t, "domain").(string)
+		domain = Domain().Draw(t, "domain")
 	case 1:
-		domain = IPv6().Draw(t, "domain").(net.IP).String()
+		domain = IPv6().Draw(t, "domain").String()
 		domain = "[" + domain + "]"
 	case 0:
-		domain = IPv4().Draw(t, "domain").(net.IP).String()
+		domain = IPv4().Draw(t, "domain").String()
+	}
+	port := IntRange(0, 2^16-1).Draw(t, "port")
+	path_ := SliceOf(printableGen).Draw(t, "path")
+	query := SliceOf(printableGen).Draw(t, "query")
+	fragment := printableGen.Draw(t, "fragment")
+
+	// join domain and port
+	if port > 0 {
+		domain += fmt.Sprintf(":%d", port)
+	}
+
+	// URL escape path
+	for i := range path_ {
+		path_[i] = url.PathEscape(path_[i])
+	}
+
+	// url escape query strings
+	for i := range query {
+		query[i] = url.QueryEscape(query[i])
 	}
-	port := IntRange(0, 2^16-1).
-		Map(func(i int) string {
-			if i == 0 {
-				return ""
-			}
-			return fmt.Sprintf(":%d", i)
-		}).
-		Draw(t, "port").(string)
-	path_ := SliceOf(printableGen).Draw(t, "path").([]string)
-	query := SliceOf(printableGen.Map(url.QueryEscape)).Draw(t, "query").([]string)
-	fragment := printableGen.Draw(t, "fragment").(string)
 
 	return url.URL{
-		Host:     domain + port,
+		Host:     domain,
 		Path:     strings.Join(path_, "/"),
 		Scheme:   scheme,
 		RawQuery: strings.Join(query, "&"),
@@ -116,12 +107,12 @@ func (g *urlGenerator) value(t *T) value {
 }
 
 // URL generates RFC 3986 compliant http/https URLs.
-func URL() *Generator {
+func URL() *Generator[url.URL] {
 	return urlOf([]string{"http", "https"})
 }
 
-func urlOf(schemes []string) *Generator {
-	return newGenerator(&urlGenerator{
+func urlOf(schemes []string) *Generator[url.URL] {
+	return newGenerator[url.URL](&urlGenerator{
 		schemes: schemes,
 	})
 }