storage: Message refactoring for #69

- Message interface renamed to StoreMessage
- Message.Delete becomes Store.RemoveMessage
- Added deleted message tracking to Store stub for #80

pkg/test/storage.go

@@ -2,6 +2,7 @@ package test
 
 import (
 	"errors"
+	"sync"
 
 	"github.com/jhillyerd/inbucket/pkg/storage"
 )
@@ -9,24 +10,26 @@ import (
 // StoreStub stubs storage.Store for testing.
 type StoreStub struct {
 	storage.Store
-	mailboxes map[string][]storage.Message
+	mailboxes map[string][]storage.StoreMessage
+	deleted   map[storage.StoreMessage]struct{}
 }
 
 // NewStore creates a new StoreStub.
 func NewStore() *StoreStub {
 	return &StoreStub{
-		mailboxes: make(map[string][]storage.Message),
+		mailboxes: make(map[string][]storage.StoreMessage),
+		deleted:   make(map[storage.StoreMessage]struct{}),
 	}
 }
 
 // AddMessage adds a message to the specified mailbox.
-func (s *StoreStub) AddMessage(mailbox string, m storage.Message) {
+func (s *StoreStub) AddMessage(mailbox string, m storage.StoreMessage) {
 	msgs := s.mailboxes[mailbox]
 	s.mailboxes[mailbox] = append(msgs, m)
 }
 
 // GetMessage gets a message by ID from the specified mailbox.
-func (s *StoreStub) GetMessage(mailbox, id string) (storage.Message, error) {
+func (s *StoreStub) GetMessage(mailbox, id string) (storage.StoreMessage, error) {
 	if mailbox == "messageerr" {
 		return nil, errors.New("internal error")
 	}
@@ -39,16 +42,36 @@ func (s *StoreStub) GetMessage(mailbox, id string) (storage.Message, error) {
 }
 
 // GetMessages gets all the messages for the specified mailbox.
-func (s *StoreStub) GetMessages(mailbox string) ([]storage.Message, error) {
+func (s *StoreStub) GetMessages(mailbox string) ([]storage.StoreMessage, error) {
 	if mailbox == "messageserr" {
 		return nil, errors.New("internal error")
 	}
 	return s.mailboxes[mailbox], nil
 }
 
+// RemoveMessage deletes a message by ID from the specified mailbox.
+func (s *StoreStub) RemoveMessage(mailbox, id string) error {
+	mb, ok := s.mailboxes[mailbox]
+	if ok {
+		var msg storage.StoreMessage
+		for i, m := range mb {
+			if m.ID() == id {
+				msg = m
+				s.mailboxes[mailbox] = append(mb[:i], mb[i+1:]...)
+				break
+			}
+		}
+		if msg != nil {
+			s.deleted[msg] = struct{}{}
+			return nil
+		}
+	}
+	return storage.ErrNotExist
+}
+
 // VisitMailboxes accepts a function that will be called with the messages in each mailbox while it
 // continues to return true.
-func (s *StoreStub) VisitMailboxes(f func([]storage.Message) (cont bool)) error {
+func (s *StoreStub) VisitMailboxes(f func([]storage.StoreMessage) (cont bool)) error {
 	for _, v := range s.mailboxes {
 		if !f(v) {
 			return nil
@@ -58,6 +81,18 @@ func (s *StoreStub) VisitMailboxes(f func([]storage.Message) (cont bool)) error
 }
 
 // NewMessage is temproary until #69 MessageData refactor
-func (s *StoreStub) NewMessage(mailbox string) (storage.Message, error) {
+func (s *StoreStub) NewMessage(mailbox string) (storage.StoreMessage, error) {
 	return nil, nil
 }
+
+// LockFor mock function returns a new RWMutex, never errors.
+// TODO(#69) remove
+func (s *StoreStub) LockFor(name string) (*sync.RWMutex, error) {
+	return &sync.RWMutex{}, nil
+}
+
+// MessageDeleted returns true if the specified message was deleted
+func (s *StoreStub) MessageDeleted(m storage.StoreMessage) bool {
+	_, ok := s.deleted[m]
+	return ok
+}