pheme 0.0.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5972c2f262d7efc2c0c341bca9e47764d3ced583
-  data.tar.gz: 7acc27e6ac4b39f4f849d0f5c000624d04e7c179
+  metadata.gz: 5bb62b021efbad7c81eabfe53f32641b051ab355
+  data.tar.gz: b45731fc261b7b7f5505e906f1d720cb99cc7259
 SHA512:
-  metadata.gz: 9ed79b1d9e576e8c0e4acff8c461e373479613b0c9a0b19220fb8c8260be7eb90701457c9ce51861af94a6b8df4e3d5f08d558c327bcec07cf01a86a5611a7dd
-  data.tar.gz: 6fbe113b021e4c75da8ec1fbe0bbab017f1a6119b02b54c5259af601334bfda24906bd449c5b1796c2d4377797f98be7cf36dfa30c7545db5895bb99cec3b6af
+  metadata.gz: f3bbbff1509ad02bd38216a4748a7c74cf11deb751b394644aced095789e16e698768163f29d7adeab4577ddfcf1d9081d9b84b95917372dec51b6653862a6c6
+  data.tar.gz: f1f5e2765cea3ef16e838c191a37c5f224f05d926fcb4ee18565ecc91a994857cc31e2bb6a625f2882a524ad0118cb2ebc3371c39cac859f78eecc09a4dd506b

data/lib/pheme/message_handler.rb

@@ -1,8 +1,8 @@
 module Pheme
   class MessageHandler
-    attr_reader :message
+    attr_reader :message, :timestamp
 
-    def initialize(message:)
+    def initialize(message:, metadata:)
       @message = message
     end
 

data/lib/pheme/queue_poller.rb

@@ -2,10 +2,10 @@ module Pheme
   class QueuePoller
     attr_accessor :queue_url, :queue_poller, :connection_pool_block, :format, :max_messages, :poller_configuration
 
-    def initialize(queue_url:, connection_pool_block: false, max_messages: nil, format: :json, poller_configuration: {})
+    def initialize(queue_url:, connection_pool_block: false, max_messages: nil, format: :json, poller_configuration: {}, sqs_client: nil)
       raise ArgumentError, "must specify non-nil queue_url" unless queue_url.present?
       @queue_url = queue_url
-      @queue_poller = Aws::SQS::QueuePoller.new(queue_url)
+      @queue_poller = Aws::SQS::QueuePoller.new(queue_url, client: sqs_client)
       @connection_pool_block = connection_pool_block
       @messages_processed = 0
       @messages_received = 0
@@ -32,7 +32,8 @@ module Pheme
           Pheme.logger.tagged(queue_message.message_id) do
             begin
               content = parse_body(queue_message)
-              handle(content)
+              metadata = parse_metadata(queue_message)
+              handle(content, metadata)
               queue_poller.delete_message(queue_message)
               log_delete(queue_message)
               @messages_processed += 1
@@ -73,6 +74,11 @@ module Pheme
       parsed_content
     end
 
+    def parse_metadata(queue_message)
+      message_body = JSON.parse(queue_message.body)
+      { timestamp: message_body['Timestamp'] }
+    end
+
     def get_metadata(message_body)
       message_body.except('Message', 'Records')
     end
@@ -91,7 +97,7 @@ module Pheme
       RecursiveOpenStruct.new({ wrapper: parsed_body }, recurse_over_arrays: true).wrapper
     end
 
-    def handle(_message)
+    def handle(_message, _metadata)
       raise NotImplementedError
     end
 

data/lib/pheme/version.rb

@@ -1,3 +1,3 @@
 module Pheme
-  VERSION = "0.0.11".freeze
+  VERSION = "1.0.0".freeze
 end

data/spec/message_handler_spec.rb

@@ -1,7 +1,8 @@
 describe Pheme::MessageHandler do
   before(:each) { use_default_configuration! }
   let(:message) { RecursiveOpenStruct.new(status: "complete") }
-  subject { ExampleMessageHandler.new(message: message) }
+  let(:timestamp) { '2018-04-17T21:45:05.915Z' }
+  subject { ExampleMessageHandler.new(message: message, metadata: { timestamp: timestamp }) }
 
   describe "#handle" do
     it "handles the message correctly" do

data/spec/queue_poller_spec.rb

@@ -1,5 +1,6 @@
 describe Pheme::QueuePoller do
   let(:queue_url) { "https://sqs.us-east-1.amazonaws.com/whatever" }
+  let(:timestamp) { '2018-04-17T21:45:05.915Z' }
 
   describe ".new" do
     context "when initialized with valid params" do
@@ -19,6 +20,15 @@ describe Pheme::QueuePoller do
         expect(ExampleQueuePoller.new(queue_url: "queue_url", max_messages: 5).max_messages).to eq(5)
       end
     end
+
+    context "when initialized with sqs_client" do
+      let(:sqs_client) { Object.new }
+
+      it "should set custom sqs_client" do
+        expect(Aws::SQS::QueuePoller).to receive(:new).with("queue_url", client: sqs_client)
+        ExampleQueuePoller.new(queue_url: "queue_url", sqs_client: sqs_client)
+      end
+    end
   end
 
   let(:poller) { ExampleQueuePoller.new(queue_url: queue_url, format: format) }
@@ -95,7 +105,7 @@ describe Pheme::QueuePoller do
       let(:mock_connection_pool) { double }
       subject { ExampleQueuePoller.new(queue_url: queue_url, connection_pool_block: true) }
       let(:message) { { status: 'complete' } }
-      let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification' } }
+      let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification', 'Timestamp' => timestamp, } }
       let!(:queue_message) do
         OpenStruct.new(
           body: notification.to_json,
@@ -119,7 +129,7 @@ describe Pheme::QueuePoller do
     context "without connection pool block" do
       subject { ExampleQueuePoller.new(queue_url: queue_url) }
       let(:message) { { status: 'complete' } }
-      let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification' } }
+      let(:notification) { { 'MessageId' => SecureRandom.uuid, 'Message' => message.to_json, 'Type' => 'Notification', 'Timestamp' => timestamp, } }
       let!(:queue_message) do
         OpenStruct.new(
           body: notification.to_json,
@@ -146,6 +156,7 @@ describe Pheme::QueuePoller do
           'MessageId' => SecureRandom.uuid,
           'Message' => message.to_json,
           'Type' => 'Notification',
+          'Timestamp' => timestamp,
         }
       end
       let!(:queue_message) do
@@ -161,7 +172,7 @@ describe Pheme::QueuePoller do
       end
 
       it "handles the message" do
-        expect(ExampleMessageHandler).to receive(:new).with(message: RecursiveOpenStruct.new(message))
+        expect(ExampleMessageHandler).to receive(:new).with(message: RecursiveOpenStruct.new(message), metadata: { timestamp: timestamp })
         subject.poll
       end
 
@@ -179,6 +190,7 @@ describe Pheme::QueuePoller do
           'MessageId' => SecureRandom.uuid,
           'Message' => message.to_json,
           'Type' => 'Notification',
+          'Timestamp' => timestamp,
         }
       end
       let!(:queue_message) do

data/spec/support/example_queue_poller.rb

@@ -3,10 +3,10 @@ class ExampleQueuePoller < Pheme::QueuePoller
     super(queue_url: queue_url, **kwargs)
   end
 
-  def handle(message)
+  def handle(message, metadata)
     case message.status
     when 'complete', 'rejected'
-      ExampleMessageHandler.new(message: message).handle
+      ExampleMessageHandler.new(message: message, metadata: metadata).handle
     else
       raise ArgumentError, "Unknown message status: #{message.status}"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheme
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 1.0.0
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby SNS publisher + SQS poller & message handler