Merge branch 'rc/0.2.1' of github.com:Fallenstedt/twitter-stream into…

… rc/0.2.1

stream.go

@@ -8,7 +8,7 @@ import (
 type (
 	// IStream is the interface that the stream struct implements.
 	IStream interface {
-		StartStream()
+		StartStream() error
 		StopStream()
 		GetMessages() *chan interface{}
 	}
@@ -43,21 +43,22 @@ func (s *stream) StopStream() {
 }
 
 // StartStream makes an HTTP request to twitter and starts streaming tweets to the Messages channel.
-func (s *stream) StartStream() {
+func (s *stream) StartStream() error {
 
 	res, err := s.httpClient.newHttpRequest(&requestOpts{
 		Method: "GET",
 		Url:    endpoints["stream"],
 	})
 
 	if err != nil {
-		panic(err)
+		return err
 	}
 
 	s.reader.setStreamResponseBody(res.Body)
 
 	s.group.Add(1)
 	go s.streamMessages(res)
+	return nil
 }
 
 func (s *stream) streamMessages(res *http.Response) {
@@ -67,15 +68,16 @@ func (s *stream) streamMessages(res *http.Response) {
 	for !stopped(s.done) {
 		data, err := s.reader.readNext()
 		if err != nil {
-			return
+			s.messages <- err
+			s.StopStream()
+			break
 		}
 		if len(data) == 0 {
 			// empty keep-alive
 			continue
 		}
 
 		m := string(data)
-		// TODO send data or error here
 		s.messages <- m
 	}
 }