Fix close behaviour of SslConnection

lib/ione/io/ssl_connection.rb

@@ -12,6 +12,7 @@ def initialize(host, port, io, unblocker, ssl_context=nil, socket_impl=OpenSSL::
         @ssl_context = ssl_context
         @raw_io = io
         @connected_promise = Promise.new
+        on_closed(&method(:cleanup_on_close))
       end
 
       def connect
@@ -26,7 +27,7 @@ def connect
         @connected_promise.future
       rescue OpenSSL::SSL::SSLError => e
         unless e.message.include?(WOULD_BLOCK_MESSAGE)
-          @connected_promise.fail(e)
+          close(e)
         end
         @connected_promise.future
       end
@@ -64,6 +65,15 @@ def read
       private
 
       WOULD_BLOCK_MESSAGE = 'would block'.freeze
+
+      def cleanup_on_close(cause)
+        if cause && !cause.is_a?(IoError)
+          cause = ConnectionError.new(cause.message)
+        end
+        unless @connected_promise.future.completed?
+          @connected_promise.fail(cause)
+        end
+      end
     end
   end
 end

spec/ione/io/ssl_connection_spec.rb

@@ -68,7 +68,7 @@ module Io
           ssl_socket.should have_received(:connect_nonblock)
         end
 
-        it 'does nothing when the socket raises' do
+        it 'does nothing when the socket raises a "would block" error' do
           ssl_socket.stub(:connect_nonblock).and_raise(OpenSSL::SSL::SSLError.new('would block'))
           expect { handler.connect }.to_not raise_error
         end
@@ -89,7 +89,13 @@ module Io
 
         it 'fails when #connect_nonblock raises an error that does not include the words "would block"' do
           ssl_socket.stub(:connect_nonblock).and_raise(OpenSSL::SSL::SSLError.new('general bork'))
-          expect { handler.connect.value }.to raise_error(OpenSSL::SSL::SSLError)
+          expect { handler.connect.value }.to raise_error(Ione::Io::ConnectionError)
+        end
+
+        it 'is closed when #connect_nonblock raises something that is not a "would block" error' do
+          ssl_socket.stub(:connect_nonblock).and_raise(OpenSSL::SSL::SSLError.new('general bork'))
+          handler.connect
+          handler.should be_closed
         end
       end