http 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58370408adc111fae0f96e4541839c2a0722ccf5
-  data.tar.gz: f3f4ff7f0ba274d7f9c969db7f65d01b134f5711
+  metadata.gz: b2e1c7f1cbe78f39dff1f5194cd2fa58b9ffe5b4
+  data.tar.gz: 60ba195836aed0fb9a78c29ac67406d725e576d2
 SHA512:
-  metadata.gz: 8c18ee7df2159660a8ff5909bdac66e61bcc8e598a1be9d5ae13f825cc704112c3a67aaef633396acd22ca395ac2762bc17b48faccf6472c27eb8c31b8e6cc16
-  data.tar.gz: bb8e776f129502b8aa1b63be4ee1f935b430a2e4db3f8e613ff96d03059af8137e3760a1a553e4f85a76679a8e7e894ef175e6bc792aa199c46aa053a74f5967
+  metadata.gz: a2dc702c28b433e98d710e7330ca9379c3fb182dbee771b03a14c73710cbe3134a5f49177802bdd3696f3586531495ba194738954c7037801c4a31b924638204
+  data.tar.gz: 2354deaba38c163740dee33693564b18398fe0a3b3ebcfc18a93b717b11f78bba6d40d4055e7a670d040b135814ed2c98fca84cf9934e5a96527b21a9bd65389

data/.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  DisplayCopNames: true
+
 Metrics/BlockNesting:
   Max: 2
 

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
   - jruby
   - jruby-head
   - ruby-head

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 1.0.1 (2015-12-27)
+
+* [#283](https://github.com/httprb/http/pull/283):
+  Use io/wait on supported platforms.
+  ([@tarcieri])
+
 ## 1.0.0 (2015-12-25)
 
 * [#265](https://github.com/httprb/http/pull/265/):

data/README.md

@@ -320,8 +320,9 @@ versions:
 * Ruby 2.0.0
 * Ruby 2.1.x
 * Ruby 2.2.x
+* Ruby 2.3.x
 * JRuby 1.7.x
-* JRuby 9000
+* JRuby 9000+
 
 If something doesn't work on one of these versions, it's a bug.
 

data/lib/http/timeout/global.rb

@@ -104,16 +104,32 @@ module HTTP
         :eof
       end
 
-      # Wait for a socket to become readable
-      def wait_readable_or_timeout
-        IO.select([@socket], nil, nil, time_left)
-        log_time
-      end
+      if RUBY_VERSION < "2.0.0"
+        # Wait for a socket to become readable
+        def wait_readable_or_timeout
+          IO.select([@socket], nil, nil, time_left)
+          log_time
+        end
 
-      # Wait for a socket to become writable
-      def wait_writable_or_timeout
-        IO.select(nil, [@socket], nil, time_left)
-        log_time
+        # Wait for a socket to become writable
+        def wait_writable_or_timeout
+          IO.select(nil, [@socket], nil, time_left)
+          log_time
+        end
+      else
+        require "io/wait"
+
+        # Wait for a socket to become readable
+        def wait_readable_or_timeout
+          @socket.to_io.wait_readable(time_left)
+          log_time
+        end
+
+        # Wait for a socket to become writable
+        def wait_writable_or_timeout
+          @socket.to_io.wait_writable(time_left)
+          log_time
+        end
       end
 
       # Due to the run/retry nature of nonblocking I/O, it's easier to keep track of time

data/lib/http/timeout/null.rb

@@ -50,26 +50,43 @@ module HTTP
       end
       alias_method :<<, :write
 
+      # These cops can be re-eanbled after we go Ruby 2.0+ only
+      # rubocop:disable Lint/UselessAccessModifier, Metrics/BlockNesting
+
       private
 
-      # Retry reading
-      def rescue_readable
-        yield
-      rescue IO::WaitReadable
-        if IO.select([socket], nil, nil, read_timeout)
-          retry
-        else
+      if RUBY_VERSION < "2.0.0"
+        # Retry reading
+        def rescue_readable
+          yield
+        rescue IO::WaitReadable
+          retry if IO.select([socket], nil, nil, read_timeout)
+          raise TimeoutError, "Read timed out after #{read_timeout} seconds"
+        end
+
+        # Retry writing
+        def rescue_writable
+          yield
+        rescue IO::WaitWritable
+          retry if IO.select(nil, [socket], nil, write_timeout)
+          raise TimeoutError, "Write timed out after #{write_timeout} seconds"
+        end
+      else
+        require "io/wait"
+
+        # Retry reading
+        def rescue_readable
+          yield
+        rescue IO::WaitReadable
+          retry if socket.to_io.wait_readable(read_timeout)
           raise TimeoutError, "Read timed out after #{read_timeout} seconds"
         end
-      end
 
-      # Retry writing
-      def rescue_writable
-        yield
-      rescue IO::WaitWritable
-        if IO.select(nil, [socket], nil, write_timeout)
-          retry
-        else
+        # Retry writing
+        def rescue_writable
+          yield
+        rescue IO::WaitWritable
+          retry if socket.to_io.wait_writable(write_timeout)
           raise TimeoutError, "Write timed out after #{write_timeout} seconds"
         end
       end

data/lib/http/timeout/per_operation.rb

@@ -59,14 +59,19 @@ module HTTP
         # Read data from the socket
         def readpartial(size)
           loop do
-            result = socket.read_nonblock(size, :exception => false)
+            # JRuby may still raise exceptions on SSL sockets even though
+            # we explicitly specify `:exception => false`
+            result = rescue_readable do
+              socket.read_nonblock(size, :exception => false)
+            end
+
             if result.nil?
               return :eof
             elsif result != :wait_readable
               return result
             end
 
-            unless IO.select([socket], nil, nil, read_timeout)
+            unless socket.to_io.wait_readable(read_timeout)
               fail TimeoutError, "Read timed out after #{read_timeout} seconds"
             end
           end
@@ -75,10 +80,15 @@ module HTTP
         # Write data to the socket
         def write(data)
           loop do
-            result = socket.write_nonblock(data, :exception => false)
+            # JRuby may still raise exceptions on SSL sockets even though
+            # we explicitly specify `:exception => false`
+            result = rescue_writable do
+              socket.write_nonblock(data, :exception => false)
+            end
+
             return result unless result == :wait_writable
 
-            unless IO.select(nil, [socket], nil, write_timeout)
+            unless socket.to_io.wait_writable(write_timeout)
               fail TimeoutError, "Read timed out after #{write_timeout} seconds"
             end
           end

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb