Refactor Net::HTTP#connect

The method was getting large, and in preparation for #141, I thought
it would be easier to break up the method into several other methods.

Author: stanhu

lib/net/http.rb

@@ -1613,73 +1613,20 @@ def connect
       s.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       debug "opened"
       if use_ssl?
-        if proxy?
-          plain_sock = BufferedIO.new(s, read_timeout: @read_timeout,
-                                      write_timeout: @write_timeout,
-                                      continue_timeout: @continue_timeout,
-                                      debug_output: @debug_output)
-          buf = +"CONNECT #{conn_address}:#{@port} HTTP/#{HTTPVersion}\r\n" \
-            "Host: #{@address}:#{@port}\r\n"
-          if proxy_user
-            credential = ["#{proxy_user}:#{proxy_pass}"].pack('m0')
-            buf << "Proxy-Authorization: Basic #{credential}\r\n"
+        proxy_connect(s, conn_address) if proxy?
+        setup_ssl_context
+        with_ssl_socket(s, conn_addr, conn_port) do |socket, verify_hostname|
+          if @ssl_session and
+             Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + @ssl_session.timeout
+            s.session = @ssl_session
           end
-          buf << "\r\n"
-          plain_sock.write(buf)
-          HTTPResponse.read_new(plain_sock).value
-          # assuming nothing left in buffers after successful CONNECT response
-        end
-
-        ssl_parameters = Hash.new
-        iv_list = instance_variables
-        SSL_IVNAMES.each_with_index do |ivname, i|
-          if iv_list.include?(ivname)
-            value = instance_variable_get(ivname)
-            unless value.nil?
-              ssl_parameters[SSL_ATTRIBUTES[i]] = value
-            end
+          ssl_socket_connect(s, @open_timeout)
+          if (@ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE) && verify_hostname
+            s.post_connection_check(@address)
           end
+          debug "SSL established, protocol: #{s.ssl_version}, cipher: #{s.cipher[0]}"
         end
-        @ssl_context.set_params(ssl_parameters)
-        unless @ssl_context.session_cache_mode.nil? # a dummy method on JRuby
-          @ssl_context.session_cache_mode =
-              OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
-                  OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
-        end
-        if @ssl_context.respond_to?(:session_new_cb) # not implemented under JRuby
-          @ssl_context.session_new_cb = proc {|sock, sess| @ssl_session = sess }
-        end
-
-        # Still do the post_connection_check below even if connecting
-        # to IP address
-        verify_hostname = @ssl_context.verify_hostname
-
-        # Server Name Indication (SNI) RFC 3546/6066
-        case @address
-        when Resolv::IPv4::Regex, Resolv::IPv6::Regex
-          # don't set SNI, as IP addresses in SNI is not valid
-          # per RFC 6066, section 3.
-
-          # Avoid openssl warning
-          @ssl_context.verify_hostname = false
-        else
-          ssl_host_address = @address
-        end
-
-        debug "starting SSL for #{conn_addr}:#{conn_port}..."
-        s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-        s.sync_close = true
-        s.hostname = ssl_host_address if s.respond_to?(:hostname=) && ssl_host_address
-
-        if @ssl_session and
-           Process.clock_gettime(Process::CLOCK_REALTIME) < @ssl_session.time.to_f + @ssl_session.timeout
-          s.session = @ssl_session
-        end
-        ssl_socket_connect(s, @open_timeout)
-        if (@ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE) && verify_hostname
-          s.post_connection_check(@address)
-        end
-        debug "SSL established, protocol: #{s.ssl_version}, cipher: #{s.cipher[0]}"
+        ssl_connect(s)
       end
       @socket = BufferedIO.new(s, read_timeout: @read_timeout,
                                write_timeout: @write_timeout,
@@ -1696,6 +1643,73 @@ def connect
     end
     private :connect
 
+    def proxy_connect(s, conn_address)
+      plain_sock = BufferedIO.new(s, read_timeout: @read_timeout,
+                                  write_timeout: @write_timeout,
+                                  continue_timeout: @continue_timeout,
+                                  debug_output: @debug_output)
+      buf = "CONNECT #{conn_address}:#{@port} HTTP/#{HTTPVersion}\r\n"
+      buf << "Host: #{@address}:#{@port}\r\n"
+      if proxy_user
+        credential = ["#{proxy_user}:#{proxy_pass}"].pack('m0')
+        buf << "Proxy-Authorization: Basic #{credential}\r\n"
+      end
+      buf << "\r\n"
+      plain_sock.write(buf)
+      HTTPResponse.read_new(plain_sock).value
+      # assuming nothing left in buffers after successful CONNECT response
+    end
+    private :proxy_connect
+
+    def setup_ssl_context
+      ssl_parameters = Hash.new
+      iv_list = instance_variables
+      SSL_IVNAMES.each_with_index do |ivname, i|
+        if iv_list.include?(ivname)
+          value = instance_variable_get(ivname)
+          unless value.nil?
+            ssl_parameters[SSL_ATTRIBUTES[i]] = value
+          end
+        end
+      end
+      @ssl_context.set_params(ssl_parameters)
+      unless @ssl_context.session_cache_mode.nil? # a dummy method on JRuby
+        @ssl_context.session_cache_mode =
+          OpenSSL::SSL::SSLContext::SESSION_CACHE_CLIENT |
+          OpenSSL::SSL::SSLContext::SESSION_CACHE_NO_INTERNAL_STORE
+      end
+      if @ssl_context.respond_to?(:session_new_cb) # not implemented under JRuby
+        @ssl_context.session_new_cb = proc {|sock, sess| @ssl_session = sess }
+      end
+    end
+    private :setup_ssl_context
+
+    def with_ssl_socket(s, conn_addr, conn_port)
+      # Still do the post_connection_check below even if connecting
+      # to IP address
+      verify_hostname = @ssl_context.verify_hostname
+
+      # Server Name Indication (SNI) RFC 3546/6066
+      case @address
+      when Resolv::IPv4::Regex, Resolv::IPv6::Regex
+        # don't set SNI, as IP addresses in SNI is not valid
+        # per RFC 6066, section 3.
+
+        # Avoid openssl warning
+        @ssl_context.verify_hostname = false
+      else
+        ssl_host_address = @address
+      end
+
+      debug "starting SSL for #{conn_addr}:#{conn_port}..."
+      s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
+      s.sync_close = true
+      s.hostname = ssl_host_address if s.respond_to?(:hostname=) && ssl_host_address
+
+      yield s, verify_hostname
+    end
+    private :with_ssl_socket
+
     def on_connect
     end
     private :on_connect