aws-sdk 1.8.5 → 1.9.0

data/lib/net/http/connection_pool/connection.rb

@@ -1,189 +0,0 @@
-# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-
-require 'uri'
-
-class Net::HTTP::ConnectionPool
-
-  # Represents a HTTP connection.  Call {#request} on a connection like
-  # you would with a Net::HTTPSession object.
-  #
-  # == Getting a Connection object
-  #
-  # To get a connection object, you start with a connection pool:
-  #
-  #   pool = Net::HTTP::ConnectionPool.new
-  #   connection = pool.connection_for('domain.com')
-  #
-  # {ConnectionPool#connection_for} accepts a number of options to control
-  # the connection settings (SSL, proxy, timeouts, etc).
-  #
-  # == Making Requests
-  #
-  # Given a connection object, you call #request.  {Connection#request}
-  # yields Net::HTTPResponse objects (when given a block).  You should 
-  # read the response (via #body or #read_body) before the end of the
-  # block.
-  #
-  #   connection.request(Net::HTTP::Get.new('/')) do |resp|
-  #     puts resp.body
-  #   end
-  #
-  class Connection
-
-    # Use {ConnectionPool#connection_for} to construct {Connection} objects.
-    # @private
-    def initialize pool, host, options = {}
-
-      @pool = pool
-
-      @host = host
-
-      @port = options.key?(:port) ? options[:port] : (options[:ssl] ? 443 : 80)
-
-      @ssl = options.key?(:ssl) ? options[:ssl] : (port == 443) 
-
-      @ssl_verify_peer = options.key?(:ssl_verify_peer) ?
-        options[:ssl_verify_peer] : true
-
-      @ssl_ca_file = options[:ssl_ca_file]
-
-      @ssl_ca_path = options[:ssl_ca_path]
-
-      if uri = options[:proxy_uri]
-        uri = URI.parse(uri) if uri.is_a?(String)
-        @proxy_address = uri.host
-        @proxy_port = uri.port
-        @proxy_user = uri.user
-        @proxy_password = uri.password
-      else
-        @proxy_address = options[:proxy_address]
-        @proxy_port = options[:proxy_port]
-        @proxy_user = options[:proxy_user]
-        @proxy_password = options[:proxy_password]
-      end
-
-      @read_timeout = options[:read_timeout] || 60
-
-    end
-
-    # @return [ConnectionPool]
-    attr_reader :pool
-
-    # @return [String]
-    attr_reader :host
-
-    # @return [Integer]
-    attr_reader :port
-
-    # @return [Boolean]
-    attr_reader :ssl
-
-    # @return [Boolean]
-    attr_reader :ssl_verify_peer
-
-    # @return [String,nil]
-    attr_reader :ssl_ca_file
-
-    # @return [String,nil]
-    attr_reader :ssl_ca_path
-
-    # @return [String,nil]
-    attr_reader :proxy_address
-
-    # @return [Integer,nil]
-    attr_reader :proxy_port
-
-    # @return [String,nil]
-    attr_reader :proxy_user
-
-    # @return [String,nil]
-    attr_reader :proxy_password
-
-    # @return [Numeric,nil]
-    attr_accessor :read_timeout
-
-    # @return [Boolean] Returns +true+ if this connection requires SSL.
-    def ssl?
-      @ssl
-    end
-
-    # @return [Boolean] Returns +true+ if ssl connections should verify the
-    #   peer certificate.
-    def ssl_verify_peer?
-      @ssl_verify_peer
-    end
-
-    # @return [Boolean] Returns +true+ if this connection proxies requests.
-    def proxy?
-      !!proxy_address
-    end
-
-    # Makes a single HTTP request.  The Net::HTTPResponse is yielded to the
-    # given block.
-    #
-    #   pool = Net::HTTP::ConnectionPool.new
-    #   connection = pool.connection_for('www.google.com')
-    #
-    #   connection.request(Net::HTTP::Get.new('/')) do |response|
-    #     # yeilds a Net::HTTPResponse object
-    #     puts "STATUS CODE: #{response.code}"
-    #     puts "HEADERS: #{response.to_hash.inspect}"
-    #     puts "BODY:\n#{response.body}"
-    #   end
-    #
-    # If you want to read the HTTP response body in chunks (useful for
-    # large responses you do not want to load into memory), you should
-    # pass a block to the #read_body method of the yielded response.
-    #
-    #   File.open('output.txt', 'w') do |file|
-    #     connection.request(Net::HTTP::Get.new('/')) do |response|
-    #       response.read_body do |chunk|
-    #         file.write(chunk)
-    #       end
-    #     end
-    #   end
-    #
-    # If you omit the block when calling #request, you will not be able
-    # to read the response.  This method never returns the 
-    # Net::HTTPResponse generated.
-    #
-    # This method passes *args to Net::HTTPSession#request.  See the
-    # Ruby standard lib documentation for more documentation about 
-    # accepted arguments.
-    #
-    # @note You should read the yielded response object before the end
-    #  of the passed block. Do no save a reference to yielded response
-    #  objects.
-    #
-    # @yield [response]
-    # @yieldparam [Net::HTTPResponse] response
-    # @return [nil]
-    def request *args, &block
-      pool.request(self, *args, &block)
-    end
-
-    # @return [String] Returns a key that can be used to group connections
-    #   that may share the same HTTP sessions.
-    def key
-      @key ||= begin
-        %w(
-          host port
-          ssl ssl_verify_peer ssl_ca_file ssl_ca_path
-          proxy_address proxy_port proxy_user proxy_password
-        ).map{|part| send(part).to_s }.join(":")
-      end
-    end
-
-  end
-end

data/lib/net/http/connection_pool/session.rb

@@ -1,126 +0,0 @@
-# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"). You
-# may not use this file except in compliance with the License. A copy of
-# the License is located at
-#
-#     http://aws.amazon.com/apache2.0/
-#
-# or in the "license" file accompanying this file. This file is
-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
-# ANY KIND, either express or implied. See the License for the specific
-# language governing permissions and limitations under the License.
-
-require 'net/http'
-require 'net/https'
-require 'openssl'
-
-class Net::HTTP::ConnectionPool
-
-  # Used by Net::HTTP::ConnectionPool to wrap Net::HTTP::Session objects.
-  # Users should never need to interact with these session wrappers.
-  # @private
-  class Session
-
-    # @param [Net::HTTPSession] http_session
-    # @param [String] key
-    def initialize http_session, key
-      @http_session = http_session
-      @key = key
-      @created_at = Time.now
-      @last_used_at = nil
-    end
-
-    # @return [Net::HTTPSession]
-    attr_reader :http_session
-
-    # @return [String]
-    attr_reader :key
-
-    # @return [Time]
-    attr_reader :created_at
-
-    # @return [Time]
-    attr_reader :last_used_at
-
-    # @param [Integer] timeout Number of seconds before Net::HTTP should
-    #   timeout while waiting to read a response.
-    def read_timeout= timeout
-      http_session.read_timeout = timeout
-    end
-
-    # Makes a HTTP request.  See Net::HTTPSession#request documentation
-    # from the Ruby standard library for information about argments.
-    #
-    #   connection.request(Net::HTTP::Get.new('/')) do |response|
-    #     # Parse the response (status, headers and body) here.
-    #     # You should be done with the response by the end of the block.
-    #   end
-    #
-    # @yield [response]
-    # @yieldparam [Net::HTTPResponse] response
-    # @return [nil]
-    def request *args, &block
-      http_session.request(*args, &block)
-      @last_used_at = Time.now
-      nil
-    end
-
-    # Attempts to cleanly close the HTTP session.
-    # @return [nil]
-    def finish
-      begin
-        http_session.finish if http_session.started?
-      rescue IOError
-      end
-      nil
-    end
-
-    class << self
-
-      # Starts a new HTTP session and returns it wrapped in a {Session} object.
-      # @param [Connection] connection
-      # @param [Hash] options
-      # @option options [Integer] :open_timeout (15) The number of seconds to
-      #   wait while trying to open the HTTP session before timeing out.
-      # @option options [Logger] :debug_logger HTTP wire traces are logged
-      #   here when specified.
-      # @return [Session]
-      def start connection, options = {}
-
-        http_args = []
-        http_args << connection.host
-        http_args << connection.port
-        if connection.proxy?
-          http_args << connection.proxy_address
-          http_args << connection.proxy_port
-          http_args << connection.proxy_user
-          http_args << connection.proxy_password
-        end
-
-        http = Net::HTTP.new(*http_args)
-        http.set_debug_output(options[:debug_logger]) if options[:debug_logger]
-        http.open_timeout = options[:open_timeout] || 15
-
-        if connection.ssl?
-          http.use_ssl = true
-          if connection.ssl_verify_peer?
-            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-            http.ca_file = connection.ssl_ca_file if connection.ssl_ca_file
-            http.ca_path = connection.ssl_ca_path if connection.ssl_ca_path
-          else
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-          end
-        else
-          http.use_ssl = false
-        end
-
-        http.start
-
-        Session.new(http, connection.key)
-
-      end
-
-    end
-  end
-end