Merge pull request #43 from ernestio/ernestio/678

updated event subjects

main_test.go

@@ -42,7 +42,7 @@ func TestMain(t *testing.T) {
 		url := hs.URL + "/events"
 
 		Convey("When listening for NATS messages", func() {
-			createEvents := []string{"service.create", "service.delete", "service.import"}
+			createEvents := []string{"build.create", "build.delete", "build.import"}
 			for _, event := range createEvents {
 				Convey("On receiving "+event, func() {
 					msg := nats.Msg{Subject: event, Data: []byte(`{"id": "test"}`)}
@@ -57,7 +57,7 @@ func TestMain(t *testing.T) {
 				})
 			}
 
-			deleteEvents := []string{"service.create.done", "service.delete.done", "service.import.done", "service.create.error", "service.delete.error", "service.import.error"}
+			deleteEvents := []string{"build.create.done", "build.delete.done", "build.import.done", "build.create.error", "build.delete.error", "build.import.error"}
 			for _, event := range deleteEvents {
 				ss.CreateStream("test")
 				time.Sleep(time.Millisecond * 10)

nats.go

@@ -10,13 +10,13 @@ import (
 )
 
 func natsHandler(msg *nats.Msg) {
-	var services = []string{
-		"service.create",
-		"service.create.*",
-		"service.delete",
-		"service.delete.*",
-		"service.import",
-		"service.import.*",
+	var buildss = []string{
+		"build.create",
+		"build.create.*",
+		"build.delete",
+		"build.delete.*",
+		"build.import",
+		"build.import.*",
 	}
 	var components = []string{
 		"*.create.*",
@@ -30,8 +30,8 @@ func natsHandler(msg *nats.Msg) {
 	}
 
 	switch {
-	case pattern.Match(msg.Subject, services...):
-		processService(msg)
+	case pattern.Match(msg.Subject, buildss...):
+		processBuild(msg)
 	case pattern.Match(msg.Subject, components...):
 		processComponent(msg)
 	}

service.go

@@ -13,16 +13,16 @@ import (
 	"github.com/r3labs/sse"
 )
 
-// Service : holds service values
-type Service struct {
+// Build : holds builds values
+type Build struct {
 	ID      string      `json:"id"`
 	Name    string      `json:"name"`
 	Subject string      `json:"_subject"`
 	Changes []Component `json:"changes"`
 }
 
-func processService(msg *nats.Msg) {
-	var s Service
+func processBuild(msg *nats.Msg) {
+	var s Build
 
 	s.Subject = msg.Subject
 
@@ -40,11 +40,11 @@ func processService(msg *nats.Msg) {
 	}
 
 	switch msg.Subject {
-	case "service.create", "service.delete", "service.import":
+	case "build.create", "build.delete", "build.import":
 		log.Println("Creating stream: ", id)
 		ss.CreateStream(id)
 		ss.Publish(id, &sse.Event{Data: data})
-	case "service.create.done", "service.create.error", "service.delete.done", "service.delete.error", "service.import.done", "service.import.error":
+	case "build.create.done", "build.create.error", "build.delete.done", "build.delete.error", "build.import.done", "build.import.error":
 		ss.Publish(id, &sse.Event{Data: data})
 		go func(ss *sse.Server) {
 			// Wait for any late connecting clients before closing stream
@@ -55,6 +55,6 @@ func processService(msg *nats.Msg) {
 	}
 }
 
-func (s *Service) getID() string {
-	return s.ID
+func (b *Build) getID() string {
+	return b.ID
 }