eventq_rabbitmq 0.1.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6412b8fa487b4b66191c078e3a769ad4d7a71c2
-  data.tar.gz: fff5750679b68ccf6b331424316e0ee58b2fb93c
+  metadata.gz: 369d9778cbb3da34514da80dfd8023e49649430d
+  data.tar.gz: d0f87ad7f7681d7170b538c2d913e5ff82d8550c
 SHA512:
-  metadata.gz: 29faa09ac8b549ddbb2d95b958d1053336c9a2d6889550b3673a06f393ccaf0de438745ff040e9d16a30d6e001ca3dbb13f64196d2eab34b827df18a90af6522
-  data.tar.gz: fa120e81de36afb83c9d836dfa37af049ae984fbebbc1b86abc936bc577818b852bb897644bfa1f3fe737934e6c08fcde0dc17727f821f73f34389735b728809
+  metadata.gz: 70bc7c81893c10e9e759044c24b8ed224deb33a00842159e52ba33bfe735c169ae8f005b0534872e9bd39780442c3895f014702e29e7912b52decf4b5202c353
+  data.tar.gz: f328c06a174ce2d9742a6e4bd7743a401509d848c44104086c4bcc91ceaeb69bcc40e718c6dd1068d665214de2a6b3613eab07a158177961b5545720c9c21595

data/lib/eventq_rabbitmq.rb

@@ -1,5 +1,6 @@
 require 'eventq_base'
 require 'bunny'
+require 'oj'
 require_relative '../lib/eventq_rabbitmq/version'
 require_relative '../lib/eventq_rabbitmq/rabbitmq_queue_client'
 require_relative '../lib/eventq_rabbitmq/rabbitmq_queue_manager'

data/lib/eventq_rabbitmq/default_queue.rb

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

data/lib/eventq_rabbitmq/rabbitmq_eventq_client.rb

@@ -1,30 +1,33 @@
-require 'oj'
+module EventQ
+  module RabbitMq
+    class EventQClient
 
-class RabbitMqEventQClient
+      def initialize(options={})
+        @client = QueueClient.new
+        @queue_manager = QueueManager.new
+        @event_raised_exchange = EventRaisedExchange.new
+        @subscription_manager = options[:subscription_manager] || SubscriptionManager.new
+      end
 
-  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)
+      def raise(event_type, event)
+        channel = @client.get_channel
+        ex = @queue_manager.get_exchange(channel, @event_raised_exchange)
 
-    subscription_manager.subscribe(event_type, DefaultQueue.new)
+        @subscription_manager.subscribe(event_type, DefaultQueue.new)
 
-    qm = QueueMessage.new
-    qm.content = event
-    qm.type = event_type
+        qm = EventQ::QueueMessage.new
+        qm.content = event
+        qm.type = event_type
 
-    message = Oj.dump(qm)
+        message = Oj.dump(qm)
 
-    ex.publish(message, :routing_key => event_type)
-  end
+        ex.publish(message, :routing_key => event_type)
+        channel.close
 
-  private
+        return true
+      end
 
-  attr_reader :subscription_manager, :queue_manager, :event_raised_exchange
+    end
+  end
 end
+

data/lib/eventq_rabbitmq/rabbitmq_queue_client.rb

@@ -1,43 +1,27 @@
-class RabbitMqQueueClient
+module EventQ
+  module RabbitMq
+    class QueueClient
 
-  attr_accessor :channel
+      def initialize
 
-  def initialize
+        @endpoint = ENV['MQ_ENDPOINT'] || 'localhost'
 
-    @endpoint = 'localhost'
-    if ENV['MQ_ENDPOINT'] != nil
-      @endpoint = ENV['MQ_ENDPOINT']
-    end
+        @port = Integer(ENV['MQ_PORT'] || 5672)
 
-    @port = 5672
-    if ENV['MQ_PORT'] != nil
-      @port = Integer(ENV['MQ_PORT'])
-    end
+        @user = ENV['MQ_USER'] || 'guest'
 
-    @user = 'guest'
-    if ENV['MQ_USER'] != nil
-      @user = ENV['MQ_USER']
-    end
+        @password = ENV['MQ_PASSWORD'] || 'guest'
 
-    @password = 'guest'
-    if ENV['MQ_PASSWORD'] != nil
-      @password = ENV['MQ_PASSWORD']
-    end
+        @ssl = ENV['MQ_SSL'] == 'true' || false
 
-    @ssl = false
-    if ENV['MQ_SSL'] != nil
-      @ssl = ENV['MQ_SSL']
-    end
+      end
 
-    #@conn = Bunny.new(:host => @endpoint, :port => @port, :user => @user, :pass => @password, :ssl => @ssl)
-    #@conn.start
-    #@channel = conn.create_channel
-  end
+      def get_channel
+        conn = Bunny.new(:host => @endpoint, :port => @port, :user => @user, :pass => @password, :ssl => @ssl)
+        conn.start
+        return conn.create_channel
+      end
 
-  def get_channel
-    conn = Bunny.new(:host => @endpoint, :port => @port, :user => @user, :pass => @password, :ssl => @ssl)
-    conn.start
-    return conn.create_channel
+    end
   end
-
-end
+end

data/lib/eventq_rabbitmq/rabbitmq_queue_manager.rb

@@ -1,42 +1,46 @@
-class RabbitMqQueueManager
+module EventQ
+  module RabbitMq
+    class QueueManager
 
-  def initialize
-    @event_raised_exchange = EventRaisedExchange.new
-  end
+      def initialize
+        @event_raised_exchange = EventQ::EventRaisedExchange.new
+      end
 
-  def get_queue(channel, queue)
+      def get_queue(channel, queue)
 
-    #get/create the queue
-    q = channel.queue(queue.name, :durable => true)
+        #get/create the queue
+        q = channel.queue(queue.name, :durable => true)
 
-    if queue.allow_retry
-      retry_exchange = get_retry_exchange(channel, queue)
-      subscriber_exchange = get_subscriber_exchange(channel, queue)
+        if queue.allow_retry
+          retry_exchange = get_retry_exchange(channel, queue)
+          subscriber_exchange = get_subscriber_exchange(channel, queue)
 
-      retry_queue = get_retry_queue(channel, queue)
-      retry_queue.bind(retry_exchange)
+          retry_queue = get_retry_queue(channel, queue)
+          retry_queue.bind(retry_exchange)
 
-      q.bind(subscriber_exchange)
-    end
+          q.bind(subscriber_exchange)
+        end
 
-    return q
-  end
+        return q
+      end
 
-  def get_retry_exchange(channel, queue)
-    return channel.fanout("#{queue.name}.r.ex")
-  end
+      def get_retry_exchange(channel, queue)
+        return channel.fanout("#{queue.name}.r.ex")
+      end
 
-  def get_subscriber_exchange(channel, queue)
-    return channel.fanout("#{queue.name}.ex")
-  end
+      def get_subscriber_exchange(channel, queue)
+        return channel.fanout("#{queue.name}.ex")
+      end
 
-  def get_retry_queue(channel, queue)
-    subscriber_exchange = get_subscriber_exchange(channel, queue)
-    return channel.queue("#{queue.name}.r", :durable => true, :arguments => { "x-dead-letter-exchange" => subscriber_exchange.name, "x-message-ttl" => queue.retry_delay })
-  end
+      def get_retry_queue(channel, queue)
+        subscriber_exchange = get_subscriber_exchange(channel, queue)
+        return channel.queue("#{queue.name}.r", :durable => true, :arguments => { "x-dead-letter-exchange" => subscriber_exchange.name, "x-message-ttl" => queue.retry_delay })
+      end
 
-  def get_exchange(channel, exchange)
-    return channel.direct(exchange.name, :durable => true)
-  end
+      def get_exchange(channel, exchange)
+        return channel.direct(exchange.name, :durable => true)
+      end
 
-end
+    end
+  end
+end

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -1,155 +1,189 @@
-class RabbitMqQueueWorker
+module EventQ
+  module RabbitMq
+    class QueueWorker
 
-  attr_accessor :is_running
+      attr_accessor :is_running
 
-  def initialize
-    @threads = []
-    @is_running = false
+      def initialize
+        @threads = []
+        @is_running = false
 
-    @retry_exceeded_block = nil
-  end
+        @retry_exceeded_block = nil
+      end
 
-  def start(queue, options = {}, &block)
+      def start(queue, options = {}, &block)
 
-    configure(queue, options)
+        configure(queue, options)
 
-    puts '[QUEUE_WORKER] Listening for messages.'
+        puts '[QUEUE_WORKER] Listening for messages.'
 
-    raise 'Worker is already running.' if running?
+        raise 'Worker is already running.' if running?
 
-    @is_running = true
-    @threads = []
+        @is_running = true
+        @threads = []
 
-    #loop through each thread count
-    @thread_count.times do
-      thr = Thread.new do
+        #loop through each thread count
+        @thread_count.times do
+          thr = Thread.new do
 
-        client = RabbitMqQueueClient.new
-        manager = RabbitMqQueueManager.new
+            client = QueueClient.new
+            manager = QueueManager.new
 
-        #begin the queue loop for this thread
-        while true do
+            #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
+              #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
+              channel = client.get_channel
 
-          #get the queue
-          q = manager.get_queue(channel, queue)
-          retry_exchange = manager.get_retry_exchange(channel, queue)
+              #get the queue
+              q = manager.get_queue(channel, queue)
+              retry_exchange = manager.get_retry_exchange(channel, queue)
 
-          received = false
-          error = false
+              received = false
+              error = false
+              abort = false
 
-          begin
-            delivery_info, properties, payload = q.pop(:manual_ack => true, :block => true)
+              begin
+                delivery_info, properties, payload = q.pop(:manual_ack => true, :block => true)
 
-            #check that message was received
-            if payload != nil
+                #check that message was received
+                if payload != nil
 
-              message = Oj.load(payload)
+                  message = Oj.load(payload)
 
-              puts "[QUEUE_WORKER] Message received. Retry Attempts: #{message.retry_attempts}"
-              puts properties
+                  puts "[QUEUE_WORKER] Message received. Retry Attempts: #{message.retry_attempts}"
+                  puts properties
 
-              #begin worker block for queue message
-              begin
-                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.'
-                received = true
-              rescue => e
-                puts '[QUEUE_WORKER] An unhandled error happened attempting to process a queue message.'
-                puts "Error: #{e}"
-
-                #reject the message to remove from queue
-                channel.reject(delivery_info.delivery_tag, false)
-                error = true
-                puts '[QUEUE_WORKER] Message rejected.'
-
-                #check if the message is allowed to be retried
-                if queue.allow_retry
-
-                  puts '[QUEUE_WORKER] Checking retry attempts...'
-                  if message.retry_attempts < queue.max_retry_attempts
-                    puts'[QUEUE_WORKER] Incrementing retry attempts count.'
-                    message.retry_attempts += 1
-                    puts '[QUEUE_WORKER] Sending message for retry.'
-                    retry_exchange.publish(Oj.dump(message))
-                    puts '[QUEUE_WORKER] Published message to retry exchange.'
-                  else
-                    if @retry_exceeded_block != nil
-                      @retry_exceeded_block.call(message)
+                  message_args = EventQ::MessageArgs.new(message.type, message.retry_attempts)
+
+                  #begin worker block for queue message
+                  begin
+                    block.call(message.content, message_args)
+
+                    if message_args.abort == true
+                      abort = true
+                      puts '[QUEUE_WORKER] Message aborted.'
                     else
-                      raise "[QUEUE_WORKER] No retry exceeded block specified."
+                      #accept the message as processed
+                      channel.acknowledge(delivery_info.delivery_tag, false)
+                      puts '[QUEUE_WORKER] Message acknowledged.'
+                      received = true
                     end
+
+                  rescue => e
+                    puts '[QUEUE_WORKER] An unhandled error happened attempting to process a queue message.'
+                    puts "Error: #{e}"
+
+                    error = true
+
+                  end
+
+                  if error || abort
+                    reject_message(channel, message, delivery_info, retry_exchange, queue)
                   end
+
                 end
 
+              rescue Timeout::Error
+                puts 'Timeout occured attempting to pop a message from the queue.'
+              end
+
+              channel.close
+
+              #check if any message was received
+              if !received && !error
+                puts "[QUEUE_WORKER] No message received. Sleeping for #{@sleep} seconds"
+                #no message received so sleep before attempting to pop another message from the queue
+                sleep(@sleep)
               end
 
             end
 
-          rescue Timeout::Error
-            puts 'Timeout occured attempting to pop a message from the queue.'
           end
+          @threads.push(thr)
 
-          #check if any message was received
-          if !received && !error
-            puts "[QUEUE_WORKER] No message received. Sleeping for #{@sleep} seconds"
-            #no message received so sleep before attempting to pop another message from the queue
-            sleep(@sleep)
-          end
+        end
 
+        if options.key?(:wait) && options[:wait] == true
+          @threads.each { |thr| thr.join }
         end
 
+        return true
+
       end
-      @threads.push(thr)
 
-    end
+      def stop
+        @is_running = false
+        @threads.each { |thr| thr.join }
+        return true
+      end
 
-    if options.key?(:wait) && options[:wait] == true
-      @threads.each { |thr| thr.join }
-    end
+      def on_retry_exceeded(&block)
+        @retry_exceeded_block = block
+        return nil
+      end
 
-  end
+      def running?
+        return @is_running
+      end
 
-  def stop
-    @is_running = false
-    @threads.each { |thr| thr.join }
-  end
+      private
 
-  def on_retry_exceeded(&block)
-    @retry_exceeded_block = block
-  end
+      def reject_message(channel, message, delivery_info, retry_exchange, queue)
+        #reject the message to remove from queue
+        channel.reject(delivery_info.delivery_tag, false)
 
-  def running?
-    @is_running
-  end
+        puts '[QUEUE_WORKER] Message rejected.'
+
+        #check if the message is allowed to be retried
+        if queue.allow_retry
 
-  private
+          puts '[QUEUE_WORKER] Checking retry attempts...'
 
-  def configure(queue, options = {})
+          if message.retry_attempts < queue.max_retry_attempts
+            puts'[QUEUE_WORKER] Incrementing retry attempts count.'
+            message.retry_attempts += 1
+            puts '[QUEUE_WORKER] Sending message for retry.'
+            retry_exchange.publish(Oj.dump(message))
+            puts '[QUEUE_WORKER] Published message to retry exchange.'
+          elsif @retry_exceeded_block != nil
+            puts '[QUEUE_WORKER] Executing retry exceeded block.'
+            @retry_exceeded_block.call(message)
+          else
+            puts '[QUEUE_WORKER] No retry exceeded block specified.'
+          end
 
-    @queue = queue
+        end
 
-    #default thread count
-    @thread_count = 5
-    if options.key?(:thread_count)
-      @thread_count = options[:thread_count]
-    end
+        return true
 
-    #default sleep time in seconds
-    @sleep = 15
-    if options.key?(:sleep)
-      @sleep = options[:sleep]
-    end
+      end
 
-  end
+      def configure(queue, options = {})
 
+        @queue = queue
+
+        #default thread count
+        @thread_count = 5
+        if options.key?(:thread_count)
+          @thread_count = options[:thread_count]
+        end
+
+        #default sleep time in seconds
+        @sleep = 15
+        if options.key?(:sleep)
+          @sleep = options[:sleep]
+        end
+
+        return true
+
+      end
+
+    end
+  end
 end
+

data/lib/eventq_rabbitmq/rabbitmq_subscription_manager.rb

@@ -1,28 +1,36 @@
-class RabbitMqSubscriptionManager
+module EventQ
+  module RabbitMq
+    class SubscriptionManager
 
-  def initialize
-    @client = RabbitMqQueueClient.new
-    @queue_manager = RabbitMqQueueManager.new
-    @event_raised_exchange = EventRaisedExchange.new
-  end
+      def initialize
+        @client = QueueClient.new
+        @queue_manager = QueueManager.new
+        @event_raised_exchange = EventQ::EventRaisedExchange.new
+      end
 
-  def subscribe(event_type, queue)
+      def subscribe(event_type, queue)
 
-    channel = @client.get_channel
-    queue = @queue_manager.get_queue(channel, queue)
-    exchange = @queue_manager.get_exchange(channel, @event_raised_exchange)
+        channel = @client.get_channel
+        queue = @queue_manager.get_queue(channel, queue)
+        exchange = @queue_manager.get_exchange(channel, @event_raised_exchange)
 
-    queue.bind(exchange, :routing_key => event_type)
-  end
+        queue.bind(exchange, :routing_key => event_type)
 
-  def unsubscribe(queue)
+        return true
+      end
 
-    channel = @client.get_channel
+      def unsubscribe(queue)
 
-    queue = @queue_manager.get_queue(channel, queue)
-    exchange = @queue_manager.get_exchange(channel, @event_raised_exchange)
+        channel = @client.get_channel
 
-    queue.unbind(exchange)
-  end
+        queue = @queue_manager.get_queue(channel, queue)
+        exchange = @queue_manager.get_exchange(channel, @event_raised_exchange)
 
-end
+        queue.unbind(exchange)
+
+        return true
+      end
+
+    end
+  end
+end

data/lib/eventq_rabbitmq/version.rb

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

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 1.0.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: eventq_base
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This is the rabbitmq implementation for EventQ
@@ -117,7 +117,6 @@ extra_rdoc_files: []
 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
@@ -125,6 +124,7 @@ files:
 - lib/eventq_rabbitmq/rabbitmq_queue_worker.rb
 - lib/eventq_rabbitmq/rabbitmq_subscription_manager.rb
 - lib/eventq_rabbitmq/version.rb
+- lib/eventq_rabbitmq.rb
 homepage: https://github.com/vaughanbrittonsage/eventq
 licenses:
 - MIT
@@ -135,19 +135,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: This is the rabbitmq implementation for EventQ
 test_files: []
-has_rdoc: