restify 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efafa496c201a2b0a9e9c08772dc6975ea76e37b
-  data.tar.gz: 247851fc3d0492a2ae373b969555f52af44d3845
+  metadata.gz: 82d3b62e23db7cb179cce7f4b8a31fe3d965f674
+  data.tar.gz: bee7bbacb6e8f25b326af0fba70f12a5609f7aa2
 SHA512:
-  metadata.gz: 0f40c4d42f9a08e3fbb068f35f19ef7e26e3b55e06e9f465fa93dcc4671d95f4f1039af1020f443a04481c14866a6001760cb7ef1951149c6ecdd1f181a62684
-  data.tar.gz: 6ca87fb113af1ae61152157c91a03668829d70792f86726b373c7c5b42c0a25e0f3500b11c11361a5253ca20441c28112ce284e0b232215a4f5e20516141acaf
+  metadata.gz: a1385660f21c2f4543a84227d49a821edaa57d515d78ba68102e5a75781d188c181fd3fec32e7444275dd951aabcfebd97174bafa654fc1b53a051bc16990559
+  data.tar.gz: 7dba379faf8e84c513ae6adc66a1f8b4ab4fe9f2f546958fe9a561ae14d335c2045d1a4559c23f5f9ea6c4753d9289f3cd21b170a5ad85232f84934068ca0272

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.4.0
+
+* Fix possible concurrency issue with typhoeus adapter
+* Add timeout option to requests (only supported by typhoeus adapter)
+
 ## 1.3.1
 
 * Improve typhoeus adapters initial request queuing

data/lib/restify/adapter/typhoeus.rb

@@ -5,6 +5,9 @@ require 'typhoeus'
 module Restify
   module Adapter
     class Typhoeus < Base
+      # rubocop:disable RedundantFreeze
+      LOG_PROGNAME = 'restify.adapter.typhoeus'.freeze
+
       attr_reader :sync
 
       DEFAULT_HEADERS = {
@@ -46,10 +49,19 @@ module Restify
           request.uri,
           method: request.method,
           headers: DEFAULT_HEADERS.merge(request.headers),
-          body: request.body
+          body: request.body,
+          followlocation: true,
+          timeout: request.timeout,
+          connecttimeout: request.timeout
 
         req.on_complete do |response|
-          writer.fulfill convert_back(response, request)
+          if response.timed_out?
+            writer.reject Restify::Timeout.new request
+          elsif response.code == 0
+            writer.reject Restify::NetworkError.new response.return_message
+          else
+            writer.fulfill convert_back(response, request)
+          end
         end
 
         req
@@ -78,8 +90,8 @@ module Restify
         @thread ||= Thread.new do
           loop do
             begin
-              Thread.stop unless queued?
               @hydra.run
+              Thread.stop unless queued?
             rescue StandardError => e
               puts "#{self.class}: #{e.message}"
             end

data/lib/restify/context.rb

@@ -48,12 +48,13 @@ module Restify
     end
 
     # rubocop:disable Metrics/MethodLength
-    def request(method, uri, data = nil, _opts = {})
-      request = Request.new \
+    def request(method, uri, data: nil, **kwargs)
+      request = Request.new(**kwargs,
         method: method,
         uri: join(uri),
         data: data,
         headers: headers
+      )
 
       ret = cache.call(request) {|req| adapter.call(req) }
       ret.then do |response|

data/lib/restify/error.rb

@@ -2,6 +2,25 @@
 
 module Restify
   #
+
+  # A {Timeout} is raised when a request or promise times out.
+  #
+  class Timeout < StandardError
+    attr_reader :source
+
+    def initialize(source)
+      super "Operation with #{source.class} has timed out"
+
+      @source = source
+    end
+  end
+
+  # A {NetworkError} is raised on unusual network exceptions such as
+  # unresolvable hosts or disconnects.
+  #
+  class NetworkError < StandardError
+  end
+
   # A {ResponseError} is returned on a non-successful
   # response from server. Usually it will either be a
   # {ClientError} or a {ServerError}.

data/lib/restify/relation.rb

@@ -20,28 +20,28 @@ module Restify
       @template = Addressable::Template.new template
     end
 
-    def request(method, data, params)
-      context.request method, expand(params), data
+    def request(method, data, params, opts = {})
+      context.request method, expand(params), **opts, data: data
     end
 
-    def get(params = {})
-      request :get, nil, params
+    def get(params = {}, opts = {})
+      request :get, nil, params, opts
     end
 
-    def delete(params = {})
-      request :delete, nil, params
+    def delete(params = {}, opts = {})
+      request :delete, nil, params, opts
     end
 
-    def post(data = {}, params = {})
-      request :post, data, params
+    def post(data = {}, params = {}, opts = {})
+      request :post, data, params, opts
     end
 
-    def put(data = {}, params = {})
-      request :put, data, params
+    def put(data = {}, params = {}, opts = {})
+      request :put, data, params, opts
     end
 
-    def patch(data = {}, params = {})
-      request :patch, data, params
+    def patch(data = {}, params = {}, opts = {})
+      request :patch, data, params, opts
     end
 
     def ==(other)

data/lib/restify/request.rb

@@ -24,10 +24,17 @@ module Restify
     #
     attr_reader :headers
 
+    # Request timeout in seconds
+    #
+    # Defaults to 300 seconds.
+    #
+    attr_reader :timeout
+
     def initialize(opts = {})
       @method  = opts.fetch(:method, :get).downcase
       @uri     = opts.fetch(:uri) { raise ArgumentError.new ':uri required.' }
       @data    = opts.fetch(:data, nil)
+      @timeout = opts.fetch(:timeout, 300)
       @headers = opts.fetch(:headers, {}).merge \
         'Content-Type' => 'application/json'
     end

data/lib/restify/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Jan Graichen