cleaner code

4 files changed, 33 insertions, 71 deletions

diff --git a/cmd/ponzu/main.go b/cmd/ponzu/main.go
index f16e24b..d064569 100644
--- a/cmd/ponzu/main.go
+++ b/cmd/ponzu/main.go
@@ -156,13 +156,7 @@ func main() {
 		serve.Stderr = os.Stderr
 		serve.Stdout = os.Stdout
 
-		err := serve.Start()
-		if err != nil {
-			fmt.Println(err)
-			os.Exit(1)
-		}
-
-		err = serve.Wait()
+		err := serve.Run()
 		if err != nil {
 			fmt.Println(err)
 			os.Exit(1)
@@ -178,13 +172,11 @@ func main() {
 		if len(args) > 1 {
 			services := strings.Split(args[1], ",")
 
-			for i := range services {
-				if services[i] == "api" {
+			for _, service := range services {
+				if service == "api" {
 					api.Run()
-
-				} else if services[i] == "admin" {
+				} else if service == "admin" {
 					admin.Run()
-
 				} else {
 					fmt.Println("To execute 'ponzu serve', you must specify which service to run.")
 					fmt.Println("$ ponzu --help")
diff --git a/management/editor/editor.go b/management/editor/editor.go
index a9a8c82..7bc5f35 100644
--- a/management/editor/editor.go
+++ b/management/editor/editor.go
@@ -234,7 +234,7 @@ func addFieldToEditorView(e *Editor, f Field) error {
 
 func addPostDefaultFieldsToEditorView(p Editable, e *Editor) error {
 	defaults := []Field{
-		Field{
+		{
 			View: Input("Slug", p, map[string]string{
 				"label":       "URL Slug",
 				"type":        "text",
@@ -242,13 +242,13 @@ func addPostDefaultFieldsToEditorView(p Editable, e *Editor) error {
 				"placeholder": "Will be set automatically",
 			}),
 		},
-		Field{
+		{
 			View: Timestamp("Timestamp", p, map[string]string{
 				"type":  "hidden",
 				"class": "timestamp __ponzu",
 			}),
 		},
-		Field{
+		{
 			View: Timestamp("Updated", p, map[string]string{
 				"type":  "hidden",
 				"class": "updated __ponzu",
diff --git a/management/manager/manager.go b/management/manager/manager.go
index 594c258..02e359e 100644
--- a/management/manager/manager.go
+++ b/management/manager/manager.go
@@ -99,14 +99,16 @@ const managerHTML = `
 				updated.val((new Date()).getTime());
 
 				timeUpdated = true;
-				$('form').submit();				
+				$('form').submit();
 			});
 		});
-		
+
 	</script>
 </div>
 `
 
+var managerTmpl = template.Must(template.New("manager").Parse(managerHTML))
+
 type manager struct {
 	ID     int
 	UUID   uuid.UUID
@@ -141,9 +143,9 @@ func Manage(e editor.Editable, typeName string) ([]byte, error) {
 	}
 
 	// execute html template into buffer for func return val
-	buf := &bytes.Buffer{}
-	tmpl := template.Must(template.New("manager").Parse(managerHTML))
-	tmpl.Execute(buf, m)
-
+	buf := new(bytes.Buffer)
+	if err := managerTmpl.Execute(buf, m); err != nil {
+		return nil, err
+	}
 	return buf.Bytes(), nil
 }
diff --git a/system/admin/admin.go b/system/admin/admin.go
index 9c4cfdd..97462ff 100644
--- a/system/admin/admin.go
+++ b/system/admin/admin.go
@@ -93,10 +93,10 @@ type admin struct {
 }
 
 // Admin ...
-func Admin(view []byte) ([]byte, error) {
+func Admin(view []byte) (_ []byte, err error) {
 	cfg, err := db.Config("name")
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	if cfg == nil {
@@ -114,7 +114,7 @@ func Admin(view []byte) ([]byte, error) {
 	tmpl := template.Must(template.New("admin").Parse(html))
 	err = tmpl.Execute(buf, a)
 	if err != nil {
-		return nil, err
+		return
 	}
 
 	return buf.Bytes(), nil
@@ -476,12 +476,7 @@ func UsersList(req *http.Request) ([]byte, error) {
 		return nil, err
 	}
 
-	view, err := Admin(buf.Bytes())
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(buf.Bytes())
 }
 
 var analyticsHTML = `
@@ -535,8 +530,7 @@ var analyticsHTML = `
 
 // Dashboard returns the admin view with analytics dashboard
 func Dashboard() ([]byte, error) {
-	buf := &bytes.Buffer{}
-
+	buf := new(bytes.Buffer)
 	data, err := analytics.ChartData()
 	if err != nil {
 		return nil, err
@@ -547,16 +541,10 @@ func Dashboard() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	view, err := Admin(buf.Bytes())
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(buf.Bytes())
 }
 
-var err400HTML = `
+var err400HTML = []byte(`
 <div class="error-page e400 col s6">
 <div class="card">
 <div class="card-content">
@@ -565,19 +553,14 @@ var err400HTML = `
 </div>
 </div>
 </div>
-`
+`)
 
 // Error400 creates a subview for a 400 error page
 func Error400() ([]byte, error) {
-	view, err := Admin([]byte(err400HTML))
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(err400HTML)
 }
 
-var err404HTML = `
+var err404HTML = []byte(`
 <div class="error-page e404 col s6">
 <div class="card">
 <div class="card-content">
@@ -586,19 +569,14 @@ var err404HTML = `
 </div>
 </div>
 </div>
-`
+`)
 
 // Error404 creates a subview for a 404 error page
 func Error404() ([]byte, error) {
-	view, err := Admin([]byte(err404HTML))
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(err404HTML)
 }
 
-var err405HTML = `
+var err405HTML = []byte(`
 <div class="error-page e405 col s6">
 <div class="card">
 <div class="card-content">
@@ -607,19 +585,14 @@ var err405HTML = `
 </div>
 </div>
 </div>
-`
+`)
 
 // Error405 creates a subview for a 405 error page
 func Error405() ([]byte, error) {
-	view, err := Admin([]byte(err405HTML))
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(err405HTML)
 }
 
-var err500HTML = `
+var err500HTML = []byte(`
 <div class="error-page e500 col s6">
 <div class="card">
 <div class="card-content">
@@ -628,14 +601,9 @@ var err500HTML = `
 </div>
 </div>
 </div>
-`
+`)
 
 // Error500 creates a subview for a 500 error page
 func Error500() ([]byte, error) {
-	view, err := Admin([]byte(err500HTML))
-	if err != nil {
-		return nil, err
-	}
-
-	return view, nil
+	return Admin(err500HTML)
 }