alephant-broker 3.14.0 → 3.15.0

data/spec/alephant/broker/load_strategy/revalidate/strategy_spec.rb

@@ -0,0 +1,185 @@
+require 'spec_helper'
+
+RSpec.describe Alephant::Broker::LoadStrategy::Revalidate::Strategy do
+  subject { described_class.new }
+
+  let(:lookup_double)    { instance_double(Alephant::Lookup::LookupHelper) }
+  let(:storage_double)   { instance_double(Alephant::Storage) }
+  let(:refresher_double) { instance_double(Alephant::Broker::LoadStrategy::Revalidate::Refresher) }
+  let(:fetcher_double)   { instance_double(Alephant::Broker::LoadStrategy::Revalidate::Fetcher) }
+
+  let(:content) do
+    {
+      content:      'Test',
+      content_type: 'test/content',
+      meta:         {
+        :ttl                  => 100,
+        :head_ETag            => '123',
+        :'head_Last-Modified' => Time.now.to_s
+      }
+    }
+  end
+
+  let(:expected_content) do
+    {
+      content:      content[:content],
+      content_type: content[:content_type],
+      meta:         content[:meta]
+    }
+  end
+
+  let(:cached_obj) do
+    Alephant::Broker::Cache::CachedObject.new(content)
+  end
+
+  let(:component_meta) do
+    Alephant::Broker::ComponentMeta.new('test', 'test_batch', {})
+  end
+
+  before do
+    allow_any_instance_of(Logger).to receive(:info)
+    allow_any_instance_of(Logger).to receive(:debug)
+    allow(Alephant::Broker).to receive(:config).and_return({})
+    allow(Thread).to receive(:new).and_yield
+  end
+
+  describe '#load' do
+    context 'when there is content in the cache' do
+      let(:cache) { subject.send(:cache) }
+
+      before do
+        allow(cache).to receive(:get).and_return(cached_obj)
+      end
+
+      context 'which is still fresh' do
+        before do
+          allow(cached_obj).to receive(:expired?).and_return(false)
+        end
+
+        it 'gets fetched from the cache and returned' do
+          expect(subject.load(component_meta)).to eq(expected_content)
+        end
+
+        it 'does NOT try to refresh the content' do
+          expect(Alephant::Broker::LoadStrategy::Revalidate::Refresher)
+            .to_not receive(:new)
+
+          subject.load(component_meta)
+        end
+      end
+
+      context 'which has expired' do
+        before do
+          allow(cached_obj).to receive(:expired?).and_return(true)
+
+          allow(Alephant::Broker::LoadStrategy::Revalidate::Refresher)
+            .to receive(:new)
+            .with(component_meta)
+            .and_return(refresher_double)
+
+          allow(refresher_double).to receive(:refresh)
+
+          allow(Alephant::Broker::LoadStrategy::Revalidate::Fetcher)
+            .to receive(:new)
+            .with(component_meta)
+            .and_return(fetcher_double)
+
+          allow(fetcher_double).to receive(:fetch).and_return(cached_obj)
+        end
+
+        it 'it gets fetched from the cache and returned to the user' do
+          expect(subject.load(component_meta)).to eq(expected_content)
+        end
+
+        context 'in the background...' do
+          let(:new_content)    { { id: 'test', batch_id: '', meta: {} } }
+          let(:new_cached_obj) { Alephant::Broker::Cache::CachedObject.new(new_content) }
+
+          it 'checks the fetcher, to see if there is newer content (in S3)' do
+            expect(fetcher_double).to receive(:fetch).and_return(new_cached_obj)
+
+            subject.load(component_meta)
+          end
+
+          context 'when there IS newer, non-expired content' do
+            let(:cache) { subject.send(:cache) }
+
+            before do
+              expect(fetcher_double).to receive(:fetch).and_return(new_cached_obj)
+              expect(new_cached_obj).to receive(:expired?).and_return(false)
+            end
+
+            it 'replaces the cached content' do
+              expect(cache).to receive(:set).with(component_meta.component_key, new_cached_obj)
+
+              subject.load(component_meta)
+            end
+          end
+
+          context 'when there IS NOT newer content' do
+            before do
+              expect(fetcher_double).to receive(:fetch).and_return(new_cached_obj)
+              expect(new_cached_obj).to receive(:expired?).and_return(true)
+            end
+
+            it 'kicks off a refresh of the content (from the renderer)' do
+              expect(refresher_double).to receive(:refresh)
+
+              subject.load(component_meta)
+            end
+          end
+        end
+      end
+    end
+
+    context 'when there is NOT content in the cache' do
+      before do
+        allow(Alephant::Broker::LoadStrategy::Revalidate::Fetcher)
+          .to receive(:new)
+          .with(component_meta)
+          .and_return(fetcher_double)
+      end
+
+      it 'returns the data as expected' do
+        expect(fetcher_double).to receive(:fetch).and_return(cached_obj)
+        expect(subject.load(component_meta)).to eq(expected_content)
+      end
+
+      it 'uses the fetcher to get the data' do
+        expect(fetcher_double).to receive(:fetch).and_return(cached_obj)
+        subject.load(component_meta)
+      end
+
+      context 'and there is nothing returned from the fetcher' do
+        before do
+          allow(fetcher_double)
+            .to receive(:fetch)
+            .and_raise(Alephant::Broker::Errors::ContentNotFound)
+
+          expect(Alephant::Broker::LoadStrategy::Revalidate::Refresher)
+            .to receive(:new)
+            .with(component_meta)
+            .and_return(refresher_double)
+
+          allow(refresher_double)
+            .to receive(:refresh)
+        end
+
+        it 'kicks off a refresh of the content' do
+          expect(refresher_double).to receive(:refresh)
+          subject.load(component_meta)
+        end
+
+        it 'returns a response that will invoke a 202 (HTTP) response' do
+          expected_response = {
+            content:      '',
+            content_type: 'text/html',
+            meta:         { status: 202 }
+          }
+
+          expect(subject.load(component_meta)).to eq(expected_response)
+        end
+      end
+    end
+  end
+end

data/spec/fixtures/json/batch_compiled_no_sequence.json

@@ -0,0 +1 @@
+{"batch_id":"baz","components":[{"component":"ni_council_results_table","options":{"foo":"bar"},"status":200,"content_type":"test/content","body":"Test"},{"component":"ni_council_results_table","options":{},"status":200,"content_type":"test/content","body":"Test"}]}

data/spec/integration/not_modified_response_spec.rb

@@ -50,8 +50,6 @@ describe Alephant::Broker::Application do
 
   let(:s3_double) { instance_double("Alephant::Storage", :get => content) }
 
-  let(:not_modified_status_code) { Alephant::Broker::Response::Base::NOT_MODIFIED_STATUS_CODE }
-
   before do
     allow_any_instance_of(Logger).to receive(:info)
     allow_any_instance_of(Logger).to receive(:debug)
@@ -69,8 +67,8 @@ describe Alephant::Broker::Application do
       )
     end
 
-    specify { expect(last_response.status).to eql not_modified_status_code }
-    specify { expect(last_response.body).to eql "" }
+    specify { expect(last_response.status).to eql(304) }
+    specify { expect(last_response.body).to eql("") }
     specify { expect(last_response.headers).to_not include("Cache-Control") }
     specify { expect(last_response.headers).to_not include("Pragma") }
     specify { expect(last_response.headers).to_not include("Expires") }
@@ -199,8 +197,8 @@ describe Alephant::Broker::Application do
         )
       end
 
-      specify { expect(last_response.status).to eql not_modified_status_code }
-      specify { expect(last_response.body).to eq "" }
+      specify { expect(last_response.status).to eql(304) }
+      specify { expect(last_response.body).to eq("") }
 
       describe "response should have headers" do
         it "should not have a Content-Type header" do

data/spec/integration/rack_spec.rb

@@ -1,5 +1,4 @@
 require_relative "spec_helper"
-require "alephant/broker"
 
 describe Alephant::Broker::Application do
   include Rack::Test::Methods
@@ -49,8 +48,6 @@ describe Alephant::Broker::Application do
 
   let(:s3_double) { instance_double("Alephant::Storage", :get => content) }
 
-  let(:not_modified_status_code) { Alephant::Broker::Response::Base::NOT_MODIFIED_STATUS_CODE }
-
   before do
     allow_any_instance_of(Logger).to receive(:info)
     allow_any_instance_of(Logger).to receive(:debug)

data/spec/integration/revalidate_spec.rb

@@ -0,0 +1,174 @@
+require_relative 'spec_helper'
+
+describe Alephant::Broker::Application do
+  include Rack::Test::Methods
+
+  let(:config) do
+    {
+      aws_account_id:    '12345',
+      lookup_table_name: 'test_table',
+      s3_bucket_id:      'test_bucket',
+      s3_object_path:    'bucket_path',
+      sqs_queue_name:    'test_queue'
+    }
+  end
+
+  let(:app) do
+    described_class.new(
+      Alephant::Broker::LoadStrategy::Revalidate::Strategy.new,
+      config
+    )
+  end
+
+  let(:content) do
+    {
+      content:      'Test',
+      content_type: 'test/content',
+      meta:         {
+        :ttl                  => '35',
+        :head_ETag            => '123',
+        :'head_Last-Modified' => 'Mon, 11 Apr 2016 10:39:57 GMT'
+      }
+    }
+  end
+
+  let(:lookup_location_double) { instance_double(Alephant::Lookup::LookupLocation, location: 'test/location') }
+  let(:lookup_helper_double)   { instance_double(Alephant::Lookup::LookupHelper, read: lookup_location_double) }
+  let(:storage_double)         { instance_double(Alephant::Storage, get: content) }
+  let(:sqs_double)             { instance_double(AWS::SQS, queues: sqs_queues_double) }
+  let(:sqs_queue_double)       { instance_double(AWS::SQS::Queue, send_message: nil) }
+  let(:sqs_queues_double)      { instance_double(AWS::SQS::QueueCollection, :url_for => 'example.com', :[] => sqs_queue_double) }
+
+  before do
+    allow_any_instance_of(Logger).to receive(:info)
+    allow_any_instance_of(Logger).to receive(:debug)
+    allow(Thread).to receive(:new).and_yield
+    allow(Alephant::Lookup).to receive(:create).and_return(lookup_helper_double)
+    allow(Alephant::Storage).to receive(:new).and_return(storage_double)
+    allow(AWS::SQS).to receive(:new).and_return(sqs_double)
+  end
+
+  describe 'GET `/status`' do
+    before { get('/status') }
+    specify { expect(last_response.status).to eql(200) }
+    specify { expect(last_response.body).to eql('ok') }
+  end
+
+  describe 'GET an undefined endpoint' do
+    before { get('/wotever') }
+    specify { expect(last_response.status).to eql(404) }
+    specify { expect(last_response.body).to eq('Not found') }
+    specify { expect(last_response.headers).to include('Cache-Control') }
+    specify { expect(last_response.headers).to include('Pragma') }
+    specify { expect(last_response.headers).to include('Expires') }
+  end
+
+  describe 'GET `/component/....`' do
+    context 'when the content IS available from S3/storage' do
+      before { get('/component/test_component') }
+
+      specify { expect(last_response.status).to eql(200) }
+      specify { expect(last_response.body).to eql('Test') }
+      specify { expect(last_response.headers).to_not include('Cache-Control') }
+      specify { expect(last_response.headers).to_not include('Pragma') }
+      specify { expect(last_response.headers).to_not include('Expires') }
+      specify { expect(last_response.headers['ETag']).to eq('123') }
+      specify { expect(last_response.headers['Last-Modified']).to eq('Mon, 11 Apr 2016 10:39:57 GMT') }
+      specify { expect(last_response.headers['Content-Type']).to eq('test/content') }
+      specify { expect(last_response.headers['Content-Length']).to eq('4') }
+    end
+
+    context 'when the content IS NOT available from S3/storage' do
+      before do
+        allow(storage_double)
+          .to receive(:get)
+          .and_raise(AWS::S3::Errors::NoSuchKey.new(nil, nil))
+
+        get('/component/test_component')
+      end
+
+      specify { expect(last_response.status).to eql(202) }
+      specify { expect(last_response.body).to eql('Accepted') }
+    end
+  end
+
+  describe '`/components`' do
+    let(:fixture_path) { "#{File.dirname(__FILE__)}/../fixtures/json" }
+    let(:batch_json) { IO.read("#{fixture_path}/batch.json").strip }
+    let(:batch_compiled_json) { IO.read("#{fixture_path}/batch_compiled_no_sequence.json").strip }
+
+    before do
+      allow(storage_double)
+        .to receive(:get)
+        .and_return(
+          content,
+          {
+            content:      'Test',
+            content_type: 'test/content',
+            meta:         {
+              :head_ETag            => '"abc"',
+              :'head_Last-Modified' => 'Mon, 11 Apr 2016 09:39:57 GMT'
+            }
+          }
+        )
+    end
+
+    describe 'POST' do
+      let(:path) { '/components/batch' }
+      let(:content_type) { 'application/json' }
+
+      context 'when the content is available from S3/Storage' do
+        before { post(path, batch_json, 'CONTENT_TYPE' => content_type) }
+
+        specify { expect(last_response.status).to eql(200) }
+        specify { expect(last_response.body).to eq(batch_compiled_json) }
+      end
+
+      context 'when the content IS NOT available from S3/storage' do
+        before do
+          allow(storage_double)
+            .to receive(:get)
+            .and_raise(AWS::S3::Errors::NoSuchKey.new(nil, nil))
+
+          post(path, batch_json, 'CONTENT_TYPE' => content_type)
+        end
+
+        specify { expect(last_response.status).to eql(200) }
+
+        specify do
+          statuses = JSON.parse(last_response.body)['components'].map { |c| c['status'] }
+          expect(statuses).to eq([202, 202])
+        end
+      end
+    end
+
+    describe 'GET' do
+      let(:path)         { '/components/batch?batch_id=baz&components[ni_council_results_table][component]=ni_council_results_table&components[ni_council_results_table][options][foo]=bar&components[ni_council_results_table_no_options][component]=ni_council_results_table' }
+      let(:content_type) { 'application/json' }
+
+      context 'when the content is available from S3/Storage' do
+        before { get(path, {}, 'CONTENT_TYPE' => content_type) }
+
+        specify { expect(last_response.status).to eql(200) }
+        specify { expect(last_response.body).to eq(batch_compiled_json) }
+      end
+
+      context 'when the content IS NOT available from S3/storage' do
+        before do
+          allow(storage_double)
+            .to receive(:get)
+            .and_raise(AWS::S3::Errors::NoSuchKey.new(nil, nil))
+
+          get(path, {}, 'CONTENT_TYPE' => content_type)
+        end
+
+        specify { expect(last_response.status).to eql(200) }
+
+        specify do
+          statuses = JSON.parse(last_response.body)['components'].map { |c| c['status'] }
+          expect(statuses).to eq([202, 202])
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ end
 require "pry"
 require "json"
 require "rack/test"
+require "timecop"
 
 require "alephant/broker"
 

metadata

@@ -1,295 +1,323 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.15.0
 platform: ruby
 authors:
 - BBC News
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rspec-nc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-nc
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: guard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard-rspec
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: pry-remote
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry-remote
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: pry-nav
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry-nav
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rake-rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  name: rake-rspec
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
-- !ruby/object:Gem::Dependency
+        version: '1.5'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  name: bundler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rack
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rack-test
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rack-test
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: simplecov
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: timecop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-lookup
   prerelease: false
-  type: :runtime
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: alephant-lookup
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 2.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
-  name: alephant-storage
+        version: 2.0.2
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-storage
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.1.1
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
-  name: alephant-logger
+        version: 1.1.1
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-logger
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  name: alephant-sequencer
+        version: 1.2.0
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: alephant-sequencer
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: dalli-elasticache
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: dalli-elasticache
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: faraday
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: faraday
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: crimp
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: crimp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: listen
+        version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: listen
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  prerelease: false
+  type: :runtime
 description: Brokers requests for alephant components
 email:
 - FutureMediaNewsRubyGems@bbc.co.uk
@@ -309,6 +337,7 @@ files:
 - lib/alephant/broker.rb
 - lib/alephant/broker/application.rb
 - lib/alephant/broker/cache.rb
+- lib/alephant/broker/cache/cached_object.rb
 - lib/alephant/broker/cache/client.rb
 - lib/alephant/broker/cache/null_client.rb
 - lib/alephant/broker/component.rb
@@ -322,6 +351,9 @@ files:
 - lib/alephant/broker/errors/invalid_cache_key.rb
 - lib/alephant/broker/load_strategy.rb
 - lib/alephant/broker/load_strategy/http.rb
+- lib/alephant/broker/load_strategy/revalidate/fetcher.rb
+- lib/alephant/broker/load_strategy/revalidate/refresher.rb
+- lib/alephant/broker/load_strategy/revalidate/strategy.rb
 - lib/alephant/broker/load_strategy/s3/archived.rb
 - lib/alephant/broker/load_strategy/s3/base.rb
 - lib/alephant/broker/load_strategy/s3/sequenced.rb
@@ -336,13 +368,19 @@ files:
 - lib/alephant/broker/response/batch.rb
 - lib/alephant/broker/response/factory.rb
 - lib/alephant/broker/version.rb
+- spec/alephant/broker/cache/cached_object_spec.rb
 - spec/alephant/broker/component_meta_spec.rb
 - spec/alephant/broker/load_strategy/http_spec.rb
+- spec/alephant/broker/load_strategy/revalidate/fetcher_spec.rb
+- spec/alephant/broker/load_strategy/revalidate/refresher_spec.rb
+- spec/alephant/broker/load_strategy/revalidate/strategy_spec.rb
 - spec/alephant/broker/load_strategy/s3/archived_spec.rb
 - spec/fixtures/json/batch.json
 - spec/fixtures/json/batch_compiled.json
+- spec/fixtures/json/batch_compiled_no_sequence.json
 - spec/integration/not_modified_response_spec.rb
 - spec/integration/rack_spec.rb
+- spec/integration/revalidate_spec.rb
 - spec/integration/spec_helper.rb
 - spec/spec_helper.rb
 homepage: https://github.com/BBC-News/alephant-broker
@@ -370,12 +408,18 @@ signing_key:
 specification_version: 4
 summary: Brokers requests for alephant components
 test_files:
+- spec/alephant/broker/cache/cached_object_spec.rb
 - spec/alephant/broker/component_meta_spec.rb
 - spec/alephant/broker/load_strategy/http_spec.rb
+- spec/alephant/broker/load_strategy/revalidate/fetcher_spec.rb
+- spec/alephant/broker/load_strategy/revalidate/refresher_spec.rb
+- spec/alephant/broker/load_strategy/revalidate/strategy_spec.rb
 - spec/alephant/broker/load_strategy/s3/archived_spec.rb
 - spec/fixtures/json/batch.json
 - spec/fixtures/json/batch_compiled.json
+- spec/fixtures/json/batch_compiled_no_sequence.json
 - spec/integration/not_modified_response_spec.rb
 - spec/integration/rack_spec.rb
+- spec/integration/revalidate_spec.rb
 - spec/integration/spec_helper.rb
 - spec/spec_helper.rb