alephant-publisher-queue 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e4629b6edec4107606c37b56d4c20c041bc1e9
-  data.tar.gz: 9f96470b7492db9645d08a24c4ccf73a7a74bab0
+  metadata.gz: d03deb00bb8ef2ad51901691fda1e96cbad33869
+  data.tar.gz: 56b2924d2f8ee1fc4fa20f5159e8a6dfd089bc32
 SHA512:
-  metadata.gz: 20162a9089a2c093fa7e4636e7abee2927866b405218c0a23cfe013227419131982cd034c75b7e50e67fd378dc837dadff6efff5b374d20fb2c48bf1d2e88e39
-  data.tar.gz: 988aca2dc1c876ecfe9315e44699fd5d69701f7a03bd9b079a031b03d6048962fc9f174fa40cab834379636265003bf86b5636e641a1c6d8c54af4f8c3230967
+  metadata.gz: 1dbce0e3685ff1cc57b5a175dea97c414cdd3d482d0841d5d5de77cbfdc97d3736e5f35bda44c6583e32ed1fd89dd14f2b7a27289fb74339ab1309a8cdf2581b
+  data.tar.gz: 9d9489398e6cf4cdda5d772e040e68a09e9a1d63de91db61c06d6b4c61af5ea37b07deb1e641f2c5cecef20541a3e10d3cb21cdd420660ecaa063c2cba3590e1

data/alephant-publisher-queue.gemspec

@@ -22,10 +22,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-nc"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "listen", "~> 3.0.8"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-remote"
   spec.add_development_dependency "pry-nav"
   spec.add_development_dependency "rake-rspec"
+  spec.add_development_dependency "simplecov"
 
   spec.add_runtime_dependency "rake"
   spec.add_runtime_dependency "aws-sdk", "~> 1.0"

data/lib/alephant/publisher/queue.rb

@@ -4,8 +4,9 @@ require "alephant/publisher/queue/version"
 require "alephant/publisher/queue/options"
 require "alephant/publisher/queue/sqs_helper/queue"
 require "alephant/publisher/queue/sqs_helper/archiver"
-require "alephant/logger"
 require "alephant/publisher/queue/processor"
+require "alephant/logger"
+require "alephant/cache"
 require "json"
 
 module Alephant
@@ -17,7 +18,7 @@ module Alephant
       end
 
       class Publisher
-        include Logger
+        include Alephant::Logger
 
         VISIBILITY_TIMEOUT = 60
         RECEIVE_WAIT_TIME  = 15
@@ -28,7 +29,7 @@ module Alephant
           @opts = opts
           @processor = processor
 
-          @queue = SQSHelper::Queue.new(
+          @queue = Alephant::Publisher::Queue::SQSHelper::Queue.new(
             aws_queue,
             archiver,
             opts.queue[:visibility_timeout] || VISIBILITY_TIMEOUT,
@@ -43,7 +44,7 @@ module Alephant
         private
 
         def archiver
-          SQSHelper::Archiver.new(archive_cache, archiver_opts)
+          Alephant::Publisher::Queue::SQSHelper::Archiver.new(archive_cache, archiver_opts)
         end
 
         def archiver_opts
@@ -62,14 +63,18 @@ module Alephant
         end
 
         def archive_cache
-          Cache.new(
+          Alephant::Cache.new(
             opts.writer[:s3_bucket_id],
             opts.writer[:s3_object_path]
           )
         end
 
+        def get_region
+          opts.queue[:sqs_account_region] || AWS.config.region
+        end
+
         def sqs_client
-          @sqs_client ||= AWS::SQS.new
+          @sqs_client ||= AWS::SQS.new(:region => get_region)
         end
 
         def sqs_queue_options

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

@@ -7,7 +7,7 @@ module Alephant
       class InvalidKeySpecifiedError < StandardError; end
 
       class Options
-        include Logger
+        include Alephant::Logger
 
         attr_reader :queue, :writer
 

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

@@ -1,5 +1,5 @@
 require "alephant/publisher/queue/writer"
-require "alephant/publisher/queue/processor/base"
+require "alephant/publisher/queue/base_processor"
 
 module Alephant
   module Publisher

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

@@ -7,7 +7,7 @@ module Alephant
     module Queue
       module SQSHelper
         class Archiver
-          include Logger
+          include Alephant::Logger
 
           attr_reader :cache, :async, :log_message_body, :log_validator
 

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

@@ -9,7 +9,7 @@ module Alephant
           WAIT_TIME = 5
           VISABILITY_TIMEOUT = 300
 
-          include Logger
+          include Alephant::Logger
 
           attr_reader :queue, :timeout, :wait_time, :archiver
 

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

@@ -1,7 +1,7 @@
 module Alephant
   module Publisher
     module Queue
-      VERSION = "2.2.0"
+      VERSION = "2.3.0"
     end
   end
 end

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

@@ -11,7 +11,7 @@ module Alephant
   module Publisher
     module Queue
       class Writer
-        include Logger
+        include Alephant::Logger
 
         attr_reader :config, :message, :cache, :parser, :renderer
 
@@ -22,14 +22,14 @@ module Alephant
         end
 
         def cache
-          @cache ||= Cache.new(
+          @cache ||= Alephant::Cache.new(
             config[:s3_bucket_id],
             config[:s3_object_path]
           )
         end
 
         def parser
-          @parser ||= Support::Parser.new(
+          @parser ||= Alephant::Support::Parser.new(
             config[:msg_vary_id_path]
           )
         end
@@ -95,7 +95,7 @@ module Alephant
         end
 
         def seq_for(id)
-          Sequencer.create(
+          Alephant::Sequencer.create(
             config[:sequencer_table_name],
             :id       => seq_key_from(id),
             :jsonpath => config[:sequence_id_path],
@@ -109,7 +109,7 @@ module Alephant
         end
 
         def seq_id
-          @seq_id ||= Sequencer::Sequencer.sequence_id_from(
+          @seq_id ||= Alephant::Sequencer::Sequencer.sequence_id_from(
             message, config[:sequence_id_path]
           )
         end
@@ -131,7 +131,7 @@ module Alephant
         end
 
         def lookup
-          Lookup.create(config[:lookup_table_name], config)
+          Alephant::Lookup.create(config[:lookup_table_name], config)
         end
       end
     end

data/spec/{processor_spec.rb → alephant/publisher/queue/processor_spec.rb}

@@ -13,7 +13,7 @@ describe Alephant::Publisher::Queue::Processor do
 
   describe "#consume(msg)" do
     it "Consume the message and deletes it" do
-      msg = double("AWS::SQS::ReceivedMessage", :delete => nil)
+      msg = instance_double(AWS::SQS::ReceivedMessage, :delete => nil)
       expect(msg).to receive(:delete)
       subject.consume(msg)
     end

data/spec/{archiver_spec.rb → alephant/publisher/queue/sqs_helper/archiver_spec.rb}

@@ -1,8 +1,8 @@
 require "spec_helper"
 
 describe Alephant::Publisher::Queue::SQSHelper::Archiver do
-  let(:cache)    { instance_double("Alephant::Cache", :put => nil) }
-  let(:queue)    { instance_double("AWS::SQS::Queue", :url => nil) }
+  let(:cache)    { instance_double(Alephant::Cache, :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" } }
   let(:message) do

data/spec/{writer_spec.rb → alephant/publisher/queue/writer_spec.rb}

@@ -63,7 +63,7 @@ describe Alephant::Publisher::Queue::Writer do
     end
 
     let(:renderer) do
-      instance_double "Alephant::Renderer::Renderer"
+      instance_double(Alephant::Renderer::Renderer)
     end
 
     subject do

data/spec/{publisher_spec.rb → alephant/publisher/queue_spec.rb}

@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe Alephant::Publisher::Queue do
   let(:options)       { Alephant::Publisher::Queue::Options.new }
-  let(:queue)         { double("AWS::SQS::Queue", :url => nil) }
-  let(:client_double) { double("AWS::SQS", :queues => queue_double) }
+  let(:queue)         { double(AWS::SQS::Queue, :url => nil) }
+  let(:client_double) { double(AWS::SQS, :queues => queue_double) }
   let(:queue_double) do
     double("AWS::SQS::QueueCollection", :[] => queue, :url_for => nil)
   end

data/spec/spec_helper.rb

@@ -1,4 +1,15 @@
-require "pry"
+$LOAD_PATH << File.join(File.dirname(__FILE__), "..", "lib")
 
+require "pry"
 require "aws-sdk"
+require "simplecov"
+
+SimpleCov.start do
+  add_filter "/spec/"
+end
+
 require "alephant/publisher/queue"
+
+RSpec.configure do |config|
+  config.order = "random"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-publisher-queue
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - BBC News
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.8
+  name: listen
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.8
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -136,6 +150,20 @@ dependencies:
     - - '>='
       - !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
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -280,19 +308,19 @@ files:
 - alephant-publisher-queue.gemspec
 - lib/alephant/publisher/env.rb
 - lib/alephant/publisher/queue.rb
+- lib/alephant/publisher/queue/base_processor.rb
 - lib/alephant/publisher/queue/options.rb
 - lib/alephant/publisher/queue/processor.rb
-- lib/alephant/publisher/queue/processor/base.rb
 - lib/alephant/publisher/queue/sqs_helper/archiver.rb
 - lib/alephant/publisher/queue/sqs_helper/queue.rb
 - lib/alephant/publisher/queue/version.rb
 - lib/alephant/publisher/queue/writer.rb
-- spec/archiver_spec.rb
-- spec/processor_spec.rb
-- spec/publisher_spec.rb
-- spec/queue_spec.rb
+- spec/alephant/publisher/queue/processor_spec.rb
+- spec/alephant/publisher/queue/sqs_helper/archiver_spec.rb
+- spec/alephant/publisher/queue/sqs_helper/queue_spec.rb
+- spec/alephant/publisher/queue/writer_spec.rb
+- spec/alephant/publisher/queue_spec.rb
 - spec/spec_helper.rb
-- spec/writer_spec.rb
 homepage: https://github.com/BBC-News/alephant-publisher-queue
 licenses:
 - MIT
@@ -318,9 +346,9 @@ signing_key:
 specification_version: 4
 summary: Static publishing to S3 based on SQS messages
 test_files:
-- spec/archiver_spec.rb
-- spec/processor_spec.rb
-- spec/publisher_spec.rb
-- spec/queue_spec.rb
+- spec/alephant/publisher/queue/processor_spec.rb
+- spec/alephant/publisher/queue/sqs_helper/archiver_spec.rb
+- spec/alephant/publisher/queue/sqs_helper/queue_spec.rb
+- spec/alephant/publisher/queue/writer_spec.rb
+- spec/alephant/publisher/queue_spec.rb
 - spec/spec_helper.rb
-- spec/writer_spec.rb