From 1d0853ac933cf0be6e179c7a0300f8091ee6ec5e Mon Sep 17 00:00:00 2001
From: Simon Eisenmann <simon@struktur.de>
Date: Wed, 12 Mar 2014 15:18:22 +0100
Subject: [PATCH] Added support for general handlers in sleeply API
 registration. Added CORS headers to stats API.

---
 .../spreed-speakfreely-server/sleepy/core.go  | 77 ++++++++++++-------
 src/app/spreed-speakfreely-server/stats.go    | 20 ++++-
 2 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/src/app/spreed-speakfreely-server/sleepy/core.go b/src/app/spreed-speakfreely-server/sleepy/core.go
index f25c5173..e060a01d 100644
--- a/src/app/spreed-speakfreely-server/sleepy/core.go
+++ b/src/app/spreed-speakfreely-server/sleepy/core.go
@@ -42,6 +42,12 @@ type DeleteSupported interface {
 	Delete(*http.Request) (int, interface{})
 }
 
+// HandleSupported is the interface that provides a general
+// use method to support custom request processing.
+type HandleSupported interface {
+	Handle(http.ResponseWriter, *http.Request) (int, []byte)
+}
+
 // An API manages a group of resources by routing requests
 // to the correct method on a matching resource and marshalling
 // the returned data to JSON for the HTTP response.
@@ -59,39 +65,54 @@ func (api *API) requestHandler(resource interface{}) http.HandlerFunc {
 
 		request.ParseForm()
 
-		var handler func(*http.Request) (int, interface{})
-
-		switch request.Method {
-		case GET:
-			if resource, ok := resource.(GetSupported); ok {
-				handler = resource.Get
-			}
-		case POST:
-			if resource, ok := resource.(PostSupported); ok {
-				handler = resource.Post
-			}
-		case PUT:
-			if resource, ok := resource.(PutSupported); ok {
-				handler = resource.Put
+		var code int
+		var content []byte
+		var err error
+
+		if resource, ok := resource.(HandleSupported); ok {
+
+			var handle func(http.ResponseWriter, *http.Request) (int, []byte)
+			handle = resource.Handle
+			code, content = handle(rw, request)
+
+		} else {
+
+			var handler func(*http.Request) (int, interface{})
+			var data interface{}
+
+			switch request.Method {
+			case GET:
+				if resource, ok := resource.(GetSupported); ok {
+					handler = resource.Get
+				}
+			case POST:
+				if resource, ok := resource.(PostSupported); ok {
+					handler = resource.Post
+				}
+			case PUT:
+				if resource, ok := resource.(PutSupported); ok {
+					handler = resource.Put
+				}
+			case DELETE:
+				if resource, ok := resource.(DeleteSupported); ok {
+					handler = resource.Delete
+				}
 			}
-		case DELETE:
-			if resource, ok := resource.(DeleteSupported); ok {
-				handler = resource.Delete
+
+			if handler == nil {
+				rw.WriteHeader(http.StatusMethodNotAllowed)
+				return
 			}
-		}
 
-		if handler == nil {
-			rw.WriteHeader(http.StatusMethodNotAllowed)
-			return
-		}
+			code, data = handler(request)
+			rw.Header().Set("Content-Type", "application/json; charset=utf-8")
 
-		code, data := handler(request)
-		rw.Header().Set("Content-Type", "application/json; charset=utf-8")
+			content, err = json.MarshalIndent(data, "", "\t")
+			if err != nil {
+				rw.WriteHeader(http.StatusInternalServerError)
+				return
+			}
 
-		content, err := json.MarshalIndent(data, "", "\t")
-		if err != nil {
-			rw.WriteHeader(http.StatusInternalServerError)
-			return
 		}
 
 		rw.WriteHeader(code)
diff --git a/src/app/spreed-speakfreely-server/stats.go b/src/app/spreed-speakfreely-server/stats.go
index f592dd49..b3a37ecb 100644
--- a/src/app/spreed-speakfreely-server/stats.go
+++ b/src/app/spreed-speakfreely-server/stats.go
@@ -21,6 +21,7 @@
 package main
 
 import (
+ 	"encoding/json"
 	"net/http"
 	"runtime"
 	"time"
@@ -71,12 +72,23 @@ type Stats struct {
 	hub *Hub
 }
 
-func (stats *Stats) Get(r *http.Request) (int, interface{}) {
+func (stats *Stats) Handle(rw http.ResponseWriter, r *http.Request) (int, []byte) {
+
+	if r.Method != "GET" {
+		return http.StatusMethodNotAllowed, nil
+	}
 
-	r.ParseForm()
 	details := r.FormValue("details") == "1"
 
-	stat := NewStat(details, stats.hub)
-	return 200, stat
+	data := NewStat(details, stats.hub)
+	rw.Header().Set("Access-Control-Allow-Origin", "*")
+	rw.Header().Set("Content-Type", "application/json; charset=utf-8")
+
+	content, err := json.MarshalIndent(data, "", "\t")
+	if err != nil {
+		return http.StatusInternalServerError, nil
+	}
+
+	return 200, content
 
 }