alephant-publisher-queue 1.3.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d78e6c9917deaa56cc0ecd2bd563388eb30f4d62
-  data.tar.gz: 715428fae721f928bc8e933b2f7da3b24feea3eb
+  metadata.gz: 24e9192b5a057c899884a53375972d72cc0baad0
+  data.tar.gz: 7706335077074b40c57b360b2c9e2f2703a56c95
 SHA512:
-  metadata.gz: 656c8367bc881ec7f9a245358ac3d4f15b788fd6e5c7fa8e7b726f8308f514798f7882c93970a9617d18179b969fdac07c8eeb0412637f5feee2e825da1f74d0
-  data.tar.gz: 7d42f79f877161ff832505437115ce3b1196097e52ef87a9f4b9014ac54681e10585d52c93639b09455639ed2fb579feceff963002e5c8e27901a7abd4c846cc
+  metadata.gz: 9c08fec946dadb90c1d505ce4e32cf39186a272dda8d6a795ec3a0a27ce25493e89a99230a166001895099a366e859f48ffb768e0a72020c5e27c87b8ed50d5f
+  data.tar.gz: 846f42745e6c3a690108300e389bf9d52b38cffe4bc006af3d69b51c335617d4d95c7745add7172cfa63ec9146d165f089e83ddd8c3f78d93d7a1cd0e963630a

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

@@ -15,7 +15,9 @@ module Alephant
           :receive_wait_time,
           :sqs_queue_name,
           :visibility_timeout,
-          :aws_account_id
+          :aws_account_id,
+          :log_archive_message,
+          :async_store
         ]
 
         WRITER_OPTS = [

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

@@ -1,5 +1,6 @@
-require 'alephant/logger'
-require 'date'
+require "alephant/logger"
+require "date"
+require "json"
 
 module Alephant
   module Publisher
@@ -8,41 +9,79 @@ module Alephant
         class Archiver
           include Logger
 
-          attr_reader :cache, :async
+          attr_reader :cache, :async, :log_message_body
 
-          def initialize(cache, async = true)
-            @async = async
-            @cache = cache
+          def initialize(cache, opts)
+            @cache            = cache
+            @async            = opts[:async_store]
+            @log_message_body = opts[:log_archive_message]
           end
 
           def see(message)
             return if message.nil?
-            message.tap { |m| async ? async_store(m) : store(m) }
+            message.tap do |m|
+              async ? async_store(m) : sync_store(m)
+            end
           end
 
           private
 
-          def async_store(m)
-            Thread.new { store(m) }
-            logger.metric "AsynchronouslyArchivedData"
+          def async_store(message)
+            Thread.new do
+              logger.metric "AsynchronouslyArchivedData"
+              store message
+            end
           end
 
-          def store(m)
+          def sync_store(message)
             logger.metric "SynchronouslyArchivedData"
-            logger.info "Publisher::Queue::SQSHelper::Archiver#store: '#{m.body}' at 'archive/#{date_key}/#{m.id}'"
-            cache.put("archive/#{date_key}/#{m.id}", m.body, meta_for(m))
+            store message
+          end
+
+          def store(message)
+            logger.info log_message(message)
+            store_item message
+          end
+
+          def store_item(message)
+            cache.put(
+              cache_key(message.id),
+              message.body,
+              meta_for(message)
+            )
+          end
+
+          def cache_key(id)
+            "archive/#{date_key}/#{id}"
+          end
+
+          def log_message_parts(id)
+            [
+              "#{self.class}#store:",
+              "'#archive/#{date_key}/#{id}'"
+            ]
+          end
+
+          def log_message(m)
+            log_message_parts(m.id).tap do |parts|
+              parts << "(#{encoded_body m.body})" if log_message_body
+            end.join(" ")
+          end
+
+          def encoded_body(message)
+            JSON.generate message.split("\n")
           end
 
           def date_key
-            DateTime.now.strftime('%d-%m-%Y_%H')
+            DateTime.now.strftime("%d-%m-%Y_%H")
           end
 
           def meta_for(m)
             {
-              :id                => m.id,
-              :md5               => m.md5,
-              :logged_at         => DateTime.now.to_s,
-              :queue             => m.queue.url,
+              :id        => m.id,
+              :md5       => m.md5,
+              :logged_at => DateTime.now.to_s,
+              :queue     => m.queue.url
             }
           end
         end
@@ -50,4 +89,3 @@ module Alephant
     end
   end
 end
-

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

@@ -1,7 +1,7 @@
 module Alephant
   module Publisher
     module Queue
-      VERSION = "1.3.6"
+      VERSION = "1.4.0"
     end
   end
 end

data/lib/alephant/publisher/queue.rb

@@ -43,7 +43,17 @@ module Alephant
         private
 
         def archiver
-          SQSHelper::Archiver.new(archive_cache)
+          SQSHelper::Archiver.new(archive_cache, archiver_opts)
+        end
+
+        def archiver_opts
+          options = {
+            :log_archive_message => true,
+            :async_store         => true
+          }
+          options.each do |key, value|
+            options[key] = opts.queue[key] == "true" if opts.queue.has_key? key
+          end
         end
 
         def archive_cache

data/spec/archiver_spec.rb

@@ -1,32 +1,68 @@
 require 'spec_helper'
 
 describe Alephant::Publisher::Queue::SQSHelper::Archiver do
-  describe "#see" do
-    it "calls cache put with the correct params" do
-      time_now = DateTime.parse("Feb 24 1981")
-      allow(DateTime).to receive(:now).and_return(time_now)
+  let (:cache) { instance_double("Alephant::Cache", :put => nil) }
+  let (:queue) { instance_double("AWS::SQS::Queue", :url => nil) }
+  let (:message) do
+    instance_double(
+      "AWS::SQS::ReceivedMessage",
+      :id    => "id",
+      :body  => "bar_baz",
+      :md5   => "qux",
+      :queue => queue
+    )
+  end
 
-      q = double("queue").as_null_object
-      c = double("cache").as_null_object
+  let (:opts) do
+    {
+      :log_archive_message => true,
+      :async_store         => false
+    }
+  end
 
-      expect(q).to receive(:url).and_return('url')
+  let (:subject) { described_class.new(cache, opts) }
+
+  describe "#see" do
+    let (:time_now) { DateTime.parse("Feb 24 1981") }
 
-      m = Struct.new(:id, :body, :md5, :queue).new('id', 'body', 'md5', q)
+    context "calls cache put with the correct params" do
+      before(:each) do
+        allow(DateTime).to receive(:now).and_return(time_now)
+      end
 
-      expect(c).to receive(:put).with(
-        "archive/#{time_now.strftime('%d-%m-%Y_%H')}/id",
-        "body",
-        {
-          :id        => "id",
-          :md5       => "md5",
-          :logged_at => time_now.to_s,
-          :queue     => "url"
-        }
-      )
+      specify do
+        expect(cache).to receive(:put).with(
+          "archive/#{time_now.strftime('%d-%m-%Y_%H')}/id",
+          message.body,
+          {
+            :id        => message.id,
+            :md5       => message.md5,
+            :logged_at => time_now.to_s,
+            :queue     => message.queue.url
+          }
+        )
+        subject.see(message)
+      end
+    end
+  end
+
+  describe "logging archive message" do
+    context "enabled" do
+      specify do
+        subject.see(message)
+        expect(message).to have_received(:body).twice
+      end
+    end
 
-      instance = Alephant::Publisher::Queue::SQSHelper::Archiver.new(c, false)
+    context "disabled" do
+      before(:each) do
+        opts[:log_archive_message] = false
+      end
 
-      instance.see(m)
+      specify do
+        subject.see(message)
+        expect(message).to have_received(:body).once
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-publisher-queue
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - revett
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement