From afe2ad4d1ead83b6d437fef57cc0feecaa5ac0ce Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Sat, 24 Sep 2016 02:06:54 -0700
Subject: creating JSON API server, initial version working

---
 cmd/cms/main.go        |   4 +-
 cmd/cms/server.go      | 122 --------------------------------------------
 system/admin/admin.go  |   3 --
 system/admin/server.go | 122 ++++++++++++++++++++++++++++++++++++++++++++
 system/api/server.go   | 135 +++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 260 insertions(+), 126 deletions(-)
 delete mode 100644 cmd/cms/server.go
 create mode 100644 system/admin/server.go
 create mode 100644 system/api/server.go

diff --git a/cmd/cms/main.go b/cmd/cms/main.go
index 0b451c5..123c65e 100644
--- a/cmd/cms/main.go
+++ b/cmd/cms/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/nilslice/cms/system/api"
 	"github.com/nilslice/cms/system/db"
 )
 
@@ -97,7 +98,8 @@ func main() {
 		}
 	case "serve", "s":
 		db.Init()
-		serve()
+		// admin.Run("8080")
+		api.Run("8000")
 
 	case "":
 		flag.PrintDefaults()
diff --git a/cmd/cms/server.go b/cmd/cms/server.go
deleted file mode 100644
index d3037d2..0000000
--- a/cmd/cms/server.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/nilslice/cms/content"
-	"github.com/nilslice/cms/management/editor"
-	"github.com/nilslice/cms/management/manager"
-	"github.com/nilslice/cms/system/admin"
-	"github.com/nilslice/cms/system/db"
-)
-
-func init() {
-	http.HandleFunc("/admin", func(res http.ResponseWriter, req *http.Request) {
-		adminView := admin.Admin(nil)
-
-		res.Header().Set("Content-Type", "text/html")
-		res.Write(adminView)
-	})
-
-	http.HandleFunc("/admin/posts", func(res http.ResponseWriter, req *http.Request) {
-		q := req.URL.Query()
-		t := q.Get("type")
-		if t == "" {
-			res.WriteHeader(http.StatusBadRequest)
-		}
-
-		posts := db.GetAll(t)
-		b := &bytes.Buffer{}
-		p := content.Types[t]().(editor.Editable)
-
-		html := `<a href="/admin/edit?type=` + t + `" class="button">New ` + t + `</a>
-			<ul class="posts">`
-		for i := range posts {
-			json.Unmarshal(posts[i], &p)
-			post := `<li><a href="/admin/edit?type=` +
-				t + `&id=` + fmt.Sprintf("%d", p.ContentID()) +
-				`">` + p.ContentName() + `</a></li>`
-			b.Write([]byte(post))
-		}
-		html = html + b.String()
-
-		adminView := admin.Admin([]byte(html))
-
-		res.Header().Set("Content-Type", "text/html")
-		res.Write(adminView)
-	})
-
-	http.HandleFunc("/admin/edit", func(res http.ResponseWriter, req *http.Request) {
-		switch req.Method {
-		case http.MethodGet:
-			q := req.URL.Query()
-			i := q.Get("id")
-			t := q.Get("type")
-			contentType, ok := content.Types[t]
-			if !ok {
-				fmt.Fprintf(res, content.ErrTypeNotRegistered, t)
-				return
-			}
-			post := contentType()
-
-			if i != "" {
-				data, err := db.Get(t + ":" + i)
-				if err != nil {
-					fmt.Println(err)
-					res.WriteHeader(http.StatusInternalServerError)
-					return
-				}
-
-				err = json.Unmarshal(data, post)
-				if err != nil {
-					fmt.Println(err)
-					res.WriteHeader(http.StatusInternalServerError)
-					return
-				}
-			} else {
-				post.(editor.Editable).SetContentID(-1)
-			}
-
-			m, err := manager.Manage(post.(editor.Editable), t)
-			adminView := admin.Admin(m)
-			if err != nil {
-				fmt.Println(err)
-				res.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-			res.Header().Set("Content-Type", "text/html")
-			res.Write(adminView)
-
-		case http.MethodPost:
-			err := req.ParseForm()
-			if err != nil {
-				fmt.Println(err)
-				res.WriteHeader(http.StatusBadRequest)
-				return
-			}
-
-			cid := req.FormValue("id")
-			t := req.FormValue("type")
-			id, err := db.Set(t+":"+cid, req.PostForm)
-			if err != nil {
-				fmt.Println(err)
-				res.WriteHeader(http.StatusInternalServerError)
-				return
-			}
-
-			scheme := req.URL.Scheme
-			host := req.URL.Host
-			path := req.URL.Path
-			sid := fmt.Sprintf("%d", id)
-			desURL := scheme + host + path + "?type=" + t + "&id=" + sid
-			http.Redirect(res, req, desURL, http.StatusFound)
-		}
-	})
-}
-
-func serve() {
-	http.ListenAndServe(":8080", nil)
-}
diff --git a/system/admin/admin.go b/system/admin/admin.go
index 8febbf7..a4053ad 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -4,7 +4,6 @@ package admin
 
 import (
 	"bytes"
-	"fmt"
 	"html/template"
 
 	"github.com/nilslice/cms/content"
@@ -55,8 +54,6 @@ func Admin(manager []byte) []byte {
 		Subview: template.HTML(manager),
 	}
 
-	fmt.Println(a.Types)
-
 	buf := &bytes.Buffer{}
 	tmpl := template.Must(template.New("admin").Parse(adminHTML))
 	tmpl.Execute(buf, a)
diff --git a/system/admin/server.go b/system/admin/server.go
new file mode 100644
index 0000000..730561a
--- /dev/null
+++ b/system/admin/server.go
@@ -0,0 +1,122 @@
+package admin
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/nilslice/cms/content"
+	"github.com/nilslice/cms/management/editor"
+	"github.com/nilslice/cms/management/manager"
+	"github.com/nilslice/cms/system/db"
+)
+
+func init() {
+	http.HandleFunc("/admin", func(res http.ResponseWriter, req *http.Request) {
+		adminView := Admin(nil)
+
+		res.Header().Set("Content-Type", "text/html")
+		res.Write(adminView)
+	})
+
+	http.HandleFunc("/admin/posts", func(res http.ResponseWriter, req *http.Request) {
+		q := req.URL.Query()
+		t := q.Get("type")
+		if t == "" {
+			res.WriteHeader(http.StatusBadRequest)
+		}
+
+		posts := db.GetAll(t)
+		b := &bytes.Buffer{}
+		p := content.Types[t]().(editor.Editable)
+
+		html := `<a href="/admin/edit?type=` + t + `" class="button">New ` + t + `</a>
+			<ul class="posts">`
+		for i := range posts {
+			json.Unmarshal(posts[i], &p)
+			post := `<li><a href="/admin/edit?type=` +
+				t + `&id=` + fmt.Sprintf("%d", p.ContentID()) +
+				`">` + p.ContentName() + `</a></li>`
+			b.Write([]byte(post))
+		}
+		html = html + b.String()
+
+		adminView := Admin([]byte(html))
+
+		res.Header().Set("Content-Type", "text/html")
+		res.Write(adminView)
+	})
+
+	http.HandleFunc("/admin/edit", func(res http.ResponseWriter, req *http.Request) {
+		switch req.Method {
+		case http.MethodGet:
+			q := req.URL.Query()
+			i := q.Get("id")
+			t := q.Get("type")
+			contentType, ok := content.Types[t]
+			if !ok {
+				fmt.Fprintf(res, content.ErrTypeNotRegistered, t)
+				return
+			}
+			post := contentType()
+
+			if i != "" {
+				data, err := db.Get(t + ":" + i)
+				if err != nil {
+					fmt.Println(err)
+					res.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+
+				err = json.Unmarshal(data, post)
+				if err != nil {
+					fmt.Println(err)
+					res.WriteHeader(http.StatusInternalServerError)
+					return
+				}
+			} else {
+				post.(editor.Editable).SetContentID(-1)
+			}
+
+			m, err := manager.Manage(post.(editor.Editable), t)
+			adminView := Admin(m)
+			if err != nil {
+				fmt.Println(err)
+				res.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+			res.Header().Set("Content-Type", "text/html")
+			res.Write(adminView)
+
+		case http.MethodPost:
+			err := req.ParseForm()
+			if err != nil {
+				fmt.Println(err)
+				res.WriteHeader(http.StatusBadRequest)
+				return
+			}
+
+			cid := req.FormValue("id")
+			t := req.FormValue("type")
+			id, err := db.Set(t+":"+cid, req.PostForm)
+			if err != nil {
+				fmt.Println(err)
+				res.WriteHeader(http.StatusInternalServerError)
+				return
+			}
+
+			scheme := req.URL.Scheme
+			host := req.URL.Host
+			path := req.URL.Path
+			sid := fmt.Sprintf("%d", id)
+			desURL := scheme + host + path + "?type=" + t + "&id=" + sid
+			http.Redirect(res, req, desURL, http.StatusFound)
+		}
+	})
+}
+
+// Run starts the Admin system on the port provided
+func Run(port string) {
+	http.ListenAndServe(":"+port, nil)
+}
diff --git a/system/api/server.go b/system/api/server.go
new file mode 100644
index 0000000..5fa0bfc
--- /dev/null
+++ b/system/api/server.go
@@ -0,0 +1,135 @@
+package api
+
+import (
+	"bytes"
+	"encoding/json"
+	"log"
+	"net/http"
+
+	"github.com/nilslice/cms/content"
+	"github.com/nilslice/cms/system/db"
+)
+
+func init() {
+	http.HandleFunc("/api/types", func(res http.ResponseWriter, req *http.Request) {
+		var types = []string{}
+		for t := range content.Types {
+			types = append(types, string(t))
+		}
+
+		j, err := toJSON(types)
+		if err != nil {
+			res.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		res.Header().Set("Content-Type", "application/json")
+		res.Write(j)
+	})
+
+	http.HandleFunc("/api/posts", func(res http.ResponseWriter, req *http.Request) {
+		q := req.URL.Query()
+		t := q.Get("type")
+		// TODO: implement pagination
+		// num := q.Get("num")
+		// page := q.Get("page")
+
+		if t == "" {
+			res.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		posts := db.GetAll(t)
+		var all = []json.RawMessage{}
+		for _, post := range posts {
+			all = append(all, post)
+		}
+
+		j, err := fmtJSON(all...)
+		if err != nil {
+			res.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		res.Header().Set("Content-Type", "application/json")
+		res.Write(j)
+	})
+
+	http.HandleFunc("/api/post", func(res http.ResponseWriter, req *http.Request) {
+		q := req.URL.Query()
+		id := q.Get("id")
+		t := q.Get("type")
+
+		if t == "" || id == "" {
+			res.WriteHeader(http.StatusBadRequest)
+			return
+		}
+
+		post, err := db.Get(t + ":" + id)
+		if err != nil {
+			res.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		j, err := fmtJSON(json.RawMessage(post))
+		if err != nil {
+			res.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		res.Header().Set("Content-Type", "application/json")
+		res.Write(j)
+	})
+
+}
+
+func fmtJSON(data ...json.RawMessage) ([]byte, error) {
+	var msg = []json.RawMessage{}
+	for _, d := range data {
+		msg = append(msg, d)
+	}
+
+	resp := map[string][]json.RawMessage{
+		"data": msg,
+	}
+
+	var buf = &bytes.Buffer{}
+	enc := json.NewEncoder(buf)
+	err := enc.Encode(resp)
+	if err != nil {
+		log.Println("Failed to encode data to JSON:", err)
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
+}
+
+func toJSON(data []string) ([]byte, error) {
+	var buf = &bytes.Buffer{}
+	enc := json.NewEncoder(buf)
+	resp := map[string][]string{
+		"data": data,
+	}
+
+	err := enc.Encode(resp)
+	if err != nil {
+		log.Println("Failed to encode data to JSON:", err)
+		return nil, err
+	}
+
+	return buf.Bytes(), nil
+}
+
+func wrapJSON(json []byte) []byte {
+	var buf = &bytes.Buffer{}
+	buf.Write([]byte("{data:"))
+	buf.Write(json)
+	buf.Write([]byte("}"))
+
+	return buf.Bytes()
+}
+
+// Run start the JSON API
+func Run(port string) {
+	log.Fatal(http.ListenAndServe(":"+port, nil))
+}
-- 
cgit v1.2.3