renamed files for clarity

4 files changed, 242 insertions, 242 deletions

diff --git a/handlers.go b/handlers.go
new file mode 100644
index 0000000..7cf3ad2
--- /dev/null
+++ b/handlers.go
@@ -0,0 +1,209 @@
+package main
+
+import (
+	"crypto/sha256"
+	"fmt"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
+	"time"
+
+	"github.com/gorilla/mux"
+)
+
+// handles "/"
+func indexHandler(w http.ResponseWriter, r *http.Request) {
+
+	// Stat the index template to get the mod time
+	var etag string
+	if indextmpl, err := os.Stat("assets/tmpl/index.html"); err != nil {
+		log.Printf("Couldn't stat index template for ETag ... %v\n", err)
+	} else {
+		etag = fmt.Sprintf("%x", sha256.Sum256([]byte(indextmpl.ModTime().String())))
+	}
+
+	// Take the hex-encoded sha256 sum of the index template's mod time
+	// to send as an ETag. If an error occured when grabbing the file info,
+	// the ETag will be empty.
+	w.Header().Set("ETag", "\""+etag+"\"")
+	w.Header().Set("Content-Type", htmlutf8)
+
+	// Pass the confObj.Instance data to the template,
+	// then send it to the client.
+	err := tmpls.ExecuteTemplate(w, "index.html", confObj.Instance)
+	if err != nil {
+		log500(w, r, err)
+		return
+	}
+
+	log200(r)
+}
+
+// handles "/api"
+func apiBaseHandler(w http.ResponseWriter, r *http.Request) {
+
+	timerfc3339, err := time.Now().MarshalText()
+	if err != nil {
+		log.Printf("Couldn't format time as RFC3339: %v\n", err)
+	}
+
+	etag := fmt.Sprintf("%x", sha256.Sum256(timerfc3339))
+
+	w.Header().Set("ETag", etag)
+	w.Header().Set("Content-Type", txtutf8)
+
+	pathdata := []byte("\n\n" + r.URL.Path)
+	timerfc3339 = append(timerfc3339, pathdata...)
+
+	n, err := w.Write(timerfc3339)
+	if err != nil || n == 0 {
+		log500(w, r, err)
+		return
+	}
+
+	log200(r)
+}
+
+// handles "/api/plain"
+// maybe add json/xml support later
+func apiFormatHandler(w http.ResponseWriter, r *http.Request) {
+
+	vars := mux.Vars(r)
+	format := vars["format"]
+
+	w.Header().Set("Content-Type", txtutf8)
+
+	n, err := w.Write([]byte(format + "\n"))
+	if err != nil || n == 0 {
+		log500(w, r, err)
+		return
+	}
+
+	log200(r)
+}
+
+// handles "/api/plain/(users|mentions|tweets)"
+func apiEndpointHandler(w http.ResponseWriter, r *http.Request) {
+
+	err := r.ParseForm()
+	if err != nil {
+		log500(w, r, err)
+		return
+	}
+
+	if r.FormValue("q") != "" || r.FormValue("url") != "" {
+		err := apiEndpointQuery(w, r)
+		if err != nil {
+			log500(w, r, err)
+			return
+		}
+		log200(r)
+		return
+	}
+
+	w.Header().Set("Content-Type", htmlutf8)
+
+	n, err := w.Write([]byte(r.URL.String()))
+	if err != nil || n == 0 {
+		log500(w, r, err)
+		return
+	}
+
+	log200(r)
+}
+
+// handles POST for "/api/plain/users"
+func apiEndpointPOSTHandler(w http.ResponseWriter, r *http.Request) {
+
+	vars := mux.Vars(r)
+	format := vars["format"]
+	endpoint := vars["endpoint"]
+
+	w.Header().Set("Content-Type", htmlutf8)
+
+	_, err := w.Write([]byte(format + "/" + endpoint))
+	if err != nil {
+		log500(w, r, err)
+		return
+	}
+
+	log200(r)
+}
+
+// handles "/api/plain/tags"
+func apiTagsBaseHandler(w http.ResponseWriter, r *http.Request) {
+
+	vars := mux.Vars(r)
+	format := vars["format"]
+
+	w.Header().Set("Content-Type", htmlutf8)
+
+	n, err := w.Write([]byte("api/" + format + "/tags"))
+	if err != nil || n == 0 {
+		log500(w, r, err)
+		return
+	}
+
+	log200(r)
+}
+
+// handles "/api/plain/tags/[a-zA-Z0-9]+"
+func apiTagsHandler(w http.ResponseWriter, r *http.Request) {
+
+	vars := mux.Vars(r)
+	tags := vars["tags"]
+
+	out, err := twtxtCache.QueryInStatus(tags)
+	if err != nil {
+		log500(w, r, err)
+		return
+	}
+
+	data := parseQueryOut(out)
+
+	w.Header().Set("Content-Type", txtutf8)
+	_, err = w.Write(data)
+	if err != nil {
+		log500(w, r, err)
+		return
+	}
+
+	log200(r)
+}
+
+// Serving the stylesheet virtually because
+// files aren't served directly.
+func cssHandler(w http.ResponseWriter, r *http.Request) {
+
+	// read the raw bytes of the stylesheet
+	css, err := ioutil.ReadFile("assets/style.css")
+	if err != nil {
+		if os.IsNotExist(err) {
+			log404(w, r, err)
+			return
+		}
+		log500(w, r, err)
+		return
+	}
+
+	// Get the mod time for the etag header
+	stat, err := os.Stat("assets/style.css")
+	if err != nil {
+		log.Printf("Couldn't stat CSS file to send ETag header: %v\n", err)
+	}
+
+	// Sending the sha256 sum of the modtime in hexadecimal for the ETag header
+	etag := fmt.Sprintf("%x", sha256.Sum256([]byte(stat.ModTime().String())))
+
+	w.Header().Set("ETag", "\""+etag+"\"")
+	w.Header().Set("Content-Type", cssutf8)
+
+	n, err := w.Write(css)
+	if err != nil || n == 0 {
+		log500(w, r, err)
+		return
+	}
+
+	log200(r)
+}
diff --git a/http_test.go b/handlers_test.go
index 4ae7ae6..4ae7ae6 100644
--- a/http_test.go
+++ b/handlers_test.go
diff --git a/http.go b/http.go
index 7cf3ad2..2a733aa 100644
--- a/http.go
+++ b/http.go
@@ -1,209 +1,60 @@
 package main
 
 import (
-	"crypto/sha256"
-	"fmt"
-	"io/ioutil"
+	"context"
 	"log"
 	"net/http"
-	"os"
-	"time"
-
-	"github.com/gorilla/mux"
+	"strings"
 )
 
-// handles "/"
-func indexHandler(w http.ResponseWriter, r *http.Request) {
-
-	// Stat the index template to get the mod time
-	var etag string
-	if indextmpl, err := os.Stat("assets/tmpl/index.html"); err != nil {
-		log.Printf("Couldn't stat index template for ETag ... %v\n", err)
-	} else {
-		etag = fmt.Sprintf("%x", sha256.Sum256([]byte(indextmpl.ModTime().String())))
-	}
+// Attaches a request's IP address to the request's context
+func newCtxUserIP(ctx context.Context, r *http.Request) context.Context {
 
-	// Take the hex-encoded sha256 sum of the index template's mod time
-	// to send as an ETag. If an error occured when grabbing the file info,
-	// the ETag will be empty.
-	w.Header().Set("ETag", "\""+etag+"\"")
-	w.Header().Set("Content-Type", htmlutf8)
+	base := strings.Split(r.RemoteAddr, ":")
+	uip := base[0]
 
-	// Pass the confObj.Instance data to the template,
-	// then send it to the client.
-	err := tmpls.ExecuteTemplate(w, "index.html", confObj.Instance)
-	if err != nil {
-		log500(w, r, err)
-		return
-	}
-
-	log200(r)
+	return context.WithValue(ctx, ctxKey, uip)
 }
 
-// handles "/api"
-func apiBaseHandler(w http.ResponseWriter, r *http.Request) {
+// Retrieves a request's IP address from the request's context
+func getIPFromCtx(ctx context.Context) string {
 
-	timerfc3339, err := time.Now().MarshalText()
-	if err != nil {
-		log.Printf("Couldn't format time as RFC3339: %v\n", err)
+	uip, ok := ctx.Value(ctxKey).(string)
+	if !ok {
+		log.Printf("Couldn't retrieve IP from request\n")
 	}
 
-	etag := fmt.Sprintf("%x", sha256.Sum256(timerfc3339))
-
-	w.Header().Set("ETag", etag)
-	w.Header().Set("Content-Type", txtutf8)
-
-	pathdata := []byte("\n\n" + r.URL.Path)
-	timerfc3339 = append(timerfc3339, pathdata...)
-
-	n, err := w.Write(timerfc3339)
-	if err != nil || n == 0 {
-		log500(w, r, err)
-		return
-	}
-
-	log200(r)
+	return uip
 }
 
-// handles "/api/plain"
-// maybe add json/xml support later
-func apiFormatHandler(w http.ResponseWriter, r *http.Request) {
+// Shim function to modify/pass context value to a handler
+func ipMiddleware(hop http.Handler) http.Handler {
 
-	vars := mux.Vars(r)
-	format := vars["format"]
-
-	w.Header().Set("Content-Type", txtutf8)
-
-	n, err := w.Write([]byte(format + "\n"))
-	if err != nil || n == 0 {
-		log500(w, r, err)
-		return
-	}
-
-	log200(r)
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		ctx := newCtxUserIP(r.Context(), r)
+		hop.ServeHTTP(w, r.WithContext(ctx))
+	})
 }
 
-// handles "/api/plain/(users|mentions|tweets)"
-func apiEndpointHandler(w http.ResponseWriter, r *http.Request) {
-
-	err := r.ParseForm()
-	if err != nil {
-		log500(w, r, err)
-		return
-	}
-
-	if r.FormValue("q") != "" || r.FormValue("url") != "" {
-		err := apiEndpointQuery(w, r)
-		if err != nil {
-			log500(w, r, err)
-			return
-		}
-		log200(r)
-		return
-	}
-
-	w.Header().Set("Content-Type", htmlutf8)
+// log output for 200s
+func log200(r *http.Request) {
 
-	n, err := w.Write([]byte(r.URL.String()))
-	if err != nil || n == 0 {
-		log500(w, r, err)
-		return
-	}
-
-	log200(r)
+	uip := getIPFromCtx(r.Context())
+	log.Printf("*** %v :: 200 :: %v %v\n", uip, r.Method, r.URL)
 }
 
-// handles POST for "/api/plain/users"
-func apiEndpointPOSTHandler(w http.ResponseWriter, r *http.Request) {
-
-	vars := mux.Vars(r)
-	format := vars["format"]
-	endpoint := vars["endpoint"]
-
-	w.Header().Set("Content-Type", htmlutf8)
-
-	_, err := w.Write([]byte(format + "/" + endpoint))
-	if err != nil {
-		log500(w, r, err)
-		return
-	}
+// log output for 404s
+func log404(w http.ResponseWriter, r *http.Request, err error) {
 
-	log200(r)
+	uip := getIPFromCtx(r.Context())
+	log.Printf("*** %v :: 404 :: %v %v :: %v\n", uip, r.Method, r.URL, err)
+	http.Error(w, err.Error(), http.StatusNotFound)
 }
 
-// handles "/api/plain/tags"
-func apiTagsBaseHandler(w http.ResponseWriter, r *http.Request) {
-
-	vars := mux.Vars(r)
-	format := vars["format"]
-
-	w.Header().Set("Content-Type", htmlutf8)
-
-	n, err := w.Write([]byte("api/" + format + "/tags"))
-	if err != nil || n == 0 {
-		log500(w, r, err)
-		return
-	}
-
-	log200(r)
-}
-
-// handles "/api/plain/tags/[a-zA-Z0-9]+"
-func apiTagsHandler(w http.ResponseWriter, r *http.Request) {
-
-	vars := mux.Vars(r)
-	tags := vars["tags"]
-
-	out, err := twtxtCache.QueryInStatus(tags)
-	if err != nil {
-		log500(w, r, err)
-		return
-	}
-
-	data := parseQueryOut(out)
-
-	w.Header().Set("Content-Type", txtutf8)
-	_, err = w.Write(data)
-	if err != nil {
-		log500(w, r, err)
-		return
-	}
-
-	log200(r)
-}
-
-// Serving the stylesheet virtually because
-// files aren't served directly.
-func cssHandler(w http.ResponseWriter, r *http.Request) {
-
-	// read the raw bytes of the stylesheet
-	css, err := ioutil.ReadFile("assets/style.css")
-	if err != nil {
-		if os.IsNotExist(err) {
-			log404(w, r, err)
-			return
-		}
-		log500(w, r, err)
-		return
-	}
-
-	// Get the mod time for the etag header
-	stat, err := os.Stat("assets/style.css")
-	if err != nil {
-		log.Printf("Couldn't stat CSS file to send ETag header: %v\n", err)
-	}
-
-	// Sending the sha256 sum of the modtime in hexadecimal for the ETag header
-	etag := fmt.Sprintf("%x", sha256.Sum256([]byte(stat.ModTime().String())))
-
-	w.Header().Set("ETag", "\""+etag+"\"")
-	w.Header().Set("Content-Type", cssutf8)
-
-	n, err := w.Write(css)
-	if err != nil || n == 0 {
-		log500(w, r, err)
-		return
-	}
+// log output for 500s
+func log500(w http.ResponseWriter, r *http.Request, err error) {
 
-	log200(r)
+	uip := getIPFromCtx(r.Context())
+	log.Printf("*** %v :: 500 :: %v %v :: %v\n", uip, r.Method, r.URL, err)
+	http.Error(w, err.Error(), http.StatusInternalServerError)
 }
diff --git a/httpmeta.go b/httpmeta.go
deleted file mode 100644
index 2a733aa..0000000
--- a/httpmeta.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package main
-
-import (
-	"context"
-	"log"
-	"net/http"
-	"strings"
-)
-
-// Attaches a request's IP address to the request's context
-func newCtxUserIP(ctx context.Context, r *http.Request) context.Context {
-
-	base := strings.Split(r.RemoteAddr, ":")
-	uip := base[0]
-
-	return context.WithValue(ctx, ctxKey, uip)
-}
-
-// Retrieves a request's IP address from the request's context
-func getIPFromCtx(ctx context.Context) string {
-
-	uip, ok := ctx.Value(ctxKey).(string)
-	if !ok {
-		log.Printf("Couldn't retrieve IP from request\n")
-	}
-
-	return uip
-}
-
-// Shim function to modify/pass context value to a handler
-func ipMiddleware(hop http.Handler) http.Handler {
-
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ctx := newCtxUserIP(r.Context(), r)
-		hop.ServeHTTP(w, r.WithContext(ctx))
-	})
-}
-
-// log output for 200s
-func log200(r *http.Request) {
-
-	uip := getIPFromCtx(r.Context())
-	log.Printf("*** %v :: 200 :: %v %v\n", uip, r.Method, r.URL)
-}
-
-// log output for 404s
-func log404(w http.ResponseWriter, r *http.Request, err error) {
-
-	uip := getIPFromCtx(r.Context())
-	log.Printf("*** %v :: 404 :: %v %v :: %v\n", uip, r.Method, r.URL, err)
-	http.Error(w, err.Error(), http.StatusNotFound)
-}
-
-// log output for 500s
-func log500(w http.ResponseWriter, r *http.Request, err error) {
-
-	uip := getIPFromCtx(r.Context())
-	log.Printf("*** %v :: 500 :: %v %v :: %v\n", uip, r.Method, r.URL, err)
-	http.Error(w, err.Error(), http.StatusInternalServerError)
-}