routemaster-drain 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0feb14006a0d3933006b02516a4c8a4676b338b
-  data.tar.gz: c347cbb8284e81d53f857989a620c17eecf938e7
+  metadata.gz: 193d7dd526f02d0397233f0c2868e74aedb41a23
+  data.tar.gz: 9a3c37a909a17321b305cd9c5d0bf916b71b722b
 SHA512:
-  metadata.gz: fc38c577ba8973327205789530b3195e6a4b5a012e9a6486b9fc1bcdfa9f6ff7ed94a6e8c10d83fed398b3b9d32351937ea0fd9cf5750e8cfdd51106e733c5d3
-  data.tar.gz: f5f64de478a53d3462b6d869b9771c6c8dcf8bea0013fbfeb6de70f3095fad40434840c67e8c3fc01a1bc0ca5003b6160a9415eaf31bab5567b4ace00a66b983
+  metadata.gz: d9dfc1c8da243ee0e56a30f77f5af28ddc374200c94de8341b77cf5f69a4a8a892426b310b59c0b5dfa8fe2763aa2bb59435e229201319a6dff94319d4de7737
+  data.tar.gz: a09d4315e6d6b9d0993aa8c35c93a5a5e2790339180159bc5346b497dc64b38b9617abe3ab8e0d2d4d771c0a4cd96e127df3ae961feb2140e35cd22a88067b13

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 3.0.1 (2017-08-08)
+
+Bug fixes:
+
+- Set middleware before adapter so Faraday is happy (#60)
+
+
 ### 3.0.0 (2017-06-22)
 
 Breaking API changes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    routemaster-drain (3.0.0)
+    routemaster-drain (3.0.1)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)
@@ -39,7 +39,7 @@ GEM
       ffi (>= 1.3.0)
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.9.17)
     fork (1.0.1)
@@ -61,7 +61,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
     json (2.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -168,4 +168,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/gemfiles/rails_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (3.0.0)
+    routemaster-drain (3.0.1)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)
@@ -69,7 +69,7 @@ GEM
       ffi (>= 1.3.0)
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.9.18)
     fork (1.0.1)
@@ -91,7 +91,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
     hike (1.2.3)
     i18n (0.8.1)
     journey (1.0.4)
@@ -237,4 +237,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (3.0.0)
+    routemaster-drain (3.0.1)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)
@@ -76,7 +76,7 @@ GEM
       ffi (>= 1.3.0)
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.9.18)
     fork (1.0.1)
@@ -100,7 +100,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
     i18n (0.8.1)
     json (2.0.3)
     listen (3.1.5)
@@ -254,4 +254,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (3.0.0)
+    routemaster-drain (3.0.1)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)
@@ -79,7 +79,7 @@ GEM
       ffi (>= 1.3.0)
     faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     ffi (1.9.18)
     fork (1.0.1)
@@ -103,7 +103,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
     i18n (0.8.1)
     json (2.0.3)
     listen (3.1.5)
@@ -257,4 +257,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.14.6
+   1.15.3

data/lib/routemaster/api_client.rb

@@ -128,8 +128,8 @@ module Routemaster
         f.response :json, content_type: /\bjson/
         f.use Routemaster::Middleware::ResponseCaching, listener: @listener
         f.use Routemaster::Middleware::Metrics, client: @metrics_client, source_peer: @source_peer
-        f.adapter :typhoeus
         f.use Routemaster::Middleware::ErrorHandling
+        f.adapter :typhoeus
 
         @middlewares.each do |middleware|
           f.use(*middleware)

data/lib/routemaster/config.rb

@@ -47,11 +47,14 @@ module Routemaster
     end
 
     def cache_expiry
-      Integer(ENV.fetch('ROUTEMASTER_CACHE_EXPIRY', 86_400 * 365))
+      # Do not increase this default value. It's likely that cached data will include PII
+      # and 90 days is the maximum permitted retention period at Deliveroo. A higher value
+      # means we would need to worry about purging caches at the end of the period.
+      Integer(ENV.fetch('ROUTEMASTER_CACHE_EXPIRY', 86_400 * 90))
     end
 
     def cache_auth
-      Hashie::Rash.new.tap do |result|
+      @cache_auth ||= Hashie::Rash.new.tap do |result|
         ENV.fetch('ROUTEMASTER_CACHE_AUTH', '').split(',').each do |entry|
           host, username, password = entry.split(':')
           result[Regexp.new(host)] = [username, password]

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '3.0.0'
+    VERSION = '3.0.1'
   end
 end

data/spec/routemaster/config_spec.rb

@@ -0,0 +1,22 @@
+require 'routemaster/config'
+
+RSpec.describe Routemaster::Config do
+  describe '.cache_expiry' do
+    subject { described_class.cache_expiry }
+
+    context 'when using the default' do
+      it 'should be 90 days' do
+        should eq 86_400 * 90
+      end
+    end
+
+    context 'when overridden with ROUTEMASTER_CACHE_EXPIRY' do
+      before { ENV['ROUTEMASTER_CACHE_EXPIRY'] = '123456' }
+      after  { ENV['ROUTEMASTER_CACHE_EXPIRY'] = nil }
+
+      it 'should be the configured value' do
+        should eq 123456
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -212,6 +212,7 @@ files:
 - routemaster-drain.gemspec
 - spec/routemaster/api_client_spec.rb
 - spec/routemaster/cache_spec.rb
+- spec/routemaster/config_spec.rb
 - spec/routemaster/dirty/filter_spec.rb
 - spec/routemaster/dirty/map_spec.rb
 - spec/routemaster/dirty/state_spec.rb
@@ -268,13 +269,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Event receiver for the Routemaster bus
 test_files:
 - spec/routemaster/api_client_spec.rb
 - spec/routemaster/cache_spec.rb
+- spec/routemaster/config_spec.rb
 - spec/routemaster/dirty/filter_spec.rb
 - spec/routemaster/dirty/map_spec.rb
 - spec/routemaster/dirty/state_spec.rb