restify 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19ee2486506eef195ed64b0a37ff921b97fefa46356e69d2fc3b28ca404ebf98
-  data.tar.gz: 3b81f57ac5b84452dc9e9b6e1bb39705b601138ee5e5f9e2d1bb33d1107e286f
+  metadata.gz: e2b5dacc128de6cbfed604453544f51eaeffd16b9b6cb83f5353ecca66d24a8d
+  data.tar.gz: 5c3eba335362aea288f851327fa96262e5b464b9a747b092955241bb362e9c0d
 SHA512:
-  metadata.gz: e2e87e8c7e31b32d7da5f70321887a7ca28831a78e088fe3c934a08dc94481413d4a24c64eb8f765d60c7195a2d9830a11d11df6fa7c9c96ee5033ae26659f80
-  data.tar.gz: 58697191071fa894417566779fcca6f74bb817ae6173bf9d7752b91af0b252d5ae4911fd29507b04fe6adf327e8b73cbf5109509fd9771078936259cb1911e46
+  metadata.gz: 32569c3544a1ac6734b3c81c1e2b6a46ea7dba324c1f71f5e85bd1df93b8b73bb70114a7cec37dd8e38e561a821e674e8c437c78757d78df75e1e51b1a5a79f8
+  data.tar.gz: 6f03d156fcc20e0dfba3d7fda0a5c7851ff5d9342fbb9b50c4d90d1f43bf65e92f0ecabb714c4023ce4ca8cfb95b231abd7ea5d1e05339e839ea046b17f3d1fe

data/CHANGELOG.md

@@ -18,6 +18,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Breaks
 
 
+## 1.13.0 - (2020-06-12)
+---
+
+### New
+* typhoeus: Support setting per-request libcurl options on adapter
+* typhoeus: Enable short TCP keepalive probes by default (5s/5s)
+
+
 ## 1.12.0 - (2020-04-01)
 ---
 

data/README.md

@@ -15,20 +15,17 @@ Restify is build upon the following libraries:
 * [addressable](https://github.com/sporkmonger/addressable)
 * [typhoeus](https://github.com/typhoeus/typhoeus)
 
-It has optional HTTP adapters using:
-
-* [em-http-request](https://github.com/igrigorik/em-http-request)
-
 The HTTP adapters are mostly run in a background thread and may not survive mid-application forks.
 
-Included processors can handle:
+Restify includes processors to parse responses and to extract links between resources. The following formats are can be parsed:
 
-* Plain JSON with GitHub-style relations
-* MessagePack with GitHub-style relations *(currently experimental)*
+* JSON
+* MessagePack
 
-(Beside HTTP Link header that's always supported)
+Links are extracted from
 
-Restify requires Ruby 2.0+.
+* HTTP Link header
+* Github-style relations in payloads
 
 ### Planned features
 
@@ -106,9 +103,9 @@ commit = repo.rel(:commits).get.value.first
 And print it:
 
 ```ruby
-puts "Last commit: #{commit[:sha]}"
-puts "By #{commit[:commit][:author][:name]} <#{commit[:commit][:author][:email]}>"
-puts "#{commit[:commit][:message]}"
+puts "Last commit: #{commit['sha']}"
+puts "By #{commit['commit']['author']['name']} <#{commit['commit']['author']['email']}>"
+puts "#{commit['commit']['message']}"
 ```
 
 See commented example in main spec [`spec/restify_spec.rb`](https://github.com/jgraichen/restify/blob/master/spec/restify_spec.rb#L100) or in the `examples` directory.

data/lib/restify/adapter/em.rb

@@ -63,8 +63,8 @@ module Restify
               query: request.uri.normalized_query,
               body: request.body,
               head: request.headers
-          rescue Exception => err # rubocop:disable RescueException
-            writer.reject err
+          rescue Exception => e # rubocop:disable Lint/RescueException
+            writer.reject e
             requests.shift unless pipeline?
             return
           end

data/lib/restify/adapter/pooled_em.rb

@@ -200,9 +200,9 @@ module Restify
         @pool = Pool.new(**kwargs)
       end
 
-      # rubocop:disable MethodLength
-      # rubocop:disable AbcSize
-      # rubocop:disable BlockLength
+      # rubocop:disable Metrics/MethodLength
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/BlockLength
       def call_native(request, writer)
         next_tick do
           defer = @pool.get(request)
@@ -241,9 +241,9 @@ module Restify
                 @pool.remove(conn)
                 writer.reject(req.error)
               end
-            rescue Exception => ex # rubocop:disable RescueException
+            rescue Exception => e # rubocop:disable Lint/RescueException
               @pool.remove(conn)
-              writer.reject(ex)
+              writer.reject(e)
             end
           end
         end

data/lib/restify/adapter/typhoeus.rb

@@ -16,20 +16,28 @@ module Restify
         'Transfer-Encoding' => ''
       }.freeze
 
-      def initialize(sync: false, **options)
-        @sync   = sync
-        @hydra  = ::Typhoeus::Hydra.new(**options)
-        @mutex  = Mutex.new
-        @signal = ConditionVariable.new
-        @thread = nil
+      DEFAULT_OPTIONS = {
+        followlocation: true,
+        tcp_keepalive: true,
+        tcp_keepidle: 5,
+        tcp_keepintvl: 5
+      }.freeze
+
+      def initialize(sync: false, options: {}, **kwargs)
+        @sync    = sync
+        @hydra   = ::Typhoeus::Hydra.new(**kwargs)
+        @mutex   = Mutex.new
+        @signal  = ConditionVariable.new
+        @thread  = nil
+        @options = DEFAULT_OPTIONS.merge(options)
       end
 
       def sync?
         @sync
       end
 
-      # rubocop:disable AbcSize
-      # rubocop:disable MethodLength
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def call_native(request, writer)
         req = convert(request, writer)
 
@@ -57,15 +65,15 @@ module Restify
 
       private
 
-      # rubocop:disable AbcSize
-      # rubocop:disable MethodLength
+      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength
       def convert(request, writer)
         ::Typhoeus::Request.new(
           request.uri,
+          **@options,
           method: request.method,
           headers: DEFAULT_HEADERS.merge(request.headers),
           body: request.body,
-          followlocation: true,
           timeout: request.timeout,
           connecttimeout: request.timeout
         ).tap do |req|
@@ -124,7 +132,7 @@ module Restify
         @hydra.queued_requests.any? || @hydra.multi.easy_handles.any?
       end
 
-      # rubocop:disable MethodLength
+      # rubocop:disable Metrics/MethodLength
       def _run
         debug 'hydra:run'
         @hydra.run while _ongoing?

data/lib/restify/context.rb

@@ -36,7 +36,7 @@ module Restify
 
     def inherit(uri, **kwargs)
       uri ||= self.uri
-      Context.new uri, kwargs.merge(options)
+      Context.new(uri, **kwargs, **options)
     end
 
     def process(response)

data/lib/restify/global.rb

@@ -39,9 +39,9 @@ module Restify
 
     def resolve_context(uri, **opts)
       if uri.is_a? Symbol
-        Restify::Registry.fetch(uri).inherit(nil, opts)
+        Restify::Registry.fetch(uri).inherit(nil, **opts)
       else
-        Context.new uri, opts
+        Context.new(uri, **opts)
       end
     end
   end

data/lib/restify/version.rb

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

data/spec/restify/context_spec.rb

@@ -47,7 +47,7 @@ describe Restify::Context do
 
     context 'YAML' do
       let(:dump) { YAML.dump(context) }
-      let(:load) { YAML.load(dump) } # rubocop:disable YAMLLoad
+      let(:load) { YAML.load(dump) } # rubocop:disable Security/YAMLLoad
 
       subject { load }
 
@@ -56,7 +56,7 @@ describe Restify::Context do
 
     context 'Marshall' do
       let(:dump) { Marshal.dump(context) }
-      let(:load) { Marshal.load(dump) } # rubocop:disable MarshalLoad
+      let(:load) { Marshal.load(dump) } # rubocop:disable Security/MarshalLoad
 
       subject { load }
 

data/spec/restify/error_spec.rb

@@ -14,7 +14,6 @@ describe Restify::ResponseError do
     allow(response).to receive(:decoded_body).and_return({})
   end
 
-
   describe '.from_code' do
     subject(:err) { described_class.from_code(response) }
 

data/spec/restify/global_spec.rb

@@ -26,7 +26,7 @@ describe Restify::Global do
       let(:options) { {accept: 'application.vnd.github.v3+json'} }
       let(:context) { Restify::Context.new uri, **options }
 
-      subject { global.new name, options }
+      subject { global.new(name, **options) }
 
       it 'returns relation for stored registry item' do
         Restify::Registry.store name, uri, options

data/spec/restify_spec.rb

@@ -134,7 +134,6 @@ describe Restify do
         # the result is here.
         expect { create_user_promise.value! }.to \
           raise_error(Restify::ClientError) do |e|
-
           # Because we forgot to send a "name" the server complains
           # with an error code that will lead to a raised error.
 
@@ -206,7 +205,6 @@ describe Restify do
 
           expect { create_user_promise.value! }.to \
             raise_error(Restify::ClientError) do |e|
-
             expect(e.status).to eq :unprocessable_entity
             expect(e.code).to eq 422
             expect(e.errors).to eq 'name' => ["can't be blank"]

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ require 'webmock/rspec'
 require 'rspec/collection_matchers'
 require 'em-synchrony'
 
-Dir[File.expand_path('spec/support/**/*.rb')].each {|f| require f }
+Dir[File.expand_path('spec/support/**/*.rb')].sort.each {|f| require f }
 
 RSpec.configure do |config|
   config.order = 'random'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport