async-io 1.16.1 → 1.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 379d35c46cafb056a9ad45909ba233b60c2494fcf2c822e114d6e4fecb489417
-  data.tar.gz: f6a5aa2014a2af8164517d3f25147d3a041b04fcc3180d271af07c6724e60aad
+  metadata.gz: 75f6a63033122d073826af1192a8993d1ecfca0e78820b60421f95dadaac2fea
+  data.tar.gz: d2f32d91cda9e88a1a366a9a072a62e118a7427019b643a5ef2946ac0a8b55e5
 SHA512:
-  metadata.gz: ce284102e8f3c8dd0b107f6d0958aff37e4aeafb71784c77b4e647e19f05346543b9f2e7d4fc738f29a45a88fa7e69e2d8df687f3325dd4a5f42c1b4ce03cc13
-  data.tar.gz: b1f090f450cce626da8b04169bd04c3a21c87184295d3bd52c157d69df336aa50ac136b7e19b09010945fc575855f7e7eaa9bd12b3408785898d2a333f5dfb06
+  metadata.gz: 402f1ba7007d6c24fbd963ada3bdd7ba4d37a82075ab38029ef09bf640b7107469be94d94c6dddd3376fb42fafaa8197eb403d272c6eb97b70ef121903c29c24
+  data.tar.gz: 3f72a92843d27ad462b940e34af302e7f0903c023382fdc379f7170988a9fdbfa71edba0f26cc347b8dcaeea5fb9164eeaafc0af474ce0558e0061e93e91061d

data/Gemfile

@@ -19,4 +19,6 @@ group :test do
 	gem 'coveralls', require: false
 	
 	gem 'async-container'
+
+	gem 'http'
 end

data/lib/async/io/socket.rb

@@ -19,6 +19,8 @@
 # THE SOFTWARE.
 
 require 'socket'
+require 'async/task'
+
 require_relative 'generic'
 
 module Async

data/lib/async/io/ssl_socket.rb

@@ -37,7 +37,7 @@ module Async
 			alias sysread read
 			
 			def self.connect(socket, context, hostname = nil, &block)
-				client = self.wrap(socket, context)
+				client = self.new(socket, context)
 				
 				# Used for SNI:
 				if hostname
@@ -72,16 +72,20 @@ module Async
 			
 			include Peer
 			
-			def self.wrap(socket, context)
-				io = @wrapped_klass.new(socket.to_io, context)
-				
-				# We detach the socket from the reactor, otherwise it's possible to add the file descriptor to the selector twice, which is bad.
-				socket.reactor = nil
-				
-				# This ensures that when the internal IO is closed, it also closes the internal socket:
-				io.sync_close = true
-				
-				return self.new(io, socket.reactor)
+			def initialize(socket, context)
+				if socket.is_a?(self.class.wrapped_klass)
+					super
+				else
+					io = self.class.wrapped_klass.new(socket.to_io, context)
+					
+					# We detach the socket from the reactor, otherwise it's possible to add the file descriptor to the selector twice, which is bad.
+					socket.reactor = nil
+					
+					# This ensures that when the internal IO is closed, it also closes the internal socket:
+					io.sync_close = true
+					
+					super(io, socket.reactor)
+				end
 			end
 		end
 		
@@ -110,7 +114,7 @@ module Async
 			def accept(task: Task.current)
 				peer, address = @server.accept
 				
-				wrapper = SSLSocket.wrap(peer, @context)
+				wrapper = SSLSocket.new(peer, @context)
 				
 				return wrapper, address unless block_given?
 				

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.16.1"
+		VERSION = "1.16.2"
 	end
 end

data/spec/async/io/wrap/http_rb_spec.rb

@@ -0,0 +1,45 @@
+# Copyright, 2018, by Thibaut Girka.
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'http'
+require 'openssl'
+
+require 'async/io/tcp_socket'
+require 'async/io/ssl_socket'
+
+RSpec.describe Async::IO do
+	let(:wrappers) do
+		{socket_class: Async::IO::TCPSocket, ssl_socket_class: Async::IO::SSLSocket}
+	end
+	
+	describe "inside reactor" do
+		include_context Async::RSpec::Reactor
+		
+		it "should fetch page" do
+			expect(Async::IO::SSLSocket).to receive(:new).and_call_original
+			
+			expect do
+				response = HTTP.get('https://www.google.com', wrappers)
+				response.connection.close
+			end.to_not raise_error
+		end
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -147,6 +147,7 @@ files:
 - spec/async/io/trap_spec.rb
 - spec/async/io/udp_socket_spec.rb
 - spec/async/io/unix_socket_spec.rb
+- spec/async/io/wrap/http_rb_spec.rb
 - spec/async/io/wrap/tcp_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/socketry/async-io
@@ -195,5 +196,6 @@ test_files:
 - spec/async/io/trap_spec.rb
 - spec/async/io/udp_socket_spec.rb
 - spec/async/io/unix_socket_spec.rb
+- spec/async/io/wrap/http_rb_spec.rb
 - spec/async/io/wrap/tcp_spec.rb
 - spec/spec_helper.rb