uv-rays 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea80508dd174f1a92ad4b87d32920f23a85067a
-  data.tar.gz: 6e2e6455a4b672a93fa9726df89ee71a1d2458b0
+  metadata.gz: f5e3a19099c48894d72cc8564ebc6ba7064f0e29
+  data.tar.gz: de7efbff60dcd1a46422a7f0ac5c6987c304f878
 SHA512:
-  metadata.gz: ac4510a1e95d2547a82e5d8367c5ce47edeabb775065de0de5afedc545a0fc3b4d21539eff6311b91795f2d9e082dac01e36ff4f773615d1777b6f238ad2f636
-  data.tar.gz: e21553e82432cb7b15db6ca134f026ec02c591ebd095ffe09fdee5f24c71dbc7f7111792bc3f52557cf90601ec1958a72a4fcaf0c14587539fbc65cae50190c3
+  metadata.gz: b18f154b1a634972ac6a44d0e9bd0469449a11ffceeb1ba8576b23135b24573917cec7e2f9b585816ca5f0a3241b9041f9cf5b4075e83cb2419b5ecf67c06464
+  data.tar.gz: ad62948fc3168d392e5e22cfa74da92689811947fcc632982b3706b34b44909cb6823f3a9fe6f00e73859b4cb643c9b9e6a4dd2e9e871e4d426089759fbe3cc5

data/Rakefile

@@ -8,7 +8,7 @@ require 'yard'                  # yard documentation
 task :default => :limited_spec
 RSpec::Core::RakeTask.new(:limited_spec) do |t|
     # Exclude network tests
-    t.rspec_opts = "--tag ~network" 
+    t.rspec_opts = "--tag ~network --tag ~mri_only"
 end
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/uv-rays/http/request.rb

@@ -20,27 +20,38 @@ module UV
 
 
             def cookies_hash
-                @endpoint.cookiejar.get_hash(@uri)
+                @cookiejar.get_hash(@uri)
             end
 
             def set_cookie(value)
-                @endpoint.cookiejar.set(@uri, value)
+                @cookiejar.set(@uri, value)
             end
 
 
             def initialize(endpoint, options)
                 super(endpoint.thread, endpoint.thread.defer)
 
+                @path = options[:path]
+                @method = options[:method]
+
+                @host = endpoint.host
+                @port = endpoint.port
+                @cookiejar = endpoint.cookiejar
+                @middleware = endpoint.middleware
+                @uri = "#{endpoint.scheme}://#{encode_host(@host, @port)}#{@path}"
+                endpoint = nil
+
                 @options = options
-                @endpoint = endpoint
                 @ntlm_creds = options[:ntlm]
                 @digest_creds = options[:digest]
                 @challenge_retries = 0
 
-                @path = options[:path]
-                @method = options[:method]
-                @uri = "#{endpoint.scheme}://#{encode_host(endpoint.host, endpoint.port)}#{@path}"
-
+                # Don't hold references to vars we don't require anymore
+                self.finally {
+                    @host = @port = nil
+                    @cookiejar = nil
+                    @middleware = nil
+                }
                 @error = proc { |reason| reject(reason) }
             end
 
@@ -91,7 +102,7 @@ module UV
                 head, body = build_request, @options[:body]
                 @transport = transport
 
-                @endpoint.middleware.each do |m|
+                @middleware.each do |m|
                     begin
                         head, body = m.request(self, head, body) if m.respond_to?(:request)
                     rescue => e
@@ -132,7 +143,7 @@ module UV
                     transport.write(request_header).catch @error
 
                     # Send file
-                    fileRef = @endpoint.reactor.file file, File::RDONLY do
+                    fileRef = @reactor.file file, File::RDONLY do
                         # File is open and available for reading
                         pSend = fileRef.send_file(transport, using: :raw, wait: :promise)
                         pSend.catch @error
@@ -180,7 +191,7 @@ module UV
                 head = @options[:headers] ? munge_header_keys(@options[:headers]) : {}
 
                 # Set the cookie header if provided
-                @cookies = @endpoint.cookiejar.get(@uri)
+                @cookies = @cookiejar.get(@uri)
                 if cookie = head[COOKIE]
                     @cookies << encode_cookie(cookie)
                 end
@@ -192,7 +203,7 @@ module UV
                 end
 
                 # Set the Host header if it hasn't been specified already
-                head['host'] ||= encode_host(@endpoint.host, @endpoint.port)
+                head['host'] ||= encode_host(@host, @port)
 
                 # Set the User-Agent if it hasn't been specified
                 if !head.key?('user-agent')

data/lib/uv-rays/http_endpoint.rb

@@ -60,9 +60,11 @@ module UV
             end
 
             def on_close # user to define
-                req = @request
+                @client.connection_closed(@request, @reason)
+            ensure
                 @request = nil
-                @client.connection_closed(req, @reason)
+                @client = nil
+                @reason = nil
             end
 
             def close_connection(request = nil)
@@ -91,11 +93,6 @@ module UV
             @options = @@defaults.merge(options)
             @tls_options = options[:tls_options] || {}
             @inactivity_timeout = options[:inactivity_timeout] || 10000
-            @idle_timeout_method = method(:idle_timeout)
-
-            if @inactivity_timeout > 0
-                @timer = @thread.timer
-            end
 
             uri = URI.parse host
             @port = uri.port
@@ -225,17 +222,17 @@ module UV
 
 
         def start_timer
-            return if @timer.nil?
-            @timer.progress @idle_timeout_method
-            @timer.start @inactivity_timeout
-        end
-
-        def restart_timer
-            @timer.again unless @timer.nil?
+            @timer.cancel if @timer
+            @timer = @thread.scheduler.in(@inactivity_timeout) do
+                @timer = nil
+                idle_timeout
+            end
         end
+        alias_method :restart_timer, :start_timer
 
         def stop_timer
-            @timer.stop unless @timer.nil?
+            @timer.cancel unless @timer.nil?
+            @timer = nil
         end
 
         def idle_timeout

data/lib/uv-rays/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UV
-    VERSION = '2.1.2'
+    VERSION = '2.1.3'
 end

data/spec/http_endpoint_spec.rb

@@ -218,6 +218,52 @@ describe UV::HttpEndpoint do
 			expect(@response.body).to eq('y')
 		end
 
+		it 'should be garbage collected', mri_only: true do
+			require 'weakref'
+			require 'objspace'
+
+			objs = nil
+			obj_id = nil
+
+			@reactor.run { |reactor|
+				tcp = UV.start_server '127.0.0.1', 3250, HttpServer
+				block = proc {
+					server = UV::HttpEndpoint.new 'http://127.0.0.1:3250', inactivity_timeout: 300
+					obj_id = server.object_id
+					objs = WeakRef.new(server)
+
+					request = server.get(:path => '/whatwhat')
+					request.catch(@request_failure)
+					request.finally {
+						tcp.close
+						@timeout.stop
+					}
+
+					server = nil
+					request = nil
+				}
+
+				block.call
+
+				reactor.scheduler.in(800) do
+					GC.start
+					ObjectSpace.garbage_collect
+				end
+			}
+			ObjectSpace.garbage_collect
+			GC.start
+
+			expect(@general_failure).to eq([])
+
+			begin
+				expect(objs.weakref_alive?).to eq(nil)
+			rescue Exception => e
+				objs = ObjectSpace.each_object.select{ |o| ObjectSpace.reachable_objects_from(o).map(&:object_id).include?(obj_id) }
+				puts "Objects referencing HTTP class:\n#{objs.inspect}\n"
+				raise e
+			end
+		end
+
 		it "should return the response when no length is given and the connection is closed" do
 			# I've seen IoT devices do this (projector screen controllers etc)
 			@reactor.run { |reactor|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uv-rays
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libuv
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Abstractions for working with Libuv