mimi-messaging-sqs_sns 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5d9e9a945e2c463bdf1ce925106b659e6d3436c
-  data.tar.gz: 14cf700db890360e1f6f3877622891b0b66186f4
+  metadata.gz: 3d47fc3876131459a7e72da66b375a26a208f370
+  data.tar.gz: ceb906309a79390bd9aa4f0a3db08c5db0ab9a86
 SHA512:
-  metadata.gz: 87f1db91d58779e0924e3bc6939033a8564aede8c7158be1341991d1dbac362cf3750a48b0431e991fe0226ed526f5a15826cb01e6a1ea2ba8e392d7846a5d1e
-  data.tar.gz: e246820202d395abbd1b58c8a3e5e71e712ed9e35b5715541e2ec661500a457c945a9b97b816baf25dd954d094ff05baea31ede68e7479c1d76738c4377113dd
+  metadata.gz: ade51ba691163a98abc1c4b408e5f1ca37d4097c5cc63149de10a984b34def353b0cb192117ceec4a70370aa782c3de4ff20b22cebe458a43a69ed3ad654c2a2
+  data.tar.gz: 560f8d00382b7ce6a49b6e02d512389e84568c9041fa1e4b5a1f9e036c51897ac39fff8c1f662d4d130088f2b93f29a552d74038c6f0c052e032df532edba95c

data/lib/mimi/messaging/sqs_sns/adapter.rb

@@ -75,22 +75,22 @@ module Mimi
         #   Mimi::Messaging.command("users/create", name: "John Smith")
         #
         # @param target [String] "<queue>/<method>"
-        # @param message [Hash]
+        # @param message [Hash,Mimi::Messaging::Message]
         # @param opts [Hash] additional adapter-specific options
         #
         # @return nil
         #
         def command(target, message, _opts = {})
           queue_name, method_name = target.split("/")
-          message_payload = serialize(message)
+          message = Mimi::Messaging::Message.new(message, __method: method_name)
           queue_url = find_queue(queue_name)
-          deliver_message(message_payload, queue_url, __method: method_name)
+          deliver_message(queue_url, message)
         end
 
         # Executes the query to the given target and returns response
         #
         # @param target [String] "<queue>/<method>"
-        # @param message [Hash]
+        # @param message [Hash,Mimi::Messaging::Message]
         # @param opts [Hash] additional options, e.g. :timeout
         #
         # @return [Hash]
@@ -98,18 +98,17 @@ module Mimi
         #
         def query(target, message, opts = {})
           queue_name, method_name = target.split("/")
-          message_payload = serialize(message)
           queue_url = find_queue(queue_name)
           request_id = SecureRandom.hex(8)
           reply_queue = reply_listener.register_request_id(request_id)
 
-          deliver_message(
-            message_payload,
-            queue_url,
+          message = Mimi::Messaging::Message.new(
+            message,
             __method: method_name,
             __reply_queue_url: reply_listener.reply_queue_url,
             __request_id: request_id
           )
+          deliver_message(queue_url, message)
           timeout = opts[:timeout] || options[:mq_default_query_timeout]
           response = nil
           Timeout::timeout(timeout) do
@@ -140,15 +139,21 @@ module Mimi
           opts = opts.dup
           queue_url = find_or_create_queue(queue_name)
           @consumers << Consumer.new(self, queue_url) do |m|
-            message = deserialize(m.body)
-            headers = deserialize_headers(m)
-            method_name = headers[:__method]
-            reply_to = headers[:__reply_queue_url]
+            message = Mimi::Messaging::Message.new(
+              deserialize(m.body),
+              deserialize_headers(m)
+            )
+            method_name = message.headers[:__method]
+            reply_to = message.headers[:__reply_queue_url]
             if reply_to
-              response = processor.call_query(method_name, message, headers: headers)
-              deliver_message(serialize(response), reply_to, __request_id: headers[:__request_id])
+              response = processor.call_query(method_name, message, {})
+              response_message = Mimi::Messaging::Message.new(
+                response,
+                __request_id: message.headers[:__request_id]
+              )
+              deliver_message(reply_to, response_message)
             else
-              processor.call_command(method_name, message, headers: headers)
+              processor.call_command(method_name, message, {})
             end
           end
         end
@@ -204,17 +209,19 @@ module Mimi
 
         # Delivers a message to a queue with given URL.
         #
-        # @param message [String]
         # @param queue_url [String]
-        # @param headers [Hash<Symbol,String>]
+        # @param message [Mimi::Messaging::Message]
         #
-        def deliver_message(message, queue_url, headers = {})
+        def deliver_message(queue_url, message)
           raise ArgumentError, "Non-empty queue URL is expected" unless queue_url
+          unless message.is_a?(Mimi::Messaging::Message)
+            raise ArgumentError, "Message is expected as argument"
+          end
           Mimi::Messaging.log "Delivering message to: #{queue_url}"
           sqs_client.send_message(
             queue_url: queue_url,
-            message_body: message,
-            message_attributes: headers.map do |k, v|
+            message_body: serialize(message),
+            message_attributes: message.headers.map do |k, v|
               [k.to_s, { data_type: "String", string_value: v.to_s }]
             end.to_h
           )

data/lib/mimi/messaging/sqs_sns/version.rb

@@ -3,7 +3,7 @@
 module Mimi
   module Messaging
     module SQS_SNS
-      VERSION = "0.1.5"
+      VERSION = "0.2.0"
     end
   end
 end

data/mimi-messaging-sqs_sns.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mimi-messaging", "~> 1.0"
+  spec.add_dependency "mimi-messaging", "~> 1.1"
   spec.add_dependency "aws-sdk-sqs", "~> 1.22"
   spec.add_dependency "aws-sdk-sns", "~> 1.19"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mimi-messaging-sqs_sns
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Alex Kukushkin
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement