eventq_rabbitmq 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6c7ba92fd9cfd728f552fd2ab582a5df7338df7
-  data.tar.gz: 2b80bfa57c70c3a90f751ee28b0d6b5e540cdddc
+  metadata.gz: d6412b8fa487b4b66191c078e3a769ad4d7a71c2
+  data.tar.gz: fff5750679b68ccf6b331424316e0ee58b2fb93c
 SHA512:
-  metadata.gz: b82fe11373109e312d84f369ef1b88a4c4cdc07004bb56b6068bee5149ec8eaa1a5066f0b23bc88f50c4f9de675b4f2b94f0330262a39fd7baab3df10932ac38
-  data.tar.gz: 6b587c693822f8a0b655c4f959cb7a3350ea4e1d945dcf5d06e5c9fb2b6698c025c17b546537d5b3a8acc9e93263d62533b22639ee60f83575bcd01f03b55c15
+  metadata.gz: 29faa09ac8b549ddbb2d95b958d1053336c9a2d6889550b3673a06f393ccaf0de438745ff040e9d16a30d6e001ca3dbb13f64196d2eab34b827df18a90af6522
+  data.tar.gz: fa120e81de36afb83c9d836dfa37af049ae984fbebbc1b86abc936bc577818b852bb897644bfa1f3fe737934e6c08fcde0dc17727f821f73f34389735b728809

data/lib/eventq_rabbitmq/default_queue.rb

@@ -0,0 +1,7 @@
+class DefaultQueue < Queue
+  def initialize
+    @name = 'Default'
+    @allow_retry = false
+    @max_retry_attempts = 1
+  end
+end

data/lib/eventq_rabbitmq/rabbitmq_eventq_client.rb

@@ -2,15 +2,18 @@ require 'oj'
 
 class RabbitMqEventQClient
 
-  def initialize
+  def initialize(options={})
     @client = RabbitMqQueueClient.new
     @queue_manager = RabbitMqQueueManager.new
     @event_raised_exchange = EventRaisedExchange.new
+    @subscription_manager = options[:subscription_manager] || RabbitMqSubscriptionManager.new
   end
 
   def raise(event_type, event)
     channel = @client.get_channel
-    ex = @queue_manager.get_exchange(channel, @event_raised_exchange)
+    ex = queue_manager.get_exchange(channel, event_raised_exchange)
+
+    subscription_manager.subscribe(event_type, DefaultQueue.new)
 
     qm = QueueMessage.new
     qm.content = event
@@ -21,4 +24,7 @@ class RabbitMqEventQClient
     ex.publish(message, :routing_key => event_type)
   end
 
-end
+  private
+
+  attr_reader :subscription_manager, :queue_manager, :event_raised_exchange
+end

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -1,20 +1,23 @@
 class RabbitMqQueueWorker
 
-  @threads = []
-  @is_running = false
+  attr_accessor :is_running
 
-  @retry_exceeded_block = nil
+  def initialize
+    @threads = []
+    @is_running = false
+
+    @retry_exceeded_block = nil
+  end
 
-  def start(queue, options = {})
+  def start(queue, options = {}, &block)
 
     configure(queue, options)
 
     puts '[QUEUE_WORKER] Listening for messages.'
 
-    if @is_running
-      raise 'Worker is already running.'
-    end
+    raise 'Worker is already running.' if running?
 
+    @is_running = true
     @threads = []
 
     #loop through each thread count
@@ -27,6 +30,11 @@ class RabbitMqQueueWorker
         #begin the queue loop for this thread
         while true do
 
+          #check if the worker is still allowed to run and break out of thread loop if not
+          if !@is_running
+            break
+          end
+
           channel = client.get_channel
 
           #get the queue
@@ -49,7 +57,8 @@ class RabbitMqQueueWorker
 
               #begin worker block for queue message
               begin
-                yield message.content, message.type, message.retry_attempts
+                block.call(message.content, message.type, message.retry_attempts)
+
                 #accept the message as processed
                 channel.acknowledge(delivery_info.delivery_tag, false)
                 puts '[QUEUE_WORKER] Message acknowledged.'
@@ -111,17 +120,18 @@ class RabbitMqQueueWorker
   end
 
   def stop
-    @threads.each do |t|
-      t.exit
-    end
-
     @is_running = false
+    @threads.each { |thr| thr.join }
   end
 
   def on_retry_exceeded(&block)
     @retry_exceeded_block = block
   end
 
+  def running?
+    @is_running
+  end
+
   private
 
   def configure(queue, options = {})
@@ -142,4 +152,4 @@ class RabbitMqQueueWorker
 
   end
 
-end
+end

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/eventq_rabbitmq.rb

@@ -6,4 +6,4 @@ require_relative '../lib/eventq_rabbitmq/rabbitmq_queue_manager'
 require_relative '../lib/eventq_rabbitmq/rabbitmq_queue_worker'
 require_relative '../lib/eventq_rabbitmq/rabbitmq_subscription_manager'
 require_relative '../lib/eventq_rabbitmq/rabbitmq_eventq_client'
-
+require_relative '../lib/eventq_rabbitmq/default_queue'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ files:
 - bin/console
 - bin/setup
 - lib/eventq_rabbitmq.rb
+- lib/eventq_rabbitmq/default_queue.rb
 - lib/eventq_rabbitmq/rabbitmq_eventq_client.rb
 - lib/eventq_rabbitmq/rabbitmq_queue_client.rb
 - lib/eventq_rabbitmq/rabbitmq_queue_manager.rb