From db2cd9e941a322a112f566c63bca1e7f9665812f Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Thu, 2 Apr 2015 21:59:45 -0600
Subject: [PATCH] Renamed extensionless to extension, Extensionless to Ext

---
 config/middleware.go                          |  4 +-
 .../extensionless.go => extension/ext.go}     | 40 +++++++++++--------
 2 files changed, 25 insertions(+), 19 deletions(-)
 rename middleware/{extensionless/extensionless.go => extension/ext.go} (69%)

diff --git a/config/middleware.go b/config/middleware.go
index 23fc0f469..589f1030d 100644
--- a/config/middleware.go
+++ b/config/middleware.go
@@ -4,7 +4,7 @@ import (
 	"github.com/mholt/caddy/middleware"
 	"github.com/mholt/caddy/middleware/browse"
 	"github.com/mholt/caddy/middleware/errors"
-	"github.com/mholt/caddy/middleware/extensionless"
+	"github.com/mholt/caddy/middleware/extension"
 	"github.com/mholt/caddy/middleware/fastcgi"
 	"github.com/mholt/caddy/middleware/gzip"
 	"github.com/mholt/caddy/middleware/headers"
@@ -43,7 +43,7 @@ func init() {
 	register("header", headers.New)
 	register("rewrite", rewrite.New)
 	register("redir", redirect.New)
-	register("ext", extensionless.New)
+	register("ext", extension.New)
 	register("proxy", proxy.New)
 	register("fastcgi", fastcgi.New)
 	register("websocket", websockets.New)
diff --git a/middleware/extensionless/extensionless.go b/middleware/extension/ext.go
similarity index 69%
rename from middleware/extensionless/extensionless.go
rename to middleware/extension/ext.go
index 7b1fff40e..fc599b422 100644
--- a/middleware/extensionless/extensionless.go
+++ b/middleware/extension/ext.go
@@ -1,8 +1,9 @@
-// Package extensionless is middleware for clean URLs. A root path is
-// passed in as well as possible extensions to add, internally,
-// to paths requested. The first path+ext that matches a resource
-// that exists will be used.
-package extensionless
+// Package extension is middleware for clean URLs. The root path
+// of the site is passed in as well as possible extensions to try
+// internally for paths requested that don't match an existing
+// resource. The first path+ext combination that matches a valid
+// file will be used.
+package extension
 
 import (
 	"net/http"
@@ -13,14 +14,6 @@ import (
 	"github.com/mholt/caddy/middleware"
 )
 
-// Extensionless is an http.Handler that can assume an extension from clean URLs.
-// It tries extensions in the order listed in Extensions.
-type Extensionless struct {
-	Next       middleware.HandlerFunc
-	Root       string
-	Extensions []string
-}
-
 // New creates a new instance of middleware that assumes extensions
 // so the site can use cleaner, extensionless URLs
 func New(c middleware.Controller) (middleware.Middleware, error) {
@@ -32,7 +25,7 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
 	}
 
 	return func(next middleware.HandlerFunc) middleware.HandlerFunc {
-		return Extensionless{
+		return Ext{
 			Next:       next,
 			Extensions: extensions,
 			Root:       root,
@@ -40,8 +33,21 @@ func New(c middleware.Controller) (middleware.Middleware, error) {
 	}, nil
 }
 
-// ServeHTTP implements the http.Handler interface.
-func (e Extensionless) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
+// Ext can assume an extension from clean URLs.
+// It tries extensions in the order listed in Extensions.
+type Ext struct {
+	// Next handler in the chain
+	Next middleware.HandlerFunc
+
+	// Path to ther root of the site
+	Root string
+
+	// List of extensions to try
+	Extensions []string
+}
+
+// ServeHTTP implements the middleware.Handler interface.
+func (e Ext) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
 	urlpath := strings.TrimSuffix(r.URL.Path, "/")
 	if path.Ext(urlpath) == "" {
 		for _, ext := range e.Extensions {
@@ -54,7 +60,7 @@ func (e Extensionless) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, e
 	return e.Next(w, r)
 }
 
-// parse sets up an instance of Extensionless middleware
+// parse sets up an instance of extension middleware
 // from a middleware controller and returns a list of extensions.
 func parse(c middleware.Controller) ([]string, error) {
 	var extensions []string