net-http 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aa488199745a574db471b279c8cbb4b46cd5dded0308bd5888f0cd9c08d5102
-  data.tar.gz: d9804849a6cff66145baf7d6557ca5845ba8777d08acf940e431b11a8c5266d9
+  metadata.gz: ad9408074d86908c8284d26a13f9ba35d86948726c5e42ce453d40639be9d255
+  data.tar.gz: b23103da88f3b5cf36274fb39b07e6889c86fbe6e9abf4cb86ed6bc2c9ce9448
 SHA512:
-  metadata.gz: d06f7fe540c1fae1b1d73b6b029c6e9b176073cdcf267b5b6b5b98095dd14d9cf53fd406b7cb1d854dbf9e31a8ff52fde927442f6f8250194df4166a00476e59
-  data.tar.gz: 3583aa361d6c121814bf3092cd1c314943774009564603452d0b0f17d9f0f35b3a7841ed02806fae131f0c85edc3dbcbe20938f010ac352fc267bfa4b36e0ebe
+  metadata.gz: 5448ae667eff55826562b25f79a8f2e2991a79e1a763d1695429286b59e7e1ef25ffe2c22d9320dcf112daca3571112c7baae4a34c1b43caed6b0a944974c089
+  data.tar.gz: 7679a6cf608155d9dabb09a9ed969deddb315662d220087fb80ba2b4e6f9d8519c714c501048b5c55a48625bb013313435461813197c63f0de6aed4dbabd68dc

data/.document

@@ -1,4 +1,5 @@
 BSDL
 COPYING
 README.md
+doc/
 lib/

data/lib/net/http.rb

@@ -724,7 +724,7 @@ module Net   #:nodoc:
   class HTTP < Protocol
 
     # :stopdoc:
-    VERSION = "0.8.0"
+    VERSION = "0.9.1"
     HTTPVersion = '1.1'
     begin
       require 'zlib'
@@ -1323,7 +1323,7 @@ module Net   #:nodoc:
     # see {Proxy Server}[rdoc-ref:Net::HTTP@Proxy+Server].
     attr_writer :proxy_pass
 
-    # Sets wheter the proxy uses SSL;
+    # Sets whether the proxy uses SSL;
     # see {Proxy Server}[rdoc-ref:Net::HTTP@Proxy+Server].
     attr_writer :proxy_use_ssl
 
@@ -1531,7 +1531,7 @@ module Net   #:nodoc:
       :verify_depth,
       :verify_mode,
       :verify_hostname,
-    ] # :nodoc:
+    ].freeze # :nodoc:
 
     SSL_IVNAMES = SSL_ATTRIBUTES.map { |a| "@#{a}".to_sym }.freeze # :nodoc:
 
@@ -1674,32 +1674,11 @@ module Net   #:nodoc:
 
       debug "opening connection to #{conn_addr}:#{conn_port}..."
       begin
-        s =
-          case @tcpsocket_supports_open_timeout
-          when nil, true
-            begin
-              # Use built-in timeout in TCPSocket.open if available
-              sock = TCPSocket.open(conn_addr, conn_port, @local_host, @local_port, open_timeout: @open_timeout)
-              @tcpsocket_supports_open_timeout = true
-              sock
-            rescue ArgumentError => e
-              raise if !(e.message.include?('unknown keyword: :open_timeout') || e.message.include?('wrong number of arguments (given 5, expected 2..4)'))
-              @tcpsocket_supports_open_timeout = false
-
-              # Fallback to Timeout.timeout if TCPSocket.open does not support open_timeout
-              Timeout.timeout(@open_timeout, Net::OpenTimeout) {
-                TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
-              }
-            end
-          when false
-            # The current Ruby is known to not support TCPSocket(open_timeout:).
-            # Directly fall back to Timeout.timeout to avoid performance penalty incured by rescue.
-            Timeout.timeout(@open_timeout, Net::OpenTimeout) {
-              TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
-            }
-          end
+        s = timeouted_connect(conn_addr, conn_port)
       rescue => e
-        e = Net::OpenTimeout.new(e) if e.is_a?(Errno::ETIMEDOUT) # for compatibility with previous versions
+        if (defined?(IO::TimeoutError) && e.is_a?(IO::TimeoutError)) || e.is_a?(Errno::ETIMEDOUT)  # for compatibility with previous versions
+          e = Net::OpenTimeout.new(e)
+        end
         raise e, "Failed to open TCP connection to " +
           "#{conn_addr}:#{conn_port} (#{e.message})"
       end
@@ -1795,6 +1774,27 @@ module Net   #:nodoc:
     end
     private :connect
 
+    tcp_socket_parameters = TCPSocket.instance_method(:initialize).parameters
+    TCP_SOCKET_NEW_HAS_OPEN_TIMEOUT = if tcp_socket_parameters != [[:rest]]
+      tcp_socket_parameters.include?([:key, :open_timeout])
+    else
+      # Use Socket.tcp to find out since there is no parameters information for TCPSocket#initialize
+      # See discussion in https://github.com/ruby/net-http/pull/224
+      Socket.method(:tcp).parameters.include?([:key, :open_timeout])
+    end
+    private_constant :TCP_SOCKET_NEW_HAS_OPEN_TIMEOUT
+
+    def timeouted_connect(conn_addr, conn_port)
+      if TCP_SOCKET_NEW_HAS_OPEN_TIMEOUT
+        TCPSocket.open(conn_addr, conn_port, @local_host, @local_port, open_timeout: @open_timeout)
+      else
+        Timeout.timeout(@open_timeout, Net::OpenTimeout) {
+          TCPSocket.open(conn_addr, conn_port, @local_host, @local_port)
+        }
+      end
+    end
+    private :timeouted_connect
+
     def on_connect
     end
     private :on_connect
@@ -2430,7 +2430,7 @@ module Net   #:nodoc:
 
     # :stopdoc:
 
-    IDEMPOTENT_METHODS_ = %w/GET HEAD PUT DELETE OPTIONS TRACE/ # :nodoc:
+    IDEMPOTENT_METHODS_ = %w/GET HEAD PUT DELETE OPTIONS TRACE/.freeze # :nodoc:
 
     def transport_request(req)
       count = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-http
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - NARUSE, Yui