routemaster-drain 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20836569e8aa8a67a439df2f2704bf04fa68c49e
-  data.tar.gz: e016b966b80009d099b3064d0365c81dfad16c92
+  metadata.gz: eb1cccd206b6825ce76f748a269bfbc261ff4328
+  data.tar.gz: a05de95ccc0c4643015f69aeeb7bbf02c4905d4f
 SHA512:
-  metadata.gz: 1d760e39869afb8b337ba935a405efb724b939fffaec97ce584d43de38bba2e551c5bfce3620d06f51fd714505e15e34d53c4df012d29076e7db8e0d3b7d8e48
-  data.tar.gz: 86c704f1e0d04e23a854cb2025ca3a687d54eb30c0dcd40c816c57ebc3b506ad880ef37f9ed918226fe1c1afc9717e2dcc1621fea44034af3531010cddd7da31
+  metadata.gz: cb053523998b5303d8c47d52963c27fac7a87181f28a33ed0a84e8739103c8031bbb3955567440a229eb0691b8878da257c585d5bcd05ac1ae5d1ba5a6028c39
+  data.tar.gz: db39fcb620c32576258a6f94ebc70eaed859cd3b5ea61f4ac899fec68df30ed7f9170cb2535b035a2c40de6425a93cd2b87b99f0e3096e6381fafacc3a3be0cb

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 3.1.0 (2017-11-42)
+
+Features:
+
+- Make retry-attempt-count and retry-methods configurable in APIClient.
+
 ### 3.0.3 (2017-09-21)
 
 Bug fixes:

data/lib/routemaster/api_client.rb

@@ -34,17 +34,14 @@ module Routemaster
     # all the time to fetch the root resource before doing anything else.
     @@root_resources = {}
 
-    def initialize(middlewares: [],
-                   listener: nil,
-                   response_class: nil,
-                   metrics_client: nil,
-                   source_peer: nil)
-
-      @listener               = listener
-      @middlewares            = middlewares
-      @default_response_class = response_class
-      @metrics_client         = metrics_client
-      @source_peer            = source_peer
+    def initialize(options = {})
+      @listener               = options.fetch :listener, nil
+      @middlewares            = options.fetch :middlewares, []
+      @default_response_class = options.fetch :response_class, nil
+      @metrics_client         = options.fetch :metrics_client, nil
+      @source_peer            = options.fetch :source_peer, nil
+      @retry_attempts         = options.fetch :retry_attempts, 2
+      @retry_methods          = options.fetch :retry_methods, Faraday::Request::Retry::IDEMPOTENT_METHODS
 
       connection # warm up connection so Faraday does all it's magical file loading in the main thread
     end
@@ -123,7 +120,11 @@ module Routemaster
     def connection
       @connection ||= Faraday.new do |f|
         f.request :json
-        f.request :retry, max: 2, interval: 100e-3, backoff_factor: 2
+        f.request :retry,
+          max: @retry_attempts,
+          interval: 100e-3,
+          backoff_factor: 2,
+          methods: @retry_methods
         f.response :mashify
         f.response :json, content_type: /\bjson/
         f.use Routemaster::Middleware::ResponseCaching, listener: @listener

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '3.0.3'.freeze
+    VERSION = '3.1.0'.freeze
   end
 end

data/spec/routemaster/api_client_spec.rb

@@ -159,24 +159,65 @@ describe Routemaster::APIClient do
   end
 
   describe '#patch' do
-    subject { fetcher.patch(url, body: {}, headers: headers) }
+    let(:body) { { 'one' => 1, 'two' => 2 }.to_json }
+    subject { fetcher.patch(url, body: body, headers: headers) }
 
-    before do
-      @patch_req = stub_request(:patch, /example\.com/).to_return(
-        status:   200,
-        body:     { id: 132, type: 'widget' }.to_json,
-        headers:  {
-          'content-type' => 'application/json;v=1'
-        }
-      )
-    end
+    context 'when request succeeds' do
+      before do
+        @patch_req = stub_request(:patch, /example\.com/).to_return(
+          status:   200,
+          body:     { id: 132, type: 'widget' }.to_json,
+          headers:  {
+            'content-type' => 'application/json;v=1'
+          }
+        )
+      end
 
-    it 'PATCH from the URL' do
-      subject
-      expect(@patch_req).to have_been_requested
+      it 'PATCH from the URL' do
+        subject
+        expect(@patch_req).to have_been_requested
+      end
+
+      it_behaves_like 'a wrappable response'
     end
 
-    it_behaves_like 'a wrappable response'
+    context 'when request times out' do
+      subject do
+        begin
+          fetcher.patch(url, body: body, headers: headers)
+        rescue Faraday::TimeoutError
+        end
+      end
+
+      before do
+        stub_request(:patch, url).to_timeout
+      end
+
+      it 'tries the PATCH request only once' do
+        subject
+        assert_requested(:patch, url, body: body, times: 1)
+      end
+
+      context 'when PATCH is specified as a method to retry' do
+        let(:retry_methods) { [:patch] }
+        let(:fetcher) { described_class.new(retry_methods: retry_methods) }
+
+        it 'tries the PATCH request 3 times' do
+          subject
+          assert_requested(:patch, url, body: body, times: 3)
+        end
+
+        context 'when retry attempt count is specified' do
+          let(:retry_attempts) { 4 }
+          let(:fetcher) { described_class.new(retry_methods: retry_methods, retry_attempts: retry_attempts) }
+
+          it "tries the PATCH request '1 + retry-count' times" do
+            subject
+            assert_requested(:patch, url, body: body, times: 1 + retry_attempts)
+          end
+        end
+      end
+    end
   end
 
   describe '#delete' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Event receiver for the Routemaster bus
@@ -317,4 +317,3 @@ test_files:
 - spec/support/uses_dotenv.rb
 - spec/support/uses_redis.rb
 - spec/support/uses_webmock.rb
-has_rdoc: