Merge pull request #32 from Comcast/backwardsCompatable

Backwards compatable

src/caduceus/caduceus.go

@@ -163,7 +163,7 @@ func caduceus(arguments []string) int {
 	mux.Handle("/api/v1/profile", caduceusHandler.Then(profileWrapper))
 
 	// Support the old endpoint too.
-	mux.Handle("/api/v2/notify", caduceusHandler.Then(serverWrapper))
+	mux.Handle("/api/v2/notify/{deviceid}/event/{eventtype:.*}", caduceusHandler.Then(serverWrapper))
 
 	webhookFactory, err := webhook.NewFactory(v)
 	if err != nil {

src/caduceus/senderWrapper.go

@@ -136,17 +136,16 @@ func (sw *CaduceusSenderWrapper) Queue(req CaduceusRequest) {
 	case "application/json":
 		if url, err := url.Parse(req.TargetURL); nil == err {
 			elements := strings.Split(url.Path, "/")
-			if 6 < len(elements) &&
+			if 5 < len(elements) &&
 				"" == elements[0] &&
 				"api" == elements[1] &&
 				"v2" == elements[2] &&
-				"notification" == elements[3] &&
-				"device" == elements[4] &&
+				"notify" == elements[3] &&
 				// Skip the device id
-				"event" == elements[6] {
+				"event" == elements[5] {
 
 				eventType := strings.SplitN(url.Path, "/event/", 2)[1]
-				deviceID := elements[5]
+				deviceID := elements[4]
 				// TODO: this looks like it's wrong, we should fill this out
 				transID := "12345"
 				sw.mutex.RLock()

src/caduceus/senderWrapper_test.go

@@ -88,17 +88,17 @@ func TestSwSimple(t *testing.T) {
 	iot := CaduceusRequest{
 		Payload:     []byte("Hello, world."),
 		ContentType: "application/json",
-		TargetURL:   "http://foo.com/api/v2/notification/device/mac:112233445566/event/iot",
+		TargetURL:   "http://foo.com/api/v2/notify/mac:112233445566/event/iot",
 	}
 	test := CaduceusRequest{
 		Payload:     []byte("Hello, world."),
 		ContentType: "application/json",
-		TargetURL:   "http://foo.com/api/v2/notification/device/mac:112233445566/event/test",
+		TargetURL:   "http://foo.com/api/v2/notify/mac:112233445566/event/test",
 	}
 	wrp := CaduceusRequest{
 		Payload:     buffer.Bytes(),
 		ContentType: "application/wrp",
-		TargetURL:   "http://foo.com/api/v2/notification/device/mac:112233445566/event/wrp",
+		TargetURL:   "http://foo.com/api/v2/notify/mac:112233445566/event/wrp",
 	}
 
 	trans := &swTransport{}