Merge pull request #25 from rud/bugfix/honor-https-during-reconnect

Reconnect with HTTPS fix: establish SSL connection also when reconnecting

lib/twitter/json_stream.rb

@@ -60,7 +60,6 @@ def self.connect options = {}
       end
 
       connection = EventMachine.connect host, port, self, options
-      connection.start_tls if options[:ssl]
       connection
     end
 
@@ -122,6 +121,7 @@ def receive_data(data)
     end
 
     def connection_completed
+      start_tls if @options[:ssl]
       send_request
     end
 

spec/twitter/json_stream_spec.rb

@@ -68,6 +68,13 @@ def receive_data data
       stream = JSONStream.connect(:proxy => "http://my-proxy:8080") {}
     end
 
+    it "should not trigger SSL until connection is established" do
+      connection = stub('connection')
+      EM.should_receive(:connect).and_return(connection)
+      stream = JSONStream.connect(:ssl => true)
+      stream.should == connection
+    end
+
   end
 
   context "on valid stream" do
@@ -197,6 +204,12 @@ def receive_data data
       end
     end
 
+    it "should reconnect with SSL if enabled" do
+      connect_stream :ssl => true do
+        stream.should_receive(:start_tls).twice
+      end
+    end
+
     it_should_behave_like "network failure"
   end