pheme 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d2997b3e60dd5fd4c627bc9ccc16f4cbf29b164
-  data.tar.gz: 3e99d44c72a4f82a4faba24e016ef09ec8d66f1c
+  metadata.gz: 7162906c4cad8bbe5247f283c06f72ce881effb9
+  data.tar.gz: 78694ae2f9a59b2abacc2afc705780ca3190a406
 SHA512:
-  metadata.gz: 02d44dd623cbf7db144d72c72794b8ea48594be62373b751c71621b4573a58b4af341785a5478439a091db68bee22ad48ed496dab76fa15dda141bdb80e364a8
-  data.tar.gz: '03961dfc0b7886d1e9a3468fa0eafa750430bc0dfd4ebc71696191ca3dc23ece589d1c71bcfca15ee97b7c7d21aa47eca2eaf17ea70bc86d82c25d88e16ebd70'
+  metadata.gz: a4f3c559ebf8db752207b441b43bdd264f1a5489b58719c9613272949cd0061ce11a05809593dacd0903821a303c727443315a82ddf0a7eaa48b0d09b59255a6
+  data.tar.gz: 4f99b81c78d8484949f0cdf480deb5434e2eb3716259662588a31aeee1d318f8325d37fcf1400168e2d38c25dfbf6c8a499f954e63d22f0da8607ab767a37616

data/lib/pheme.rb

@@ -11,3 +11,5 @@ require 'pheme/rollbar'
 require 'pheme/topic_publisher'
 require 'pheme/message_handler'
 require 'pheme/queue_poller'
+require 'pheme/message_type/aws_event'
+require 'pheme/message_type/sns_message'

data/lib/pheme/message_type/aws_event.rb

@@ -0,0 +1,26 @@
+#
+# Poller that consume internal AWS Events,
+# like S3 notifications, CloudWatch events, etc.
+#
+# This poller's output message will be a list of hashes,
+# each containing one event.
+#
+module Pheme
+  module MessageType
+    module AwsEvent
+      extend ActiveSupport::Concern
+
+      def get_content(body)
+        body['Records']
+      end
+
+      def format
+        :aws_event
+      end
+
+      def parse_aws_event(message_contents)
+        RecursiveOpenStruct.new({wrapper: message_contents}, recurse_over_arrays: true).wrapper
+      end
+    end
+  end
+end

data/lib/pheme/message_type/sns_message.rb

@@ -0,0 +1,21 @@
+#
+# Default poller for messages publish through SNS.
+# No need to use this concern unless
+# the default behaviour has been overwritten and you
+# wish to restore it.
+#
+module Pheme
+  module MessageType
+    module SnsMessage
+      extend ActiveSupport::Concern
+
+      def get_content(body)
+        body['Message']
+      end
+
+      def format
+        :json
+      end
+    end
+  end
+end

data/lib/pheme/queue_poller.rb

@@ -44,17 +44,23 @@ module Pheme
 
     def parse_message(message)
       Pheme.log(:info, "Received JSON payload: #{message.body}")
-      body = JSON.parse(message.body)
+      content = get_content(JSON.parse(message.body))
       case format
       when :csv
-        parse_csv(body['Message'])
+        parse_csv(content)
       when :json
-        parse_json(body['Message'])
+        parse_json(content)
       else
-        raise ArgumentError.new("Unknown format #{format}. Valid formats: :csv, :json.")
+        method_name = "parse_#{format}".to_sym
+        raise ArgumentError.new("Unknown format #{format}") unless self.respond_to?(method_name)
+        self.__send__(method_name, content)
       end
     end
 
+    def get_content(body)
+      body['Message']
+    end
+
     def parse_csv(message_contents)
       parsed_body = SmarterCSV.process(StringIO.new(message_contents))
       parsed_body.map{ |item| RecursiveOpenStruct.new(item, recurse_over_arrays: true) }

data/lib/pheme/version.rb

@@ -1,3 +1,3 @@
 module Pheme
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/message_type/aws_event_spec.rb

@@ -0,0 +1,26 @@
+describe Pheme::MessageType::AwsEvent do
+  subject { ExampleAwsEventQueuePoller.new }
+
+  let(:poller) do
+    poller = double
+    allow(poller).to receive(:poll).with(kind_of(Hash))
+    allow(poller).to receive(:parse_message)
+    allow(poller).to receive(:before_request)
+    poller
+  end
+
+  before(:each) do
+    use_default_configuration!
+    allow(Aws::SQS::QueuePoller).to receive(:new) { poller }
+  end
+
+  describe "#parse_message" do
+    context "with JSON message" do
+      let!(:message) { OpenStruct.new({ body: "{\"Records\":[{\"eventVersion\":\"2.0\"}]}" }) }
+
+      it 'should parse the message correctly' do
+        expect(subject.parse_message(message).first.eventVersion).to eq("2.0")
+      end
+    end
+  end
+end

data/spec/message_type/sns_message_spec.rb

@@ -0,0 +1,32 @@
+describe Pheme::MessageType::SnsMessage do
+  module SnsMessage
+    class Fixture < ExampleQueuePoller
+      include Pheme::MessageType::SnsMessage
+    end
+  end
+
+  subject { SnsMessage::Fixture.new }
+
+  let(:poller) do
+    poller = double
+    allow(poller).to receive(:poll).with(kind_of(Hash))
+    allow(poller).to receive(:parse_message)
+    allow(poller).to receive(:before_request)
+    poller
+  end
+  
+  before(:each) do
+    use_default_configuration!
+    allow(Aws::SQS::QueuePoller).to receive(:new) { poller }
+  end
+
+  describe "#parse_message" do
+    context "with JSON message" do
+      let!(:message) { OpenStruct.new({ body: '{"Message":"{\"test\":\"test\"}"}' }) }
+
+      it 'should parse the message correctly' do
+        expect(subject.parse_message(message).test).to eq("test")
+      end
+    end
+  end
+end

data/spec/support/example_aws_event_queue_poller.rb

@@ -0,0 +1,12 @@
+require_relative 'example_queue_poller'
+
+#
+# Example for pollers that consume internal AWS Events,
+# like S3 notifications, CloudWatch events, etc.
+#
+# This poller's output message will be a list of hashes,
+# each containing one event.
+#
+class ExampleAwsEventQueuePoller < ExampleQueuePoller
+  include Pheme::MessageType::AwsEvent
+end

data/spec/support/example_queue_poller.rb

@@ -1,4 +1,8 @@
 class ExampleQueuePoller < Pheme::QueuePoller
+  def initialize(queue_url: 'http://mock_url.test', **kwargs)
+    super(queue_url: queue_url, **kwargs)
+  end
+
   def handle(message)
     case message.status
     when 'complete', 'rejected'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pheme
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Peter Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -117,6 +117,8 @@ files:
 - lib/pheme/configuration.rb
 - lib/pheme/logger.rb
 - lib/pheme/message_handler.rb
+- lib/pheme/message_type/aws_event.rb
+- lib/pheme/message_type/sns_message.rb
 - lib/pheme/queue_poller.rb
 - lib/pheme/rollbar.rb
 - lib/pheme/topic_publisher.rb
@@ -124,8 +126,11 @@ files:
 - pheme.gemspec
 - spec/configuration_spec.rb
 - spec/message_handler_spec.rb
+- spec/message_type/aws_event_spec.rb
+- spec/message_type/sns_message_spec.rb
 - spec/queue_poller_spec.rb
 - spec/spec_helper.rb
+- spec/support/example_aws_event_queue_poller.rb
 - spec/support/example_message_handler.rb
 - spec/support/example_publisher.rb
 - spec/support/example_queue_poller.rb
@@ -158,8 +163,11 @@ summary: Ruby SNS publisher + SQS poller & message handler
 test_files:
 - spec/configuration_spec.rb
 - spec/message_handler_spec.rb
+- spec/message_type/aws_event_spec.rb
+- spec/message_type/sns_message_spec.rb
 - spec/queue_poller_spec.rb
 - spec/spec_helper.rb
+- spec/support/example_aws_event_queue_poller.rb
 - spec/support/example_message_handler.rb
 - spec/support/example_publisher.rb
 - spec/support/example_queue_poller.rb