rabid_mq 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8010b58365ea9f5351f770c9f500a1dc0540c8a2
-  data.tar.gz: f82934497af821cbdcb68149c77ab27e10478650
+  metadata.gz: 00c8990a2d97feae21f657180719f5d6784d4509
+  data.tar.gz: 34d977530cb959f6ab9996564914b4dd56327df8
 SHA512:
-  metadata.gz: 6bf22422cbdee7287954c33858920bfff70323c3d9b9e447c05adfd4af8017620f8d0dc74c5d816f634129475c3d237507947c43d3cf09b6bf87e0aad392060a
-  data.tar.gz: 65e179ed94a5626a2b3d37a3b2f5f5b9bcc3a326d06057fb8f51fc7918806601d29d9dbf631943e8298487987e42103d243b0376237925a2bd582784d609675d
+  metadata.gz: b339ce90a271e03791ee69f3af6962402c2f16be3e533d014cb8d9087d8368070585f082b30c369f4b12b834396f15c4a6605f151d59418fb919cf7563ccf717
+  data.tar.gz: a2ec7410a4b03684072fff1be7eac0273f6816f0b2afd07cf667a32e545dd8395a8f1888f1acf16db946a97d59daa4dc630135cd4aea80197da726d5464aba2f

data/lib/rabid_mq/listener.rb

@@ -32,7 +32,7 @@ module RabidMQ
         # end
         #
         def queue_name(name, **options)
-          @amqp_queue = RabidMQ.channel.queue(name, **options)
+          @amqp_queue = RabidMQ.channel.queue(name_with_env(name), **options)
         end
 
         # Use this as a macro in including classes like
@@ -42,12 +42,7 @@ module RabidMQ
         # end
         #
         def exchange(topic, **options)
-          @amqp_exchange = RabidMQ.topic_exchange env_topic(topic), options
-        end
-
-        def env_topic(topic)
-          return topic unless defined?(::Rails)
-          topic + "[#{Rails.env}]"
+          @amqp_exchange = RabidMQ.topic_exchange name_with_env(topic), options
         end
 
         def bind(exchange=@amqp_exchange, routing_key: '#', **options)
@@ -57,6 +52,7 @@ module RabidMQ
         delegate :subscribe, to: :bind
         delegate :channel, to: ::RabidMQ
         delegate :queue, to: :channel
+        delegate :name_with_env, to: ::RabidMQ
 
         def amqp_connection
           amqp_exchange.channel.connection

data/lib/rabid_mq/version.rb

@@ -1,3 +1,3 @@
 module RabidMQ
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/rabid_mq.rb

@@ -1,5 +1,6 @@
 require 'bunny'
 require 'yaml'
+require 'sleepers'
 require 'active_support/concern'
 require 'active_support/core_ext/module/delegation'
 require 'rabid_mq/version'
@@ -14,12 +15,12 @@ module RabidMQ
 
     # Provide a topic exchange on demand connected to the existing channel
     def topic_exchange(topic, **options)
-      channel.topic(topic, **options)
+      channel.topic(name_with_env(topic), **options)
     end
 
     # Provide fanout exchange
     def fanout_exchange(topic, **options)
-      channel.fanout(topic, **options)
+      channel.fanout(name_with_env(topic), **options)
     end
 
     # Get a channel with the Bunny::Session
@@ -40,6 +41,12 @@ module RabidMQ
       end
     end
 
+    def name_with_env(name)
+      return name unless defined?(::Rails)
+      return name if name.match /\[(development|test|production)\]/
+      name + "[#{Rails.env}]"
+    end
+
     # Provide a new or existing Bunny::Session
     def connection
       @connection ||= Bunny.new RabidMQ::Config.load_config

data/rabid_mq.gemspec

@@ -36,5 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "hashie"
+  spec.add_development_dependency "sleepers"
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabid_mq
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Tyrone Wilson
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: sleepers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="