routemaster-drain 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174d544b122fdee4b52eb706ce2d1324e416eea4
-  data.tar.gz: 2d33ba614a48f0e613adc1941a2126d17354b2a0
+  metadata.gz: 7a8ad60bfee0918ed21059151f9766548347337c
+  data.tar.gz: b6522a49633aca5590802c36cb072cec0d667fd4
 SHA512:
-  metadata.gz: 0b3cc42bfe4e62e6ecc2b60e71c69525d669447c0601ea5bf06a1b79c1fdab7b6c1e20e1494acb980ac5097615231b2b22fda210cca1fc43b5fd87875667d453
-  data.tar.gz: 4688fb67eb80241cf5fe28e5eed11be1617d083f8625fe378de960ee2506d45f105666ab556e69adb0944d592755d2ec9b302c31b6c8864ebdcc23070e02734d
+  metadata.gz: d05a881d29704c66cb409799d6de1503632f486be0a8b8dab6fd6012f824a170e5d96ab5827314094a10d5bb12e7b0579f7844cf48366743100f9d734ceae080
+  data.tar.gz: b574538c1c40e6c16c4d09fdb4ccacca3f6214f1b9088cdf4fa1de2d87d8b82fff1955ecf55b0e2208a8aaaa11a9db499f4dd32a73d4ad2ced5564a8c7e7e17b

data/.rubocop.yml

@@ -716,7 +716,7 @@ Style/LineEndConcatenation:
                  line end.
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Description: 'Do not use parentheses for method calls with no arguments.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-args-no-parens'
   Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 2.5.1 (2017-05-10)
+
+Features:
+
+- Adds the `Siphon` middleware  to `CacheBusting` drain (#45)
+
+Bug fixes:
+
+- Sweep from dirty map if resource is missing (#47)
+
+
 ### 2.5.0 (2017-04-11)
 
 Features:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    routemaster-drain (2.5.0)
+    routemaster-drain (2.5.1)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)
@@ -37,7 +37,7 @@ GEM
     dotenv (2.1.1)
     ethon (0.10.1)
       ffi (>= 1.3.0)
-    faraday (0.12.0.1)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)

data/gemfiles/rails_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.5.0)
+    routemaster-drain (2.5.1)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)
@@ -67,7 +67,7 @@ GEM
     erubis (2.7.0)
     ethon (0.10.1)
       ffi (>= 1.3.0)
-    faraday (0.12.0.1)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.5.0)
+    routemaster-drain (2.5.1)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)
@@ -74,7 +74,7 @@ GEM
     erubis (2.7.0)
     ethon (0.10.1)
       ffi (>= 1.3.0)
-    faraday (0.12.0.1)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.5.0)
+    routemaster-drain (2.5.1)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)
@@ -77,7 +77,7 @@ GEM
     erubis (2.7.0)
     ethon (0.10.1)
       ffi (>= 1.3.0)
-    faraday (0.12.0.1)
+    faraday (0.12.1)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.11.0.1)
       faraday (>= 0.7.4, < 1.0)

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '2.5.0'
+    VERSION = '2.5.1'
   end
 end

data/lib/routemaster/drain/cache_busting.rb

@@ -1,6 +1,7 @@
 require 'routemaster/middleware/root_post_only'
 require 'routemaster/middleware/authenticate'
 require 'routemaster/middleware/parse'
+require 'routemaster/middleware/siphon'
 require 'routemaster/middleware/expire_cache'
 require 'routemaster/middleware/payload_filter'
 require 'routemaster/middleware/filter'
@@ -25,6 +26,7 @@ module Routemaster
           use Middleware::RootPostOnly
           use Middleware::Authenticate, options
           use Middleware::Parse
+          use Middleware::Siphon,       options
           use Middleware::Filter, { filter: Routemaster::Middleware::PayloadFilter.new }.merge(options)
           use Middleware::ExpireCache
           run terminator

data/lib/routemaster/jobs/cache_and_sweep.rb

@@ -11,7 +11,7 @@ module Routemaster
           begin
             Routemaster::Cache.new.get(url)
           rescue Errors::ResourceNotFound
-            nil # nothing to cache
+            true # nothing to cache, remove the element from dirty
           end
         end
       end

data/lib/routemaster/middleware/dirty.rb

@@ -18,6 +18,7 @@ module Routemaster
 
       def call(env)
         env['routemaster.dirty'] = dirty = []
+
         env.fetch('routemaster.payload', []).each do |event|
           next if event['type'] == 'noop'
           next unless @map.mark(event['url'])

data/spec/routemaster/drain/cache_busting_spec.rb

@@ -3,6 +3,8 @@ require 'spec/support/rack_test'
 require 'spec/support/uses_redis'
 require 'spec/support/uses_dotenv'
 require 'spec/support/events'
+require 'spec/support/siphon'
+
 require 'routemaster/drain/cache_busting'
 require 'json'
 
@@ -10,18 +12,21 @@ describe Routemaster::Drain::CacheBusting do
   uses_dotenv
   uses_redis
 
-  let(:app) { described_class.new }
+  let(:app) { described_class.new options }
   let(:listener) { double 'listener' }
+  let(:options) { {} }
 
   before { app.subscribe(listener, prefix: true) }
 
   let(:path)    { '/' }
-  let(:payload) { [1,2,3,1].map { |idx| make_event(idx) }.to_json }
+  let(:payload) { [1,2,3,1].map { |idx| make_event(idx) } }
   let(:environment) {{ 'CONTENT_TYPE' => 'application/json' }}
-  let(:perform) { post path, payload, environment }
+  let(:perform) { post path, payload.to_json, environment }
 
   before { authorize 'd3m0', 'x' }
 
+  include_examples 'supports siphon'
+
   it 'succeeds' do
     perform
     expect(last_response.status).to eq(204)

data/spec/routemaster/jobs/cache_and_sweep_spec.rb

@@ -1,16 +1,29 @@
 require 'routemaster/jobs/cache_and_sweep'
+require 'routemaster/dirty/map'
 require 'spec_helper'
 
 RSpec.describe Routemaster::Jobs::CacheAndSweep do
+  let(:url) { 'https://example.com/foo' }
+
   subject { described_class.new }
 
   context 'when there is an ResourceNotFound error' do
     before do
-      expect_any_instance_of(Routemaster::Cache).to receive(:get).and_raise(Routemaster::Errors::ResourceNotFound.new(""))
+      allow_any_instance_of(Routemaster::Cache)
+        .to receive(:get)
+        .and_raise(Routemaster::Errors::ResourceNotFound.new(""))
     end
 
     it 'does not bubble up the error' do
-      expect { subject.perform('url') }.to_not raise_error
+      expect { subject.perform(url) }.to_not raise_error
+    end
+
+    it 'sweeps the resource from the dirty map' do
+      expect_any_instance_of(Routemaster::Dirty::Map)
+        .to receive(:sweep_one)
+        .with(url) { |&block| expect(block.call).to eq true }
+
+      subject.perform(url)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable