cutoff 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630a704243a3bd8c2196e0be8bba735eb8f2afb185c3db7ba68f3c8bed242041
-  data.tar.gz: 1922fbb0c382c62fd894cd8d2f0bfa2d21ef5bbf2cdb5f7b128d9de582c14344
+  metadata.gz: 5ac27ce016591276e55afa82f64c08de370a969cb6552cc0d5ae69093d3a9e0c
+  data.tar.gz: 31e989979ae04de967a22e8d2457d6da654862603f380dd7521e415c9220148b
 SHA512:
-  metadata.gz: 7dcb206df1a3dc2ce265e0b78f0d93a8c3ddfe1f92b52945ff06cc87fa20ecfcaf2f4f9636555966b7c5cd9b624a498be788bd8fdf3d6c67cd9c5ffbd35aa393
-  data.tar.gz: 8178c8dd01267bc67b96eef6b2ff103f90a9e47954c55d10b33f1c21a39f36701bfb2bfd0e6896f6975a210e66c09611cd8cf419d9ea62b2cf489603dcff8808
+  metadata.gz: 4241c63fc4c647c44860aa0781e2966a5eadc1d7edea259851018308d1877d664c46a8d90bd5553f725d2e1fa5f767995b0f27327482bf2ce5128701908aa684
+  data.tar.gz: 64d599559055f6d8b3c384b88b5268b02317784bd44fd6be2384fd3c56b1f9da5a9cfb435c4af05c083ba20af6d8865f0c73a8fc46afff261ad70d43fc9c35e4

data/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.1] - 2021-10-02
+
+- Fix Net::HTTP patch to override timeouts given to start
+
 ## [0.4.0] - 2021-10-01
 
 - Add benchmarks and slight performance improvements
@@ -29,7 +33,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Cutoff class
 - Mysql2 patch
 
-[Unreleased]: https://github.com/justinhoward/cutoff/compare/v0.4.0...HEAD
+[Unreleased]: https://github.com/justinhoward/cutoff/compare/v0.4.1...HEAD
+[0.4.0]: https://github.com/justinhoward/cutoff/compare/v0.4.0...v0.4.1
 [0.4.0]: https://github.com/justinhoward/cutoff/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/justinhoward/cutoff/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/justinhoward/cutoff/compare/v0.1.0...v0.2.0

data/lib/cutoff/patch/net_http.rb

@@ -4,27 +4,36 @@ require 'net/http'
 
 class Cutoff
   module Patch
-    # Adds a checkpoint for starting HTTP requests and sets network timeouts
-    # to the remaining time
     module NetHttp
-      # Construct a {Net::HTTP}, but with the timeouts set to the remaining
-      # cutoff time if one is active
-      def initialize(address, port = nil)
-        super
-        return unless (cutoff = Cutoff.current)
+      def self.gen_timeout_method(name)
+        <<~RUBY
+          if #{name}.nil? || #{name} > remaining
+            self.#{name} = cutoff.seconds_remaining
+          end
+        RUBY
+      end
 
-        @open_timeout = cutoff.seconds_remaining
-        @read_timeout = cutoff.seconds_remaining
-        @write_timeout = cutoff.seconds_remaining
+      def self.use_write_timeout?
+        Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.6')
       end
 
-      # Same as the original start, but with a cutoff checkpoint
+      # Same as the original start, but adds a checkpoint for starting HTTP
+      # requests and sets network timeouts to the remaining time
       #
-      # @see {Net::HTTP#start}
-      def start
-        Cutoff.checkpoint!
-        super
-      end
+      # @see Net::HTTP#start
+      module_eval(<<~RUBY, __FILE__, __LINE__ + 1)
+        def start
+          if (cutoff = Cutoff.current)
+            remaining = cutoff.seconds_remaining
+            #{gen_timeout_method('open_timeout')}
+            #{gen_timeout_method('read_timeout')}
+            #{gen_timeout_method('write_timeout') if use_write_timeout?}
+            #{gen_timeout_method('continue_timeout')}
+            Cutoff.checkpoint!
+          end
+          super
+        end
+      RUBY
     end
   end
 end

data/lib/cutoff/version.rb

@@ -3,6 +3,6 @@
 class Cutoff
   # @return [Gem::Version] The current version of the cutoff gem
   def self.version
-    Gem::Version.new('0.4.0')
+    Gem::Version.new('0.4.1')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cutoff
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Justin Howard
@@ -111,7 +111,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/justinhoward/cutoff/blob/master/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/cutoff/0.4.0
+  documentation_uri: https://www.rubydoc.info/gems/cutoff/0.4.1
 post_install_message: 
 rdoc_options: []
 require_paths: