net-http2 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3f05adbbbbe99f8eb15097186a59db80eb66042
-  data.tar.gz: e22193008420db5d3dffffab3a39ba73eff062df
+  metadata.gz: 451f976b504ea90082e3b543005bfa5acd492d6c
+  data.tar.gz: 08aaf99a27c00e11869b93055f27d6c36a13181a
 SHA512:
-  metadata.gz: 8ede872c9f2ed793b385354507dd0bc0dc4bb66fef127afa673eddb005e19125342faf94b977cd1994803b239b36425ebbe40bee044bdf1e82d1343d9051b21a
-  data.tar.gz: 2e4e48b32df8d4860590d155b15d4bfd363a8f10d27897ab2ff3643c7a93827ff10fd40b7bdfe2be0a9c3bd7ffb11df45981053e34140f894e0c9273294f6303
+  metadata.gz: 9e2ca697436e974ffb51f42018a75b323aec53ea3a5fb8557d189bdeab5a5763796577e94346795a0f05bf2558071dc741d8e0b7fe2a2e87df04f047faf098a0
+  data.tar.gz: c67502d2c1e67309a43b729f6ccf040fb01e5b6cda05e472bb2afe6f98739968d52f37e45a913e42c35f4cc62dbe9f345af7eac8df8045c99c0ad3b8455ff131

data/lib/net-http2/client.rb

@@ -28,7 +28,8 @@ module NetHttp2
 
     def call_async(request)
       ensure_open
-      new_stream.async_call_with request
+      stream = new_monitored_stream_for request
+      stream.async_call_with request
     end
 
     def prepare_request(method, path, options={})
@@ -50,14 +51,6 @@ module NetHttp2
       end
     end
 
-    def add_stream_to_monitor(stream)
-      @streams[stream.id] = true
-    end
-
-    def mark_stream_as_closed(stream)
-      @streams.delete(stream.id)
-    end
-
     private
 
     def init_vars
@@ -70,7 +63,16 @@ module NetHttp2
     end
 
     def new_stream
-      NetHttp2::Stream.new(client: self, h2_stream: h2.new_stream)
+      NetHttp2::Stream.new(h2_stream: h2.new_stream)
+    end
+
+    def new_monitored_stream_for(request)
+      stream = new_stream
+
+      @streams[stream.id] = true
+      request.on(:close) { @streams.delete(stream.id) }
+
+      stream
     end
 
     def ensure_open
@@ -78,15 +80,15 @@ module NetHttp2
 
         return if @socket_thread
 
+        main_thread = Thread.current
         @socket = new_socket
 
         @socket_thread = Thread.new do
-
           begin
             socket_loop
           rescue Exception => e
             # socket closed
-            Thread.main.raise e
+            main_thread.raise e
           ensure
             @socket.close unless @socket.closed?
             @socket        = nil

data/lib/net-http2/stream.rb

@@ -3,7 +3,6 @@ module NetHttp2
   class Stream
 
     def initialize(options={})
-      @client    = options[:client]
       @h2_stream = options[:h2_stream]
       @headers   = {}
       @data      = ''
@@ -31,7 +30,6 @@ module NetHttp2
     def async_call_with(request)
       @request = request
       @async   = true
-      @client.add_stream_to_monitor(self)
 
       send_request_data
     end
@@ -74,7 +72,6 @@ module NetHttp2
 
         if async?
           @request.emit(:close, data)
-          @client.mark_stream_as_closed(self)
         else
           @mutex.synchronize { @cv.signal }
         end

data/lib/net-http2/version.rb

@@ -1,3 +1,3 @@
 module NetHttp2
-  VERSION = "0.12.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-http2
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Roberto Ostinelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2