restify 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241fd43c8e40d2a0c2c839443df03106edf3c8e491cac9338277ff4327a3927f
-  data.tar.gz: d8eea64a1de42ee6eb4666feb510669b69482f24c72a0f5c883f3482143751ca
+  metadata.gz: 95d9cf12fd58e2f17bd1d3c046dfda23eaa38ec2fb99fe0c9b7e1034e014cd1f
+  data.tar.gz: b995cf5d935ba1c83b403fedf18d4c35154ea0ad60d4be0437fa98c89281d687
 SHA512:
-  metadata.gz: 603395d24a3ecad6d35b217ef2d154cd0982f9cd9181769b2a5aa949e134f0f9af1a15cc731f54a2d700e3bd1162b667240420e5669af20b48c66a1ba84fc2c5
-  data.tar.gz: 89e64dcd00dde5a7711922619380d2003db5f8c42a7cbc473b19678b6ed251134ffe4b4c94b86afaa7efa7dea030c6d43876e57c00c85ea76523f9f7029f6804
+  metadata.gz: 96b5f22cc74ca967876f2ecc86bf30c70fa21ceee6f8726117862ad0e94a6319a9384673cd83a4222bd40b49f4b6eeb48cdec7bd5d1e94ac70fcdab787a8ed5b
+  data.tar.gz: 98199df1ecf1b9467b609ae57f58f2ae459f42f7121c1947763a9d49acb7224d6b8dc50088e74cd7f563719fb81f507d88fca2252a823856e57bbf995db5cbbe

data/CHANGELOG.md

@@ -18,6 +18,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Breaks
 
 
+## 1.15.1 - (2021-07-15)
+---
+
+### Fixes
+* Typhoeus internal exception when request timed out
+
+
 ## 1.15.0 - (2021-07-09)
 ---
 
@@ -33,6 +40,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 
 ## 1.14.0 - (2020-12-15)
+---
 
 ### New
 * Allow making requests with non-JSON bodies and custom content types (#42)

data/lib/restify/adapter/typhoeus.rb

@@ -49,7 +49,8 @@ module Restify
           debug 'request:add',
             tag: request.object_id,
             method: request.method.upcase,
-            url: request.uri
+            url: request.uri,
+            timeout: request.timeout
 
           @queue << convert(request, writer)
 
@@ -75,11 +76,11 @@ module Restify
           req.on_complete do |response|
             debug 'request:complete',
               tag: request.object_id,
-              status: response.code
+              status: response.code,
+              message: response.return_message,
+              timeout: response.timed_out?
 
-            if response.timed_out?
-              writer.reject Restify::Timeout.new request
-            elsif response.code.zero?
+            if response.timed_out? || response.code.zero?
               writer.reject \
                 Restify::NetworkError.new(request, response.return_message)
             else

data/lib/restify/version.rb

@@ -4,7 +4,7 @@ module Restify
   module VERSION
     MAJOR = 1
     MINOR = 15
-    PATCH = 0
+    PATCH = 1
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 

data/spec/restify/features/request_errors_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Restify, adapter: ::Restify::Adapter::Typhoeus do
+  before do
+    stub_request(:get, 'http://stubserver/base').to_timeout
+  end
+
+  describe 'Timeout' do
+    subject(:request) { Restify.new('http://localhost:9292/base').get({}, timeout: 0.1).value! }
+
+    it 'throws a network error' do
+      expect { request }.to raise_error Restify::NetworkError do |error|
+        expect(error.message).to match(/timeout/i)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -34,13 +34,20 @@ if ENV['ADAPTER']
   end
 end
 
-require_relative 'support/stub_server.rb'
+require_relative 'support/stub_server'
 
 RSpec.configure do |config|
   config.order = 'random'
 
   config.before(:suite) do
-    ::Restify::Timeout.default_timeout = 0.1
+    ::Restify::Timeout.default_timeout = 1.0
+  end
+
+  config.before(:each) do |example|
+    next unless (adapter = example.metadata[:adapter])
+    next if Restify.adapter.is_a?(adapter)
+
+    skip 'Spec not enabled for current adapter'
   end
 
   config.before(:each) do

data/spec/support/stub_server.rb

@@ -40,18 +40,22 @@ module Stub
       WebMock::RequestRegistry.instance.requested_signatures.put(signature)
       response = ::WebMock::StubRegistry.instance.response_for_request(signature)
 
-      # If no stub matched `nil` is returned.
-      if response
-        status = response.status
-        status = status.to_s.split(' ', 2) unless status.is_a?(Array)
-        status = Integer(status[0])
-
-        [status, response.headers || {}, [response.body.to_s]]
-      else
-        # Return special HTTP 599 with the error message that would normally
-        # appear on missing stubs.
-        [599, {}, [WebMock::NetConnectNotAllowedError.new(signature).message]]
+      # Return special HTTP 599 with the error message that would normally
+      # appear on missing stubs.
+      unless response
+        return [599, {}, [WebMock::NetConnectNotAllowedError.new(signature).message]]
       end
+
+      if response.should_timeout
+        sleep 10
+        return [599, {}, ['Timeout']]
+      end
+
+      status = response.status
+      status = status.to_s.split(' ', 2) unless status.is_a?(Array)
+      status = Integer(status[0])
+
+      [status, response.headers || {}, [response.body.to_s]]
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -195,6 +195,7 @@ files:
 - spec/restify/error_spec.rb
 - spec/restify/features/head_requests_spec.rb
 - spec/restify/features/request_bodies_spec.rb
+- spec/restify/features/request_errors_spec.rb
 - spec/restify/features/request_headers_spec.rb
 - spec/restify/features/response_errors_spec.rb
 - spec/restify/global_spec.rb
@@ -229,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: An experimental hypermedia REST client.
@@ -239,6 +240,7 @@ test_files:
 - spec/restify/error_spec.rb
 - spec/restify/features/head_requests_spec.rb
 - spec/restify/features/request_bodies_spec.rb
+- spec/restify/features/request_errors_spec.rb
 - spec/restify/features/request_headers_spec.rb
 - spec/restify/features/response_errors_spec.rb
 - spec/restify/global_spec.rb