http 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9ab434cda0513a1deb802c3eb66532ad897ef13
-  data.tar.gz: 4a5ee3cdd9658e59103c4199d9cb188373118328
+  metadata.gz: c1272220e79324fa76789c67d151606fa0dbcfc7
+  data.tar.gz: f230afedc0fe89d4c1d5e6ed085d9be2175ef18f
 SHA512:
-  metadata.gz: c91c74059544ed2f6435bfce620b1720453451419a6a948880043abab4883f5176d32c92d9f59ed86199dff1df1a781d01c876817f7d8312918dc21f338846aa
-  data.tar.gz: ba055614610f7fe562ed53c8ea87e350a74459ebcfa38dcf7ec28b2d8c3bd8d1f6581bda7345853087d573218e174813d21b449c69d5c9ace94b6dfa640d089a
+  metadata.gz: 1a39842cb85a6cc17c7d4c98cda9eb66f381388640f60bca7eb706029efac93a3c2477ea0ead3059fe878db61bdc2c561a68aa735b8920784caff1baa3008f70
+  data.tar.gz: c2009ff6fc49726815f0ff0860b91b77b626a02845ba534dd04e3466971ee4cc2d5926c8e4a966ed802d7e789e264eb2a104e1fc0f49e3e2a37472a0d8ac9952

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.9.7 (2015-09-19)
+
+* Unified strategy for handling exception-based and exceptionless non-blocking
+  I/O. Fixes SSL support on JRuby 9000. See #258. (@tonyarcieri)
+
 ## 0.9.6 (2015-09-06)
 
 * Removed use of an ActiveSupport specific method #present?

data/Rakefile

@@ -23,7 +23,7 @@ end
 require "yardstick/rake/verify"
 Yardstick::Rake::Verify.new do |verify|
   verify.require_exact_threshold = false
-  verify.threshold = 58
+  verify.threshold = 55
 end
 
 task :generate_status_codes do

data/lib/http/timeout/global.rb

@@ -39,75 +39,77 @@ module HTTP
         end
       end
 
-      # NIO with exceptions
+      # Read from the socket
+      def readpartial(size)
+        perform_io { read_nonblock(size) }
+      end
+
+      # Write to the socket
+      def write(data)
+        perform_io { write_nonblock(data) }
+      end
+
+      alias_method :<<, :write
+
+      private
+
       if RUBY_VERSION < "2.1.0"
-        # Read from the socket
-        def readpartial(size)
-          reset_timer
 
-          begin
-            socket.read_nonblock(size)
-          rescue IO::WaitReadable
-            IO.select([socket], nil, nil, time_left)
-            log_time
-            retry
-          end
-        rescue EOFError
-          :eof
+        def read_nonblock(size)
+          @socket.read_nonblock(size)
         end
 
-        # Write to the socket
-        def write(data)
-          reset_timer
-
-          begin
-            return socket.write_nonblock(data)
-          rescue IO::WaitWritable
-            IO.select(nil, [socket], nil, time_left)
-            log_time
-            retry
-          end
-        rescue EOFError
-          :eof
+        def write_nonblock(data)
+          @socket.write_nonblock(data)
         end
 
-      # NIO without exceptions
       else
 
-        # Read from the socket
-        def readpartial(size)
-          reset_timer
-
-          loop do
-            result = socket.read_nonblock(size, :exception => false)
-            if result.nil?
-              return :eof
-            elsif result != :wait_readable
-              return result
-            end
+        def read_nonblock(size)
+          @socket.read_nonblock(size, :exception => false)
+        end
 
-            IO.select([socket], nil, nil, time_left)
-            log_time
-          end
+        def write_nonblock(data)
+          @socket.write_nonblock(data, :exception => false)
         end
 
-        # Write to the socket
-        def write(data)
-          reset_timer
+      end
+
+      # Perform the given I/O operation with the given argument
+      def perform_io
+        reset_timer
 
-          loop do
-            result = socket.write_nonblock(data, :exception => false)
-            return result unless result == :wait_writable
+        loop do
+          begin
+            result = yield
 
-            IO.select(nil, [socket], nil, time_left)
-            log_time
+            case result
+            when :wait_readable then wait_readable_or_timeout
+            when :wait_writable then wait_writable_or_timeout
+            when NilClass       then return :eof
+            else                return result
+            end
+          rescue IO::WaitReadable
+            wait_readable_or_timeout
+          rescue IO::WaitWritable
+            wait_writable_or_timeout
           end
         end
+      rescue EOFError
+        :eof
       end
 
-      alias_method :<<, :write
+      # Wait for a socket to become readable
+      def wait_readable_or_timeout
+        IO.select([@socket], nil, nil, time_left)
+        log_time
+      end
 
-      private
+      # Wait for a socket to become writable
+      def wait_writable_or_timeout
+        IO.select(nil, [@socket], nil, time_left)
+        log_time
+      end
 
       # Due to the run/retry nature of nonblocking I/O, it's easier to keep track of time
       # via method calls instead of a block to monitor.

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.9.6".freeze
+  VERSION = "0.9.7".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Tony Arcieri
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb