fix for uuid implementation, was overwriting uuid on save w/ 0 value

3 files changed, 24 insertions, 10 deletions

diff --git a/content/item.go b/content/item.go
index 4583c07..9eb3c16 100644
--- a/content/item.go
+++ b/content/item.go
@@ -14,12 +14,14 @@ type Sluggable interface {
 	SetSlug(string)
 }
 
-// Identifiable enables a struct to have its ID set. Typically this is done
+// Identifiable enables a struct to have its ID set/get. Typically this is done
 // to set an ID to -1 indicating it is new for DB inserts, since by default
 // a newly initialized struct would have an ID of 0, the int zero-value, and
 // BoltDB's starting key per bucket is 0, thus overwriting the first record.
 type Identifiable interface {
+	ItemID() int
 	SetItemID(int)
+	UniqueID() uuid.UUID
 }
 
 // Hookable provides our user with an easy way to intercept or add functionality
@@ -58,21 +60,29 @@ func (i Item) Touch() int64 {
 	return i.Updated
 }
 
-// ItemID partially implements the Sortable interface
-func (i Item) ItemID() int {
-	return i.ID
-}
-
 // SetSlug sets the item's slug for its URL
 func (i *Item) SetSlug(slug string) {
 	i.Slug = slug
 }
 
+// ItemID gets the Item's ID field
+// partially implements the Identifiable interface
+func (i Item) ItemID() int {
+	return i.ID
+}
+
 // SetItemID sets the Item's ID field
+// partially implements the Identifiable interface
 func (i *Item) SetItemID(id int) {
 	i.ID = id
 }
 
+// UniqueID gets the Item's UUID field
+// partially implements the Identifiable interface
+func (i Item) UniqueID() uuid.UUID {
+	return i.UUID
+}
+
 // BeforeSave is a no-op to ensure structs which embed Item implement Hookable
 func (i Item) BeforeSave(req *http.Request) error {
 	return nil
diff --git a/management/editor/editor.go b/management/editor/editor.go
index 3843592..2a9183b 100644
--- a/management/editor/editor.go
+++ b/management/editor/editor.go
@@ -18,7 +18,6 @@ type Editable interface {
 type Sortable interface {
 	Time() int64
 	Touch() int64
-	ItemID() int
 }
 
 // Mergeable allows external post content to be approved and published through
diff --git a/management/manager/manager.go b/management/manager/manager.go
index 2830ba4..6083f73 100644
--- a/management/manager/manager.go
+++ b/management/manager/manager.go
@@ -5,12 +5,15 @@ import (
 	"fmt"
 	"html/template"
 
+	"github.com/bosssauce/ponzu/content"
 	"github.com/bosssauce/ponzu/management/editor"
+	uuid "github.com/satori/go.uuid"
 )
 
 const managerHTML = `
 <div class="card editor">
     <form method="post" action="/admin/edit" enctype="multipart/form-data">
+		<input type="hidden" name="uuid" value="{{.UUID}}"/>
 		<input type="hidden" name="id" value="{{.ID}}"/>
 		<input type="hidden" name="type" value="{{.Kind}}"/>
 		{{ .Editor }}
@@ -104,6 +107,7 @@ const managerHTML = `
 
 type manager struct {
 	ID     int
+	UUID   uuid.UUID
 	Kind   string
 	Editor template.HTML
 }
@@ -115,13 +119,14 @@ func Manage(e editor.Editable, typeName string) ([]byte, error) {
 		return nil, fmt.Errorf("Couldn't marshal editor for content %s. %s", typeName, err.Error())
 	}
 
-	s, ok := e.(editor.Sortable)
+	i, ok := e.(content.Identifiable)
 	if !ok {
-		return nil, fmt.Errorf("Content type %s does not implement content.Identifiable.", typeName)
+		return nil, fmt.Errorf("Content type %s does not implement content.Sortable.", typeName)
 	}
 
 	m := manager{
-		ID:     s.ItemID(),
+		ID:     i.ItemID(),
+		UUID:   i.UniqueID(),
 		Kind:   typeName,
 		Editor: template.HTML(v),
 	}