alephant-publisher-queue 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b1b2837e329ce182d54c1fe307c4c8259b4fcd
-  data.tar.gz: 4c87d9d58d99f3b7f917eaf75b93774935e10897
+  metadata.gz: bf29d6e5e6cd44bc99c3d654a013e57afb4191a2
+  data.tar.gz: 019f8916b0859fb3e1eca573c08edff35ee8cd04
 SHA512:
-  metadata.gz: 25243830b708e3f5163068e146d6a00f093cffa14895820e5cdb466b83196e3c54b9c2e9cb3140df56626d2d355b963885ef21d0796f92d7c4d9bab5b5558714
-  data.tar.gz: ae945d97df41eb1d0a44c1b7afcb772adb30441e84999d79631ad02f90f36ad85e9027a7f93aa6a3094856e9523e4b3ee6e641f145a5f14aa26a6cba72b1f064
+  metadata.gz: 11bcdfdb4998721749b617dcfb86196cf3d780666ee11f2d93f230270a0192653d71fd9e187a1bb99e9684b09c0d9926120e11466ec642a85b0d35fef208c757
+  data.tar.gz: 37aa6ffdd3f8e356897d6f23184347c136ffd632211b75f35d1e8037d756582351df6e498bf4bbd72cddd6a4c287a462a73fee831f9a8750a5f405e03c784497

data/alephant-publisher-queue.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "dalli-elasticache"
   spec.add_runtime_dependency "alephant-support"
   spec.add_runtime_dependency "alephant-sequencer", "~> 3"
-  spec.add_runtime_dependency "alephant-cache"
+  spec.add_runtime_dependency "alephant-storage"
   spec.add_runtime_dependency "alephant-logger", "~> 3.1"
   spec.add_runtime_dependency "alephant-lookup", "~> 2"
   spec.add_runtime_dependency "alephant-renderer"

data/lib/alephant/publisher/queue.rb

@@ -8,7 +8,7 @@ require "alephant/publisher/queue/sqs_helper/archiver"
 require "alephant/publisher/queue/processor"
 require "alephant/publisher/queue/revalidate_processor"
 require "alephant/logger"
-require "alephant/cache"
+require "alephant/storage"
 require "json"
 
 module Alephant

data/lib/alephant/publisher/queue/publisher.rb

@@ -28,7 +28,7 @@ module Alephant
         private
 
         def archiver
-          Alephant::Publisher::Queue::SQSHelper::Archiver.new(archive_cache, archiver_opts)
+          Alephant::Publisher::Queue::SQSHelper::Archiver.new(archive_storage, archiver_opts)
         end
 
         def archiver_opts
@@ -46,8 +46,8 @@ module Alephant
           options.key?(key) && key != :log_validator
         end
 
-        def archive_cache
-          Alephant::Cache.new(
+        def archive_storage
+          Alephant::Storage.new(
             opts.writer[:s3_bucket_id],
             opts.writer[:s3_object_path]
           )

data/lib/alephant/publisher/queue/revalidate_writer.rb

@@ -23,7 +23,7 @@ module Alephant
         end
 
         def storage
-          @storage ||= Alephant::Cache.new(config.fetch(:s3_bucket_id), config.fetch(:s3_object_path))
+          @storage ||= Alephant::Storage.new(config.fetch(:s3_bucket_id), config.fetch(:s3_object_path))
         end
 
         def lookup

data/lib/alephant/publisher/queue/sqs_helper/archiver.rb

@@ -9,10 +9,10 @@ module Alephant
         class Archiver
           include Alephant::Logger
 
-          attr_reader :cache, :async, :log_message_body, :log_validator
+          attr_reader :storage, :async, :log_message_body, :log_validator
 
-          def initialize(cache, opts)
-            @cache            = cache
+          def initialize(storage, opts)
+            @storage          = storage
             @async            = opts[:async_store]
             @log_message_body = opts[:log_archive_message]
             @log_validator    = opts[:log_validator] || -> _ { true }
@@ -51,14 +51,14 @@ module Alephant
           end
 
           def store_item(message)
-            cache.put(
-              cache_key(message.id),
+            storage.put(
+              storage_key(message.id),
               message.body,
               meta_for(message)
             )
           end
 
-          def cache_key(id)
+          def storage_key(id)
             "archive/#{date_key}/#{id}"
           end
 

data/lib/alephant/publisher/queue/version.rb

@@ -1,7 +1,7 @@
 module Alephant
   module Publisher
     module Queue
-      VERSION = '2.4.2'.freeze
+      VERSION = '2.5.0'.freeze
     end
   end
 end

data/lib/alephant/publisher/queue/writer.rb

@@ -1,6 +1,6 @@
 require "crimp"
 
-require "alephant/cache"
+require "alephant/storage"
 require "alephant/lookup"
 require "alephant/logger"
 require "alephant/sequencer"
@@ -13,7 +13,7 @@ module Alephant
       class Writer
         include Alephant::Logger
 
-        attr_reader :config, :message, :cache, :parser
+        attr_reader :config, :message, :storage, :parser
 
         def initialize(config, message)
           @config   = config
@@ -24,8 +24,8 @@ module Alephant
           @renderer ||= Alephant::Renderer.create(config, data)
         end
 
-        def cache
-          @cache ||= Alephant::Cache.new(
+        def storage
+          @storage ||= Alephant::Storage.new(
             config[:s3_bucket_id],
             config[:s3_object_path]
           )
@@ -93,7 +93,7 @@ module Alephant
             storage_opts: storage_opts
           )
 
-          cache.put(location, render, view.content_type, storage_opts).tap do
+          storage.put(location, render, view.content_type, storage_opts).tap do
             logger.info(
               "event"          => "MessageStored",
               "location"       => location,

data/spec/alephant/publisher/queue/revalidate_writer_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Alephant::Publisher::Queue::RevalidateWriter do
   end
 
   describe '#run!' do
-    let(:storage_double)  { instance_double(Alephant::Cache, put: nil) }
+    let(:storage_double)  { instance_double(Alephant::Storage, put: nil) }
     let(:lookup_double)   { instance_double(Alephant::Lookup::LookupHelper, write: nil) }
     let(:renderer_double) do
       instance_double(Alephant::Renderer::Renderer, views: { hello_world_view: hello_world_view })
@@ -39,7 +39,7 @@ RSpec.describe Alephant::Publisher::Queue::RevalidateWriter do
 
     before do
       allow(Alephant::Renderer).to receive(:create).and_return(renderer_double)
-      allow(Alephant::Cache).to receive(:new).and_return(storage_double)
+      allow(Alephant::Storage).to receive(:new).and_return(storage_double)
       allow(Alephant::Lookup).to receive(:create).and_return(lookup_double)
     end
 
@@ -84,7 +84,7 @@ RSpec.describe Alephant::Publisher::Queue::RevalidateWriter do
 
   describe '#storage' do
     it 'builds an Alephant::Cache object' do
-      expect(subject.storage).to be_a(Alephant::Cache)
+      expect(subject.storage).to be_a(Alephant::Storage)
     end
   end
 

data/spec/alephant/publisher/queue/sqs_helper/archiver_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Alephant::Publisher::Queue::SQSHelper::Archiver do
-  let(:cache)    { instance_double(Alephant::Cache, :put => nil) }
+  let(:storage) { instance_double(Alephant::Storage, :put => nil) }
   let(:queue)    { instance_double(AWS::SQS::Queue, :url => nil) }
   let(:msg_body) { { :Message => JSON.generate(msg_uri) } }
   let(:msg_uri)  { { :uri => "/content/asset/newsbeat" } }
@@ -22,18 +22,18 @@ describe Alephant::Publisher::Queue::SQSHelper::Archiver do
     }
   end
 
-  let(:subject) { described_class.new(cache, opts) }
+  let (:subject) { described_class.new(storage, opts) }
 
   describe "#see" do
     let(:time_now) { DateTime.parse("Feb 24 1981") }
 
-    context "calls cache put with the correct params" do
+    context "calls storage put with the correct params" do
       before(:each) do
         allow(DateTime).to receive(:now).and_return(time_now)
       end
 
       specify do
-        expect(cache).to receive(:put).with(
+        expect(storage).to receive(:put).with(
           "archive/#{time_now.strftime('%d-%m-%Y_%H')}/id",
           message.body,
           :id        => message.id,

data/spec/alephant/publisher/queue/writer_spec.rb

@@ -17,7 +17,7 @@ describe Alephant::Publisher::Queue::Writer do
   before(:each) do
     AWS.stub!
 
-    allow_any_instance_of(Alephant::Cache).to receive(:initialize)
+    allow_any_instance_of(Alephant::Storage).to receive(:initialize)
       .with(
         opts[:s3_bucket_id],
         opts[:s3_object_path]
@@ -71,7 +71,7 @@ describe Alephant::Publisher::Queue::Writer do
     end
 
     it "should write the correct lookup location" do
-      allow_any_instance_of(Alephant::Cache).to receive(:put)
+      allow_any_instance_of(Alephant::Storage).to receive(:put)
 
       allow_any_instance_of(Alephant::Lookup::LookupHelper).to receive(:write)
         .with(
@@ -82,10 +82,10 @@ describe Alephant::Publisher::Queue::Writer do
         )
     end
 
-    it "should put the correct location, content to cache" do
+    it "should put the correct location, content to storage" do
       allow_any_instance_of(Alephant::Lookup::LookupHelper).to receive(:write)
 
-      allow_any_instance_of(Alephant::Cache).to receive(:put)
+      allow_any_instance_of(Alephant::Storage).to receive(:put)
         .with(expected_location, "content", "foo/bar", :msg_id=>"id")
     end
 

metadata

@@ -1,321 +1,321 @@
 --- !ruby/object:Gem::Specification
 name: alephant-publisher-queue
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - BBC News
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !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: 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: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.8
-  name: listen
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.8
 - !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'
-  name: rake-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: 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: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: aws-sdk
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: crimp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: crimp
-  prerelease: false
   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: faraday
-  prerelease: false
   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'
-  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: alephant-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-support
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-sequencer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-  name: alephant-sequencer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
+  name: alephant-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-cache
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: alephant-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-  name: alephant-logger
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
+  name: alephant-lookup
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
-  name: alephant-lookup
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
+  name: alephant-renderer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: alephant-renderer
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Static publishing to S3 based on SQS messages
@@ -325,9 +325,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -357,24 +357,24 @@ homepage: https://github.com/BBC-News/alephant-publisher-queue
 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: Static publishing to S3 based on SQS messages
 test_files: