Refactor Trigger/TriggerBatch encoding related functions, filenames and types (#51)

- it refactors Trigger/TriggerBatch encoding logic filename from event.go -> encoder.go
- it refactors Trigger/TriggerBatch encoding logic functions names to more meaningful ones.
- it changes Trigger/TriggerBatch encoding logic types going from a single source->destination type to one source type and one destination type.

Author: damdo

client.go

@@ -190,7 +190,7 @@ func (c *Client) trigger(channels []string, eventName string, data interface{},
 	if err := validateSocketID(socketID); err != nil {
 		return nil, err
 	}
-	payload, err := createTriggerPayload(channels, eventName, data, socketID, c.EncryptionMasterKey)
+	payload, err := encodeTriggerBody(channels, eventName, data, socketID, c.EncryptionMasterKey)
 	if err != nil {
 		return nil, err
 	}
@@ -206,8 +206,11 @@ func (c *Client) trigger(channels []string, eventName string, data interface{},
 	return unmarshalledBufferedEvents(response)
 }
 
-type batchRequest struct {
-	Batch []Event `json:"batch"`
+type Event struct {
+	Channel  string
+	Name     string
+	Data     interface{}
+	SocketId *string
 }
 
 /* TriggerBatch triggers multiple events on multiple types of channels in a single call:
@@ -236,7 +239,7 @@ func (c *Client) TriggerBatch(batch []Event) (*BufferedEvents, error) {
 			return nil, errors.New("Your encryptionMasterKey is not of the correct format")
 		}
 	}
-	payload, err := createTriggerBatchPayload(batch, c.EncryptionMasterKey)
+	payload, err := encodeTriggerBatchBody(batch, c.EncryptionMasterKey)
 	if err != nil {
 		return nil, err
 	}

event.go renamed to encoder.go

@@ -9,11 +9,14 @@ import (
 // maxEventPayloadSize indicates the max size allowed for the data content (payload) of each event
 const maxEventPayloadSize = 10240
 
-type Event struct {
-	Channel  string      `json:"channel"`
-	Name     string      `json:"name"`
-	Data     interface{} `json:"data"`
-	SocketId *string     `json:"socket_id,omitempty"`
+type batchEvent struct {
+	Channel  string  `json:"channel"`
+	Name     string  `json:"name"`
+	Data     string  `json:"data"`
+	SocketId *string `json:"socket_id,omitempty"`
+}
+type batchPayload struct {
+	Batch []batchEvent `json:"batch"`
 }
 
 type eventPayload struct {
@@ -27,8 +30,8 @@ type BufferedEvents struct {
 	EventIds map[string]string `json:"event_ids,omitempty"`
 }
 
-func createTriggerPayload(channels []string, event string, data interface{}, socketID *string, encryptionKey string) ([]byte, error) {
-	dataBytes, err := encodePayload(data)
+func encodeTriggerBody(channels []string, event string, data interface{}, socketID *string, encryptionKey string) ([]byte, error) {
+	dataBytes, err := encodeEventData(data)
 	if err != nil {
 		return nil, err
 	}
@@ -49,25 +52,34 @@ func createTriggerPayload(channels []string, event string, data interface{}, soc
 	})
 }
 
-func createTriggerBatchPayload(batch []Event, encryptionKey string) ([]byte, error) {
+func encodeTriggerBatchBody(batch []Event, encryptionKey string) ([]byte, error) {
+ 	batchEvents := make([]batchEvent, len(batch))
 	for idx, e := range batch {
-		dataBytes, err := encodePayload(e.Data)
+		var stringifyedDataBytes string
+		dataBytes, err := encodeEventData(e.Data)
 		if err != nil {
 			return nil, err
 		}
 		if isEncryptedChannel(e.Channel) {
-			batch[idx].Data = encrypt(e.Channel, dataBytes, encryptionKey)
+			stringifyedDataBytes = encrypt(e.Channel, dataBytes, encryptionKey)
 		} else {
-			batch[idx].Data = string(dataBytes)
+			stringifyedDataBytes = string(dataBytes)
 		}
-		if len(batch[idx].Data.(string)) > maxEventPayloadSize {
+		if len(stringifyedDataBytes) > maxEventPayloadSize {
 			return nil, fmt.Errorf("Data of the event #%d in batch, must be smaller than 10kb", idx)
 		}
+		newBatchEvent := batchEvent{
+			Channel:  e.Channel,
+			Name:     e.Name,
+			Data:     stringifyedDataBytes,
+			SocketId: e.SocketId,
+		}
+		batchEvents[idx] = newBatchEvent
 	}
-	return json.Marshal(&batchRequest{batch})
+	return json.Marshal(&batchPayload{batchEvents})
 }
 
-func encodePayload(data interface{}) ([]byte, error) {
+func encodeEventData(data interface{}) ([]byte, error) {
 	var dataBytes []byte
 	var err error