Merge pull request #5 from choria-io/4

(#4) allow Identity() extract a event identity

Author: ripienaar

event.go

@@ -4,7 +4,8 @@ package lifecycle
 type Event interface {
 	Target() (string, error)
 	String() string
-	Component() string
 	Type() Type
 	SetIdentity(string)
+	Component() string
+	Identity() string
 }

options_test.go

@@ -15,7 +15,7 @@ var _ = Describe("Options", func() {
 	Describe("Identity", func() {
 		It("Should set the identity", func() {
 			Identity("ginkgo")(event)
-			Expect(event.Identity).To(Equal("ginkgo"))
+			Expect(event.Ident).To(Equal("ginkgo"))
 		})
 	})
 

shutdown.go

@@ -8,7 +8,7 @@ import (
 // ShutdownEvent is a choria:lifecycle:shutdown:1 event
 type ShutdownEvent struct {
 	Protocol  string `json:"protocol"`
-	Identity  string `json:"identity"`
+	Ident     string `json:"identity"`
 	Comp      string `json:"component"`
 	Timestamp int64  `json:"timestamp"`
 }
@@ -64,7 +64,12 @@ func (e *ShutdownEvent) SetComponent(c string) {
 
 // SetIdentity sets the identity for the event
 func (e *ShutdownEvent) SetIdentity(i string) {
-	e.Identity = i
+	e.Ident = i
+}
+
+// Identity sets the identity for the event
+func (e *ShutdownEvent) Identity() string {
+	return e.Ident
 }
 
 // Target is where to publish the event to
@@ -78,7 +83,7 @@ func (e *ShutdownEvent) Target() (string, error) {
 
 // String is text suitable to display on the console etc
 func (e *ShutdownEvent) String() string {
-	return fmt.Sprintf("[shutdown] %s: %s", e.Identity, e.Component())
+	return fmt.Sprintf("[shutdown] %s: %s", e.Ident, e.Component())
 }
 
 // Type is the type of event

shutdown_test.go

@@ -45,7 +45,7 @@ var _ = Describe("ShutdownEvent", func() {
 		It("Should set the identity", func() {
 			e := &ShutdownEvent{}
 			e.SetIdentity("node.example")
-			Expect(e.Identity).To(Equal("node.example"))
+			Expect(e.Ident).To(Equal("node.example"))
 		})
 	})
 

startup.go

@@ -8,7 +8,7 @@ import (
 // StartupEvent is a choria:lifecycle:startup:1 event
 type StartupEvent struct {
 	Protocol  string `json:"protocol"`
-	Identity  string `json:"identity"`
+	Ident     string `json:"identity"`
 	Version   string `json:"version"`
 	Timestamp int64  `json:"timestamp"`
 	Comp      string `json:"component"`
@@ -70,7 +70,12 @@ func (e *StartupEvent) SetVersion(v string) {
 
 // SetIdentity sets the identity for the event
 func (e *StartupEvent) SetIdentity(i string) {
-	e.Identity = i
+	e.Ident = i
+}
+
+// Identity retrieves the identity
+func (e *StartupEvent) Identity() string {
+	return e.Ident
 }
 
 // Target is where to publish the event to
@@ -84,7 +89,7 @@ func (e *StartupEvent) Target() (string, error) {
 
 // String is text suitable to display on the console etc
 func (e *StartupEvent) String() string {
-	return fmt.Sprintf("[startup] %s: %s version %s", e.Identity, e.Component(), e.Version)
+	return fmt.Sprintf("[startup] %s: %s version %s", e.Ident, e.Component(), e.Version)
 }
 
 // Type is the type of event

startup_test.go

@@ -53,7 +53,7 @@ var _ = Describe("StartupEvent", func() {
 		It("Should set the identity", func() {
 			e := &StartupEvent{}
 			e.SetIdentity("node.example")
-			Expect(e.Identity).To(Equal("node.example"))
+			Expect(e.Ident).To(Equal("node.example"))
 		})
 	})