alephant-broker 3.16.2 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3187ff4748e0bb5bc849bc09aa4743e05f9d7c3c
-  data.tar.gz: 4ce94f6c24687d4aa299bb1c33adbfff50ea0197
+  metadata.gz: 79ffc0d688acfa52b4b51a2c2272292c2e9d56de
+  data.tar.gz: 06cba46f0b07201a0d10cf496db2ba3f04d0b96e
 SHA512:
-  metadata.gz: a8123c1eb40579c15a8aad3e6e93306fb6532066db946e2a35c31986ed72e17ccd5fd6bc15477dea3657d9395d8994a9e5cb2f5f2743e5c66c138f142f4fc4da
-  data.tar.gz: e510b456c07e302a4765ad749e85bf7dae03a315f72a9c5e180627a7e4479f43defde9f6665f95a0fc30af49eee633817b7c62c9145ffe9a8c000718d4378c00
+  metadata.gz: 9d43960d272a526f2fd73e7be91e828b38dfafecdafeac315610b901cd2b462d728091db477a7adbe08fad7587b8009f587389c8a75d67177fd5f6bad8e5568d
+  data.tar.gz: 546a4468df7246a3121f3b3cdd01422c1a4fc6467a8ded2cf359bce99e2c2cd000e30fb65540ad78f8ab977bfbd2bb4a1cc6b469de319a44dedf911e78b61209

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.25
+2.3

data/.travis.yml

@@ -1,24 +1,10 @@
-sudo: false
-cache: bundler
 language: ruby
-
-# Ruby build matrix
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - 2.3.1
-  - jruby-1.7.25
-
-# Environment variables
-env:
-  - RUBYOPT="-W0"
-
-# Ensure we don't build for *every* commit (doesn't apply to PR builds)
-branches:
-  only:
-  - master
-
-script:
-  - bundle exec rspec --format documentation
+  - "2.3"
+  - "jruby"
+notifications:
+  email:
+    recipients:
+      - D&ENewsFrameworksTeam@bbc.co.uk
+    on_failure: change
+    on_success: never

data/README.md

@@ -126,7 +126,7 @@ end
 
 The "Revalidate" strategy uses the following process flow:
 
-![https://raw.githubusercontent.com/BBC-News/Documentation/master/Alephant/Diagrams/Alephant%20Revalidate%20Broker.png?token=AADB7YskdW22P6z-hDjfk12UiR7bZA8Jks5XkI7EwA%3D%3D](https://raw.githubusercontent.com/BBC-News/Documentation/master/Alephant/Diagrams/Alephant%20Revalidate%20Broker.png?token=AADB7YskdW22P6z-hDjfk12UiR7bZA8Jks5XkI7EwA%3D%3D)
+![https://github.com/BBC-News/Documentation/blob/master/Alephant/Diagrams/Alephant%20Revalidate%20Broker.png?raw=true](https://github.com/BBC-News/Documentation/blob/master/Alephant/Diagrams/Alephant%20Revalidate%20Broker.png?raw=true)
 
 And uses the following AWS resources:
 

data/alephant-broker.gemspec

@@ -33,10 +33,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "timecop"
 
-  spec.add_runtime_dependency "alephant-lookup", ">= 2.0.2"
-  spec.add_runtime_dependency "alephant-storage", ">= 1.1.1"
-  spec.add_runtime_dependency "alephant-logger", "~> 3.1.4"
+  spec.add_runtime_dependency "alephant-lookup"
+  spec.add_runtime_dependency "alephant-storage"
+  spec.add_runtime_dependency "alephant-logger"
   spec.add_runtime_dependency 'alephant-sequencer'
+  spec.add_runtime_dependency "aws-sdk-sqs"
+  spec.add_runtime_dependency "aws-sdk-s3"
   spec.add_runtime_dependency "dalli-elasticache"
   spec.add_runtime_dependency "faraday"
   spec.add_runtime_dependency "crimp"

data/lib/alephant/broker/load_strategy/revalidate/fetcher.rb

@@ -15,7 +15,7 @@ module Alephant
 
           def fetch
             Alephant::Broker::Cache::CachedObject.new(s3.get(s3_path))
-          rescue AWS::S3::Errors::NoSuchKey, InvalidCacheKey => error
+          rescue Aws::S3::Errors::NoSuchKey, InvalidCacheKey => error
             logger.info(event: 'ErrorCaught', method: "#{self.class}#fetch", error: error)
             logger.metric('S3InvalidCacheKey')
             raise Alephant::Broker::Errors::ContentNotFound

data/lib/alephant/broker/load_strategy/revalidate/refresher.rb

@@ -22,35 +22,37 @@ module Alephant
 
             logger.info(event: 'QueueMessage', message: message, method: "#{self.class}#refresh")
 
-            queue.send_message(message)
+            client.send_message(
+              queue_url: queue_url,
+              message_body: message
+              )
+
             cache.set(inflight_cache_key, true, INFLIGHT_CACHE_TTL)
           end
 
           private
 
-          def message
-            ::JSON.generate(id:        component_meta.id,
-                            batch_id:  component_meta.batch_id,
-                            options:   component_meta.options,
-                            timestamp: Time.now.to_s)
-          end
-
-          def queue
-            @queue ||= proc do
-              client = AWS::SQS.new
-              url    = client.queues.url_for(Broker.config[:sqs_queue_name], queue_options)
+          def client
+            options = {}
+            options[:endpoint] = ENV['AWS_SQS_ENDPOINT'] if ENV['AWS_SQS_ENDPOINT']
+            options[:queue_owner_aws_account_id] = aws_acc_id if aws_acc_id
 
-              client.queues[url]
-            end.call
+            @client ||= Aws::SQS::Client.new(options)
           end
 
-          def queue_options
-            opts = {}
-            opts[:queue_owner_aws_account_id] = aws_acc_id if aws_acc_id
+          def queue_url
+            options = {
+              queue_name: Broker.config[:sqs_queue_name]
+            }
 
-            logger.info(event: 'SQSQueueOptionsConfigured', options: opts, method: "#{self.class}#queue_options")
+            client.get_queue_url(options).queue_url
+          end
 
-            opts
+          def message
+            ::JSON.generate(id:        component_meta.id,
+                            batch_id:  component_meta.batch_id,
+                            options:   component_meta.options,
+                            timestamp: Time.now.to_s)
           end
 
           def aws_acc_id

data/lib/alephant/broker/load_strategy/s3/base.rb

@@ -60,7 +60,7 @@ module Alephant
           def retrieve_object(component_meta)
             @cached = false
             s3.get s3_path(component_meta)
-          rescue AWS::S3::Errors::NoSuchKey, InvalidCacheKey
+          rescue Aws::S3::Errors::NoSuchKey, InvalidCacheKey
             logger.metric "S3InvalidCacheKey"
             raise Alephant::Broker::Errors::ContentNotFound
           end

data/lib/alephant/broker/response/base.rb

@@ -1,6 +1,8 @@
 require "alephant/broker/errors/invalid_cache_key"
 require "alephant/logger"
-require "aws-sdk"
+require "aws-sdk-s3"
+require "aws-sdk-sqs"
+
 require "ostruct"
 require "date"
 

data/lib/alephant/broker/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Broker
-    VERSION = "3.16.2".freeze
+    VERSION = "3.17.0".freeze
   end
 end

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

@@ -23,15 +23,15 @@ RSpec.describe Alephant::Broker::LoadStrategy::Revalidate::Fetcher do
       let(:content_type) { "text/html" }
 
       let(:content) do
-        instance_double(AWS::S3::S3Object,
+        {
           :content_type => "test/content",
-          :read         => "Test",
+          :body         => "Test",
           :metadata     => {
             "ttl"                => 30,
             "head_ETag"          => "123",
             "head_Last-Modified" => "Mon, 11 Apr 2016 10:39:57 GMT"
           }
-        )
+        }
       end
 
       before do
@@ -75,7 +75,7 @@ RSpec.describe Alephant::Broker::LoadStrategy::Revalidate::Fetcher do
         before do
           allow(storage_double)
             .to receive(:get)
-            .and_raise(AWS::S3::Errors::NoSuchKey.new(nil, nil))
+            .and_raise(Aws::S3::Errors::NoSuchKey.new(nil, nil))
         end
 
         it "raises an Alephant::Broker::Errors::ContentNotFound error" do

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

@@ -7,20 +7,19 @@ RSpec.describe Alephant::Broker::LoadStrategy::Revalidate::Refresher do
     Alephant::Broker::ComponentMeta.new("test", "test_batch", {})
   end
 
-  let(:sqs_double)        { instance_double(AWS::SQS, :queues => sqs_queues_double) }
-  let(:sqs_queue_double)  { instance_double(AWS::SQS::Queue) }
-  let(:sqs_queues_double) { instance_double(AWS::SQS::QueueCollection, :url_for => "example.com", :[] => sqs_queue_double) }
-
   let(:config)  { { :aws_account_id => "12345", :sqs_queue_name => "bob" } }
 
   let(:cache)              { subject.send(:cache) }
   let(:cache_key)          { subject.send(:cache_key) }
   let(:inflight_cache_key) { subject.send(:inflight_cache_key) }
 
+  let(:queue_url) { 'http://sqs.aws.myqueue/id' }
+  let(:fake_client) { Aws::SQS::Client.new(stub_responses: true) }
+
   before do
+    allow(subject).to receive(:client).and_return(fake_client)
     allow_any_instance_of(Logger).to receive(:info)
     allow_any_instance_of(Logger).to receive(:debug)
-    allow(AWS::SQS).to receive(:new).and_return(sqs_double)
     allow(Alephant::Broker).to receive(:config).and_return(config)
   end
 
@@ -48,10 +47,12 @@ RSpec.describe Alephant::Broker::LoadStrategy::Revalidate::Refresher do
           .and_return(nil)
       end
 
-      it "adds a message to the SQS queue, ",
-        "and puts a 'inflight' message in the cache" do
+      it "adds a message to the SQS queue, and puts a 'inflight' message in the cache" do
+        fake_client.stub_responses(:get_queue_url, { queue_url: queue_url })
+
+        expect(fake_client).to receive(:send_message)
+
         expect(cache).to receive(:set).with(inflight_cache_key, true, described_class::INFLIGHT_CACHE_TTL)
-        expect(sqs_queue_double).to receive(:send_message)
 
         subject.refresh
       end
@@ -59,9 +60,10 @@ RSpec.describe Alephant::Broker::LoadStrategy::Revalidate::Refresher do
       context "there was a problem pushing a message onto the queue" do
         it "does NOT put an 'inflight' message in the cache" do
           expect(cache).to_not receive(:set)
-          expect(sqs_queue_double).to receive(:send_message).and_raise
 
-          expect { subject.refresh }.to raise_error
+          expect(fake_client).to receive(:send_message).and_raise
+
+          expect { subject.refresh }.to raise_error(RuntimeError)
         end
       end
     end

data/spec/integration/not_modified_response_spec.rb

@@ -21,14 +21,14 @@ describe Alephant::Broker::Application do
   end
 
   let(:content) do
-    AWS::Core::Data.new(
+    {
       :content_type => "test/content",
       :content      => "Test",
       :meta         => {
         "head_ETag"          => "123",
         "head_Last-Modified" => "Mon, 11 Apr 2016 10:39:57 GMT"
       }
-    )
+    }
   end
 
   let(:sequencer_double) do
@@ -99,14 +99,14 @@ describe Alephant::Broker::Application do
       allow(s3_double_with_etag).to receive(:get)
         .with("test/location/with/options")
         .and_return(
-          AWS::Core::Data.new(
+          {
             :content_type => "test/content",
             :content      => "Test",
             :meta         => {
               "head_ETag"          => "abc",
               "head_Last-Modified" => "Mon, 11 Apr 2016 09:39:57 GMT"
             }
-          )
+          }
         )
 
       allow(Alephant::Storage).to receive(:new) { s3_double_with_etag }
@@ -170,14 +170,14 @@ describe Alephant::Broker::Application do
       allow(s3_double_with_etag).to receive(:get)
         .with("test/location/with/options")
         .and_return(
-          AWS::Core::Data.new(
+          {
             :content_type => "test/content",
             :content      => "Test",
             :meta         => {
               "head_ETag"          => "abc",
               "head_Last-Modified" => "Mon, 11 Apr 2016 09:39:57 GMT"
             }
-          )
+          }
         )
 
       allow(Alephant::Storage).to receive(:new) { s3_double_with_etag }

data/spec/integration/rack_spec.rb

@@ -19,14 +19,14 @@ describe Alephant::Broker::Application do
   end
 
   let(:content) do
-    AWS::Core::Data.new(
+    {
       :content_type => "test/content",
       :content      => "Test",
       :meta         => {
         "head_ETag"          => "123",
         "head_Last-Modified" => "Mon, 11 Apr 2016 10:39:57 GMT"
       }
-    )
+    }
   end
 
   let(:sequencer_double) do
@@ -145,14 +145,14 @@ describe Alephant::Broker::Application do
     before do
       allow(s3_double_batch).to receive(:get).and_return(
         content,
-        AWS::Core::Data.new(
+        {
           :content_type => "test/content",
           :content      => "Test",
           :meta         => {
             :head_ETag            => "\"abc\"",
             :"head_Last-Modified" => "Mon, 11 Apr 2016 09:39:57 GMT"
           }
-        )
+        }
       )
 
       allow(Alephant::Storage).to receive(:new) { s3_double_batch }
@@ -194,14 +194,14 @@ describe Alephant::Broker::Application do
     before do
       allow(s3_double_batch).to receive(:get).and_return(
         content,
-        AWS::Core::Data.new(
+        {
           :content_type => "test/content",
           :content      => "Test",
           :meta         => {
             :head_ETag            => "\"abc\"",
             :"head_Last-Modified" => "Mon, 11 Apr 2016 09:39:57 GMT"
           }
-        )
+        }
       )
 
       allow(Alephant::Storage).to receive(:new) { s3_double_batch }
@@ -240,14 +240,14 @@ describe Alephant::Broker::Application do
     before do
       allow(s3_double_batch).to receive(:get).and_return(
         content,
-        AWS::Core::Data.new(
+        {
           :content_type => "test/content",
           :content      => "Test",
           :meta         => {
             :head_ETag            => "\"abc\"",
             :"head_Last-Modified" => "Mon, 11 Apr 2016 09:39:57 GMT"
           }
-        )
+        }
       )
 
       allow(Alephant::Storage).to receive(:new) { s3_double_batch }
@@ -281,10 +281,10 @@ describe Alephant::Broker::Application do
 
   describe "S3 headers" do
     let(:content) do
-      AWS::Core::Data.new(
+      {
         :content => "missing_content",
         :meta    => {}
-      )
+      }
     end
     let(:s3_double) do
       instance_double(
@@ -352,13 +352,17 @@ describe Alephant::Broker::Application do
           :content      => "<p>Some data</p>",
           :meta         => {}
         },
-        :get => "<p>Some data</p>"
+        :get => "<p>Some data</p>" # @TODO: What should cache return?
       )
     end
     let(:s3_double) do
       instance_double(
         "Alephant::Storage",
-        :get => "test_content"
+        :get => {
+          :content_type => "test/html",
+          :content      => "<p>Some data</p>",
+          :meta         => {}
+        }
       )
     end
 

data/spec/integration/revalidate_spec.rb

@@ -35,9 +35,8 @@ describe Alephant::Broker::Application do
   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) }
+
+  let(:fake_client) { Aws::SQS::Client.new(stub_responses: true) }
 
   before do
     allow_any_instance_of(Logger).to receive(:info)
@@ -45,7 +44,8 @@ describe Alephant::Broker::Application do
     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)
+    allow_any_instance_of(Alephant::Broker::LoadStrategy::Revalidate::Refresher).to receive(:client).and_return(fake_client)
+    fake_client.stub_responses(:get_queue_url, { queue_url: 'http://sqs.aws.myqueue/id' })
   end
 
   describe 'GET `/status`' do
@@ -82,7 +82,7 @@ describe Alephant::Broker::Application do
       before do
         allow(storage_double)
           .to receive(:get)
-          .and_raise(AWS::S3::Errors::NoSuchKey.new(nil, nil))
+          .and_raise(Aws::S3::Errors::NoSuchKey.new(nil, nil))
 
         get('/component/test_component')
       end
@@ -128,7 +128,7 @@ describe Alephant::Broker::Application do
         before do
           allow(storage_double)
             .to receive(:get)
-            .and_raise(AWS::S3::Errors::NoSuchKey.new(nil, nil))
+            .and_raise(Aws::S3::Errors::NoSuchKey.new(nil, nil))
 
           post(path, batch_json, 'CONTENT_TYPE' => content_type)
         end
@@ -157,7 +157,7 @@ describe Alephant::Broker::Application do
         before do
           allow(storage_double)
             .to receive(:get)
-            .and_raise(AWS::S3::Errors::NoSuchKey.new(nil, nil))
+            .and_raise(Aws::S3::Errors::NoSuchKey.new(nil, nil))
 
           get(path, {}, 'CONTENT_TYPE' => content_type)
         end

metadata

@@ -1,321 +1,349 @@
 --- !ruby/object:Gem::Specification
 name: alephant-broker
 version: !ruby/object:Gem::Version
-  version: 3.16.2
+  version: 3.17.0
 platform: ruby
 authors:
 - BBC News
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-nc
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: guard-rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry-remote
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: pry-nav
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
-  name: rake-rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: rack
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rack-test
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: simplecov
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: timecop
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-lookup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
-  name: alephant-lookup
-  prerelease: false
+        version: '0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
-  name: alephant-storage
-  prerelease: false
+        version: '0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
-  name: alephant-logger
-  prerelease: false
+        version: '0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-sequencer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-sequencer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: dalli-elasticache
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: faraday
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dalli-elasticache
+  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: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: crimp
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: crimp
+  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: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-  name: listen
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Brokers requests for alephant components
@@ -325,9 +353,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -387,24 +415,24 @@ homepage: https://github.com/BBC-News/alephant-broker
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.12
+signing_key: 
 specification_version: 4
 summary: Brokers requests for alephant components
 test_files: