Switch Handler to an interface.

HandlerFunc is much better as a function returning a Handler, rather
than a newtype for the function type itself. This way there is no
confusion creating a type-inferenced variable with HandlerFunc(func(...
and then using a HandlerFunc where a Handler is expected. Much better to
only have one public type.

4 files changed, 15 insertions, 15 deletions

diff --git a/contrib/fs/dir_test.go b/contrib/fs/dir_test.go
index 6109a3c..9c6770d 100644
--- a/contrib/fs/dir_test.go
+++ b/contrib/fs/dir_test.go
@@ -47,7 +47,7 @@ func TestDirectoryDefault(t *testing.T) {
 			require.Nil(t, err)
 
 			request := &gus.Request{URL: u}
-			response := handler(context.Background(), request)
+			response := handler.Handle(context.Background(), request)
 
 			if response == nil {
 				assert.Equal(t, test.status, gemini.StatusNotFound)
@@ -108,7 +108,7 @@ func TestDirectoryListing(t *testing.T) {
 			require.Nil(t, err)
 
 			request := &gus.Request{URL: u}
-			response := handler(context.Background(), request)
+			response := handler.Handle(context.Background(), request)
 
 			if response == nil {
 				assert.Equal(t, test.status, gemini.StatusNotFound)
diff --git a/contrib/fs/file_test.go b/contrib/fs/file_test.go
index f97b66b..3949b83 100644
--- a/contrib/fs/file_test.go
+++ b/contrib/fs/file_test.go
@@ -58,7 +58,7 @@ func TestFileHandler(t *testing.T) {
 			require.Nil(t, err)
 
 			request := &gus.Request{URL: u}
-			response := handler(context.Background(), request)
+			response := handler.Handle(context.Background(), request)
 
 			if response == nil {
 				assert.Equal(t, test.status, gemini.StatusNotFound)
diff --git a/contrib/fs/gemini.go b/contrib/fs/gemini.go
index 4193493..15677f1 100644
--- a/contrib/fs/gemini.go
+++ b/contrib/fs/gemini.go
@@ -14,7 +14,7 @@ import (
 //
 // It only serves responses for paths which do not correspond to directories on disk.
 func GeminiFileHandler(fileSystem fs.FS) gus.Handler {
-	return func(ctx context.Context, request *gus.Request) *gus.Response {
+	return gus.HandlerFunc(func(ctx context.Context, request *gus.Request) *gus.Response {
 		filepath, file, err := ResolveFile(request, fileSystem)
 		if err != nil {
 			return gemini.Failure(err)
@@ -25,7 +25,7 @@ func GeminiFileHandler(fileSystem fs.FS) gus.Handler {
 		}
 
 		return gemini.Success(mediaType(filepath), file)
-	}
+	})
 }
 
 // GeminiDirectoryDefault serves up default files for directory path requests.
@@ -42,7 +42,7 @@ func GeminiFileHandler(fileSystem fs.FS) gus.Handler {
 // It requires that files from the provided fs.FS implement fs.ReadDirFile. If they
 // don't, it will produce nil responses for any directory paths.
 func GeminiDirectoryDefault(fileSystem fs.FS, filenames ...string) gus.Handler {
-	return func(ctx context.Context, request *gus.Request) *gus.Response {
+	return gus.HandlerFunc(func(ctx context.Context, request *gus.Request) *gus.Response {
 		dirpath, dir, response := handleDirGemini(request, fileSystem)
 		if response != nil {
 			return response
@@ -61,7 +61,7 @@ func GeminiDirectoryDefault(fileSystem fs.FS, filenames ...string) gus.Handler {
 		}
 
 		return gemini.Success(mediaType(filepath), file)
-	}
+	})
 }
 
 // GeminiDirectoryListing produces a listing of the contents of any requested directories.
@@ -78,7 +78,7 @@ func GeminiDirectoryDefault(fileSystem fs.FS, filenames ...string) gus.Handler {
 // The template may be nil, in which case DefaultGeminiDirectoryList is used instead. The
 // template is then processed with RenderDirectoryListing.
 func GeminiDirectoryListing(fileSystem fs.FS, template *template.Template) gus.Handler {
-	return func(ctx context.Context, request *gus.Request) *gus.Response {
+	return gus.HandlerFunc(func(ctx context.Context, request *gus.Request) *gus.Response {
 		dirpath, dir, response := handleDirGemini(request, fileSystem)
 		if response != nil {
 			return response
@@ -97,7 +97,7 @@ func GeminiDirectoryListing(fileSystem fs.FS, template *template.Template) gus.H
 		}
 
 		return gemini.Success("text/gemini", body)
-	}
+	})
 }
 
 // DefaultGeminiDirectoryList is a template which renders a reasonable gemtext dir list.
diff --git a/contrib/fs/gopher.go b/contrib/fs/gopher.go
index 7b0d8bd..f63785c 100644
--- a/contrib/fs/gopher.go
+++ b/contrib/fs/gopher.go
@@ -16,7 +16,7 @@ import (
 //
 // It only serves responses for paths which correspond to files, not directories.
 func GopherFileHandler(fileSystem fs.FS) gus.Handler {
-	return func(ctx context.Context, request *gus.Request) *gus.Response {
+	return gus.HandlerFunc(func(ctx context.Context, request *gus.Request) *gus.Response {
 		filepath, file, err := ResolveFile(request, fileSystem)
 		if err != nil {
 			return gopher.Error(err).Response()
@@ -27,7 +27,7 @@ func GopherFileHandler(fileSystem fs.FS) gus.Handler {
 		}
 
 		return gopher.File(GuessGopherItemType(filepath), file)
-	}
+	})
 }
 
 // GopherDirectoryDefault serves up default files for directory path requests.
@@ -40,7 +40,7 @@ func GopherFileHandler(fileSystem fs.FS) gus.Handler {
 // It requires that files from the provided fs.FS implement fs.ReadDirFile. If
 // they don't, it will produce nil responses for all directory paths.
 func GopherDirectoryDefault(fileSystem fs.FS, filenames ...string) gus.Handler {
-	return func(ctx context.Context, request *gus.Request) *gus.Response {
+	return gus.HandlerFunc(func(ctx context.Context, request *gus.Request) *gus.Response {
 		dirpath, dir, err := ResolveDirectory(request, fileSystem)
 		if err != nil {
 			return gopher.Error(err).Response()
@@ -59,7 +59,7 @@ func GopherDirectoryDefault(fileSystem fs.FS, filenames ...string) gus.Handler {
 		}
 
 		return gopher.File(gopher.MenuType, file)
-	}
+	})
 }
 
 // GopherDirectoryListing produces a listing of the contents of any requested directories.
@@ -72,7 +72,7 @@ func GopherDirectoryDefault(fileSystem fs.FS, filenames ...string) gus.Handler {
 // A template may be nil, in which case DefaultGopherDirectoryList is used instead. The
 // template is then processed with RenderDirectoryListing.
 func GopherDirectoryListing(fileSystem fs.FS, tpl *template.Template) gus.Handler {
-	return func(ctx context.Context, request *gus.Request) *gus.Response {
+	return gus.HandlerFunc(func(ctx context.Context, request *gus.Request) *gus.Response {
 		dirpath, dir, err := ResolveDirectory(request, fileSystem)
 		if err != nil {
 			return gopher.Error(err).Response()
@@ -91,7 +91,7 @@ func GopherDirectoryListing(fileSystem fs.FS, tpl *template.Template) gus.Handle
 		}
 
 		return gopher.File(gopher.MenuType, body)
-	}
+	})
 }
 
 // GopherTemplateFunctions is a map for templates providing useful functions for gophermaps.