rabid_mq 0.1.32 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be42c752f6e55457fb8ffdea58cb29d1303a9430
-  data.tar.gz: 51a05bcf48297ac8d55545e21d3959b466545dff
+  metadata.gz: ac1fbab1f556e3d449095f7b725dc27a8a9a3d29
+  data.tar.gz: a1c5c1deecd7aa89d1e1cc4f1c6c0273aa918187
 SHA512:
-  metadata.gz: f5d09bfb3becb48f1b4ff3b0e3a8b6e35df951e78610d43b3b27944be07265f3d02cc26ff53b7c9eb97ba32b5314383847b8f182a7378bbb23e7df08dc807fc6
-  data.tar.gz: 7b2f8b243b2fc9acf49e0f08b5a6a8e579205cf2befc2ab8fd9012375a31fc891eab1e7d46c7b0cdbc4e9cdcbe144bf89ee1aebcbee3b664bb43d59c8fb333e4
+  metadata.gz: 5a5124a0a556be7bcef5f07e6071ed1ef2c85ce157455ea8de52d9b6a936bffaccd5389f712ac0a2dcceb3029da50594bf7a6c5b61c53a94cc7b84c60bc93060
+  data.tar.gz: 7e3218752cc5b829a515ecb371e4856915e3af238042f465e78a588f99bd367e15ac74463b726631a645caacd26acbca388df0a5f4305dff23e4f78c1ab1b37e

data/lib/rabid_mq/listener.rb

@@ -18,15 +18,17 @@ module RabidMQ
 
     included do
       class << self
-        attr_reader :amqp_queue, :amqp_exchange, :routing_key
+        attr_reader :amqp_queue, :amqp_exchange, :amqp_queue_name
 
         def amqp(queue, exchange, exclusive: false, routing_key: '#')
           # Set up an exchange
-          self.exchange(exchange)
+          setup_exchange(exchange)
+          queue_name(queue)
+
           @routing_key = routing_key
 
           # Set up Queue
-          self.queue_name queue, exclusive: exclusive
+          setup_queue(queue, exclusive: exclusive)
 
           # Bind together
           amqp_queue.bind(amqp_exchange, routing_key: routing_key)
@@ -35,11 +37,14 @@ module RabidMQ
         # 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, **options)
-          @amqp_queue = RabidMQ.channel.queue(name_with_env(name), **options)
+        def queue_name(name)
+          @amqp_queue_name ||= name
+        end
+
+        def setup_queue(name, **options)
+          @amqp_queue = RabidMQ.channel.queue(amqp_queue_name, **options)
         end
 
         # Use this as a macro in including classes like
@@ -48,10 +53,12 @@ module RabidMQ
         #   exchange 'exchange.name'
         # end
         #
-        def exchange(topic, **options)
+        def setup_exchange(topic, **options)
           @amqp_exchange = RabidMQ.topic_exchange 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/version.rb

@@ -1,3 +1,3 @@
 module RabidMQ
-  VERSION = "0.1.32"
+  VERSION = "0.1.33"
 end

data/lib/rabid_mq.rb

@@ -18,8 +18,9 @@ module RabidMQ
     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'/).present?
+      if !e.message.match(/inequivalent arg 'durable'/).nil?
         puts "[WARNING] RabbitMQ exchange durability does not match for #{topic}, overriding to match exchange!"
+        binding.pry
         durable = !durable
         reconnect
         topic_exchange(topic, durable: durable, **options)
@@ -50,6 +51,7 @@ module RabidMQ
     def connect
       connection.tap do |c|
         c.start
+
       end
     end
 

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.7.2'
+  spec.add_dependency 'bunny', '~> 2.9.2'
   spec.add_dependency 'activesupport'
 
   spec.add_development_dependency "bundler", "~> 1.14"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabid_mq
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
 platform: ruby
 authors:
 - Tyrone Wilson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement