osbourne 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aa3421f43348d004bceebe0e3128fe59fdabfae25c3d6080a1f3f83c607b908
-  data.tar.gz: 2897a8044538c7afd5637d4e37a6b8bf990f208b28135e871b29a7650974677b
+  metadata.gz: 5bc30cb744a8d1f61944e06d22366941ac38cb47a403b7326bcae0d42675354b
+  data.tar.gz: 763818934b5e711f4d490c79a5e0c23ac9be6cbd405db01d2ff84d566bc89965
 SHA512:
-  metadata.gz: 1f8168a4f50a7a79a0b37c5604e828129d4514d83245520a06feedb74990ae85179324e470f8e24009f3ad4a72bbdda2f7a141dd929efeac69708cb40535d51b
-  data.tar.gz: '05876b12a5e16ebf32351a339a221de15ffd7a1021774c5b373ca0e4af1b2e06f6ab20f07e7500ce373bc634369c80f7bd7ceff098f412fcf7da478794519170'
+  metadata.gz: a4747c0fc40a18ec8f4c09dd1bb6f524642d6237f595bf2467313d39dc650886a292e0c546cef3f2ea68c1bb7d360b9336ce24fcec16315dd8a2d4c413b275fc
+  data.tar.gz: fa40de44493aa86981222b685da16e9a291e07906a6d743b5e0d85572dee996d502bd6bd75ead9f9d1d5e59036374bf0ab66d56b6d6496f1db2e2cafd9deb03e

data/lib/generators/osbourne/install/templates/osbourne_initializer_template.template

@@ -13,6 +13,9 @@ Osbourne.configure do |config|
   # sent to the dead letter queue
   # config.max_retry_count = 5 
 
+  # The prefix to be used on queues and topics. Useful for environment separation
+  # config.prefix = Rails.env
+
   # Amount of time each worker will wait between attempting to fetch messages
   # config.sleep_time = 15.seconds
 

data/lib/osbourne.rb

@@ -47,5 +47,9 @@ module Osbourne
     def configure
       yield config
     end
+
+    def prefixer(str)
+      [Osbourne.prefix, str].reject(&:blank?).reject(&:nil?).join("_")
+    end
   end
 end

data/lib/osbourne/config/shared_configs.rb

@@ -48,6 +48,10 @@ module Osbourne
       def threads_per_worker
         config.threads_per_worker ||= 5
       end
+
+      def prefix
+        config.prefix ||= Rails.env
+      end
     end
   end
 end

data/lib/osbourne/test/mock_pubsub.rb

@@ -6,10 +6,11 @@ module Osbourne
     class MockPubsub
       class << self
         def mock_publish(topic, message)
+          prefixed_topic = Osbourne.prefixer(topic)
           parsed_message = parse(message)
           Osbourne::WorkerBase.descendants.each do |worker|
-            msg = Osbourne::Test::Message.new(topic: topic, body: parsed_message)
-            worker.new.process(msg) if worker.config[:topic_names].include? topic
+            msg = Osbourne::Test::Message.new(topic: prefixed_topic, body: parsed_message)
+            worker.new.process(msg) if worker.config[:topic_names].include? prefixed_topic
           end
         end
 

data/lib/osbourne/topic.rb

@@ -4,8 +4,10 @@ module Osbourne
   class Topic
     include Services::SNS
     attr_reader :name
+    attr_reader :prefixed_name
     def initialize(name)
       @name = name
+      @prefixed_name = Osbourne.prefixer(name)
       arn
     end
 
@@ -17,7 +19,7 @@ module Osbourne
       parsed_message = parse(message)
       return if Osbourne.test_mode?
 
-      Osbourne.logger.info "[PUB] TOPIC: `#{name}` MESSAGE: `#{parsed_message}`"
+      Osbourne.logger.info "[PUB] TOPIC: `#{prefixed_name}` MESSAGE: `#{parsed_message}`"
       sns.publish(topic_arn: arn, message: parsed_message)
     end
 
@@ -26,14 +28,14 @@ module Osbourne
     def ensure_topic
       return if Osbourne.test_mode?
 
-      Osbourne.logger.debug "Ensuring topic `#{name}` exists"
-      Osbourne.cache.fetch("osbourne_existing_topic_arn_for_#{name}", ex: 1.minute) do
-        sns.create_topic(name: name).topic_arn
+      Osbourne.logger.debug "Ensuring topic `#{prefixed_name}` exists"
+      Osbourne.cache.fetch("osbourne_existing_topic_arn_for_#{prefixed_name}", ex: 1.minute) do
+        sns.create_topic(name: prefixed_name).topic_arn
       end
     end
 
     def subscriptions_cache_key
-      "existing_sqs_subscriptions_for_#{name}"
+      "existing_sqs_subscriptions_for_#{prefixed_name}"
     end
 
     def parse(message)

data/lib/osbourne/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Osbourne
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/lib/osbourne/worker_base.rb

@@ -81,8 +81,8 @@ module Osbourne
                         dead_letter_queue: true,
                         max_retry_count: Osbourne.max_retry_count)
         self.config = {
-          topic_names:     Array(topics),
-          queue_name:      queue_name,
+          topic_names:     Array(topics).map {|tp| Osbourne.prefixer(tp) },
+          queue_name:      Osbourne.prefixer(queue_name),
           max_batch_size:  max_batch_size,
           max_wait:        max_wait,
           threads:         threads,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osbourne
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Steve Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core