routemaster-drain 3.6.4 → 3.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8751ba11d3ecc6376887aca2600adf850839d0ab
-  data.tar.gz: 3bcbd8c7cdeefdbe07deb264f196a987e7adeda1
+SHA256:
+  metadata.gz: 574a92a97a0ae12a367d2aa0021852c9d721f8a542754eb6d038441cf411c38a
+  data.tar.gz: 74fc0e9be7b142971eb6d800e4e77faf88a9a00303490dfb0f2405cd0174f1c6
 SHA512:
-  metadata.gz: d30f96275f9ed9785088da2e7d231e7a9f79073bca0f427f796e7a8cc0c42905bd5e1e1d4ef6e97a00f9f665d9433e59d2ee7e04c7e3577a693fb13c4a994cde
-  data.tar.gz: e82794bf28ddfc30c60a489020a3d14f652bbbc6e6c476015863cd3a067a6282e9e541dee123e39b159d72296e1d4642a3ef53a74f9cded123d5461676eb9eb0
+  metadata.gz: 599155767c3d938d91c68e81e773b5940a35960fbf9c42ce802a8700c1a049391960afacbe1e4b22945ef199df19569a2627fd68e9bd899fa35d3ddaac78b5d6
+  data.tar.gz: aabdfac82f389474c62856923bbcc87633a44aca389f3bb1ac8e120225f77946c36972d25b46e1ed7b8b40891d8c28f8fddffbfac7e26d72ea4e5a71ce0a9612

data/.circleci/config.yml

@@ -4,51 +4,6 @@
 version: 2
 jobs:
 
-  build_2.2.7_rails_3:
-    docker:
-      - image: deliveroo/multiruby
-      - image: redis:3-alpine
-    steps:
-      - checkout
-
-      - run:
-          name: Select build variant (Ruby 2.2.7, rails_3)
-          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
@@ -60,7 +15,7 @@ jobs:
           name: Select build variant (Ruby 2.3.4, rails_3)
           command: |
             rbenv local 2.3.4 ;
-            gem install bundler ;
+            gem install bundler -v '~> 1.17' ;
             bundle config --local gemfile $PWD/gemfiles/rails_3.gemfile
 
       - restore_cache:
@@ -94,51 +49,6 @@ jobs:
           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
@@ -150,7 +60,7 @@ jobs:
           name: Select build variant (Ruby 2.3.4, rails_4)
           command: |
             rbenv local 2.3.4 ;
-            gem install bundler ;
+            gem install bundler -v '~> 1.17' ;
             bundle config --local gemfile $PWD/gemfiles/rails_4.gemfile
 
       - restore_cache:
@@ -195,7 +105,7 @@ jobs:
           name: Select build variant (Ruby 2.4.1, rails_4)
           command: |
             rbenv local 2.4.1 ;
-            gem install bundler ;
+            gem install bundler -v '~> 1.17' ;
             bundle config --local gemfile $PWD/gemfiles/rails_4.gemfile
 
       - restore_cache:
@@ -229,51 +139,6 @@ jobs:
           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
@@ -285,7 +150,7 @@ jobs:
           name: Select build variant (Ruby 2.3.4, rails_5)
           command: |
             rbenv local 2.3.4 ;
-            gem install bundler ;
+            gem install bundler -v '~> 1.17' ;
             bundle config --local gemfile $PWD/gemfiles/rails_5.gemfile
 
       - restore_cache:
@@ -330,7 +195,7 @@ jobs:
           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:
@@ -370,18 +235,12 @@ workflows:
   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

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

@@ -2,6 +2,16 @@
 
 _A description of your awesome changes here!_
 
+### 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:

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).
 

data/lib/routemaster/api_client.rb

@@ -140,12 +140,13 @@ 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.adapter :typhoeus
+
         f.options.timeout      = ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1).to_f
         f.options.open_timeout = ENV.fetch('ROUTEMASTER_CACHE_TIMEOUT', 1).to_f
         f.ssl.verify           = ENV.fetch('ROUTEMASTER_CACHE_VERIFY_SSL', 'false') == 'true'

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '3.6.4'.freeze
+    VERSION = '3.6.5'.freeze
   end
 end

data/spec/routemaster/api_client_spec.rb

@@ -53,7 +53,7 @@ describe Routemaster::APIClient do
       subject.status
       assert_requested(:get, /example/) do |req|
         expect(req.headers.keys).to include('X-Custom-Header')
-        expect(req.headers['User-Agent']).to eql "RoutemasterDrain - Faraday v0.15.3"
+        expect(req.headers['User-Agent']).to eql "RoutemasterDrain - Faraday v#{Faraday::VERSION}"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.6.5
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2019-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -286,8 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Event receiver for the Routemaster bus