mimi-messaging-sqs_sns 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c519409be703d17780104c7128f1ac45356e6a28
-  data.tar.gz: d79e3369b555015308c3e794bec2e6e5a7990c56
+  metadata.gz: 297b98675dafdc02dc9cbc9256339b3ecb696875
+  data.tar.gz: db1e2efc5ac9f8b98b1de5fb5dff0c76ee21930c
 SHA512:
-  metadata.gz: 835a5d1103716fa79de1db5b4869650645ebfd472b8e80343741f5af0f666f12ab07bd16b35eb88b6c9a8d601364b2bcebba86f050e0b111fcec0a627ac631e9
-  data.tar.gz: 6980d6feea3ed5c9e5af6a2a5735c05511b19dcc091e7ac0f62c37cfd7357689b4efdfaa7fbc443d266cfbed9746351d102db1c433d9e44cd30df5afa9861e56
+  metadata.gz: c9d87b2c28ed31a1836070e09adc8732d3becc46364b3d04836e031bb9ae424e02aad22519a1632a1c205900a10a8ba7e2650c1e80b9947b40fa8dea5cd95331
+  data.tar.gz: 0d64bb39d6858fddb0645561180695fc9c6bb4ae44cc2f79027e36f9bab4bc4ff5efa69814da79a3046a0ead1412897ec00c0a9902f9d0b8a85c08f124029ee8

data/lib/mimi/messaging/sqs_sns.rb

@@ -12,4 +12,5 @@ end # module Mimi
 
 require_relative "sqs_sns/adapter"
 require_relative "sqs_sns/consumer"
+require_relative "sqs_sns/temporary_queue_consumer"
 require_relative "sqs_sns/reply_consumer"

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

@@ -219,6 +219,45 @@ module Mimi
           end
         end
 
+        # Creates a new queue
+        #
+        # @param queue_name [String] name of the topic to be created
+        # @return [String] a new queue URL
+        #
+        def create_queue(queue_name)
+          fqn = sqs_sns_converted_full_name(queue_name)
+          Mimi::Messaging.log "Creating a queue: #{fqn}"
+          result = sqs_client.create_queue(queue_name: fqn)
+          result.queue_url
+        rescue StandardError => e
+          raise Mimi::Messaging::ConnectionError, "Failed to create queue '#{queue_name}': #{e}"
+        end
+
+
+        # Finds a queue URL for a queue with given name.
+        #
+        # If an existing queue with this name is not found,
+        # the method will try to create a new one.
+        #
+        # @param queue_name [String]
+        # @return [String] a queue URL
+        #
+        def find_or_create_queue(queue_name)
+          queue_registry(queue_name) || create_queue(queue_name)
+        end
+
+        # Deletes a queue identified by the queue URL
+        #
+        # @param queue_url [String]
+        #
+        def delete_queue(queue_url)
+          Mimi::Messaging.log "Deleting a queue: #{queue_url}"
+          sqs_client.delete_queue(queue_url: queue_url)
+        rescue StandardError => e
+          raise Mimi::Messaging::ConnectionError,
+            "Failed to delete queue with url '#{queue_url}': #{e}"
+        end
+
         private
 
         # Returns configuration parameters for AWS SQS client
@@ -266,20 +305,6 @@ module Mimi
           end
         end
 
-        # Creates a new queue
-        #
-        # @param queue_name [String] name of the topic to be created
-        # @return [String] a new queue URL
-        #
-        def create_queue(queue_name)
-          fqn = sqs_sns_converted_full_name(queue_name)
-          Mimi::Messaging.log "Creating a queue: #{fqn}"
-          result = sqs_client.create_queue(queue_name: fqn)
-          result.queue_url
-        rescue StandardError => e
-          raise Mimi::Messaging::ConnectionError, "Failed to create queue '#{queue_name}': #{e}"
-        end
-
         # Delivers a message to a queue with given URL.
         #
         # @param queue_url [String]
@@ -349,18 +374,6 @@ module Mimi
           )
         end
 
-        # Finds a queue URL for a queue with given name.
-        #
-        # If an existing queue with this name is not found,
-        # the method will try to create a new one.
-        #
-        # @param queue_name [String]
-        # @return [String] a queue URL
-        #
-        def find_or_create_queue(queue_name)
-          queue_registry(queue_name) || create_queue(queue_name)
-        end
-
         # Returns the configured reply listener for this process
         #
         # @return [ReplyConsumer]
@@ -368,8 +381,7 @@ module Mimi
         def reply_consumer
           @reply_consumer ||= begin
             reply_queue_name = options[:mq_reply_queue_prefix] + SecureRandom.hex(8)
-            reply_queue_url = create_queue(reply_queue_name)
-            Mimi::Messaging::SQS_SNS::ReplyConsumer.new(self, reply_queue_url)
+            Mimi::Messaging::SQS_SNS::ReplyConsumer.new(self, reply_queue_name)
           end
         end
 

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

@@ -4,20 +4,15 @@ module Mimi
   module Messaging
     module SQS_SNS
       #
-      # Message processor for SQS queues
+      # Message consumer for SQS queues
       #
       class Consumer
         def initialize(adapter, queue_url, &block)
-          @block = block
           @stop_requested = false
           Mimi::Messaging.log "Starting consumer for: #{queue_url}"
           @consumer_thread = Thread.new do
             while not @stop_requested do
-              message = read_message(adapter, queue_url)
-              next unless message
-              Mimi::Messaging.log "Read message from: #{queue_url}"
-              block.call(message)
-              ack_message(adapter, queue_url, message)
+              read_and_process_message(adapter, queue_url, block)
             end
             Mimi::Messaging.log "Stopping consumer for: #{queue_url}"
           end
@@ -35,8 +30,9 @@ module Mimi
         #
         # @param adapter [Mimi::Messaging::SQS_SNS::Adapter]
         # @param queue_url [String]
+        # @param block [Proc] a block to be invoked when a message is received
         #
-        def read_and_process_message(adapter, queue_url)
+        def read_and_process_message(adapter, queue_url, block)
           message = read_message(adapter, queue_url)
           return unless message
           Mimi::Messaging.log "Read message from: #{queue_url}"

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

@@ -8,25 +8,23 @@ module Mimi
       # and passes them to registered Queues (see Ruby ::Queue class).
       #
       class ReplyConsumer
-        attr_reader :reply_queue_url
+        attr_reader :reply_queue_name, :reply_queue_url
 
-        def initialize(adapter, reply_queue_url)
+        def initialize(adapter, reply_queue_name)
           @mutex = Mutex.new
           @queues = {}
           @adapter = adapter
-          @reply_queue_url = reply_queue_url
-          @consumer = Consumer.new(adapter, reply_queue_url) do |message|
+          @reply_queue_name = reply_queue_name
+          @consumer = TemporaryQueueConsumer.new(adapter, reply_queue_name) do |message|
             dispatch_message(message)
           end
+          @reply_queue_url = @consumer.queue_url
         end
 
         def stop
-          begin
-            @consumer.stop
-          rescue StandardError => e
-            raise Mimi::Messaging::Error, "Failed to stop consumer: #{e}"
-          end
-          # TODO: adapter.sqs_client.delete_queue(reply_queue_url)
+          @consumer.stop
+        rescue StandardError => e
+          raise Mimi::Messaging::Error, "Failed to stop reply consumer: #{e}"
         end
 
         # Register a new request_id to listen for.

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Mimi
+  module Messaging
+    module SQS_SNS
+      #
+      # Temporary queue consumer creates a temporary queue
+      # and attaches to it. The queue will be deleted
+      # on consumer shutdown.
+      #
+      class TemporaryQueueConsumer
+        attr_reader :queue_url
+
+        def initialize(adapter, queue_name, &block)
+          @adapter = adapter
+          @queue_url = adapter.find_or_create_queue(queue_name)
+          @consumer = Consumer.new(adapter, @queue_url, &block)
+        end
+
+        def stop
+          @consumer.stop
+          @adapter.delete_queue(queue_url)
+        rescue StandardError => e
+          raise Mimi::Messaging::Error, "Failed to stop temporary queue consumer: #{e}"
+        end
+      end # class TemporaryQueueConsumer
+    end # module SQS_SNS
+  end # module Messaging
+end # module Mimi

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

@@ -3,7 +3,7 @@
 module Mimi
   module Messaging
     module SQS_SNS
-      VERSION = "0.4.3"
+      VERSION = "0.5.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mimi-messaging-sqs_sns
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Alex Kukushkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mimi-messaging
@@ -133,6 +133,7 @@ files:
 - lib/mimi/messaging/sqs_sns/adapter.rb
 - lib/mimi/messaging/sqs_sns/consumer.rb
 - lib/mimi/messaging/sqs_sns/reply_consumer.rb
+- lib/mimi/messaging/sqs_sns/temporary_queue_consumer.rb
 - lib/mimi/messaging/sqs_sns/version.rb
 - mimi-messaging-sqs_sns.gemspec
 homepage: https://github.com/kukushkin/mimi-messaging-sqs_sns