routemaster-drain 3.0.2 → 3.0.3

data/.codeclimate.yml

@@ -1,7 +1,7 @@
 ---
 engines:
   bundler-audit:
-    enabled: true
+    enabled: false
   duplication:
     enabled: true
     config:
@@ -13,7 +13,6 @@ engines:
     enabled: true
 ratings:
   paths:
-  - Gemfile.lock
   - "**.rb"
 exclude_paths:
 - spec/

data/.gitignore

@@ -9,3 +9,5 @@ tags
 *.swo
 coverage/
 .byebug_history
+/Gemfile.lock
+/gemfiles/*.lock

data/.ruby-version

@@ -1 +1 @@
-2.4.0
+2.4.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 3.0.3 (2017-09-21)
+
+Bug fixes:
+
+- Fixes a regression introduced in 3.0.1 where the APIClient auth data would not be populated under some conditions. (#65)
+
 ### 3.0.2 (2017-09-05)
 
 Bug fixes:

data/README.md

@@ -1,4 +1,4 @@
-# routemaster-drain [![Version](https://badge.fury.io/rb/routemaster-drain.svg)](https://rubygems.org/gems/routemaster-drain) [![Build](https://travis-ci.org/deliveroo/routemaster-drain.svg?branch=master)](https://travis-ci.org/deliveroo/routemaster-drain) [![Code Climate](https://codeclimate.com/github/deliveroo/routemaster-drain/badges/gpa.svg)](https://codeclimate.com/github/deliveroo/routemaster-drain) [![codecov](https://codecov.io/gh/deliveroo/routemaster-drain/branch/master/graph/badge.svg)](https://codecov.io/gh/deliveroo/routemaster-drain) [![Docs](http://img.shields.io/badge/API%20docs-rubydoc.info-blue.svg)](http://rubydoc.info/github/deliveroo/routemaster-drain)
+# routemaster-drain [![Version](https://badge.fury.io/rb/routemaster-drain.svg)](https://rubygems.org/gems/routemaster-drain) [![Build](https://circleci.com/gh/deliveroo/routemaster-drain.svg?style=shield&circle-token=7c256c63e5683bc25f0b4c3db0170446c91d36c8)](https://circleci.com/gh/deliveroo/routemaster-drain) [![Code Climate](https://codeclimate.com/github/deliveroo/routemaster-drain/badges/gpa.svg)](https://codeclimate.com/github/deliveroo/routemaster-drain) [![codecov](https://codecov.io/gh/deliveroo/routemaster-drain/branch/master/graph/badge.svg)](https://codecov.io/gh/deliveroo/routemaster-drain) [![Docs](http://img.shields.io/badge/API%20docs-rubydoc.info-blue.svg)](http://rubydoc.info/github/deliveroo/routemaster-drain)
 
 A Rack-based event receiver for the
 [Routemaster](https://github.com/deliveroo/routemaster) event bus.

data/lib/routemaster/config.rb

@@ -54,7 +54,7 @@ module Routemaster
     end
 
     def cache_auth
-      @cache_auth ||= Hashie::Rash.new.tap do |result|
+      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.2'.freeze
+    VERSION = '3.0.3'.freeze
   end
 end

data/spec/core_ext/forwardable_spec.rb

@@ -0,0 +1,17 @@
+require 'core_ext/forwardable'
+
+describe Forwardable do
+  class Foo
+    extend Forwardable
+
+    def initialize
+      @bar = :bar
+    end
+
+    def_delegator :@bar, :to_s, :qux
+  end
+
+  it 'expect delegation to work' do
+    expect(Foo.new.qux).to eq 'bar'
+  end
+end

data/spec/routemaster/integration/api_client_spec.rb

@@ -18,7 +18,7 @@ describe Routemaster::APIClient do
   uses_redis
   uses_webmock
 
-  let(:port) { 8000 }
+  let(:port) { 8080 }
   let(:service) do
     TestServer.new(port) do |server|
       [400, 401, 403, 404, 409, 412, 413, 429, 500].each do |status_code|
@@ -42,7 +42,7 @@ describe Routemaster::APIClient do
       server.mount_proc "/discover" do |req, res|
         res['Content-Type'] = 'application/json'
         res.status = 200
-        res.body = { _links: { resources: { href: "http://localhost:#{port}/resources" } } }.to_json
+        res.body = { _links: { resources: { href: "http://127.0.0.1:#{port}/resources" } } }.to_json
       end
 
       server.mount_proc "/resources" do |req, res|
@@ -53,20 +53,20 @@ describe Routemaster::APIClient do
           res.body = {
             _links: {
               self: {
-                href: "http://localhost:#{port}/resourcess?first_name=roo&page=1&per_page=2"
+                href: "http://127.0.0.1:#{port}/resourcess?first_name=roo&page=1&per_page=2"
               },
               first: {
-                href: "http://localhost:#{port}/resources?first_name=roo&page=1&per_page=2"
+                href: "http://127.0.0.1:#{port}/resources?first_name=roo&page=1&per_page=2"
               },
               last: {
-                href: "http://localhost:#{port}/resources?first_name=roo&page=3&per_page=2"
+                href: "http://127.0.0.1:#{port}/resources?first_name=roo&page=3&per_page=2"
               },
               next: {
-                href: "http://localhost:#{port}/resources?first_name=roo&page=2&per_page=2"
+                href: "http://127.0.0.1:#{port}/resources?first_name=roo&page=2&per_page=2"
               },
               resources: [
-                { href: "http://localhost:#{port}/resources/1" },
-                { href: "http://localhost:#{port}/resources/1" }
+                { href: "http://127.0.0.1:#{port}/resources/1" },
+                { href: "http://127.0.0.1:#{port}/resources/1" }
               ]
             }
           }.to_json
@@ -74,20 +74,20 @@ describe Routemaster::APIClient do
           res.body = {
             _links: {
               self: {
-                href: "http://localhost:#{port}/resourcess?first_name=roo&page=2&per_page=2"
+                href: "http://127.0.0.1:#{port}/resourcess?first_name=roo&page=2&per_page=2"
               },
               first: {
-                href: "http://localhost:#{port}/resources?first_name=roo&page=1&per_page=2"
+                href: "http://127.0.0.1:#{port}/resources?first_name=roo&page=1&per_page=2"
               },
               last: {
-                href: "http://localhost:#{port}/resources?first_name=roo&page=3&per_page=2"
+                href: "http://127.0.0.1:#{port}/resources?first_name=roo&page=3&per_page=2"
               },
               next: {
-                href: "http://localhost:#{port}/resources?first_name=roo&page=3&per_page=2"
+                href: "http://127.0.0.1:#{port}/resources?first_name=roo&page=3&per_page=2"
               },
               resources: [
-                { href: "http://localhost:#{port}/resources/1" },
-                { href: "http://localhost:#{port}/resources/1" }
+                { href: "http://127.0.0.1:#{port}/resources/1" },
+                { href: "http://127.0.0.1:#{port}/resources/1" }
               ]
             }
           }.to_json
@@ -95,16 +95,16 @@ describe Routemaster::APIClient do
           res.body = {
             _links: {
               self: {
-                href: "http://localhost:#{port}/resourcess?first_name=roo&page=3&per_page=2"
+                href: "http://127.0.0.1:#{port}/resourcess?first_name=roo&page=3&per_page=2"
               },
               first: {
-                href: "http://localhost:#{port}/resources?first_name=roo&page=1&per_page=2"
+                href: "http://127.0.0.1:#{port}/resources?first_name=roo&page=1&per_page=2"
               },
               last: {
-                href: "http://localhost:#{port}/resources?first_name=roo&page=3&per_page=2"
+                href: "http://127.0.0.1:#{port}/resources?first_name=roo&page=3&per_page=2"
               },
               resources: [
-                { href: "http://localhost:#{port}/resources/1" }
+                { href: "http://127.0.0.1:#{port}/resources/1" }
               ]
             }
           }.to_json
@@ -118,7 +118,7 @@ describe Routemaster::APIClient do
 
   before { WebMock.disable_net_connect!(allow_localhost: true) }
 
-  let(:host) { "http://localhost:#{port}" }
+  let(:host) { "http://127.0.0.1:#{port}" }
 
   describe 'error handling' do
 
@@ -290,7 +290,7 @@ describe Routemaster::APIClient do
   end
 
   describe 'INDEX request' do
-    let(:url) { "http://localhost:#{port}/discover" }
+    let(:url) { "http://127.0.0.1:#{port}/discover" }
 
     subject do
       Routemaster::APIClient.new(response_class: Routemaster::Responses::HateoasResponse)
@@ -305,13 +305,13 @@ describe Routemaster::APIClient do
     it 'does not make any http requests to fetch individual resources if just the index method is called' do
       res = subject.discover(url)
 
-      expect(subject).not_to receive(:get).with("http://localhost:#{port}/resources/#{anything}", anything)
+      expect(subject).not_to receive(:get).with("http://127.0.0.1:#{port}/resources/#{anything}", anything)
       res.resources.index
     end
   end
 
   describe 'DISCOVER request' do
-    let(:url) { "http://localhost:#{port}/discover" }
+    let(:url) { "http://127.0.0.1:#{port}/discover" }
 
     subject do
       Routemaster::APIClient.new(response_class: Routemaster::Responses::HateoasResponse)
@@ -365,21 +365,21 @@ describe Routemaster::APIClient do
     it 'sends request metrics' do
       subject.get(url)
       expect(metrics_client).to have_received(:increment).with(
-        'api_client.request.count', tags: %w[source:test_service destination:localhost verb:get]
+        'api_client.request.count', tags: %w[source:test_service destination:127.0.0.1 verb:get]
       )
     end
 
     it 'sends response metrics' do
       subject.get(url)
       expect(metrics_client).to have_received(:increment).with(
-        'api_client.response.count', tags: %w[source:test_service destination:localhost status:200]
+        'api_client.response.count', tags: %w[source:test_service destination:127.0.0.1 status:200]
       )
     end
 
     it 'sends timing metrics' do
       subject.get(url)
       expect(metrics_client).to have_received(:time).with(
-        'api_client.latency', tags: %w[source:test_service destination:localhost verb:get]
+        'api_client.latency', tags: %w[source:test_service destination:127.0.0.1 verb:get]
       )
     end
   end

data/spec/support/server.rb

@@ -35,8 +35,9 @@ class TestServer
     Timeout.timeout(5) do
       loop do
         begin
-          TCPSocket.new('localhost', '8000')
+          TCPSocket.new('127.0.0.1', @port)
         rescue Errno::ECONNREFUSED
+          sleep 0.1
           next
         end
         break

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -143,6 +143,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
+- ".circleci/config.yml.erb"
 - ".codeclimate.yml"
 - ".codecov.yml"
 - ".env.test"
@@ -151,23 +153,18 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
-- ".travis.yml"
 - ".yardopts"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - appraise
 - gemfiles/rails_3.gemfile
-- gemfiles/rails_3.gemfile.lock
 - gemfiles/rails_4.gemfile
-- gemfiles/rails_4.gemfile.lock
 - gemfiles/rails_5.gemfile
-- gemfiles/rails_5.gemfile.lock
 - lib/core_ext/forwardable.rb
 - lib/routemaster/api_client.rb
 - lib/routemaster/cache.rb
@@ -211,6 +208,7 @@ files:
 - lib/routemaster/responses/response_promise.rb
 - lib/routemaster/tasks/fix_cache_ttl.rb
 - routemaster-drain.gemspec
+- spec/core_ext/forwardable_spec.rb
 - spec/routemaster/api_client_spec.rb
 - spec/routemaster/cache_spec.rb
 - spec/routemaster/config_spec.rb
@@ -272,11 +270,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Event receiver for the Routemaster bus
 test_files:
+- spec/core_ext/forwardable_spec.rb
 - spec/routemaster/api_client_spec.rb
 - spec/routemaster/cache_spec.rb
 - spec/routemaster/config_spec.rb
@@ -318,3 +317,4 @@ test_files:
 - spec/support/uses_dotenv.rb
 - spec/support/uses_redis.rb
 - spec/support/uses_webmock.rb
+has_rdoc: 

data/.travis.yml

@@ -1,20 +0,0 @@
-language: ruby
-cache: bundler
-services:
-  - redis-server
-rvm:
-  - 2.2.6
-  - 2.3.3
-  - 2.4.0
-  - ruby-head
-gemfile:
-  - gemfiles/rails_3.gemfile
-  - gemfiles/rails_4.gemfile
-  - gemfiles/rails_5.gemfile
-script:
-  - bundle exec rspec
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: 2.4.0
-      gemfile: gemfiles/rails_3.gemfile

data/Gemfile.lock

@@ -1,171 +0,0 @@
-PATH
-  remote: .
-  specs:
-    routemaster-drain (3.0.2)
-      addressable
-      concurrent-ruby
-      faraday (>= 0.9.0)
-      faraday_middleware
-      hashie
-      rack (>= 1.4.5)
-      redis-namespace
-      typhoeus (~> 1.1)
-      wisper (~> 1.6.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    appraisal (2.1.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    byebug (9.0.6)
-    codecov (0.1.9)
-      json
-      simplecov
-      url
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    dogstatsd (2.0.0)
-    dotenv (2.1.1)
-    ethon (0.10.1)
-      ffi (>= 1.3.0)
-    faraday (0.12.2)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.12.2)
-      faraday (>= 0.7.4, < 1.0)
-    ffi (1.9.17)
-    fork (1.0.1)
-    fork_break (0.1.4)
-      fork (= 1.0.1)
-    formatador (0.2.5)
-    guard (2.14.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-rspec (4.7.3)
-      guard (~> 2.1)
-      guard-compat (~> 1.1)
-      rspec (>= 2.99.0, < 4.0)
-    hashdiff (0.3.2)
-    hashie (3.5.6)
-    json (2.0.3)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    lumberjack (1.0.10)
-    method_source (0.8.2)
-    mono_logger (1.1.0)
-    multi_json (1.12.1)
-    multipart-post (2.0.0)
-    nenv (0.3.0)
-    notiffany (0.1.1)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    psych (2.2.1)
-    public_suffix (2.0.5)
-    rack (1.6.5)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (12.0.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    redis (3.3.2)
-    redis-namespace (1.5.2)
-      redis (~> 3.0, >= 3.0.4)
-    resque (1.26.0)
-      mono_logger (~> 1.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
-    shellany (0.0.1)
-    sidekiq (4.2.7)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    thor (0.19.4)
-    tilt (2.0.5)
-    typhoeus (1.3.0)
-      ethon (>= 0.9.0)
-    url (0.3.2)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-    wisper (1.6.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  appraisal
-  bundler
-  byebug
-  codecov
-  dogstatsd
-  dotenv
-  fork_break
-  guard-rspec
-  pry
-  psych
-  rack-test
-  rake
-  resque
-  routemaster-drain!
-  rspec
-  sidekiq
-  simplecov
-  webmock
-
-BUNDLED WITH
-   1.15.4