Develop client/session separation

.travis.yml

@@ -1,14 +1,21 @@
+sudo: false
 language: go
 go:
-  - 1.3
-services:
-  - redis-server
+  - 1.4.2
 before_script:
   - go get github.com/onsi/ginkgo
   - go get github.com/onsi/gomega
-  - go get code.google.com/p/go.tools/cmd/cover
+  - go get golang.org/x/tools/cmd/cover
   - go install github.com/onsi/ginkgo/ginkgo
-script: ginkgo -r --skipMeasurements --cover --trace
+script: ginkgo -r --skipMeasurements --cover --trace --race
 env:
     global:
         - PATH=$HOME/gopath/bin:$PATH
+
+notifications:
+  email: false
+
+branches:
+  only:
+    - master
+    - develop

apns_suite_test.go

@@ -5,8 +5,45 @@ import (
 	. "github.com/onsi/gomega"
 
 	"testing"
+	"time"
 )
 
+type mockConn struct {
+	connect         func() error
+	read            func([]byte) (int, error)
+	setReadDeadline func(time.Time) error
+}
+
+func (m *mockConn) Connect() error {
+	if m.connect != nil {
+		return m.connect()
+	}
+
+	return nil
+}
+
+func (m *mockConn) Read(b []byte) (int, error) {
+	if m.read != nil {
+		return m.read(b)
+	}
+	return 0, nil
+}
+
+func (m *mockConn) Write([]byte) (int, error) {
+	return 0, nil
+}
+
+func (m *mockConn) Close() error {
+	return nil
+}
+
+func (m *mockConn) SetReadDeadline(t time.Time) error {
+	if m.setReadDeadline != nil {
+		return m.setReadDeadline(t)
+	}
+	return nil
+}
+
 func TestApns(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "Apns Suite")

buffer.go

@@ -0,0 +1,79 @@
+package apns
+
+import (
+	"container/list"
+	"sync"
+)
+
+// circular buffer of sent messages
+// to retry if connection is dropped
+type buffer struct {
+	size int
+	m    sync.Mutex
+	*list.List
+}
+
+func newBuffer(size int) *buffer {
+	return &buffer{size, sync.Mutex{}, list.New()}
+}
+
+func (b *buffer) Add(v interface{}) *list.Element {
+	b.m.Lock()
+	defer b.m.Unlock()
+
+	e := b.PushBack(v)
+
+	if b.Len() > b.size {
+		b.Remove(b.Front())
+	}
+
+	return e
+}
+
+// NotificationResult associates an error from Apple to a notification.
+type NotificationResult struct {
+	Notif Notification
+	Err   Error
+}
+
+func (s NotificationResult) Error() string {
+	return s.Err.Error()
+}
+
+func (b *buffer) FindFailedNotification(e Error) NotificationResult {
+	for cursor := b.Back(); cursor != nil; cursor = cursor.Prev() {
+		// Get serialized notification
+		n, _ := cursor.Value.(Notification)
+
+		// If the notification, move cursor after the trouble notification
+		if n.Identifier == e.Identifier {
+			return NotificationResult{n, e}
+		}
+	}
+	return NotificationResult{Notification{}, e}
+}
+
+// RequeueableNotifications returns good notifications sent after an error.
+func (b *buffer) RequeueableNotifications(identifier uint32) []Notification {
+	notifs := []Notification{}
+
+	// Walk back to last known good notification and return the slice
+	var e *list.Element
+	for e = b.Front(); e != nil; e = e.Next() {
+		if n, ok := e.Value.(Notification); ok && n.Identifier == identifier {
+			break
+		}
+	}
+
+	// Start right after errored ID and get the rest of the list
+	for e = e.Next(); e != nil; e = e.Next() {
+		n, ok := e.Value.(Notification)
+		if !ok {
+			continue
+		}
+
+		notifs = append(notifs, n)
+	}
+
+	return notifs
+}

buffer_test.go

@@ -0,0 +1,11 @@
+package apns
+
+import (
+	. "github.com/onsi/ginkgo"
+	// . "github.com/onsi/gomega"
+)
+
+var _ = Describe("Session", func() {
+	Describe("RequeueableNotifications", func() {
+	})
+})