messaging-adapter 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c2dec583c312d39a8b1576b630713dc3c437a23
-  data.tar.gz: a0d6c9eff0c8121b7bc17abd427c4096b1941a13
+  metadata.gz: 1921ca8d41d072562f3ab6e308d47b2c977bbd40
+  data.tar.gz: 8bc7c59595789439cff189d73b443f7967cceda8
 SHA512:
-  metadata.gz: 5834124a249b35ff6c4445441104f4520d39728c4f5b50c15c0acf73fda21cf50c6d333965a9ce8d9f425276e703cee3e8cbc75a59996da66cfdcb3f1f4085ba
-  data.tar.gz: 0b6fa1c849cb4d4d15c5de6afff10a580d1a306aa2ab6be479b25780b5d33a4afd08b04af8f4f08c7734d443615b6f82d26f6fd8ec598ac34b1b6d9c859628b0
+  metadata.gz: bb4e8a5f861fa7c2af4934ee2fc816d6bca3c695036cca5a08c56b05d05643df78ee6523ed52ad625fa01020b03ccb00cb8e421542f8754db64f9523c02628d8
+  data.tar.gz: f8d7f58f064b379d6caa60f890c98479a8b08e7cfcfa421bbeff5ed70b74409bc73dc63e9638372f8360f3769c9d63b8b8804100ddf8725b30ba60a0187caed5

data/lib/messaging_adapter.rb

@@ -12,12 +12,12 @@ module MessagingAdapter
       @adapter = MessageBrokerAdapter.const_get(adapter.to_s)
     end
 
-    def publish(topic, payload)
-      @adapter.publish(topic, payload)
+    def publish(topic, payload, options = {})
+      @adapter.publish(topic, payload, options)
     end
 
-    def subscribe(topic)
-      @adapter.subscribe(topic) { |payload| yield(payload) }
+    def subscribe(topic, options = {})
+      @adapter.subscribe(topic, options) { |payload| yield(payload) }
     end
 
     def self.available_adapters

data/lib/messaging_adapter/adapters/kafka.rb

@@ -3,12 +3,14 @@
 module MessageBrokerAdapter
   # Adapter implements Apache Kafka
   class Kafka
-    def self.publish(topic, payload)
+    def self.publish(topic, payload, options = {})
       puts "Not implemented yet!! publish{#{topic} [#{payload}]}"
+      puts options
     end
 
-    def self.subscribe(topic)
+    def self.subscribe(topic, options = {})
       puts "Not implemented yet!! subscribe{#{topic}}"
+      puts options
     end
   end
 end

data/lib/messaging_adapter/adapters/rabbitmq.rb

@@ -20,17 +20,24 @@ module MessageBrokerAdapter
       attr_reader :sub_channel_locker
     end
 
-    def self.publish(topic, payload)
-      exchange = publisher_channel.fanout(topic)
-      exchange.publish(payload.to_json)
+    def self.publish(topic, payload, options = {})
+      if options[:direct_to_q] == true
+        q = publisher_channel.queue(topic, passive: true)
+        q.publish(payload.to_json)
+      else
+        exchange = publisher_channel.fanout(topic, passive: true)
+        exchange.publish(payload.to_json)
+      end
 
       puts '- RMQ: Message published successfully on topic ' \
            "#{topic} [#{payload}]"
     end
 
-    def self.subscribe(queue)
-      q = subscriber_channel.queue(queue, durable: true)
-      q.subscribe(block: blocking_subscriber?) do |_delivery_info, _properties, payload|
+    def self.subscribe(queue, options = {})
+      q = subscriber_channel.queue(queue, passive: true)
+      options[:block] ||= options[:block].nil? ? true : options[:block]
+      puts options[:block]
+      q.subscribe(block: options[:block]) do |delivery_info, _properties, payload|
         yield(payload)
       end
 
@@ -42,14 +49,11 @@ module MessageBrokerAdapter
         host: ENV['MessageBroker_Host'] || 'localhost',
         port: ENV['MessageBroker_Port'] || '5672',
         username: ENV['MessageBroker_User'] || 'guest',
-        password: ENV['MessageBroker_Pass'] || 'guest'
+        password: ENV['MessageBroker_Pass'] || 'guest',
+        vhost: ENV['MessageBroker_RabbitMQ_Vhost'] || '/'
       }
     end
 
-    def self.blocking_subscriber?
-      (ENV['MessageBroker_RabbitMQ_Block'] || 'true') == 'true'
-    end
-
     def self.recover_connection(conn, locker)
       locker.synchronize { conn.start } unless conn.open?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: messaging-adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ayyoub Jadoo @ TAM
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.8'
 description: Makes it easy to pub/sup with many message brokers.
 email: ayyoubjadoo@gmail.com
 executables: []