eventq 2.1.3 → 2.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff7c42a020c9dcd1c69286c86121aa5c1479f7b7cb2338e46a257cab1826d8b
-  data.tar.gz: b02d13924c3619d54ea0a5e8b75bb103457a6001550608d739a9f257e8ad87ef
+  metadata.gz: 4fc23d23d17caae6127d95e44d06bf912708916788e5ddd8a4d7a9c6d7cb6804
+  data.tar.gz: bb48c0c4e39e4bd22b0a939f1517dec464aef1b70b770abc918b763259a0bc73
 SHA512:
-  metadata.gz: 07c73cb255746f3059981a488e19a81bee3a593eefda8db954ddc35f53b0f3803cd8da4dc27a4764b736b09f25eb19fea89136dfc25bd0612c4eb41851626391
-  data.tar.gz: 48f78d71377237644e0bb0b28329a6f5dfa468e5b4c00700bf60d6798691e10eeb0978f435bc6ca88bc29ec57dc7b89995d9eb15a99512259c9c088dd6192713
+  metadata.gz: e733843db33486369179b19933ea3d30c503bb0d7a35f3ecfa36f338d1b13b88a8c79598cfc5b2e757793bfe963e29c9e60c3dea7d65fe2d7624b210160cac72
+  data.tar.gz: 3dc195c0c857189de331225056c0b5f396b51531d85dd4671c1e077c309d3aeb89d26da514b0c2cb6a7514baaae94e92777a91b13322eac02279806e5ec5e2bd

data/lib/eventq.rb

@@ -4,6 +4,7 @@ require 'class_kit'
 require 'hash_kit'
 require 'oj'
 
+require_relative 'eventq/base'
 require_relative 'eventq/eventq_base/eventq_logger'
 require_relative 'eventq/eventq_base/queue'
 require_relative 'eventq/eventq_base/exchange'

data/lib/eventq/aws.rb

@@ -12,23 +12,5 @@ require_relative './eventq_aws/aws_status_checker'
 require_relative './eventq_aws/aws_queue_worker'
 
 module EventQ
-  def self.namespace
-    @namespace
-  end
-  def self.namespace=(value)
-    @namespace = value
-  end
-  def self.create_event_type(event_type)
-    if EventQ.namespace == nil
-      return event_type
-    end
-    return "#{EventQ.namespace}-#{event_type}"
-  end
-  def self.create_queue_name(queue_name)
-    if EventQ.namespace == nil
-      return queue_name
-    end
-    return "#{EventQ.namespace}-#{queue_name}"
-  end
 end
 

data/lib/eventq/base.rb

@@ -0,0 +1,23 @@
+module EventQ
+  def self.namespace
+    @namespace
+  end
+
+  def self.namespace=(value)
+    @namespace = value
+  end
+
+  def self.create_event_type(event_type)
+    if EventQ.namespace == nil
+      return event_type
+    end
+    return "#{EventQ.namespace}-#{event_type}"
+  end
+
+  def self.create_queue_name(queue)
+    return queue.name if EventQ.namespace == nil
+
+    delimiter = queue.namespace_delimiter || '-'
+    return "#{EventQ.namespace}#{delimiter}#{queue.name}"
+  end
+end

data/lib/eventq/eventq_aws/aws_subscription_manager.rb

@@ -13,18 +13,20 @@ module EventQ
       end
 
       def subscribe(event_type, queue, topic_region = nil, queue_region = nil)
-        topic_arn = @client.sns_helper(topic_region).create_topic_arn(event_type, topic_region)
+        if queue.isolated
+          method = :get_topic_arn
+        else
+          method = :create_topic_arn
+        end
+
+        topic_arn = @client.sns_helper(topic_region).public_send(method, event_type, topic_region)
+        raise Exceptions::EventTypeNotFound, 'SNS topic not found, unable to subscribe' unless topic_arn
 
         q = @manager.get_queue(queue)
         queue_arn = @client.sqs_helper(queue_region).get_queue_arn(queue)
 
-        @client.sqs(queue_region).set_queue_attributes(
-          queue_url: q,
-          attributes:
-            {
-              'Policy' => queue_policy(queue_arn)
-            }
-        )
+        attributes = default_queue_attributes(q, queue_arn)
+        @client.sqs(queue_region).set_queue_attributes(attributes)
 
         @client.sns(topic_region).subscribe(
           topic_arn: topic_arn,
@@ -43,6 +45,18 @@ module EventQ
         raise "[#{self.class}] - Not implemented. Please unsubscribe the queue from the topic inside the AWS Management Console."
       end
 
+      private
+
+      def default_queue_attributes(queue, queue_arn)
+        {
+          queue_url: queue,
+          attributes:
+            {
+              'Policy' => queue_policy(queue_arn)
+            }
+        }
+      end
+
       def queue_policy(queue_arn)
         '{
           "Version": "2012-10-17",

data/lib/eventq/eventq_aws/sqs.rb

@@ -15,7 +15,7 @@ module EventQ
 
       # Create a new queue.
       def create_queue(queue, attributes = {})
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
 
         url = get_queue_url(queue)
         unless url
@@ -50,7 +50,7 @@ module EventQ
       # @param queue [EventQ::Queue]
       # @return ARN [String]
       def get_queue_arn(queue)
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
 
         arn = @@queue_arns[_queue_name]
         unless arn
@@ -74,7 +74,7 @@ module EventQ
       # @param queue [EventQ::Queue]
       # @return URL [String]
       def get_queue_url(queue)
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
 
         url = @@queue_urls[_queue_name]
         unless url
@@ -97,7 +97,7 @@ module EventQ
         q = get_queue_url(queue)
         sqs.delete_queue(queue_url: q)
 
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
         @@queue_urls.delete(_queue_name)
         @@queue_arns.delete(_queue_name)
 

data/lib/eventq/eventq_base/exceptions.rb

@@ -1,2 +1,3 @@
 require_relative 'exceptions/invalid_signature_exception'
 require_relative 'exceptions/worker_thread_error'
+require_relative 'exceptions/event_type_not_found'

data/lib/eventq/eventq_base/exceptions/event_type_not_found.rb

@@ -0,0 +1,12 @@
+module EventQ
+  module Exceptions
+    # Error for when an event type is not found by the relevant adapters
+    # For AWS SNS that would be a Topic
+    # For RabbitMq that would be an Exchange.
+    class EventTypeNotFound < StandardError
+      def initialize(message)
+        super(message)
+      end
+    end
+  end
+end

data/lib/eventq/eventq_base/exchange.rb

@@ -1,5 +1,6 @@
 module EventQ
   class Exchange
     attr_accessor :name
+    attr_accessor :namespace_delimiter
   end
 end

data/lib/eventq/eventq_base/queue.rb

@@ -11,6 +11,10 @@ module EventQ
     attr_accessor :retry_delay
     attr_accessor :retry_back_off_grace
     attr_accessor :retry_back_off_weight
+    # Character delimiter between namespace and queue name.  Default = '-'
+    attr_accessor :namespace_delimiter
+    # Flag to control that the queue runs in isolation of auto creating the topic it belongs to
+    attr_accessor :isolated
 
     def initialize
       @allow_retry = false
@@ -30,6 +34,7 @@ module EventQ
       @retry_back_off_grace = 0
       # Multiplier for the backoff retry in case retry_delay is too small
       @retry_back_off_weight = 1
+      @isolated = false
     end
   end
 end

data/lib/eventq/eventq_rabbitmq/rabbitmq_eventq_client.rb

@@ -81,7 +81,7 @@ module EventQ
           delay_queue = @queue_manager.create_delay_queue(channel, queue, exchange.name, delay)
           delay_queue.bind(delay_exchange, routing_key: _event_type)
 
-          _queue_name = EventQ.create_queue_name(queue.name)
+          _queue_name = EventQ.create_queue_name(queue)
 
           q = channel.queue(_queue_name, durable: @queue_manager.durable)
           q.bind(exchange, routing_key: _event_type)

data/lib/eventq/eventq_rabbitmq/rabbitmq_queue_manager.rb

@@ -14,7 +14,7 @@ module EventQ
 
       def get_queue(channel, queue)
 
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
 
         # get/create the queue
         q = channel.queue(_queue_name, :durable => @durable)
@@ -41,29 +41,29 @@ module EventQ
       end
 
       def get_queue_exchange(channel, queue)
-        _exchange_name = EventQ.create_exchange_name(queue.name)
+        _exchange_name = EventQ.create_exchange_name(queue)
         channel.fanout("#{_exchange_name}.ex")
       end
 
       def get_retry_exchange(channel, queue)
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
         return channel.fanout("#{_queue_name}.r.ex")
       end
 
       def get_subscriber_exchange(channel, queue)
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
         return channel.fanout("#{_queue_name}.ex")
       end
 
       def get_delay_exchange(channel, queue, delay)
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
         channel.direct("#{_queue_name}.#{delay}.d.ex")
       end
 
       def get_retry_queue(channel, queue)
         subscriber_exchange = get_subscriber_exchange(channel, queue)
 
-        _queue_name = EventQ.create_queue_name(queue.name)
+        _queue_name = EventQ.create_queue_name(queue)
 
         if queue.allow_retry_back_off == true
 
@@ -82,13 +82,13 @@ module EventQ
       end
 
       def create_delay_queue(channel, queue, dlx_name, delay=0)
-        queue_name = EventQ.create_queue_name(queue.name)
+        queue_name = EventQ.create_queue_name(queue)
         channel.queue("#{queue_name}.#{delay}.delay", durable: @durable,
                       arguments: { X_DEAD_LETTER_EXCHANGE => dlx_name, X_MESSAGE_TTL => delay * 1000 })
       end
 
       def get_exchange(channel, exchange)
-        _exchange_name = EventQ.create_exchange_name(exchange.name)
+        _exchange_name = EventQ.create_exchange_name(exchange)
         return channel.direct(_exchange_name, :durable => @durable)
       end
     end

data/lib/eventq/eventq_rabbitmq/rabbitmq_status_checker.rb

@@ -27,7 +27,7 @@ module EventQ
         begin
           connection = @client.get_connection
           channel = connection.create_channel
-          _queue_name = EventQ.create_queue_name(queue.name)
+          _queue_name = EventQ.create_queue_name(queue)
           channel.queue(_queue_name, :durable => true)
         rescue
           outcome = false
@@ -59,4 +59,4 @@ module EventQ
 
     end
   end
-end
+end

data/lib/eventq/queue_worker.rb

@@ -30,7 +30,7 @@ module EventQ
       configure(queue, options)
       worker_adapter.configure(options)
 
-      queue_name = EventQ.create_queue_name(queue.name)
+      queue_name = EventQ.create_queue_name(queue)
       EventQ.logger.info("[#{self.class}] - Listening for messages on queue: #{queue_name}}")
 
       # Allow the worker to be started on a thread or on the main process.

data/lib/eventq/rabbitmq.rb

@@ -1,41 +1,16 @@
-# require 'eventq_base'
-
 require 'bunny'
 
 require 'hash_kit'
 require_relative './eventq_rabbitmq/rabbitmq_queue_client'
 require_relative './eventq_rabbitmq/rabbitmq_queue_manager'
-
 require_relative './eventq_rabbitmq/rabbitmq_queue_worker'
-
 require_relative './eventq_rabbitmq/rabbitmq_subscription_manager'
 require_relative './eventq_rabbitmq/rabbitmq_eventq_client'
 require_relative './eventq_rabbitmq/default_queue'
 require_relative './eventq_rabbitmq/rabbitmq_status_checker'
 
 module EventQ
-  def self.namespace
-    @namespace
-  end
-  def self.namespace=(value)
-    @namespace = value
-  end
-  def self.create_event_type(event_type)
-    if EventQ.namespace == nil
-      return event_type
-    end
-    return "#{EventQ.namespace}-#{event_type}"
-  end
-  def self.create_queue_name(queue_name)
-    if EventQ.namespace == nil
-      return queue_name
-    end
-    return "#{EventQ.namespace}-#{queue_name}"
-  end
-  def self.create_exchange_name(exchange_name)
-    if EventQ.namespace == nil
-      return exchange_name
-    end
-    return "#{EventQ.namespace}-#{exchange_name}"
+  def self.create_exchange_name(exchange)
+    create_queue_name(exchange)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0.rc1
 platform: ruby
 authors:
 - SageOne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -205,6 +205,7 @@ files:
 - bin/setup
 - lib/eventq.rb
 - lib/eventq/aws.rb
+- lib/eventq/base.rb
 - lib/eventq/eventq_aws/aws_calculate_visibility_timeout.rb
 - lib/eventq/eventq_aws/aws_eventq_client.rb
 - lib/eventq/eventq_aws/aws_queue_client.rb
@@ -220,6 +221,7 @@ files:
 - lib/eventq/eventq_base/eventq_client_contract.rb
 - lib/eventq/eventq_base/eventq_logger.rb
 - lib/eventq/eventq_base/exceptions.rb
+- lib/eventq/eventq_base/exceptions/event_type_not_found.rb
 - lib/eventq/eventq_base/exceptions/invalid_signature_exception.rb
 - lib/eventq/eventq_base/exceptions/worker_thread_error.rb
 - lib/eventq/eventq_base/exchange.rb
@@ -262,11 +264,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: EventQ is a pub/sub system that uses async notifications and message queues