eventq_rabbitmq 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c9acbc79c90b23e20f046b6e08cbab5699dee7c
-  data.tar.gz: 23f1c79ae679115d6ec2274e0fe266f2b644237e
+  metadata.gz: 5ffa54724256f83b66fec1203d2d7c378f507b1f
+  data.tar.gz: 8df00ee11ae9fd66f25ce064479492ab778aa96c
 SHA512:
-  metadata.gz: d0b027367ed624d32b88c1ace1bf563b26c6426cfd2cc0ba74518936a70ba79a4d29b3d0bd6c9173c321ea38cb0c585f86550edd38a28736b4aa6e1be2506e32
-  data.tar.gz: ee68a5641e73fd630eb701eb9669064cd754c3e6b685df427f861db52e0afac061d72983da75936d62a15e67997934a27b98da59d0541d5f95ee0b70be6ae52f
+  metadata.gz: 8d476e366f439033b370b31ce9e5c3e642629e5ec24be6371a50f9bf0ab2503d356aa7139a500a4cf5e53ea21399de65eb102bc44fa44eb0c71097ff92532fdd
+  data.tar.gz: 58f26ad9602a576b7bd01b7732a38d2e06a9c10ce8ec01bb019a3f681939f1a87cfc203585d52965e7edc91ed8544f6ce12689f284f6ab4fafcdf75c3de27018

data/lib/eventq_rabbitmq/rabbitmq_eventq_client.rb

@@ -1,5 +1,7 @@
 module EventQ
   module RabbitMq
+    # Implements a general interface to raise an event
+    # EventQ::Amazon::EventQClient is the sister-class which does the same for AWS
     class EventQClient
 
       def initialize(options={})
@@ -13,52 +15,102 @@ module EventQ
         @event_raised_exchange = EventRaisedExchange.new
         @serialization_manager = EventQ::SerializationProviders::Manager.new
         @signature_manager = EventQ::SignatureProviders::Manager.new
+
+        #this array is used to record known event types
+        @known_event_types = []
       end
 
-      def raise_event(event_type, event)
+      def registered?(event_type)
+        @known_event_types.include?(event_type)
+      end
 
-        connection = @client.get_connection
+      def register_event(event_type)
+        if registered?(event_type)
+          return true
+        end
+
+        @known_event_types << event_type
+        true
+      end
+
+      def raise_event(event_type, event)
+        register_event(event_type)
 
         _event_type = EventQ.create_event_type(event_type)
 
-        begin
-        channel = connection.create_channel
+        with_connection do |channel|
+          exchange = @queue_manager.get_exchange(channel, @event_raised_exchange)
 
-        ex = @queue_manager.get_exchange(channel, @event_raised_exchange)
+          message = serialized_message(_event_type, event)
 
-        qm = new_message
-        qm.content = event
-        qm.type = _event_type
+          exchange.publish(message, routing_key: _event_type)
 
-        if EventQ::Configuration.signature_secret != nil
-          provider = @signature_manager.get_provider(EventQ::Configuration.signature_provider)
-          qm.signature = provider.write(message: qm, secret: EventQ::Configuration.signature_secret)
+          EventQ.logger.debug "[#{self.class}] - Raised event. Message: #{message} | Type: #{event_type}."
         end
+      end
 
-        serialization_provider = @serialization_manager.get_provider(EventQ::Configuration.serialization_provider)
+      def raise_event_in_queue(event_type, event, queue, delay)
+        register_event(event_type)
 
-        message = serialization_provider.serialize(qm)
+        _event_type = EventQ.create_event_type(event_type)
 
-        ex.publish(message, :routing_key => _event_type)
-        rescue => e
+        with_connection do |channel|
+          exchange = @queue_manager.get_queue_exchange(channel, queue)
 
-          channel.close
-          connection.close
-          raise e
-        end
+          delay_exchange = @queue_manager.get_delay_exchange(channel, queue, delay)
+
+          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)
+
+          q = channel.queue(_queue_name, durable: @queue_manager.durable)
+          q.bind(exchange, routing_key: _event_type)
 
-        channel.close
-        connection.close
+          message = serialized_message(_event_type, event)
 
-        EventQ.logger.debug "[#{self.class}] - Raised event. Message: #{message} | Type: #{event_type}."
+          delay_exchange.publish(message, routing_key: _event_type)
 
-        return true
+          EventQ.logger.debug "[#{self.class}] - Raised event. Message: #{message} | Type: #{event_type} | Delay: #{delay}."
+        end
       end
 
       def new_message
         EventQ::QueueMessage.new
       end
 
+      private
+
+      def with_connection
+        connection = @client.get_connection
+
+        begin
+          channel = connection.create_channel
+
+          yield(channel)
+
+        ensure
+          channel&.close
+          connection.close
+        end
+
+        true
+      end
+
+      def serialized_message(event_type, event)
+        qm = new_message
+        qm.content = event
+        qm.type = event_type
+
+        if EventQ::Configuration.signature_secret != nil
+          provider = @signature_manager.get_provider(EventQ::Configuration.signature_provider)
+          qm.signature = provider.write(message: qm, secret: EventQ::Configuration.signature_secret)
+        end
+
+        serialization_provider = @serialization_manager.get_provider(EventQ::Configuration.serialization_provider)
+
+        serialization_provider.serialize(qm)
+      end
     end
   end
 end

data/lib/eventq_rabbitmq/rabbitmq_queue_manager.rb

@@ -32,6 +32,11 @@ module EventQ
         return q
       end
 
+      def get_queue_exchange(channel, queue)
+        _exchange_name = EventQ.create_exchange_name(queue.name)
+        channel.direct("#{_exchange_name}.ex")
+      end
+
       def get_retry_exchange(channel, queue)
         _queue_name = EventQ.create_queue_name(queue.name)
         return channel.fanout("#{_queue_name}.r.ex")
@@ -42,6 +47,11 @@ module EventQ
         return channel.fanout("#{_queue_name}.ex")
       end
 
+      def get_delay_exchange(channel, queue, delay)
+        _queue_name = EventQ.create_queue_name(queue.name)
+        channel.direct("#{_queue_name}.#{delay}.d.ex")
+      end
+
       def get_retry_queue(channel, queue)
         subscriber_exchange = get_subscriber_exchange(channel, queue)
 
@@ -63,11 +73,16 @@ module EventQ
 
       end
 
+      def create_delay_queue(channel, queue, dlx_name, delay=0)
+        queue_name = EventQ.create_queue_name(queue.name)
+        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)
         return channel.direct(_exchange_name, :durable => @durable)
       end
-
     end
   end
 end

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.13.0"
+  VERSION = "1.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler