routemaster-drain 3.6.2 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3767d797098f45ef97ab1109e2adc72e02db4fc8
-  data.tar.gz: 9efed3541d15645fabc5ec362eea53ff25509237
+SHA256:
+  metadata.gz: c4469f5d849b4e194fab122200d8ad3b674b0614192c8d772c93d5632bc9d7c7
+  data.tar.gz: 1dcc2036e9718877e22c3af4f2dce9605ae28d851173ede745b3e6dbcd2b4b75
 SHA512:
-  metadata.gz: 858c27a01bf3d3d0117d40956be50e63535fa07df173d8c43047e6feb3caf214c88b057c888e3bf61a794076db7d740020137faeef7b8425e9469e8361b29c3e
-  data.tar.gz: 9c261c1b13f3a0629efe44a04ae2896a30480d3552b82f9df226e87bb5c94649d00e1b893d0952f30a04787e89e24b6946992e4e1f945161ff026bc7b15422c4
+  metadata.gz: cbac86db4c0502ac01f77e1b4daeb1559dfe7d5edb795a25891ddd7cf0cf7bc948f475349c89a98a4727e1dcacf26bffd36b4d0928a4e9384a0b74482adecc8e
+  data.tar.gz: 8df8cf287f7fadd4183946e217cbb79247bf875139ff29ae03b3b8951a2b68270c58caf263da5a7dc0847eb4bdb88ed2248fb5b3fd4c41d66a71e03deb90822e

data/.circleci/config.yml

@@ -4,340 +4,24 @@
 version: 2
 jobs:
 
-  build_2.2.7_rails_3:
+  build_2.5_rails_5:
     docker:
-      - image: deliveroo/multiruby
+      - image: circleci/ruby:2.4.1
       - image: redis:3-alpine
     steps:
       - checkout
 
       - run:
-          name: Select build variant (Ruby 2.2.7, rails_3)
+          name: Install bundler
           command: |
-            rbenv local 2.2.7 ;
-            gem install bundler ;
-            bundle config --local gemfile $PWD/gemfiles/rails_3.gemfile
-
-      - restore_cache:
-          keys: 
-            - v2-bundle-2.2.7-rails_3-{{ .Branch }}
-            - v2-bundle-2.2.7-rails_3
-            - v2-bundle-2.2.7
-
-      - run: 
-          name: Install dependencies
-          command: |
-            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
-
-      - run:
-          name: Run test suite
-          command: |
-            unset RACK_ENV &&
-            unset RAILS_ENV &&
-            bundle exec rspec
-
-      - save_cache:
-          key: v2-bundle-2.2.7-rails_3-{{ .Branch }}
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.2.7-rails_3
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.2.7
-          paths:
-            - ~/project/vendor/bundle
-
-  build_2.3.4_rails_3:
-    docker:
-      - image: deliveroo/multiruby
-      - image: redis:3-alpine
-    steps:
-      - checkout
-
-      - run:
-          name: Select build variant (Ruby 2.3.4, rails_3)
-          command: |
-            rbenv local 2.3.4 ;
-            gem install bundler ;
-            bundle config --local gemfile $PWD/gemfiles/rails_3.gemfile
-
-      - restore_cache:
-          keys: 
-            - v2-bundle-2.3.4-rails_3-{{ .Branch }}
-            - v2-bundle-2.3.4-rails_3
-            - v2-bundle-2.3.4
-
-      - run: 
-          name: Install dependencies
-          command: |
-            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
-
-      - run:
-          name: Run test suite
-          command: |
-            unset RACK_ENV &&
-            unset RAILS_ENV &&
-            bundle exec rspec
-
-      - save_cache:
-          key: v2-bundle-2.3.4-rails_3-{{ .Branch }}
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.3.4-rails_3
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.3.4
-          paths:
-            - ~/project/vendor/bundle
-
-  build_2.2.7_rails_4:
-    docker:
-      - image: deliveroo/multiruby
-      - image: redis:3-alpine
-    steps:
-      - checkout
-
-      - run:
-          name: Select build variant (Ruby 2.2.7, rails_4)
-          command: |
-            rbenv local 2.2.7 ;
-            gem install bundler ;
-            bundle config --local gemfile $PWD/gemfiles/rails_4.gemfile
-
-      - restore_cache:
-          keys: 
-            - v2-bundle-2.2.7-rails_4-{{ .Branch }}
-            - v2-bundle-2.2.7-rails_4
-            - v2-bundle-2.2.7
-
-      - run: 
-          name: Install dependencies
-          command: |
-            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
-
-      - run:
-          name: Run test suite
-          command: |
-            unset RACK_ENV &&
-            unset RAILS_ENV &&
-            bundle exec rspec
-
-      - save_cache:
-          key: v2-bundle-2.2.7-rails_4-{{ .Branch }}
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.2.7-rails_4
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.2.7
-          paths:
-            - ~/project/vendor/bundle
-
-  build_2.3.4_rails_4:
-    docker:
-      - image: deliveroo/multiruby
-      - image: redis:3-alpine
-    steps:
-      - checkout
-
-      - run:
-          name: Select build variant (Ruby 2.3.4, rails_4)
-          command: |
-            rbenv local 2.3.4 ;
-            gem install bundler ;
-            bundle config --local gemfile $PWD/gemfiles/rails_4.gemfile
-
-      - restore_cache:
-          keys: 
-            - v2-bundle-2.3.4-rails_4-{{ .Branch }}
-            - v2-bundle-2.3.4-rails_4
-            - v2-bundle-2.3.4
-
-      - run: 
-          name: Install dependencies
-          command: |
-            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
-
-      - run:
-          name: Run test suite
-          command: |
-            unset RACK_ENV &&
-            unset RAILS_ENV &&
-            bundle exec rspec
-
-      - save_cache:
-          key: v2-bundle-2.3.4-rails_4-{{ .Branch }}
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.3.4-rails_4
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.3.4
-          paths:
-            - ~/project/vendor/bundle
-
-  build_2.4.1_rails_4:
-    docker:
-      - image: deliveroo/multiruby
-      - image: redis:3-alpine
-    steps:
-      - checkout
-
-      - run:
-          name: Select build variant (Ruby 2.4.1, rails_4)
-          command: |
-            rbenv local 2.4.1 ;
-            gem install bundler ;
-            bundle config --local gemfile $PWD/gemfiles/rails_4.gemfile
-
-      - restore_cache:
-          keys: 
-            - v2-bundle-2.4.1-rails_4-{{ .Branch }}
-            - v2-bundle-2.4.1-rails_4
-            - v2-bundle-2.4.1
-
-      - run: 
-          name: Install dependencies
-          command: |
-            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
-
-      - run:
-          name: Run test suite
-          command: |
-            unset RACK_ENV &&
-            unset RAILS_ENV &&
-            bundle exec rspec
-
-      - save_cache:
-          key: v2-bundle-2.4.1-rails_4-{{ .Branch }}
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.4.1-rails_4
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.4.1
-          paths:
-            - ~/project/vendor/bundle
-
-  build_2.2.7_rails_5:
-    docker:
-      - image: deliveroo/multiruby
-      - image: redis:3-alpine
-    steps:
-      - checkout
-
-      - run:
-          name: Select build variant (Ruby 2.2.7, rails_5)
-          command: |
-            rbenv local 2.2.7 ;
-            gem install bundler ;
-            bundle config --local gemfile $PWD/gemfiles/rails_5.gemfile
-
-      - restore_cache:
-          keys: 
-            - v2-bundle-2.2.7-rails_5-{{ .Branch }}
-            - v2-bundle-2.2.7-rails_5
-            - v2-bundle-2.2.7
-
-      - run: 
-          name: Install dependencies
-          command: |
-            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
-
-      - run:
-          name: Run test suite
-          command: |
-            unset RACK_ENV &&
-            unset RAILS_ENV &&
-            bundle exec rspec
-
-      - save_cache:
-          key: v2-bundle-2.2.7-rails_5-{{ .Branch }}
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.2.7-rails_5
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.2.7
-          paths:
-            - ~/project/vendor/bundle
-
-  build_2.3.4_rails_5:
-    docker:
-      - image: deliveroo/multiruby
-      - image: redis:3-alpine
-    steps:
-      - checkout
-
-      - run:
-          name: Select build variant (Ruby 2.3.4, rails_5)
-          command: |
-            rbenv local 2.3.4 ;
-            gem install bundler ;
-            bundle config --local gemfile $PWD/gemfiles/rails_5.gemfile
-
-      - restore_cache:
-          keys: 
-            - v2-bundle-2.3.4-rails_5-{{ .Branch }}
-            - v2-bundle-2.3.4-rails_5
-            - v2-bundle-2.3.4
-
-      - run: 
-          name: Install dependencies
-          command: |
-            bundle install --jobs=3 --retry=3 --path=$PWD/vendor/bundle
-
-      - run:
-          name: Run test suite
-          command: |
-            unset RACK_ENV &&
-            unset RAILS_ENV &&
-            bundle exec rspec
-
-      - save_cache:
-          key: v2-bundle-2.3.4-rails_5-{{ .Branch }}
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.3.4-rails_5
-          paths:
-            - ~/project/vendor/bundle
-      - save_cache:
-          key: v2-bundle-2.3.4
-          paths:
-            - ~/project/vendor/bundle
-
-  build_2.4.1_rails_5:
-    docker:
-      - image: deliveroo/multiruby
-      - image: redis:3-alpine
-    steps:
-      - checkout
-
-      - run:
-          name: Select build variant (Ruby 2.4.1, rails_5)
-          command: |
-            rbenv local 2.4.1 ;
-            gem install bundler ;
+            gem install bundler -v '~> 1.17' ;
             bundle config --local gemfile $PWD/gemfiles/rails_5.gemfile
 
       - restore_cache:
           keys: 
-            - v2-bundle-2.4.1-rails_5-{{ .Branch }}
-            - v2-bundle-2.4.1-rails_5
-            - v2-bundle-2.4.1
+            - v2-bundle-2.5.0-rails_5-{{ .Branch }}
+            - v2-bundle-2.5.0-rails_5
+            - v2-bundle-2.5.0
 
       - run: 
           name: Install dependencies
@@ -352,15 +36,15 @@ jobs:
             bundle exec rspec
 
       - save_cache:
-          key: v2-bundle-2.4.1-rails_5-{{ .Branch }}
+          key: v2-bundle-2.5.0-rails_5-{{ .Branch }}
           paths:
             - ~/project/vendor/bundle
       - save_cache:
-          key: v2-bundle-2.4.1-rails_5
+          key: v2-bundle-2.5.0-rails_5
           paths:
             - ~/project/vendor/bundle
       - save_cache:
-          key: v2-bundle-2.4.1
+          key: v2-bundle-2.5.0
           paths:
             - ~/project/vendor/bundle
 
@@ -369,20 +53,5 @@ workflows:
   version: 2
   test:
     jobs:
-    
-      - build_2.2.7_rails_3
-    
-      - build_2.3.4_rails_3
-    
-      - build_2.2.7_rails_4
-    
-      - build_2.3.4_rails_4
-    
-      - build_2.4.1_rails_4
-    
-      - build_2.2.7_rails_5
-    
-      - build_2.3.4_rails_5
-    
-      - build_2.4.1_rails_5
+      - build_2.5_rails_5
     

data/.circleci/config.yml.erb

@@ -2,14 +2,11 @@
 # erb .circleci/config.yml.erb > .circleci/config.yml
 <%
   builds = [
-		['2.2.7', 'rails_3'],
 		['2.3.4', 'rails_3'],
-		['2.2.7', 'rails_4'],
 		['2.3.4', 'rails_4'],
 		['2.4.1', 'rails_4'],
-		['2.2.7', 'rails_5'],
 		['2.3.4', 'rails_5'],
-		['2.4.1', 'rails_5'],
+		['2.4.1', 'rails_5']
   ]
 %>
 version: 2
@@ -26,7 +23,7 @@ jobs:
           name: Select build variant (Ruby <%= ruby %>, <%= variant %>)
           command: |
             rbenv local <%= ruby %> ;
-            gem install bundler ;
+            gem install bundler -v '~> 1.17' ;
             bundle config --local gemfile $PWD/gemfiles/<%= variant %>.gemfile
 
       - restore_cache:

data/CHANGELOG.md

@@ -1,6 +1,34 @@
 ### HEAD
 
 _A description of your awesome changes here!_
+### 3.6.7 (2021-02-11)
+
+Features:
+
+- APIClient accepts timeout and open_timeout options
+
+### 3.6.5 (2019-02-08)
+
+Bug fix:
+
+- Make sure Faraday adapter is loaded after all middleware for ApiClient
+
+Drop:
+
+- Builds for Ruby 2.2
+
+### 3.6.4 (2018-10-23)
+
+Features:
+
+- Allow specification of User-Agent through environment variable
+- Add fallback values for User-Agent header in API client
+
+### 3.6.3 (2018-10-17)
+
+Bug fix:
+
+- Allow all middleware classes to be initialised in the same format
 
 ### 3.6.2 (2018-10-11)
 

data/README.md

@@ -139,6 +139,13 @@ map '/events' do
 end
 ```
 
+You can use the `.subscribe` method multiple times to have your event batches
+go through multiple listeners. But bear in the mind any performance cost of
+multiple places of processing the event batches. For example, instead of having
+multiple listener classes that iterate over the events in a batch, you can have
+a single listener class that iterates over the batch only once and reacts to the
+batch's events accordingly.
+
 This relies on the excellent event bus from the [wisper
 gem](https://github.com/krisleech/wisper#wisper).
 
@@ -264,6 +271,9 @@ configure it using `client_options`:
 $cache = Routemaster::Cache.new(client_options: {source_peer: "<your user agent>"})
 ```
 
+You can specify your user agent with the `ROUTEMASTER_API_CLIENT_USER_AGENT` environment
+variable as well.
+
 ### Expire Cache data for all notified resources
 
 You may wish to maintain a coherent cache, but don't need the cache to be warmed

data/lib/routemaster/api_client.rb

@@ -30,6 +30,7 @@ require 'hashie/mash'
 
 module Routemaster
   class APIClient
+    DEFAULT_USER_AGENT = ENV.fetch('ROUTEMASTER_API_CLIENT_USER_AGENT') { "RoutemasterDrain - Faraday v#{Faraday::VERSION}" }.freeze
 
     # Memoize the root resources at Class level so that we don't hit the cache
     # all the time to fetch the root resource before doing anything else.
@@ -44,6 +45,8 @@ module Routemaster
       @retry_attempts         = options.fetch :retry_attempts, 2
       @retry_methods          = options.fetch :retry_methods, Faraday::Request::Retry::IDEMPOTENT_METHODS
       @retry_exceptions       = options.fetch :retry_exceptions, Faraday::Request::Retry::Options.new.exceptions
+      @timeout                = options.fetch :timeout, nil
+      @open_timeout           = options.fetch :open_timeout, nil
 
       connection # warm up connection so Faraday does all it's magical file loading in the main thread
     end
@@ -139,14 +142,15 @@ module Routemaster
         f.use Routemaster::Middleware::ResponseCaching, listener: @listener
         f.use Routemaster::Middleware::Metrics, client: @metrics_client, source_peer: @source_peer
         f.use Routemaster::Middleware::ErrorHandling
-        f.adapter :typhoeus
 
         @middlewares.each do |middleware|
           f.use(*middleware)
         end
 
-        f.options.timeout      = ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1).to_f
-        f.options.open_timeout = ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1).to_f
+        f.adapter :typhoeus
+
+        f.options.timeout      = (@timeout || ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1)).to_f
+        f.options.open_timeout = (@open_timeout || ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1)).to_f
         f.ssl.verify           = ENV.fetch('ROUTEMASTER_CACHE_VERIFY_SSL', 'false') == 'true'
       end
     end
@@ -157,8 +161,7 @@ module Routemaster
     end
 
     def user_agent_header
-      agent = @source_peer || "Faraday v#{Faraday::VERSION}"
-      { 'User-Agent' => agent }
+      { 'User-Agent' => @source_peer || DEFAULT_USER_AGENT }
     end
 
     def response_cache_opt_headers(value)

data/lib/routemaster/api_client_circuit.rb

@@ -25,13 +25,14 @@ module Routemaster
       ENV.fetch('ROUTEMASTER_ENABLE_API_CLIENT_CIRCUIT', 'NO') =~ /\A(YES|TRUE|ON|1)\Z/i
     end
 
+
     def circuit
       Circuitbox.circuit(@circuit_name, {
         sleep_window: configuration_setting(@circuit_name, 'ROUTEMASTER_CIRCUIT_BREAKER_SLEEP_WINDOW', 60).to_i,
         time_window: configuration_setting(@circuit_name, 'ROUTEMASTER_CIRCUIT_BREAKER_TIME_WINDOW', 120).to_i,
         volume_threshold: configuration_setting(@circuit_name, 'ROUTEMASTER_CIRCUIT_BREAKER_VOLUME_THRESHOLD', 50).to_i,
         error_threshold:  configuration_setting(@circuit_name, 'ROUTEMASTER_CIRCUIT_BREAKER_ERROR_THRESHOLD', 50).to_i,
-        cache: Moneta.new(:Redis, backend: Config.cache_redis),
+        cache: Moneta::Adapters::Redis.new(backend: Config.cache_redis),
         exceptions: [Routemaster::Errors::FatalResource, Faraday::TimeoutError]
       })
     end

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '3.6.2'.freeze
+    VERSION = '3.6.7'.freeze
   end
 end

data/lib/routemaster/middleware/authenticate.rb

@@ -16,10 +16,10 @@ module Routemaster
     class Authenticate
       include Wisper::Publisher
 
-      # @param uuid [Enumerable] a set of accepted authentication tokens
-      def initialize(app, uuid: nil, **_)
+      # options[:uuid] [Enumerable] a set of accepted authentication tokens
+      def initialize(app, options = {})
         @app  = app
-        @uuid = uuid || Config.drain_tokens
+        @uuid = options.fetch(:uuid) { Config.drain_tokens }
 
         unless @uuid.kind_of?(String) || @uuid.kind_of?(Enumerable)
           raise ArgumentError, ':uuid must be a String or Enumerable'

data/lib/routemaster/middleware/cache.rb

@@ -7,11 +7,11 @@ require 'routemaster/event_index'
 module Routemaster
   module Middleware
     class Cache
-      def initialize(app, cache:nil, client:nil, queue:nil, **_)
+      def initialize(app, options = {})
         @app    = app
-        @cache  = cache || Routemaster::Cache.new
-        @client = client || Routemaster::Jobs::Client.new
-        @queue  = queue || Config.queue_name
+        @cache  = options.fetch(:cache) { Routemaster::Cache.new }
+        @client = options.fetch(:client) { Routemaster::Jobs::Client.new }
+        @queue  = options.fetch(:queue) { Config.queue_name }
       end
 
       def call(env)

data/lib/routemaster/middleware/dirty.rb

@@ -11,9 +11,9 @@ module Routemaster
     # The dirty map is passed as `:map` to the constructor and must respond to
     # `#mark` (like `Routemaster::Dirty::Map`).
     class Dirty
-      def initialize(app, dirty_map: nil, **_)
+      def initialize(app, options = {})
         @app = app
-        @map = dirty_map || Routemaster::Dirty::Map.new
+        @map = options.fetch(:dirty_map) { Routemaster::Dirty::Map.new }
       end
 
       def call(env)

data/lib/routemaster/middleware/expire_cache.rb

@@ -3,9 +3,9 @@ require 'routemaster/cache'
 module Routemaster
   module Middleware
     class ExpireCache
-      def initialize(app, cache:nil, **_)
+      def initialize(app, options = {})
         @app    = app
-        @cache  = cache || Routemaster::Cache.new
+        @cache  = options.fetch(:cache) { Routemaster::Cache.new }
       end
 
       def call(env)

data/lib/routemaster/middleware/filter.rb

@@ -7,11 +7,11 @@ module Routemaster
     #
     # Will use `Routemaster::Dirty::Filter` by default.
     class Filter
-      # @param filter [Routemaster::Dirty::Filter] an event filter (optional;
+      # options[:filter] [Routemaster::Dirty::Filter] an event filter (optional;
       # will be created using the `redis` and `expiry` options if not provided)
-      def initialize(app, filter:nil, **_)
+      def initialize(app, options = {})
         @app    = app
-        @filter = filter || Routemaster::Dirty::Filter.new
+        @filter = options.fetch(:filter) { Routemaster::Dirty::Filter.new }
       end
 
       def call(env)

data/lib/routemaster/middleware/metrics.rb

@@ -3,10 +3,10 @@ module Routemaster
     class Metrics
       INTERACTION_KEY = 'api_client'.freeze
 
-      def initialize(app, client: nil, source_peer: nil)
+      def initialize(app, options = {})
         @app    = app
-        @client = client
-        @source_peer = source_peer
+        @client = options[:client]
+        @source_peer = options[:source_peer]
       end
 
       def call(request_env)

data/lib/routemaster/middleware/parse.rb

@@ -10,7 +10,7 @@ module Routemaster
     # Lower middlewares (or the app) can access the parsed payload as a hash
     # in +env['routemaster.payload']+
     class Parse
-      def initialize(app)
+      def initialize(app, _options = {})
         @app  = app
       end
 

data/lib/routemaster/middleware/response_caching.rb

@@ -10,11 +10,11 @@ module Routemaster
       VERSION_REGEX = /application\/json;v=(?<version>\S*)/
       RESPONSE_CACHING_OPT_HEADER = 'X-routemaster_drain.opt_cache'.freeze
 
-      def initialize(app, cache: Config.cache_redis, listener: nil)
+      def initialize(app, options = {})
         @app = app
-        @cache = cache
+        @cache = options.fetch(:cache) { Config.cache_redis }
         @expiry = Config.cache_expiry
-        @listener = listener
+        @listener = options[:listener]
       end
 
       def call(env)

data/lib/routemaster/middleware/root_post_only.rb

@@ -2,7 +2,7 @@ module Routemaster
   module Middleware
     # Rejects all requests but POST to the root path
     class RootPostOnly
-      def initialize(app)
+      def initialize(app, _options = {})
         @app  = app
       end
 

data/lib/routemaster/middleware/siphon.rb

@@ -6,9 +6,9 @@ module Routemaster
     #
     #  Topic handlers are initialized with the full event payload and must respond to `#call`
     class Siphon
-      def initialize(app, siphon_events: nil)
+      def initialize(app, options = {})
         @app = app
-        @processors = siphon_events || {}
+        @processors = options.fetch(:siphon_events) { {} }
       end
 
       def call(env)

data/routemaster-drain.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency     'redis-namespace'
   spec.add_runtime_dependency     'concurrent-ruby'
   spec.add_runtime_dependency     'circuitbox'
+  spec.add_runtime_dependency     'moneta', '1.0.0'
 end

data/spec/routemaster/api_client_spec.rb

@@ -52,7 +52,8 @@ describe Routemaster::APIClient do
       headers['x-custom-header'] = 'why do you even'
       subject.status
       assert_requested(:get, /example/) do |req|
-        expect(req.headers).to include('X-Custom-Header')
+        expect(req.headers.keys).to include('X-Custom-Header')
+        expect(req.headers['User-Agent']).to eql "RoutemasterDrain - Faraday v#{Faraday::VERSION}"
       end
     end
 
@@ -76,7 +77,7 @@ describe Routemaster::APIClient do
         it 'should set the user agent header to the faraday version' do
           subject.status
           assert_requested(:get, /example/) do |req|
-            expect(req.headers).to include('User-Agent' => "Faraday v#{Faraday::VERSION}" )
+            expect(req.headers).to include('User-Agent' => "RoutemasterDrain - Faraday v#{Faraday::VERSION}" )
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.7
 platform: ruby
 authors:
 - Julien Letessier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-11 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -150,7 +150,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: moneta
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+description:
 email:
 - julien.letessier@gmail.com
 executables: []
@@ -271,7 +285,7 @@ homepage: http://github.com/deliveroo/routemaster-drain
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -286,9 +300,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Event receiver for the Routemaster bus
 test_files: