async-io 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c16b3fc4731d433938fa0e1e17dfc6f9adf6d04e5be969490d48393c0c1e88c8
-  data.tar.gz: ce83e964e7bac569a90fc6c53130b0fbfe6ef8f331ecd8e070711237dc36e170
+  metadata.gz: 20fb916388ff09f81a73c5933c6c73661162004bf7e03d5cffe2df2bd532160d
+  data.tar.gz: f1fb4209db5a4ec83ef34d24119d5b84e448e8eb2409a9e0443878e0bc1acc38
 SHA512:
-  metadata.gz: c75b738875dab6744261a409eda31b33356fe0350fbf1baa61103294ef5166ba93f70b73428ba41c2077976b69aa6b755c71f8221b74ed913b7a13ad7bb0b7bb
-  data.tar.gz: 6e9f04ae63f63698bdfc611e67af677a293f103561de4cfb163de5e92aa3573ac89623d642e25419e5a4abc3436aae4d91d990c294852c6bcbca26ab269c039f
+  metadata.gz: 42480fc1ba98ce7693186a1b07fe3648294de99dc407d5f777043a08bba73aef2df2b6e61e3bd35e2dbe77ef132b0746f58000397a268c50eb55c61c93bf0214
+  data.tar.gz: e0fbfc6080bfc4310b9a3092936d0be65d6e9a0566403ec90566229575ba2e51380625623482e0c029f827d230c6818cda0ac4bcde832ad02c6bafcb7762408a

data/async-io.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async", "~> 1.3"
 	spec.add_development_dependency "async-rspec", "~> 1.4"
 
+	spec.required_ruby_version = '~> 2.3'
+
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"

data/lib/async/io/generic.rb

@@ -117,70 +117,23 @@ module Async
 				true
 			end
 			
+			def connected?
+				!@io.closed?
+			end
+			
 			protected
 			
-			if RUBY_ENGINE == "ruby" and RUBY_VERSION >= "2.3"
-				def async_send(*args)
-					async do
-						@io.__send__(*args, exception: false)
-					end
-				rescue Errno::EPROTOTYPE
-					raise Errno::EPIPE
-				end
-				
-				def async
-					while true
-						result = yield
-						
-						case result
-						when :wait_readable
-							wait_readable
-						when :wait_writable
-							wait_writable
-						else
-							return result
-						end
-					end
-				end
-			elsif RUBY_ENGINE == "ruby" and RUBY_VERSION >= "2.1"
-				def async_send(*args)
-					async do
-						@io.__send__(*args)
-					end
-				end
-				
-				def async
-					while true
-						begin
-							return yield
-						rescue ::IO::WaitReadable, ::IO::EAGAINWaitReadable
-							wait_readable
-						rescue ::IO::WaitWritable, ::IO::EAGAINWaitWritable
-							wait_writable
-						rescue Errno::EPROTOTYPE
-							raise Errno::EPIPE
-						end
-					end
-				end
-			else
-				# This is also correct for Rubinius.
-				def async_send(*args)
-					async do
-						@io.__send__(*args)
-					end
-				end
-				
-				def async
-					while true
-						begin
-							return yield
-						rescue ::IO::WaitReadable
-							wait_readable
-						rescue ::IO::WaitWritable
-							wait_writable
-						rescue Errno::EPROTOTYPE
-							raise Errno::EPIPE
-						end
+			def async_send(*args)
+				while true
+					result = @io.__send__(*args, exception: false)
+					
+					case result
+					when :wait_readable
+						wait_readable
+					when :wait_writable
+						wait_writable
+					else
+						return result
 					end
 				end
 			end

data/lib/async/io/socket.rb

@@ -23,6 +23,20 @@ require_relative 'generic'
 
 module Async
 	module IO
+		module Peer
+			# Is it likely that the socket is still connected?
+			# May return false positive, but won't return false negative.
+			def connected?
+				return false if @io.closed?
+				
+				# If we can wait for the socket to become readable, we know that the socket may still be open.
+				result = to_io.recv_nonblock(1, Socket::MSG_PEEK, exception: false)
+				
+				# Either there was some data available, or we can wait to see if there is data avaialble.
+				return !result.empty? || result == :wait_readable
+			end
+		end
+		
 		class BasicSocket < Generic
 			wraps ::BasicSocket, :setsockopt, :connect_address, :close_read, :close_write, :local_address, :remote_address, :do_not_reverse_lookup, :do_not_reverse_lookup=, :shutdown, :getsockopt, :getsockname, :getpeername, :getpeereid
 			
@@ -35,6 +49,8 @@ module Async
 			def type
 				self.local_address.socktype
 			end
+			
+			include Peer
 		end
 		
 		module Server

data/lib/async/io/ssl_socket.rb

@@ -36,8 +36,6 @@ module Async
 			alias syswrite write
 			alias sysread read
 			
-			# It's hard to know what #to_io / #io should do. So, they are omitted.
-			
 			def self.connect(socket, context, hostname = nil, &block)
 				client = self.wrap(socket, context)
 				
@@ -72,6 +70,8 @@ module Async
 				@io.to_io.remote_address
 			end
 			
+			include Peer
+			
 			def self.wrap(socket, context)
 				io = @wrapped_klass.new(socket.to_io, context)
 				

data/lib/async/io/stream.rb

@@ -137,7 +137,11 @@ module Async
 				
 				flush
 			end
-
+			
+			def connected?
+				@io.connected?
+			end
+			
 			def closed?
 				@io.closed?
 			end

data/lib/async/io/tcp_socket.rb

@@ -53,6 +53,8 @@ module Async
 				alias open new
 			end
 			
+			include Peer
+			
 			attr :buffer
 			
 			def_delegators :@buffer, :gets, :puts, :flush

data/lib/async/io/unix_socket.rb

@@ -25,6 +25,8 @@ module Async
 		class UNIXSocket < BasicSocket
 			# `send_io`, `recv_io` and `recvfrom` may block but no non-blocking implementation available.
 			wraps ::UNIXSocket, :path, :addr, :peeraddr, :send_io, :recv_io, :recvfrom
+			
+			include Peer
 		end
 		
 		class UNIXServer < UNIXSocket

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.10.0"
+		VERSION = "1.11.0"
 	end
 end

data/spec/async/io/socket_spec.rb

@@ -63,6 +63,18 @@ RSpec.describe Async::IO::Socket do
 			expect(s2.recv(32)).to be == "Hello World"
 			s2.close
 		end
+		
+		it "should be connected" do
+			s1, s2 = *subject
+			
+			expect(s1).to be_connected
+			
+			s1.close
+			
+			expect(s2).to_not be_connected
+			
+			s2.close
+		end
 	end
 end
 

data/spec/async/io/ssl_socket_spec.rb

@@ -63,6 +63,8 @@ RSpec.describe Async::IO::SSLSocket do
 				
 				reactor.async do
 					client_endpoint.connect do |client|
+						expect(client).to be_connected
+						
 						client.write(data)
 						
 						expect(client.read(512)).to be == data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-02 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -146,9 +146,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="