Merge pull request #1 from codeguard/import_endpoint

Add import capability

Author: Jonathan Manuzak

mixpanel.go

@@ -55,6 +55,8 @@ type Mixpanel struct {
 const events_endpoint string = "https://api.mixpanel.com/track"
 const people_endpoint string = "https://api.mixpanel.com/engage"
 
+var import_endpoint string = "https://api.mixpanel.com/import"
+
 func b64(payload []byte) []byte {
 	var b bytes.Buffer
 	encoder := base64.NewEncoder(base64.URLEncoding, &b)
@@ -108,6 +110,20 @@ mp.Track("12345", "Welcome Email Sent", &P{
  })
 */
 func (mp *Mixpanel) Track(distinct_id, event string, prop *P) error {
+	import_endpoint += "?api_key=" + mp.Token
+	return mp.sendEvent(distinct_id, event, prop, "events")
+}
+
+/*
+Imports events that occurred more than 5 days in the past. Takes the
+same arguments as Track and behaves in the same way.
+*/
+func (mp *Mixpanel) Import(distinct_id, event string, prop *P) error {
+	return mp.sendEvent(distinct_id, event, prop, "import")
+}
+
+/* Internal implementation of event sending. Can be used with Track or Import. */
+func (mp *Mixpanel) sendEvent(distinct_id, event string, prop *P, endpoint string) error {
 	properties := &P{
 		"token":        mp.Token,
 		"distinct_id":  distinct_id,
@@ -129,7 +145,7 @@ func (mp *Mixpanel) Track(distinct_id, event string, prop *P) error {
 		return err
 	}
 
-	return mp.c.Send("events", data)
+	return mp.c.Send(endpoint, data)
 }
 
 /*
@@ -337,6 +353,7 @@ func NewStdConsumer() *StdConsumer {
 	c.endpoints = make(map[string]string)
 	c.endpoints["events"] = events_endpoint
 	c.endpoints["people"] = people_endpoint
+	c.endpoints["import"] = import_endpoint
 	return c
 }
 
@@ -383,6 +400,7 @@ func NewBuffConsumer(maxSize int64) *BuffConsumer {
 	bc.buffers = make(map[string][][]byte)
 	bc.buffers["people"] = make([][]byte, 0, maxSize)
 	bc.buffers["events"] = make([][]byte, 0, maxSize)
+	bc.buffers["import"] = make([][]byte, 0, maxSize)
 	return bc
 }
 

mixpanel_test.go

@@ -31,26 +31,25 @@ func TestTrack(t *testing.T) {
 	}
 }
 
-func TestJsonArray(t *testing.T){
-	result := jsonArray( [][]byte{ []byte("{'a':'b'}")} )
+func TestJsonArray(t *testing.T) {
+	result := jsonArray([][]byte{[]byte("{'a':'b'}")})
 	if string(result) != "[{'a':'b'}]" {
 		t.Error(string(result))
 	}
-	result = jsonArray( [][]byte{ []byte("{'a':'b'}"), []byte("{'c':'d'}")} )
+	result = jsonArray([][]byte{[]byte("{'a':'b'}"), []byte("{'c':'d'}")})
 	if string(result) != "[{'a':'b'},{'c':'d'}]" {
 		t.Error(string(result))
 	}
 }
 
-func TestSmoke(t *testing.T){
+func TestSmoke(t *testing.T) {
 	Smoke(t, NewMixpanel(token))
 	Smoke(t, NewMixpanelWithConsumer(token, NewBuffConsumer(1)))
 	mp := NewBuffConsumer(2)
 	Smoke(t, NewMixpanelWithConsumer(token, mp))
 	mp.Flush()
 }
 
-
 func Smoke(t *testing.T, mp *Mixpanel) {
 
 	err := mp.PeopleSet("12345", &P{"Address": "1313 Mockingbird Lane",
@@ -64,6 +63,14 @@ func Smoke(t *testing.T, mp *Mixpanel) {
 		t.Error(err)
 	}
 
+	// Import an older event
+	err = mp.Import("12345", "Welcome Email Sent", &P{
+		"time": 1392646952,
+	})
+	if err != nil {
+		t.Error(err)
+	}
+
 	// Track that user "12345"'s credit card was declined
 	err = mp.Track("12345", "Credit Card Declined", nil)
 	if err != nil {
@@ -73,9 +80,9 @@ func Smoke(t *testing.T, mp *Mixpanel) {
 	// Properties describe the circumstances of the event,
 	// or aspects of the source or user associated with the event
 	err = mp.Track("12345", "Welcome Email Sent", &P{
-	  "Email Template" : "Pretty Pink Welcome",
-	  "User Sign-up Cohort" : "July 2013",
-	 })
+		"Email Template":      "Pretty Pink Welcome",
+		"User Sign-up Cohort": "July 2013",
+	})
 	if err != nil {
 		t.Error(err)
 	}