rabid_mq 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97a994357baf82e1c1b8647810760c6711c3d000
-  data.tar.gz: 5ce6886aa4eb78f1d66a09dc610207bdd26eae75
+  metadata.gz: 9ff0b2b418b4aa5885ab95513cf23ed0833deb4a
+  data.tar.gz: 3f63f7a19c9fd404e518ba409de814c35bd107a0
 SHA512:
-  metadata.gz: 7a678059c9597b8366dc777598a0811ec5c5edf9883a1ee6b739ce5607f3152726885e8ca7000f06a76aa3de9677c1acdced648cdc6f8f91a15df2147e89e7bc
-  data.tar.gz: 11f439a4eaa597b6e7f2633192609a92efe6d61b1a2b0e7cb839c63c2c0e5eb146be0c9314c035f7c96137a08e3949cd95472ec110744589603fb08eda256155
+  metadata.gz: 2da7634d1e55d9206e3e51e1e73983bb81c4ffd4e0a3a745b2e8042f40257e333bbc5a7b1809a0e34d07dc893f7538d6c57a40aa3d1280fb419c78ad6973bea2
+  data.tar.gz: 0c365f972184202f6f0488033009ce1fa6ba16e0f1866343373eadc03b61f46f161f944c0c89d02e8944701b5082c332560216bb03b6b7e3786469d55b6cffda

data/lib/rabid_mq/listener.rb

@@ -21,9 +21,14 @@ module RabidMQ
         attr_reader :amqp_queue, :amqp_exchange, :routing_key
 
         def amqp(queue, exchange, exclusive: false, routing_key: '#')
-          self.queue_name queue, exclusive: exclusive
+          # Set up an exchange
           self.exchange(exchange)
           @routing_key = routing_key
+
+          # Set up Queue
+          self.queue_name queue, exclusive: exclusive
+
+          # Bind together
           amqp_queue.bind(amqp_exchange, routing_key: routing_key)
         end
 
@@ -44,7 +49,7 @@ module RabidMQ
         # end
         #
         def exchange(topic, **options)
-          @amqp_exchange = RabidMQ.topic_exchange name_with_env(topic), **options
+          @amqp_exchange = RabidMQ.topic_exchange topic, **options
         end
 
         def bind(exchange=amqp_exchange, routing_key: @routing_key, **options)

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)
-          exchange = topic_exchange(topic, durable: true)
+        def amqp_broadcast(topic, payload, routing_key: self.default_amqp_routing_key, **options)
+          exchange = topic_exchange(topic, **options)
           exchange.publish(payload, routing_key: routing_key)
         rescue  => e
           if defined? ::Rails
@@ -42,11 +42,6 @@ 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)
@@ -55,25 +50,28 @@ module RabidMQ
         # Get a channel with the Bunny::Session
         delegate  :channel,
                   :reconnect,
+                  :connection,
+                  :name_with_env,
+                  :topic_exchange,
                   to: ::RabidMQ
 
-        # Start a new connection
-        def amqp_connect
-          connection.tap do |c|
-            c.start
-          end
-        end
+        # # Start a new connection
+        # def amqp_connect
+        #   connection.tap do |c|
+        #     c.start
+        #   end
+        # end
 
-        def name_with_env(name)
-          return name unless defined?(::Rails)
-          return name if name.match /\[(development|test|production|integration|pod)\]/
-          name + "[#{Config.environment}]"
-        end
+        # def name_with_env(name)
+        #   return name unless defined?(::Rails)
+        #   return name if name.match /\[(development|test|production|integration|pod)\]/
+        #   name + "[#{Config.environment}]"
+        # end
 
-        # Provide a new or existing Bunny::Session
-        def connection
-          @connection ||= Bunny.new RabidMQ::Config.load_config
-        end
+        # # Provide a new or existing Bunny::Session
+        # def connection
+        #   @connection ||= Bunny.new RabidMQ::Config.load_config
+        # end
 
       end
     end

data/lib/rabid_mq/version.rb

@@ -1,3 +1,3 @@
 module RabidMQ
-  VERSION = "0.1.30"
+  VERSION = "0.1.31"
 end

data/lib/rabid_mq.rb

@@ -15,13 +15,21 @@ module RabidMQ
   class << self
 
     # Provide a topic exchange on demand connected to the existing channel
-    def topic_exchange(topic, durable: true, **options)
+    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?
+        durable = !durable
+        reconnect
+        topic_exchange(topic, durable: durable, **options)
+      else
+        fail e
+      end
     end
 
     # Provide fanout exchange
-    def fanout_exchange(topic, durable: true, **options)
-      channel.fanout(name_with_env(topic), durable: durable, **options)
+    def fanout_exchange(topic, **options)
+      channel.fanout(name_with_env(topic), **options)
     end
 
     # Get a channel with the Bunny::Session

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabid_mq
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Tyrone Wilson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny