routemaster-drain 1.0.5 → 1.1.0

data/spec/routemaster/drain/caching_spec.rb

@@ -12,7 +12,7 @@ describe Routemaster::Drain::Caching do
 
   let(:app) { described_class.new }
   let(:listener) { double 'listener' }
-  
+
   before { app.subscribe(listener, prefix: true) }
 
   let(:path)    { '/' }
@@ -40,7 +40,7 @@ describe Routemaster::Drain::Caching do
   end
 
   it 'schedules caching jobs' do
-    expect(Resque).to receive(:enqueue_to).exactly(3).times
+    expect_any_instance_of(Routemaster::Jobs::Client).to receive(:enqueue).exactly(3).times
     perform
   end
 end

data/spec/routemaster/fetcher_spec.rb

@@ -1,17 +1,20 @@
 require 'spec_helper'
 require 'spec/support/uses_dotenv'
+require 'spec/support/uses_redis'
 require 'spec/support/uses_webmock'
 require 'routemaster/fetcher'
 require 'json'
 
 describe Routemaster::Fetcher do
   uses_dotenv
+  uses_redis
   uses_webmock
 
   describe '.get' do
     let(:url) { 'https://example.com/widgets/132' }
     let(:headers) {{}}
-    subject { described_class.get(url, headers: headers) }
+    let(:fetcher) { described_class.new }
+    subject { fetcher.get(url, headers: headers) }
 
     before do
       @req = stub_request(:get, /example\.com/).to_return(
@@ -41,7 +44,8 @@ describe Routemaster::Fetcher do
     it 'uses auth' do
       subject
       assert_requested(:get, /example/) do |req|
-        expect(req.uri.userinfo).to eq('username:s3cr3t')
+        credentials = Base64.strict_encode64('username:s3cr3t')
+        expect(req.headers['Authorization']).to eq("Basic #{credentials}")
       end
     end
 

data/spec/routemaster/integration/cache_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'spec/support/uses_redis'
+require 'spec/support/uses_dotenv'
+require 'routemaster/cache'
+require 'webrick'
+
+RSpec.describe 'Requests with caching' do
+  uses_dotenv
+  uses_redis
+
+  let!(:log) { WEBrick::Log.new '/dev/null' }
+  let(:service) do
+    WEBrick::HTTPServer.new(Port: 8000, DocumentRoot: Dir.pwd, Logger: log).tap do |server|
+      server.mount_proc '/test' do |req, res|
+        res.body = { field: 'test' }.to_json
+      end
+    end
+  end
+
+  before do
+    @pid = fork do
+      trap 'INT' do service.shutdown end
+      service.start
+    end
+    sleep(0.5) # leave sometime for the previous webrick to teardown
+  end
+
+  after do
+    Process.kill('KILL', @pid)
+    Process.wait(@pid)
+  end
+
+  subject { Routemaster::Cache.new }
+
+  describe 'GET request' do
+    let(:cache_keys) { ["cache:#{url}", "v:,l:"] }
+    let(:url) { 'http://localhost:8000/test' }
+
+    context 'when there is no previous cached response' do
+      it 'makes an http call' do
+        response = subject.get(url)
+        expect(response.headers['server']).to be
+      end
+
+      it 'sets the new response onto the cache' do
+        expect { subject.get(url) }
+          .to change { Routemaster::Config.cache_redis.hget(*cache_keys)}
+          .from(nil)
+          .to({ field: 'test'}.to_json)
+      end
+    end
+
+    context 'when there is a previous cached response' do
+      before do
+        subject.get(url)
+      end
+
+      it 'fetches the cached response' do
+        expect(subject.get(url).body).to eq({ field: 'test' }.to_json)
+      end
+
+      it 'does not make an http call' do
+        response = subject.get(url)
+        expect(response.headers['server']).to be_nil
+      end
+    end
+  end
+end

data/spec/routemaster/jobs/backends/backend_examples.rb

@@ -0,0 +1,21 @@
+RSpec.shared_examples 'a job backend' do
+  class TestJob
+    def perform(x, y); end
+  end
+
+  let(:job) { TestJob.new }
+  let(:x) { 123 }
+  let(:y) { 'hello' }
+
+  before do
+    allow(TestJob).to receive(:new).and_return(job)
+    allow(job).to receive(:perform).and_call_original
+    described_class.new.enqueue('test_queue', TestJob, x, y)
+  end
+
+  describe '#enqueue' do
+    it 'should execute jobs with a #perform method with the passed arguments' do
+      expect(job).to have_received(:perform).with(x, y)
+    end
+  end
+end

data/spec/routemaster/jobs/backends/resque_spec.rb

@@ -0,0 +1,16 @@
+require 'routemaster/jobs/backends/resque'
+require 'spec/routemaster/jobs/backends/backend_examples'
+
+RSpec.describe Routemaster::Jobs::Backends::Resque do
+  around do |example|
+    original_inline = Resque.inline
+    begin
+      Resque.inline = true
+      example.run
+    ensure
+      Resque.inline = original_inline
+    end
+  end
+
+  it_behaves_like 'a job backend'
+end

data/spec/routemaster/jobs/backends/sidekiq_spec.rb

@@ -0,0 +1,11 @@
+require 'sidekiq/testing'
+require 'routemaster/jobs/backends/sidekiq'
+require 'spec/routemaster/jobs/backends/backend_examples'
+
+RSpec.describe Routemaster::Jobs::Backends::Sidekiq do
+  around do |example|
+    Sidekiq::Testing.inline! { example.run }
+  end
+
+  it_behaves_like 'a job backend'
+end

data/spec/routemaster/jobs/client_spec.rb

@@ -0,0 +1,46 @@
+require 'routemaster/jobs/client'
+require 'routemaster/jobs/cache_and_sweep'
+
+RSpec.describe Routemaster::Jobs::Client do
+  let(:client) { Routemaster::Jobs::Client.new(adapter) }
+
+  let(:perform) do
+    client.enqueue('routemaster', Routemaster::Jobs::CacheAndSweep, 'https://example.com/1')
+  end
+
+  describe '#enqueue' do
+    before do
+      allow(Routemaster::Config).to receive(:queue_adapter).and_return(backend)
+      allow(client).to receive(:enqueue).and_call_original
+    end
+
+     context 'when the backend is Resque' do
+      let(:backend) { :resque }
+      let(:adapter) { double('Resque', enqueue_to: nil) }
+
+      it 'queues a Resque fetch job' do
+        expect(adapter).to receive(:enqueue_to).with(
+          'routemaster',
+          Routemaster::Jobs::Backends::Resque::JobWrapper,
+          { 'class' => 'Routemaster::Jobs::CacheAndSweep', 'args' => ['https://example.com/1'] })
+        perform
+      end
+    end
+
+    context 'when the backend is Sidekiq' do
+      let(:backend) { :sidekiq }
+      let(:adapter) { double('Sidekiq', push: nil) }
+
+      it 'queues a Sidekiq fetch job' do
+        expect(adapter).to receive(:push).with(
+          'queue' => 'routemaster',
+          'class' => Routemaster::Jobs::Backends::Sidekiq::JobWrapper,
+          'args' => [{ 'class' => 'Routemaster::Jobs::CacheAndSweep', 'args' => ['https://example.com/1'] }])
+        perform
+      end
+    end
+  end
+end
+
+
+

data/spec/routemaster/middleware/cache_spec.rb

@@ -2,30 +2,29 @@ require 'spec_helper'
 require 'spec/support/rack_test'
 require 'routemaster/middleware/cache'
 
-describe Routemaster::Middleware::Cache do
- 
+RSpec.describe Routemaster::Middleware::Cache do
   # busts the cache for each dirty url
 
   let(:terminator) { ErrorRackApp.new }
   let(:app) { described_class.new(terminator, **options) }
-  let(:resque) { double 'resque', enqueue_to: nil }
-  let(:cache) { double 'cache', bust: nil }
-  let(:options) {{ cache: cache, resque: resque }}
-  
+  let(:client) { Routemaster::Jobs::Client.new }
+  let(:cache) { instance_double(Routemaster::Cache, bust: nil) }
+  let(:options) {{ cache: cache, client: client }}
+
   let(:perform) do
     post '/whatever', '', 'routemaster.dirty' => payload
   end
 
   describe '#call' do
     let(:payload) { ['https://example.com/1'] }
-    
+
     it 'busts the cache' do
       expect(cache).to receive(:bust).with(payload.first)
       perform
     end
 
     it 'queues a fetch job' do
-      expect(resque).to receive(:enqueue_to).with('routemaster', anything, 'https://example.com/1')
+      expect(client).to receive(:enqueue).with('routemaster', Routemaster::Jobs::CacheAndSweep, 'https://example.com/1')
       perform
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'byebug'
+
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
 # Require this file using `require "spec_helper"` to ensure that it is only

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -42,44 +42,44 @@ dependencies:
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: wisper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
@@ -167,10 +153,15 @@ files:
 - lib/routemaster/drain/mapping.rb
 - lib/routemaster/drain/terminator.rb
 - lib/routemaster/fetcher.rb
+- lib/routemaster/jobs/backends/resque.rb
+- lib/routemaster/jobs/backends/sidekiq.rb
 - lib/routemaster/jobs/cache.rb
 - lib/routemaster/jobs/cache_and_sweep.rb
+- lib/routemaster/jobs/client.rb
+- lib/routemaster/jobs/job.rb
 - lib/routemaster/middleware/authenticate.rb
 - lib/routemaster/middleware/cache.rb
+- lib/routemaster/middleware/caching.rb
 - lib/routemaster/middleware/dirty.rb
 - lib/routemaster/middleware/filter.rb
 - lib/routemaster/middleware/parse.rb
@@ -186,6 +177,11 @@ files:
 - spec/routemaster/drain/mapping_spec.rb
 - spec/routemaster/drain/terminator_spec.rb
 - spec/routemaster/fetcher_spec.rb
+- spec/routemaster/integration/cache_spec.rb
+- spec/routemaster/jobs/backends/backend_examples.rb
+- spec/routemaster/jobs/backends/resque_spec.rb
+- spec/routemaster/jobs/backends/sidekiq_spec.rb
+- spec/routemaster/jobs/client_spec.rb
 - spec/routemaster/middleware/authenticate_spec.rb
 - spec/routemaster/middleware/cache_spec.rb
 - spec/routemaster/middleware/dirty_spec.rb
@@ -220,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Event receiver for the Routemaster bus
@@ -234,6 +230,11 @@ test_files:
 - spec/routemaster/drain/mapping_spec.rb
 - spec/routemaster/drain/terminator_spec.rb
 - spec/routemaster/fetcher_spec.rb
+- spec/routemaster/integration/cache_spec.rb
+- spec/routemaster/jobs/backends/backend_examples.rb
+- spec/routemaster/jobs/backends/resque_spec.rb
+- spec/routemaster/jobs/backends/sidekiq_spec.rb
+- spec/routemaster/jobs/client_spec.rb
 - spec/routemaster/middleware/authenticate_spec.rb
 - spec/routemaster/middleware/cache_spec.rb
 - spec/routemaster/middleware/dirty_spec.rb