rabid_mq 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd62092327b8c0d5914d4364b48564eb16c9aba0
-  data.tar.gz: c468666cc6283c529c5ffdd94ce8df8034e83ecd
+  metadata.gz: 60a529e7dee912940f223740162d45767a53f765
+  data.tar.gz: 7097749742e8805903bce0a94b1272bf1f5c64c6
 SHA512:
-  metadata.gz: 347116d5de2b0c93543cb52c882ca242a2c6ea534a91e75548c8a2a3dbc56e70936fada7f1369711c2f4f3657611aa34100fb81250b64d3be8b4ff1339093a53
-  data.tar.gz: 87d949b44cdc05cfcd8d52a8d85881e4d20321d106bb865f106cee655bc39918b28dc7cb301de1b41fd34572e21a0bbe9c37563cfc16e7e830640b8e89348097
+  metadata.gz: a4308b5d1918dc730e499ec1f4efb7a80c68f6df7958a53565c50e7aac89e97ba7392e0d9ba00de9a42375e0f5f98eac042143bf2bf196f086eea9642e474b3b
+  data.tar.gz: 4be16cafabcd10e23addc95ad062d02f5162bd0901f57569ec615fa071f08d9ec8eef68e1b355ce7fe8bdb245f7186b51b185db6b60a72f6d87ff0d9aa84c1aa

data/lib/rabid_mq/listener.rb

@@ -18,33 +18,23 @@ module RabidMQ
 
     included do
       class << self
-        attr_reader :amqp_queue, :amqp_exchange, :amqp_queue_name
+        attr_reader :amqp_queue, :amqp_exchange, :routing_key
 
         def amqp(queue, exchange, exclusive: false, routing_key: '#')
-          # Set up an exchange
-          setup_exchange(exchange)
-          queue_name(queue)
-
+          self.queue_name queue, exclusive: exclusive
+          self.exchange(exchange)
           @routing_key = routing_key
-
-          # Set up Queue
-          setup_queue(queue, exclusive: exclusive)
-
-          # Bind together
           amqp_queue.bind(amqp_exchange, routing_key: routing_key)
         end
 
         # Use this as a macro in including classes like
         # class MyClass
         #   include RabidMQ::Listener
+        #   queue_name 'some.queue_name', exclusive: true
         # end
         #
-        def queue_name(name)
-          @amqp_queue_name ||= name
-        end
-
-        def setup_queue(name, **options)
-          @amqp_queue = RabidMQ.channel.queue(amqp_queue_name, **options)
+        def queue_name(name, **options)
+          @amqp_queue = RabidMQ.channel.queue(name_with_env(name), **options)
         end
 
         # Use this as a macro in including classes like
@@ -53,12 +43,10 @@ module RabidMQ
         #   exchange 'exchange.name'
         # end
         #
-        def setup_exchange(topic, **options)
-          @amqp_exchange = RabidMQ.topic_exchange topic, **options
+        def exchange(topic, **options)
+          @amqp_exchange = RabidMQ.topic_exchange name_with_env(topic), **options
         end
 
-        alias_method :exchange, :setup_exchange
-
         def bind(exchange=amqp_exchange, routing_key: @routing_key, **options)
           amqp_queue.bind(exchange, routing_key: routing_key, **options)
         end

data/lib/rabid_mq/publisher.rb

@@ -23,8 +23,8 @@ module RabidMQ
       end
 
       class << self
-        def amqp_broadcast(topic, payload, routing_key: self.default_amqp_routing_key, **options)
-          exchange = topic_exchange(topic, **options)
+        def amqp_broadcast(topic, payload, routing_key: self.default_amqp_routing_key)
+          exchange = topic_exchange(topic)
           exchange.publish(payload, routing_key: routing_key)
         rescue  => e
           if defined? ::Rails
@@ -42,6 +42,11 @@ module RabidMQ
           self.name.underscore.gsub(/\//, '.')
         end
 
+        # Provide a topic exchange on demand connected to the existing channel
+        def topic_exchange(topic, **options)
+          channel.topic(name_with_env(topic), **options)
+        end
+
         # Provide fanout exchange
         def fanout_exchange(topic, **options)
           channel.fanout(name_with_env(topic), **options)
@@ -49,13 +54,12 @@ module RabidMQ
 
         # Get a channel with the Bunny::Session
         delegate  :channel,
-                  :name_with_env,
-                  :topic_exchange,
+                  :reconnect,
                   to: ::RabidMQ
 
-        # # Start a new connection
+        # Start a new connection
         def amqp_connect
-          amqp_connection.tap do |c|
+          connection.tap do |c|
             c.start
           end
         end
@@ -67,8 +71,8 @@ module RabidMQ
         end
 
         # Provide a new or existing Bunny::Session
-        def amqp_connection
-          @amqp_connection ||= Bunny.new RabidMQ::Config.load_config
+        def connection
+          @connection ||= Bunny.new RabidMQ::Config.load_config
         end
 
       end

data/lib/rabid_mq/version.rb

@@ -1,3 +1,3 @@
 module RabidMQ
-  VERSION = "0.1.35"
+  VERSION = "0.1.36"
 end

data/lib/rabid_mq.rb

@@ -15,17 +15,8 @@ module RabidMQ
   class << self
 
     # Provide a topic exchange on demand connected to the existing channel
-    def topic_exchange(topic, durable: false, **options)
-      channel.topic(name_with_env(topic), durable: durable, **options)
-    rescue Bunny::PreconditionFailed => e
-      if !e.message.match(/inequivalent arg 'durable'/).nil?
-        puts "[WARNING] RabbitMQ exchange durability does not match for #{topic}, overriding to match exchange!"
-        durable = !durable
-        reconnect
-        topic_exchange(topic, durable: durable, **options)
-      else
-        fail e
-      end
+    def topic_exchange(topic, **options)
+      channel.topic(name_with_env(topic), **options)
     end
 
     # Provide fanout exchange

data/rabid_mq.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'bunny', '~> 2.9.2'
+  spec.add_dependency 'bunny', '~> 2.7.2'
   spec.add_dependency 'activesupport'
 
   spec.add_development_dependency "bundler", "~> 1.14"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabid_mq
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Tyrone Wilson
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 2.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.2
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement