propono 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd3ced592b10a7174ff8ad5d289be236e5ae911b
-  data.tar.gz: 684569cf1483fd61aa542bfd92156446ebdd10d6
+  metadata.gz: d5f84182f9c9e4875a47a3ac2875a4982500831e
+  data.tar.gz: 1b75f8844c07e4b9294584a8ca21e2658a7a9f50
 SHA512:
-  metadata.gz: 1b1070b99440428a2fcefe9ce90e2e7ead21058df3170ae76364e5e88f38b4102471bef86597d1996036f22d4916e0b2d7a49dc7d1039699a65ee60d62e1ba22
-  data.tar.gz: 449066005af17034bdd41b606fa8c649c2dc99e42950567fb8d91f903a34451a1b483f8f369037b3d6b1f68fe68bae98e377822865d2238581ef889ff442b4b8
+  metadata.gz: 32730a332521b97195a04228553fa44d01299afd182e64688ee35059dd97fdd46460b600424e6cd4d2e89819733449e63eb2eb9212f58a5d017ba40498021133
+  data.tar.gz: 1e0f553345f7df641ce0ede23404aae1c436dabefc24b6d336eec7360665fb94c65265b335382d5d2b19e89c0d9d38a85bf5bbf512ee52e7792b23df5d7f6de1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.10.0 / 2013-12-03
+
+* [FEATURE] Add queue_suffix config variable
+
 # 0.9.1 / Unreleased
 
 * [FEATURE] Propono will raise exceptions if the message processing fails

data/lib/propono.rb

@@ -67,7 +67,8 @@ module Propono
   # @param [Hash] options
   #   * protocol: :udp
   def self.publish(topic, message, options = {})
-    Publisher.publish(topic, message, options)
+    suffixed_topic = "#{topic}#{Propono.config.queue_suffix}"
+    Publisher.publish(suffixed_topic, message, options)
   end
 
   # Creates a new SNS-SQS subscription on the specified topic.

data/lib/propono/components/queue_subscription.rb

@@ -14,17 +14,19 @@ module Propono
 
     def initialize(topic_id)
       @topic_id = topic_id
+      @suffixed_topic_id = "#{topic_id}#{Propono.config.queue_suffix}"
     end
 
     def create
-      @topic = TopicCreator.find_or_create(@topic_id)
+      raise ProponoError.new("topic_id is nil") unless @topic_id
+      @topic = TopicCreator.find_or_create(@suffixed_topic_id)
       @queue = QueueCreator.find_or_create(queue_name)
       sns.subscribe(@topic.arn, @queue.arn, 'sqs')
       sqs.set_queue_attributes(@queue.url, "Policy", generate_policy)
     end
 
     def queue_name
-      @queue_name ||= "#{Propono.config.application_name.gsub(" ", "_")}-#{@topic_id}"
+      @queue_name ||= "#{Propono.config.application_name.gsub(" ", "_")}-#{@suffixed_topic_id}"
     end
 
     private

data/lib/propono/configuration.rb

@@ -6,7 +6,7 @@ module Propono
   class Configuration
 
     SETTINGS = [
-      :access_key, :secret_key, :queue_region,
+      :access_key, :secret_key, :queue_region, :queue_suffix,
       :application_name,
       :udp_host, :udp_port,
       :tcp_host, :tcp_port,
@@ -16,6 +16,7 @@ module Propono
 
     def initialize
       self.logger = Propono::Logger.new
+      self.queue_suffix = ""
     end
 
     SETTINGS.each do |setting|

data/lib/propono/services/queue_listener.rb

@@ -13,6 +13,7 @@ module Propono
     end
 
     def listen
+      raise ProponoError.new("topic_id is nil") unless @topic_id
       loop do
         unless read_messages
           sleep 10

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/test/components/queue_subscription_test.rb

@@ -2,10 +2,21 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class QueueSubscriptionTest < Minitest::Test
+    def setup
+      super
+      @suffix = "-suf"
+      Propono.config.queue_suffix = @suffix
+    end
+
+    def teardown
+      super
+      Propono.config.queue_suffix = ""
+    end
+
     def test_create_topic
       topic_id = 'foobar'
       topic = Topic.new(topic_id)
-      TopicCreator.expects(:find_or_create).with(topic_id).returns(topic)
+      TopicCreator.expects(:find_or_create).with("#{topic_id}#{@suffix}").returns(topic)
       QueueSubscription.create(topic_id)
     end
 
@@ -28,7 +39,7 @@ module Propono
       topic_id = "Foobar"
       subscription = QueueSubscription.new(topic_id)
 
-      assert_equal subscription.send(:queue_name), "MyApp-Foobar"
+      assert_equal "MyApp-Foobar#{@suffix}", subscription.send(:queue_name)
     end
 
     def test_subscription_queue_name_with_spaces
@@ -37,7 +48,7 @@ module Propono
       topic_id = "Foobar"
       subscription = QueueSubscription.new(topic_id)
 
-      assert_equal subscription.send(:queue_name), "My_App-Foobar"
+      assert_equal "My_App-Foobar#{@suffix}", subscription.send(:queue_name)
     end
 
     def test_create_calls_subscribe
@@ -77,8 +88,15 @@ module Propono
       assert_equal queue, subscription.queue
     end
 
+    def test_create_raises_with_nil_topic
+      subscription = QueueSubscription.new(nil)
+      assert_raises ProponoError do
+        subscription.create
+      end
+    end
+
     def test_generate_policy
-      skip"TODO - Implement this test."
+      skip "TODO - Implement this test."
     end
   end
 end

data/test/configuration_test.rb

@@ -43,6 +43,12 @@ module Propono
       assert_equal application_name, Propono.config.application_name
     end
 
+    def test_queue_suffix
+      queue_suffix = "test-application-name"
+      Propono.config.queue_suffix = queue_suffix
+      assert_equal queue_suffix, Propono.config.queue_suffix
+    end
+
     def test_udp_host
       val = "test-application-name"
       Propono.config.udp_host = val

data/test/propono_test.rb

@@ -9,6 +9,15 @@ module Propono
       Propono.publish(topic, message)
     end
 
+    def test_publish_sets_suffix_publish
+      Propono.config.queue_suffix = "-bar"
+      topic = "foo"
+      Publisher.expects(:publish).with("foo-bar", '', {})
+      Propono.publish(topic, "")
+    ensure
+      Propono.config.queue_suffix = ""
+    end
+
     def test_subscribe_by_queue_calls_subscribe
       topic = 'foobar'
       Subscriber.expects(:subscribe_by_queue).with(topic)

data/test/services/queue_listener_test.rb

@@ -32,6 +32,13 @@ module Propono
       @listener.listen
     end
 
+    def test_listen_raises_with_nil_topic
+      listener = QueueListener.new(nil) {}
+      assert_raises ProponoError do
+        listener.listen
+      end
+    end
+
     def test_read_messages_should_subscribe
       QueueSubscription.expects(create: mock(queue: mock(url: {})))
       @listener.send(:read_messages)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - MalcyL
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog