propono 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19a7aae1334abb194ea3fe2ca03a3b7d6641a9b0
-  data.tar.gz: 181145ff80cc31864884a2ed6f6ca3b2c8757f24
+  metadata.gz: 8cbff5dcb118c99e3f7ff39f3cfc172e478edb5e
+  data.tar.gz: 619b6da2339dd1a0c9feea52b4851e0735f6a826
 SHA512:
-  metadata.gz: 43c3d394220ac21226e33245ea52e10e07cb093a367c4747c750421c6c99f8e7267692f8470f1e5b885f7eef60571f9d0e6af1f355ea8e62773f3d8583684df3
-  data.tar.gz: f69c5512d119490b0ef13bd2fd8b219166f660f724cd6539a1176e987ea8d821b8310277700868ed6dff2e42429f252c802eea166535cb8a9af9ecf582248cbd
+  metadata.gz: bf7e492a492a3a31dd40fede408e1b084f996aff7b057f1747617a10f8d217028d2dca4541d381dd0da70612e89ca2b91b4d3a91696036e057a3504940760b47
+  data.tar.gz: f9fec93fc0c85902123a9b6d5c608ef711a89853e01502fd70d3c563797889707b14687522bd302abe5eeb039951d1a43a1bf94add6286955c6675533796dacb

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.3.0 / 2014-07-12
+* [FEATURE] Add {async: false} option to publisher
+
 # 1.2.0 / 2014-05-25
 * [BUGFIX] Restrict SQS policy to only allow SNS topic publishes.
 

data/lib/propono/services/publisher.rb

@@ -11,7 +11,7 @@ module Propono
       new(topic_id, message, options).publish
     end
 
-    attr_reader :topic_id, :message, :protocol, :id
+    attr_reader :topic_id, :message, :protocol, :id, :async
 
     def initialize(topic_id, message, options = {})
       raise PublisherError.new("Topic is nil") if topic_id.nil?
@@ -24,6 +24,7 @@ module Propono
       @protocol = options.fetch(:protocol, :sns).to_sym
       @id = SecureRandom.hex(3)
       @id = "#{options[:id]}-#{@id}" if options[:id]
+      @async = options.fetch(:async, true)
     end
 
     def publish
@@ -34,20 +35,26 @@ module Propono
     private
 
     def publish_via_sns
-      Thread.new do
-        begin
-          topic = TopicCreator.find_or_create(topic_id)
-        rescue => e
-          Propono.config.logger.error "Propono [#{id}]: Failed to create topic #{topic_id}: #{e}"
-          raise
-        end
-
-        begin
-          sns.publish(topic.arn, body.to_json)
-        rescue => e
-          Propono.config.logger.error "Propono [#{id}]: Failed to send via sns: #{e}"
-          raise
-        end
+      async ? publish_via_sns_asyncronously : publish_via_sns_syncronously
+    end
+
+    def publish_via_sns_asyncronously
+      Thread.new { publish_via_sns_syncronously }
+    end
+
+    def publish_via_sns_syncronously
+      begin
+        topic = TopicCreator.find_or_create(topic_id)
+      rescue => e
+        Propono.config.logger.error "Propono [#{id}]: Failed to create topic #{topic_id}: #{e}"
+        raise
+      end
+
+      begin
+        sns.publish(topic.arn, body.to_json)
+      rescue => e
+        Propono.config.logger.error "Propono [#{id}]: Failed to send via sns: #{e}"
+        raise
       end
     end
 

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/test/integration/slow_queue_test.rb

@@ -36,8 +36,8 @@ module Propono
 
       sleep(1) # Make sure the listener has started
 
-      Propono.publish(slow_topic, slow_text)
-      Propono.publish(topic, text)
+      Propono.publish(slow_topic, slow_text, async: false)
+      Propono.publish(topic, text, async: false)
       flunks << "Test Timeout" unless wait_for_thread(thread)
       flunk(flunks.join("\n")) unless flunks.empty?
     ensure

data/test/integration/tcp_to_sqs_test.rb

@@ -35,7 +35,7 @@ module Propono
 
       tcp_thread = Thread.new do
         Propono.listen_to_tcp do |tcp_topic, tcp_message|
-          Propono.publish(tcp_topic, tcp_message)
+          Propono.publish(tcp_topic, tcp_message, async: false)
           tcp_thread.terminate
         end
       end

data/test/services/publisher_test.rb

@@ -223,5 +223,17 @@ module Propono
       end
     end
 
+    def test_publish_can_be_called_syncronously
+      publisher = Publisher.new("topic_id", "message", async: false)
+      publisher.expects(:publish_via_sns_syncronously).once
+      publisher.expects(:publish_via_sns_asyncronously).never
+      publisher.send(:publish_via_sns)
+    end
+
+    def test_publish_is_normally_called_asyncronously
+      publisher = Publisher.new("topic_id", "message")
+      publisher.expects(:publish_via_sns_asyncronously)
+      publisher.send(:publish_via_sns)
+    end
   end
 end

data/test/services/queue_listener_test.rb

@@ -25,7 +25,7 @@ module Propono
 
       @listener = QueueListener.new(@topic_id) {}
       @listener.stubs(sqs: @sqs)
-      
+
       Propono.config.max_retries = 0
     end
 
@@ -157,7 +157,7 @@ module Propono
       @listener.stubs(:requeue_message_on_failure).with(SqsMessage.new(@sqs_message2), exception)
       @listener.send(:read_messages_from_queue, queue_url, 10)
     end
-    
+
     def test_messages_are_retried_or_abandoned_on_failure
       queue_url = "test-queue-url"
 
@@ -198,7 +198,7 @@ module Propono
       @sqs.expects(:send_message).with(regexp_matches(/https:\/\/queue.amazonaws.com\/[0-9]+\/MyApp-some-topic-failed/), anything)
       @listener.send(:requeue_message_on_failure, SqsMessage.new(@sqs_message1), StandardError.new)
     end
-    
+
     def test_message_requeued_if_there_is_an_exception_but_failure_count_less_than_retry_count
       Propono.config.max_retries = 5
       message = SqsMessage.new(@sqs_message1)
@@ -206,7 +206,7 @@ module Propono
       @sqs.expects(:send_message).with(regexp_matches(/https:\/\/queue.amazonaws.com\/[0-9]+\/MyApp-some-topic$/), anything)
       @listener.send(:requeue_message_on_failure, message, StandardError.new)
     end
-    
+
     def test_message_requeued_if_there_is_an_exception_but_failure_count_exceeds_than_retry_count
       Propono.config.max_retries = 5
       message = SqsMessage.new(@sqs_message1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - MalcyL
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: General purpose pub/sub library built on top of AWS SNS and SQS