restify 1.15.1 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d9cf12fd58e2f17bd1d3c046dfda23eaa38ec2fb99fe0c9b7e1034e014cd1f
-  data.tar.gz: b995cf5d935ba1c83b403fedf18d4c35154ea0ad60d4be0437fa98c89281d687
+  metadata.gz: c29c95a9b1c0b18f2a73b51c99da7cdddf163e1cee33c43272810f5557b1375b
+  data.tar.gz: 95f956684154058cc6f25b7d4ffebde6706864b00c1369e91c8f8b5fcc50f0d9
 SHA512:
-  metadata.gz: 96b5f22cc74ca967876f2ecc86bf30c70fa21ceee6f8726117862ad0e94a6319a9384673cd83a4222bd40b49f4b6eeb48cdec7bd5d1e94ac70fcdab787a8ed5b
-  data.tar.gz: 98199df1ecf1b9467b609ae57f58f2ae459f42f7121c1947763a9d49acb7224d6b8dc50088e74cd7f563719fb81f507d88fca2252a823856e57bbf995db5cbbe
+  metadata.gz: f420cc4d0c4ebbdade1bc1a780c24218b5eea707bd8e420c113d155d58067936464dc3d4807717de8f515ed586784c9f13476b46c66f68c8d1181501937db3a2
+  data.tar.gz: 71da11cdf50d25abc968af02c6157c63f1aa5703c88f7ae28c3394aa028d9f038013d220283510532f7b540dffc69d0abad5fe4952c4e27df4910a4009475ae5

data/CHANGELOG.md

@@ -1,11 +1,11 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 
-
 ## Unreleased
 ---
 
@@ -18,163 +18,227 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Breaks
 
 
+## 1.15.2 - (2021-12-23)
+
+---
+
+### Fixes
+
+- ActiveSupport v7.0 issues with cache module
+
+
 ## 1.15.1 - (2021-07-15)
+
 ---
 
 ### Fixes
-* Typhoeus internal exception when request timed out
 
+- Typhoeus internal exception when request timed out
 
 ## 1.15.0 - (2021-07-09)
+
 ---
 
 ### New
-* Improve memory usage when running lots of requests with typhoeus adapter
-* Use hydra for synchronous requests
-* Increased thread stability of typhoeus adapter (new internal queuing mechanism)
+
+- Improve memory usage when running lots of requests with typhoeus adapter
+- Use hydra for synchronous requests
+- Increased thread stability of typhoeus adapter (new internal queuing mechanism)
 
 ### Changes
-* Use Ruby 2.5 as baseline for testing and linting
-* Add Ruby 3.0 to automated testing
-* Changed timing behavior for multiple requests due to new internal queuing mechanism for the typhoeus adapter
 
+- Use Ruby 2.5 as baseline for testing and linting
+- Add Ruby 3.0 to automated testing
+- Changed timing behavior for multiple requests due to new internal queuing mechanism for the typhoeus adapter
 
 ## 1.14.0 - (2020-12-15)
+
 ---
 
 ### New
-* Allow making requests with non-JSON bodies and custom content types (#42)
 
+- Allow making requests with non-JSON bodies and custom content types (#42)
 
 ## 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)
 
+- 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)
+
 ---
 
 ### Added
-* Explicit exception class for HTTP status code 410 (Gone)
+
+- Explicit exception class for HTTP status code 410 (Gone)
 
 ### Changed
 
 ### Fixed
-* `GatewayError` exception classes introduced in v1.11.0 now properly inherit from `ServerError` (#30)
 
+- `GatewayError` exception classes introduced in v1.11.0 now properly inherit from `ServerError` (#30)
 
 ## 1.11.0 - (2019-07-11)
+
 ### Added
-* Explicit exception classes for HTTP status codes 500, 502, 503, 504
+
+- Explicit exception classes for HTTP status codes 500, 502, 503, 504
 
 ## 1.10.0 - 2018-12-11
+
 ### Changed
+
 - Raise more specific error on a few status codes (#17)
 - Complete promises with an empty list (but a list) of dependencies (#18)
 
 ## 1.9.0 - 2018-11-13
+
 ### Changed
+
 - Do not raise error on 3XX responses but return responses
 
 ## 1.8.0 - 2018-08-22
+
 ### Added
+
 - Add HEAD request method (#16)
 
 ## 1.7.0 - 2018-08-15
+
 ### Added
+
 - Introduce promise dependency timeouts (#15)
 
 ## 1.6.0 - 2018-08-09
+
 ### Changed
+
 - Specify headers on restify clients and individual requests (#14)
 
 ## 1.5.0 - 2018-07-31
+
 ### Added
+
 - Add MessagePack processor enabled by default
 
 ### Changed
+
 - Tune typhoeus adapter to be more race-condition resilent
 
 ## 1.4.4 - 2018-07-13
+
 ### Added
+
 - Add `#request` to `NetworkError` to ease debugging
 
 ### Changed
+
 - Fix race condition in typhoeus adapter
 
 ## 1.4.3 - 2017-11-15
+
 ### Added
+
 - Add advanced logging capabilities using logging gem
 
 ### Changed
+
 - Improve compatibility with webmocks returning `nil` as headers
 
 ## 1.4.1 - 2017-11-15
+
 ### Changed
+
 - Fix possible deadlock issues
 
 ## 1.4.0 - 2017-11-10
+
 ### Added
+
 - Add timeout option to requests (only supported by typhoeus adapter)
 
 ### Changed
+
 - Fix possible concurrency issue with typhoeus adapter
 
 ## 1.3.1 - 2017-11-10
+
 ### Changed
+
 - Improve typhoeus adapters initial request queuing
 - Disable default pipelining
 
 ## 1.3.0 - 2017-11-08
+
 ### Changed
+
 - Improve typhoeus adapter to better utilize concurrency
 - Default to new typhoeus adapter
 
 ## 1.2.1 - 2017-10-30
+
 ### Changed
+
 - Fix issue with Ruby 2.2 compatibility
 
 ## 1.2.0 - 2017-10-30
+
 ### Added
+
 - Add experimental PooledEM adapter (#10)
 
 ### Changed
+
 - Improve marshaling of resources
 
 ## 1.1.0 - 2017-05-12
+
 ### Added
+
 - Add shortcuts for creating fulfilled / rejected promises (#6)
 
 ### Changed
+
 - Return response body if no processor matches (#7)
 
 ## 1.0.0 - 2016-08-22
+
 ### Added
+
 - Experimental cache API doing nothing for now
 
 ### Changed
+
 - Use `~> 1.0` of `concurrent-ruby`
 
 ## 0.5.0 - 2016-04-04
+
 ### Added
+
 - Add `sync` option to typhoeus adapter
 - Add registry for storing entry points
 
 ### Changed
+
 - Make eventmachine based adapter default
 
 ## 0.4.0 - 2016-02-24
+
 ### Added
+
 - Add method to explicit access resource data
 
 ### Changed
+
 - Use typhoeus as default adapter
 - `Restify.new` returns relation now instead of resource
 
 ### Removed
+
 - Drop obligation in favor of simple Concurrent::IVar based promise class.
   Notable changes:
   - Returned object us of type `Restify::Promise` now.

data/lib/restify/adapter/em.rb

@@ -29,7 +29,7 @@ module Restify
         end
 
         # rubocop:disable Style/IdenticalConditionalBranches
-        def call(request, writer, retried = false)
+        def call(request, writer, retried: false)
           if requests.empty?
             requests << [request, writer, retried]
             process_next
@@ -47,10 +47,6 @@ module Restify
           @pipeline
         end
 
-        # rubocop:disable Metrics/AbcSize
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/MethodLength
-        # rubocop:disable Metrics/PerceivedComplexity
         def process_next
           return if requests.empty?
 
@@ -77,7 +73,7 @@ module Restify
               req.last_effective_url,
               req.response_header.status,
               req.response_header,
-              req.response
+              req.response,
             )
 
             if req.response_header['CONNECTION'] == 'close'
@@ -108,7 +104,6 @@ module Restify
             end
           end
         end
-        # rubocop:enable all
       end
 
       def call_native(request, writer)
@@ -128,7 +123,7 @@ module Restify
         return if EventMachine.reactor_running?
 
         Thread.new do
-          EventMachine.run {}
+          EventMachine.run
         rescue StandardError => e
           puts "#{self.class} -> #{e}\n#{e.backtrace.join("\n")}"
           raise e

data/lib/restify/adapter/pooled_em.rb

@@ -164,7 +164,7 @@ module Restify
         def new(origin)
           logger.debug do
             "Connect to '#{origin}' " \
-            "(#{@connect_timeout}/#{@inactivity_timeout})..."
+              "(#{@connect_timeout}/#{@inactivity_timeout})..."
           end
 
           @host[origin] += 1
@@ -197,11 +197,10 @@ module Restify
       end
 
       def initialize(**kwargs)
+        super()
         @pool = Pool.new(**kwargs)
       end
 
-      # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/AbcSize
       # rubocop:disable Metrics/BlockLength
       def call_native(request, writer)
         next_tick do
@@ -226,7 +225,7 @@ module Restify
                 req.last_effective_url,
                 req.response_header.status,
                 req.response_header,
-                req.response
+                req.response,
               )
 
               if req.response_header['CONNECTION'] == 'close'
@@ -259,7 +258,7 @@ module Restify
         return if EventMachine.reactor_running?
 
         Thread.new do
-          EventMachine.run {}
+          EventMachine.run
         rescue StandardError => e
           logger.error(e)
           raise e

data/lib/restify/adapter/typhoeus.rb

@@ -13,14 +13,14 @@ module Restify
 
       DEFAULT_HEADERS = {
         'Expect' => '',
-        'Transfer-Encoding' => ''
+        'Transfer-Encoding' => '',
       }.freeze
 
       DEFAULT_OPTIONS = {
         followlocation: true,
         tcp_keepalive: true,
         tcp_keepidle: 5,
-        tcp_keepintvl: 5
+        tcp_keepintvl: 5,
       }.freeze
 
       def initialize(sync: false, options: {}, **kwargs)
@@ -38,7 +38,6 @@ module Restify
         @sync
       end
 
-      # rubocop:disable Metrics/MethodLength
       def call_native(request, writer)
         req = convert(request, writer)
 
@@ -57,12 +56,9 @@ module Restify
           thread.run unless thread.status
         end
       end
-      # rubocop:enable Metrics/MethodLength
 
       private
 
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
       def convert(request, writer)
         ::Typhoeus::Request.new(
           request.uri,
@@ -71,7 +67,7 @@ module Restify
           headers: DEFAULT_HEADERS.merge(request.headers),
           body: request.body,
           timeout: request.timeout,
-          connecttimeout: request.timeout
+          connecttimeout: request.timeout,
         ).tap do |req|
           req.on_complete do |response|
             debug 'request:complete',
@@ -93,8 +89,6 @@ module Restify
           end
         end
       end
-      # rubocop:enable Metrics/MethodLength
-      # rubocop:enable Metrics/AbcSize
 
       def convert_back(response, request)
         uri     = request.uri
@@ -127,7 +121,6 @@ module Restify
         @thread
       end
 
-      # rubocop:disable Metrics/MethodLength
       def run
         runs = 0
 
@@ -154,7 +147,6 @@ module Restify
       ensure
         debug 'hydra:exit'
       end
-      # rubocop:enable Metrics/MethodLength
 
       def dequeue_all
         loop do

data/lib/restify/context.rb

@@ -47,26 +47,22 @@ module Restify
       processor.new(context, response).resource
     end
 
-    # rubocop:disable Metrics/MethodLength
     def request(method, uri, data: nil, headers: {}, **kwargs)
       request = Request.new(
         headers: default_headers.merge(headers),
         **kwargs,
         method: method,
         uri: join(uri),
-        data: data
+        data: data,
       )
 
       ret = cache.call(request) {|req| adapter.call(req) }
       ret.then do |response|
-        if response.errored?
-          raise ResponseError.from_code(response)
-        else
-          process response
-        end
+        raise ResponseError.from_code(response) if response.errored?
+
+        process(response)
       end
     end
-    # rubocop:enable all
 
     def encode_with(coder)
       coder.map = marshal_dump
@@ -79,7 +75,7 @@ module Restify
     def marshal_dump
       {
         uri: uri.to_s,
-        headers: default_headers
+        headers: default_headers,
       }
     end
 

data/lib/restify/global.rb

@@ -20,6 +20,7 @@ module Restify
 
     def cache
       @cache ||= begin
+        require 'active_support'
         require 'active_support/cache'
         Restify::Cache.new store: ActiveSupport::Cache::MemoryStore.new
       end

data/lib/restify/logging.rb

@@ -14,7 +14,7 @@ module Restify
           _log_prefix,
           *Array(tag),
           message,
-          _fmt(**kwargs)
+          _fmt(**kwargs),
         ].map(&:to_s).reject(&:empty?).join(' ')
       end
     end

data/lib/restify/processors/base/parsing.rb

@@ -21,8 +21,8 @@ module Restify
         def parse(object, root: false)
           case object
             when Hash
-              data      = object.each_with_object({}, &method(:parse_data))
-              relations = object.each_with_object({}, &method(:parse_rels))
+              data      = object.each_with_object({}) {|each, obj| parse_data(each, obj) }
+              relations = object.each_with_object({}) {|each, obj| parse_rels(each, obj) }
 
               data = with_indifferent_access(data) if self.class.indifferent_access?
 
@@ -32,7 +32,7 @@ module Restify
                 relations: relations
 
             when Array
-              object.map(&method(:parse))
+              object.map {|each| parse(each) }
             else
               object
           end

data/lib/restify/resource.rb

@@ -96,7 +96,7 @@ module Restify
     def inspect
       text = {
         '@data' => data,
-        '@relations' => @relations
+        '@relations' => @relations,
       }.map {|k, v| "#{k}=#{v.inspect}" }.join(' ')
 
       "#<#{self.class} #{text}>"

data/lib/restify/response.rb

@@ -89,7 +89,6 @@ module Restify
     #
     # @return [Array<Link>] Links.
     #
-    # rubocop:disable Metrics/MethodLength
     def links
       @links ||= begin
         if headers['LINK']
@@ -104,7 +103,6 @@ module Restify
         end
       end
     end
-    # rubocop:enable all
 
     # Return content type header from response headers.
     #

data/lib/restify/version.rb

@@ -4,9 +4,9 @@ module Restify
   module VERSION
     MAJOR = 1
     MINOR = 15
-    PATCH = 1
+    PATCH = 2
     STAGE = nil
-    STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
+    STRING = [MAJOR, MINOR, PATCH, STAGE].compact.join('.').freeze
 
     def self.to_s
       STRING

data/spec/restify/cache_spec.rb

@@ -3,11 +3,11 @@
 require 'spec_helper'
 
 describe Restify::Cache do
+  subject { cache }
+
   let(:store) { double 'store' }
   let(:cache) { described_class.new store }
 
-  subject { cache }
-
   describe '#call' do
     let(:request) { double 'request' }
     let(:promise0) { double 'promise0' }

data/spec/restify/context_spec.rb

@@ -18,27 +18,30 @@ describe Restify::Context do
       end
 
       describe '#adapter' do
-        let(:kwargs) { {adapter: double('adapter')} }
         subject { super().options[:adapter] }
 
+        let(:kwargs) { {adapter: double('adapter')} }
+
         it 'adapter is not serialized' do
           expect(subject).to equal nil
         end
       end
 
       describe '#cache' do
-        let(:kwargs) { {adapter: double('cache')} }
         subject { super().options[:cache] }
 
+        let(:kwargs) { {adapter: double('cache')} }
+
         it 'cache is not serialized' do
           expect(subject).to equal nil
         end
       end
 
       describe '#headers' do
-        let(:kwargs) { {headers: {'Accept' => 'application/json'}} }
         subject { super().options[:headers] }
 
+        let(:kwargs) { {headers: {'Accept' => 'application/json'}} }
+
         it 'all headers are serialized' do
           expect(subject).to eq('Accept' => 'application/json')
         end
@@ -46,20 +49,20 @@ describe Restify::Context do
     end
 
     context 'YAML' do
+      subject { load }
+
       let(:dump) { YAML.dump(context) }
       let(:load) { YAML.load(dump) } # rubocop:disable Security/YAMLLoad
 
-      subject { load }
-
       include_examples 'serialization'
     end
 
     context 'Marshall' do
+      subject { load }
+
       let(:dump) { Marshal.dump(context) }
       let(:load) { Marshal.load(dump) } # rubocop:disable Security/MarshalLoad
 
-      subject { load }
-
       include_examples 'serialization'
     end
   end

data/spec/restify/error_spec.rb

@@ -19,51 +19,61 @@ describe Restify::ResponseError do
 
     context 'with 400 Bad Request' do
       let(:code) { 400 }
+
       it { is_expected.to be_a ::Restify::BadRequest }
     end
 
     context 'with 401 Unauthorized' do
       let(:code) { 401 }
+
       it { is_expected.to be_a ::Restify::Unauthorized }
     end
 
     context 'with 404 Unauthorized' do
       let(:code) { 404 }
+
       it { is_expected.to be_a ::Restify::NotFound }
     end
 
     context 'with 406 Not Acceptable' do
       let(:code) { 406 }
+
       it { is_expected.to be_a ::Restify::NotAcceptable }
     end
 
     context 'with 410 Gone' do
       let(:code) { 410 }
+
       it { is_expected.to be_a ::Restify::Gone }
     end
 
     context 'with 422 Unprocessable Entity' do
       let(:code) { 422 }
+
       it { is_expected.to be_a ::Restify::UnprocessableEntity }
     end
 
     context 'with 500 Internal Server Error' do
       let(:code) { 500 }
+
       it { is_expected.to be_a ::Restify::InternalServerError }
     end
 
     context 'with 502 Bad Gateway' do
       let(:code) { 502 }
+
       it { is_expected.to be_a ::Restify::BadGateway }
     end
 
     context 'with 503 Service Unavailable' do
       let(:code) { 503 }
+
       it { is_expected.to be_a ::Restify::ServiceUnavailable }
     end
 
     context 'with 504 Gateway Timeout' do
       let(:code) { 504 }
+
       it { is_expected.to be_a ::Restify::GatewayTimeout }
     end
   end

data/spec/restify/features/head_requests_spec.rb

@@ -17,6 +17,7 @@ describe Restify do
 
   describe 'HEAD requests' do
     subject { Restify.new('http://localhost:9292/base').head(params).value! }
+
     let(:params) { {} }
 
     it 'returns a resource with access to headers' do
@@ -33,7 +34,7 @@ describe Restify do
       it 'adds them to the query string' do
         subject
         expect(
-          request_stub.with(query: {foo: 'bar'})
+          request_stub.with(query: {foo: 'bar'}),
         ).to have_been_requested
       end
     end