refactor httprouter -> net/http.ServeMux

Author: jehiah

councilmember.go

@@ -13,7 +13,6 @@ import (
 
 	"cloud.google.com/go/storage"
 	"github.com/jehiah/legislator/db"
-	"github.com/julienschmidt/httprouter"
 )
 
 func (l LegislationList) Statuses() []Status {
@@ -94,8 +93,9 @@ func (s Status) CSSClass() string {
 // Councilmember returns the list of councilmembers at /councilmembers/$name
 //
 // Redirects from /councilmembers/$district -> /councilmembers/$name
-func (a *App) Councilmember(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	councilmember := ps.ByName("year")
+func (a *App) Councilmember(w http.ResponseWriter, r *http.Request) {
+
+	councilmember := r.PathValue("councilmember")
 	// log.Printf("Councilmember %q", councilmember)
 
 	if i, _ := strconv.Atoi(councilmember); i > 0 && i <= 51 {

councilmembers.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/jehiah/legislator/db"
-	"github.com/julienschmidt/httprouter"
 )
 
 type Person struct {
@@ -196,7 +195,7 @@ func (p Person) PartyShort() string {
 }
 
 // Councilmembers returns the list of councilmembers at /councilmembers
-func (a *App) Councilmembers(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (a *App) Councilmembers(w http.ResponseWriter, r *http.Request) {
 	T := Printer(r.Context())
 	t := newTemplate(a.templateFS, "councilmembers.html")
 

events.go

@@ -16,7 +16,6 @@ import (
 	ics "github.com/arran4/golang-ical"
 	"github.com/gosimple/slug"
 	"github.com/jehiah/legislator/db"
-	"github.com/julienschmidt/httprouter"
 )
 
 type Event struct {
@@ -57,7 +56,7 @@ type EventPage struct {
 	Events []Event
 }
 
-func (a *App) Events(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (a *App) Events(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	templateName := "events.html"
 	var err error

go.mod

@@ -9,7 +9,6 @@ require (
 	github.com/gorilla/handlers v1.5.2
 	github.com/gosimple/slug v1.13.1
 	github.com/jehiah/legislator v0.0.0-20240301042206-71fa4af9b12a
-	github.com/julienschmidt/httprouter v1.3.0
 	golang.org/x/text v0.14.0
 )
 

go.sum

@@ -75,8 +75,6 @@ github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6
 github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc=
 github.com/jehiah/legislator v0.0.0-20240301042206-71fa4af9b12a h1:VyPsm1ErkjgJE2qs5swaCA6vs9MexGBipLHNlfdOAwc=
 github.com/jehiah/legislator v0.0.0-20240301042206-71fa4af9b12a/go.mod h1:NwkvFxVHuh8mYUpnmuJEiIhy4i+Y1OrLS9J4NaF5QSU=
-github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=

intro.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/jehiah/legislator/db"
 	"github.com/jehiah/legislator/legistar"
-	"github.com/julienschmidt/httprouter"
 )
 
 // IsValidFileNumber matches 0123-2020
@@ -32,11 +31,23 @@ func IsValidFileNumber(file string) bool {
 	return true
 }
 
+func (a *App) FileRedirect(w http.ResponseWriter, r *http.Request) {
+	file := r.PathValue("file")
+	if IsValidFileNumber(file) {
+		a.IntroRedirect(w, r, file)
+		return
+	}
+	if strings.HasSuffix(file, ".json") && IsValidFileNumber(strings.TrimSuffix(file, ".json")) {
+		a.IntroJSON(w, r, file)
+		return
+	}
+	http.Error(w, "Not Found", 404)
+}
+
 // IntroRedirect redirects from /1234-2020 to the URL for File "Intro 1234-2020"
 //
 // Redirects are cached for the lifetime of the process but not persisted
-func (a *App) IntroRedirect(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	file := ps.ByName("file")
+func (a *App) IntroRedirect(w http.ResponseWriter, r *http.Request, file string) {
 	if !IsValidFileNumber(file) {
 		http.Error(w, "Not Found", 404)
 		return
@@ -82,8 +93,7 @@ func (a *App) IntroRedirect(w http.ResponseWriter, r *http.Request, ps httproute
 }
 
 // IntroJSON returns a json to the URL for File "Intro 1234-2020"
-func (a *App) IntroJSON(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	file := ps.ByName("file")
+func (a *App) IntroJSON(w http.ResponseWriter, r *http.Request, file string) {
 	file = fmt.Sprintf("Int %s", strings.TrimSuffix(file, ".json"))
 	ctx := r.Context()
 

intro_nyc.go

@@ -22,7 +22,6 @@ import (
 	"cloud.google.com/go/storage"
 	"github.com/gorilla/handlers"
 	"github.com/jehiah/legislator/legistar"
-	"github.com/julienschmidt/httprouter"
 )
 
 //go:embed templates/*
@@ -53,7 +52,7 @@ type CachedFile struct {
 }
 
 // RobotsTXT renders /robots.txt
-func (a *App) RobotsTXT(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (a *App) RobotsTXT(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("content-type", "text/plain")
 	a.addExpireHeaders(w, time.Hour*24*7)
 	io.WriteString(w, "# robots welcome\n# https://github.com/jehiah/intro.nyc\n")
@@ -120,37 +119,12 @@ func (a *App) addExpireHeaders(w http.ResponseWriter, duration time.Duration) {
 	w.Header().Add("Expires", time.Now().Add(duration).Format(http.TimeFormat))
 }
 
-// L2 /:file/:year
-func (a *App) L2(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	path := ps.ByName("year")
-	file := ps.ByName("file")
-	switch {
-	case path == "local-law" && IsValidFileNumber(file):
-		a.LocalLaw(w, r, file)
-	case file == "local-laws":
-		a.LocalLaws(w, r, ps)
-	case file == "councilmembers":
-		a.Councilmember(w, r, ps)
-	case file == "static":
-		a.staticHandler.ServeHTTP(w, r)
-	case file == "data":
-		a.ProxyJSON(w, r, ps)
-	case file == "reports":
-		ps = append(ps, httprouter.Param{Key: "report", Value: path})
-		a.Reports(w, r, ps)
-	default:
-		http.Error(w, "Not Found", 404)
-	}
-}
-
 // ProxyJSON proxies to /data/file.json to gs://intronyc/build/$file.json
-//
-// Note: the router match pattern is `/:file/:year` so `:file` must be == "data"
-func (a *App) ProxyJSON(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	path := ps.ByName("year")
+func (a *App) ProxyJSON(w http.ResponseWriter, r *http.Request) {
+	path := r.PathValue("path")
 
 	if !strings.HasSuffix(path, ".json") {
-		log.Printf("year %q", path)
+		// log.Printf("year %q", path)
 		http.Error(w, "Not Found", 404)
 		return
 	}
@@ -183,43 +157,11 @@ func (a *App) ProxyJSON(w http.ResponseWriter, r *http.Request, ps httprouter.Pa
 	}
 }
 
-// L1 handles /:file
-//
-// Redirects are cached for the lifetime of the process but not persisted
-func (a *App) L1(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-
-	file := ps.ByName("file")
-	switch file {
-	case "robots.txt":
-		a.RobotsTXT(w, r, ps)
-		return
-	case "local-laws":
-		a.LocalLaws(w, r, ps)
-		return
-	case "councilmembers":
-		a.Councilmembers(w, r, ps)
-		return
-	case "recent":
-		a.RecentLegislation(w, r, ps)
-		return
-	case "reports":
-		a.Reports(w, r, ps)
-		return
-	case "map":
-		a.Map(w, r, ps)
-		return
-	case "events", "calendar", "events.ics":
-		a.Events(w, r, ps)
-		return
-	}
-	if IsValidFileNumber(file) {
-		a.IntroRedirect(w, r, ps)
-	}
-	if strings.HasSuffix(file, ".json") && IsValidFileNumber(strings.TrimSuffix(file, ".json")) {
-		a.IntroJSON(w, r, ps)
+func redirect(p string) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		u := &url.URL{Path: p, RawQuery: r.URL.RawQuery}
+		http.Redirect(w, r, u.String(), 301)
 	}
-	http.Error(w, "Not Found", 404)
-	return
 }
 
 func main() {
@@ -255,10 +197,37 @@ func main() {
 		panic(err)
 	}
 
-	router := httprouter.New()
-	router.GET("/", app.Search)
-	router.GET("/:file/:year", app.L2)
-	router.GET("/:file", app.L1)
+	fileRouter := http.NewServeMux()
+	fileRouter.HandleFunc("GET /{file}", app.FileRedirect)
+	fileRouter.HandleFunc("GET /{file}/local-law", app.LocalLaw)
+
+	router := http.NewServeMux()
+
+	router.HandleFunc("GET /{$}", app.Search)
+	router.HandleFunc("GET /robots.txt", app.RobotsTXT)
+	router.HandleFunc("GET /recent", app.RecentLegislation)
+	router.HandleFunc("GET /map", app.Map)
+	router.HandleFunc("GET /calendar", app.Events)
+	router.HandleFunc("GET /events", app.Events)
+	router.HandleFunc("GET /events.ics", app.Events)
+	router.HandleFunc("GET /councilmembers", app.Councilmembers)
+	router.HandleFunc("GET /councilmembers/{councilmember}", app.Councilmember)
+	router.HandleFunc("GET /local-laws", app.LocalLaws)
+	router.HandleFunc("GET /local-laws/{year}", app.LocalLaws)
+	router.HandleFunc("GET /data/{path}", app.ProxyJSON)
+	router.HandleFunc("GET /reports/", redirect("/reports/session")) // redirect -> /reports/session
+	router.Handle("GET /static/", app.staticHandler)
+
+	router.HandleFunc("GET /reports/most_sponsored", app.ReportMostSponsored)
+	router.HandleFunc("GET /reports/status", redirect("/reports/session")) // /reports/session
+	router.HandleFunc("GET /reports/session", app.ReportBySession)
+	router.HandleFunc("GET /reports/similarity", app.ReportSimilarity)
+	router.HandleFunc("GET /reports/councilmembers", app.ReportCouncilmembers)
+	router.HandleFunc("GET /reports/committees", app.ReportCommittees)
+	router.HandleFunc("GET /reports/attendance", app.ReportAttendance)
+	router.HandleFunc("GET /reports/resubmit", redirect("/reports/reintroductions"))
+
+	router.Handle("/", fileRouter)
 
 	// Determine port for HTTP service.
 	port := os.Getenv("PORT")

local_laws.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/jehiah/legislator/legistar"
-	"github.com/julienschmidt/httprouter"
 )
 
 type LocalLaw struct {
@@ -82,8 +81,10 @@ func groupLaws(l []LocalLaw) []LocalLawYear {
 }
 
 // LocalLaws returns the list of local laws at /local-laws
-func (a *App) LocalLaws(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	path := ps.ByName("year")
+// and handles /local-laws/2024
+// and handles /local-laws/2024-102
+func (a *App) LocalLaws(w http.ResponseWriter, r *http.Request) {
+	path := r.PathValue("year")
 	ctx := r.Context()
 	if matched, _ := regexp.MatchString("^(19|20)[9012][0-9]-[0-9]{1,3}$", path); matched {
 		c := strings.Split(path, "-")
@@ -202,7 +203,8 @@ func (a *App) LocalLaws(w http.ResponseWriter, r *http.Request, ps httprouter.Pa
 // URL: /1234-2020/local-law
 //
 // file == 1234-2020
-func (a *App) LocalLaw(w http.ResponseWriter, r *http.Request, file string) {
+func (a *App) LocalLaw(w http.ResponseWriter, r *http.Request) {
+	file := r.PathValue("file")
 	ctx := r.Context()
 	if !IsValidFileNumber(file) {
 		http.Error(w, "Not Found", 404)

map.go

@@ -4,11 +4,9 @@ import (
 	"log"
 	"net/http"
 	"time"
-
-	"github.com/julienschmidt/httprouter"
 )
 
-func (a *App) Map(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (a *App) Map(w http.ResponseWriter, r *http.Request) {
 	T := Printer(r.Context())
 	t := newTemplate(a.templateFS, "map.html")
 	w.Header().Set("content-type", "text/html")

recent.go

@@ -13,7 +13,6 @@ import (
 
 	"cloud.google.com/go/storage"
 	"github.com/jehiah/legislator/db"
-	"github.com/julienschmidt/httprouter"
 )
 
 type RecentLegislation struct {
@@ -93,7 +92,7 @@ func NewDateGroups(r []RecentLegislation) []DateGroup {
 }
 
 // RecentLegislation returns the list of legislation changes /recent
-func (a *App) RecentLegislation(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (a *App) RecentLegislation(w http.ResponseWriter, r *http.Request) {
 
 	t := newTemplate(a.templateFS, "recent_legislation.html")
 

reports.go

@@ -15,7 +15,6 @@ import (
 	"cloud.google.com/go/storage"
 	"github.com/gosimple/slug"
 	"github.com/jehiah/legislator/db"
-	"github.com/julienschmidt/httprouter"
 )
 
 func TrimCommittee(s string) string {
@@ -28,35 +27,6 @@ func TrimCommittee(s string) string {
 	return s
 }
 
-// Reports handles /reports/...
-func (a *App) Reports(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	switch ps.ByName("report") {
-	case "":
-		http.Redirect(w, r, "/reports/session", 302)
-	case "most_sponsored":
-		a.ReportMostSponsored(w, r)
-	case "status":
-		http.Redirect(w, r, "/reports/session", 301)
-	case "session":
-		a.ReportBySession(w, r)
-	case "similarity":
-		a.ReportSimilarity(w, r)
-	case "councilmembers":
-		a.ReportCouncilmembers(w, r)
-	case "committees":
-		a.ReportCommittees(w, r)
-	case "attendance":
-		a.ReportAttendance(w, r)
-	case "resubmit":
-		u := &url.URL{Path: "/reports/reintroductions", RawQuery: r.URL.RawQuery}
-		http.Redirect(w, r, u.String(), 301)
-	case "reintroductions":
-		a.ReportReintroductions(w, r)
-	default:
-		http.Error(w, "Not Found", 404)
-	}
-}
-
 type CommitteeSponsorship struct {
 	BodyName              string
 	Sponsors              int

search.go

@@ -4,12 +4,10 @@ import (
 	"log"
 	"net/http"
 	"time"
-
-	"github.com/julienschmidt/httprouter"
 )
 
 // Search returns the root path of `/` for in-browser search
-func (a *App) Search(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (a *App) Search(w http.ResponseWriter, r *http.Request) {
 	T := Printer(r.Context())
 	t := newTemplate(a.templateFS, "index.html")
 	w.Header().Set("content-type", "text/html")