propono 0.3.0 → 0.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDE0YzRiMzE2ZmNkZGU3NGIwODc4YzkxMjljNWFiMGM0MDEwM2U3OA==
+    OGI3ZmNiOTNiM2RhMmMzOWQwM2NlNTM4OWRhMjY0NjJiYmUyZGMwMQ==
   data.tar.gz: !binary |-
-    N2Y4YTI2YmY3NWM3ZTA0MjJlZWJkMjkxNGQxMGYwZDlkNDI4NzE0Zg==
+    ZTgyOTIyOTRlNWZhYzNiNGRjNzc0NGZiZTk4ZWVhZjA1ODNmY2UzZA==
 SHA512:
   metadata.gz: !binary |-
-    MGM3Mzg3NmZmZjIzYjZjMTUyODMzMzM1ZGZlNDRhNjYwNzkzMzE4ZTI0ODA4
-    YzJlNzc5OGE2MzMyNDY0MWViYTVlZjNmODIyMGIyMGY0OWE1ZDgxOThiYWI5
-    NGFlMjIzYTAxNzcxZTBhYzQ0YmE5ZTQ2NzYyNDViNDYzNGNhMzc=
+    MjZjMTVlN2IwMmM5Njc5YzMyN2YzZTNmZmUzMDFkYWNkNWFiY2JkYmY1MWMx
+    MDA2OWJlOTNhODc2MWQyNzUzYjgxODI0ZjZiMzBhZDJiNDEwZjM1ZmNiMzhl
+    Y2ZkNTc1MTQ3NDcyZDJkZjdiZjNlYTQyZmZmMmI1MjY1M2RkYzk=
   data.tar.gz: !binary |-
-    MGJkYTU1YTBlZTI4ZWJlZWMwZDcyZjg3NWNmOTBlOGU5YjMyYTcxOTI1OGZm
-    MTczNGM2NDE2MDJlZDQ4ZjY5ZDc4NWE2MWU4YWRmODUzZWI2MzQ3OGZlYzIx
-    OGE1ZmJkY2U1OGI5ODFmMWRlYTJkYjliYjRkZGJmOWUxYTkxZTc=
+    NmM4ZGNmNThjOTFmZTc5MGNmOGFmOWMxNjJlODE0NDRjMWMyZGFkNWU1OThm
+    NjNhNDNhMDQ2NjUxOTc0MTU4Njk1NmIwOTE0NGM5ZjkyN2EyOTNjNzkzZjFm
+    OWE4MTIzZmMyMGMyN2YzNGM2NDQxNTJjMDA0ZGUyNTg0ZTlmZDA=

data/lib/propono.rb

@@ -4,12 +4,12 @@ require 'propono/components/sns'
 require 'propono/components/sqs'
 require "propono/components/queue"
 require "propono/components/topic"
+require "propono/components/post_subscription"
+require "propono/components/queue_subscription"
 
-require "propono/services/post_subscriber"
 require "propono/services/publisher"
 require "propono/services/queue_creator"
 require "propono/services/queue_listener"
-require "propono/services/queue_subscriber"
 require "propono/services/subscriber"
 require "propono/services/topic_creator"
 

data/lib/propono/{services/post_subscriber.rb → components/post_subscription.rb}

@@ -1,9 +1,9 @@
 module Propono
-  class PostSubscriber
+  class PostSubscription
     include Sns
 
-    def self.subscribe(topic, endpoint)
-      new(topic, endpoint).subscribe
+    def self.create(topic, endpoint)
+      new(topic, endpoint).create
     end
 
     def initialize(topic_id, endpoint)
@@ -11,7 +11,7 @@ module Propono
       @endpoint = endpoint
     end
 
-    def subscribe
+    def create
       topic_arn = TopicCreator.find_or_create(@topic_id)
       sns.subscribe(topic_arn, @endpoint, 'http')
     end

data/lib/propono/{services/queue_subscriber.rb → components/queue_subscription.rb}

@@ -1,31 +1,33 @@
 module Propono
-  class QueueSubscriber
+  class QueueSubscription
 
     include Sns
     include Sqs
 
     attr_reader :topic_arn, :queue
 
-    def self.subscribe(topic_id)
-      new(topic_id).subscribe
+    def self.create(topic_id)
+      new(topic_id).tap do |subscription|
+        subscription.create
+      end
     end
 
     def initialize(topic_id)
       @topic_id = topic_id
     end
 
-    def subscribe
+    def create
       @topic = TopicCreator.find_or_create(@topic_id)
       @queue = QueueCreator.find_or_create(queue_name)
       sns.subscribe(@topic.arn, @queue.arn, 'sqs')
     end
 
-    private
-
     def queue_name
-      "#{config.application_name.gsub(" ", "_")}::#{@topic_id}"
+      @queue_name ||= "#{config.application_name.gsub(" ", "_")}::#{@topic_id}"
     end
 
+    private
+
     def config
       Configuration.instance
     end

data/lib/propono/services/queue_listener.rb

@@ -3,43 +3,51 @@ module Propono
 
     include Sqs
 
-    def self.listen(queue_url, &block)
-      new(queue_url, &block).listen
+    def self.listen(topic_id, &message_processor)
+      new(topic_id, &message_processor).listen
     end
 
-    def initialize(queue_url, &block)
-      @queue_url = queue_url
-      @block = block
+    def initialize(topic_id, &message_processor)
+      @topic_id = topic_id
+      @message_processor = message_processor
     end
 
     def listen
-      loop {
-        sleep 10 unless read_messages
-      }
+      loop do
+        unless read_messages
+          sleep 10
+        end
+      end
     end
 
     private
 
     def read_messages
-      begin
-        response = sqs.receive_message( @queue_url, options = { 'MaxNumberOfMessages' => 10 } )
-        messages = response.body['Message']
-        if messages.empty?
-          false
-        else
-          process_messages(messages)
-        end
-      rescue
-        config.logger.puts "Unexpected error reading from queue #{@queue_url}"
+      response = sqs.receive_message( queue_url, options = { 'MaxNumberOfMessages' => 10 } )
+      messages = response.body['Message']
+      if messages.empty?
+        false
+      else
+        process_messages(messages)
       end
+    rescue
+      config.logger.puts "Unexpected error reading from queue #{queue_url}"
     end
 
     def process_messages(messages)
       messages.each do |message|
-        @block.call(message)
+        @message_processor.call(message)
         sqs.delete_message(message['ReceiptHandle'])
       end
       true
     end
+
+    def queue_url
+      @queue_url ||= subscription.queue.url
+    end
+
+    def subscription
+      @subscription ||= QueueSubscription.create(@topic_id)
+    end
   end
 end

data/lib/propono/services/subscriber.rb

@@ -2,11 +2,11 @@ module Propono
 
   module Subscriber
     def self.subscribe_by_queue(topic)
-      QueueSubscriber.subscribe(topic)
+      QueueSubscription.create(topic)
     end
 
     def self.subscribe_by_post(topic, endpoint)
-      PostSubscriber.subscribe(topic, endpoint)
+      PostSubscription.create(topic, endpoint)
     end
   end
 end

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/test/{post_subscriber_test.rb → post_subscription_test.rb}

@@ -1,14 +1,14 @@
 require File.expand_path('../test_helper', __FILE__)
 
 module Propono
-  class PostSubscriberTest < Minitest::Test
+  class PostSubscriptionTest < Minitest::Test
     def test_create_topic
       topic = 'foobar'
       TopicCreator.expects(:find_or_create).with(topic)
-      PostSubscriber.subscribe(topic, "foobar")
+      PostSubscription.create(topic, "foobar")
     end
 
-    def test_subscribe_calls_subscribe
+    def test_create_calls_create
       arn = "arn123"
       endpoint = "http://meducation.net/some_queue_name"
 
@@ -16,9 +16,9 @@ module Propono
 
       sns = mock()
       sns.expects(:subscribe).with(arn, endpoint, 'http')
-      subscriber = PostSubscriber.new("Some topic", endpoint)
-      subscriber.stubs(sns: sns)
-      subscriber.subscribe
+      subscription = PostSubscription.new("Some topic", endpoint)
+      subscription.stubs(sns: sns)
+      subscription.create
     end
 
     def test_it_correctly_uses_http_and_https

data/test/queue_listener_test.rb

@@ -4,10 +4,11 @@ module Propono
   class QueueListenerTest < Minitest::Test
 
     def setup
-      @queue_url = "http://example.com"
+      super
+      @topic_id = "some-topic"
 
-      @receipt_hanlde1 = "test-receipt-handle1"
-      @receipt_hanlde2 = "test-receipt-handle2"
+      @receipt_handle1 = "test-receipt-handle1"
+      @receipt_handle2 = "test-receipt-handle2"
       @message1 = { "ReceiptHandle" => @receipt_handle1}
       @message2 = { "ReceiptHandle" => @receipt_handle2}
       @messages = { "Message" => [ @message1, @message2 ] }
@@ -22,10 +23,10 @@ module Propono
 
       sqs.expects(:receive_message).returns(message_response)
 
-      queueListener = QueueListener.new(@queue_url) {}
-      queueListener.stubs(sqs: sqs)
+      queue_listener = QueueListener.new(@topic_id) {}
+      queue_listener.stubs(sqs: sqs)
 
-      queueListener.send(:read_messages)
+      queue_listener.send(:read_messages)
     end
 
     def test_each_message_yielded
@@ -37,10 +38,10 @@ module Propono
       sqs.expects(:delete_message).with(@receipt_handle1)
       sqs.expects(:delete_message).with(@receipt_handle2)
 
-      queueListener = QueueListener.new(@queue_url) { }
-      queueListener.stubs(sqs: sqs)
+      queue_listener = QueueListener.new(@topic_id) { }
+      queue_listener.stubs(sqs: sqs)
 
-      queueListener.send(:read_messages)
+      queue_listener.send(:read_messages)
     end
 
     def test_each_message_deleted_from_sqs
@@ -51,10 +52,10 @@ module Propono
       sqs.stubs(receive_message: message_response)
 
       messages_yielded = [ ]
-      queueListener = QueueListener.new(@queue_url) { |m| messages_yielded.push(m) }
-      queueListener.stubs(sqs: sqs)
+      queue_listener = QueueListener.new(@topic_id) { |m| messages_yielded.push(m) }
+      queue_listener.stubs(sqs: sqs)
 
-      queueListener.send(:read_messages)
+      queue_listener.send(:read_messages)
 
       assert_equal messages_yielded.size, 2
       assert messages_yielded.include?(@message1)
@@ -70,29 +71,51 @@ module Propono
 
       sqs.expects(:receive_message).returns(message_response)
 
-      queueListener = QueueListener.new(@queue_url) {}
-      queueListener.stubs(sqs: sqs)
+      queue_listener = QueueListener.new(@topic_id) {}
+      queue_listener.stubs(sqs: sqs)
 
-      refute queueListener.send(:read_messages)
+      refute queue_listener.send(:read_messages)
     end
 
     def test_exception_from_sqs_is_logged
       sqs = mock()
       sqs.stubs(:receive_message).raises(StandardError)
 
-      queueListener = QueueListener.new(@queue_url) {}
-      queueListener.stubs(sqs: sqs)
+      queue_listener = QueueListener.new(@topic_id) {}
+      queue_listener.stubs(sqs: sqs)
+      queue_listener.stubs(queue_url: "http://example.com")
 
       # capture_io reasigns stderr. Assign the config.logger
       # to where capture_io has redirected it to for this test.
       out, err = capture_io do
         config.logger = $stderr
-        queueListener.send(:read_messages)
+        queue_listener.send(:read_messages)
       end
       # Reassign config.logger to the correct stderr
       config.logger = $stderr
       assert_equal "Unexpected error reading from queue http://example.com\n", err
     end
 
+    def test_exception_from_sqs_returns_false
+      sqs = mock()
+      sqs.stubs(:receive_message).raises(StandardError)
+
+      queue_listener = QueueListener.new(@topic_id) {}
+      queue_listener.stubs(sqs: sqs)
+
+      refute queue_listener.send(:read_messages)
+    end
+
+    def test_listen_should_loop
+      listener = QueueListener.new(@topic_id)
+      listener.expects(:loop)
+      listener.listen
+    end
+
+    def test_read_messages_should_subscribe
+      listener = QueueListener.new(@topic_id)
+      QueueSubscription.expects(create: mock(queue: mock(url: {})))
+      listener.send(:read_messages)
+    end
   end
 end

data/test/{queue_subscriber_test.rb → queue_subscription_test.rb}

@@ -1,46 +1,46 @@
 require File.expand_path('../test_helper', __FILE__)
 
 module Propono
-  class QueueSubscriberTest < Minitest::Test
+  class QueueSubscriptionTest < Minitest::Test
     def test_create_topic
       topic_id = 'foobar'
       topic = Topic.new(topic_id)
       TopicCreator.expects(:find_or_create).with(topic_id).returns(topic)
-      QueueSubscriber.subscribe(topic_id)
+      QueueSubscription.create(topic_id)
     end
 
     def test_sqs_create_is_called
       topic_id = "Foobar"
-      subscriber = QueueSubscriber.new(topic_id)
+      subscription = QueueSubscription.new(topic_id)
 
       TopicCreator.stubs(find_or_create: Topic.new("1123"))
 
       sqs = mock()
-      sqs.expects(:create_queue).with(subscriber.send(:queue_name)).returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
+      sqs.expects(:create_queue).with(subscription.send(:queue_name)).returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
       QueueCreator.any_instance.stubs(sqs: sqs)
 
-      subscriber.subscribe
+      subscription.create
     end
 
-    def test_subscriber_queue_name
+    def test_subscription_queue_name
       config.application_name = "MyApp"
 
       topic_id = "Foobar"
-      subscriber = QueueSubscriber.new(topic_id)
+      subscription = QueueSubscription.new(topic_id)
 
-      assert_equal subscriber.send(:queue_name), "MyApp::Foobar"
+      assert_equal subscription.send(:queue_name), "MyApp::Foobar"
     end
 
-    def test_subscriber_queue_name_with_spaces
+    def test_subscription_queue_name_with_spaces
       config.application_name = "My App"
 
       topic_id = "Foobar"
-      subscriber = QueueSubscriber.new(topic_id)
+      subscription = QueueSubscription.new(topic_id)
 
-      assert_equal subscriber.send(:queue_name), "My_App::Foobar"
+      assert_equal subscription.send(:queue_name), "My_App::Foobar"
     end
 
-    def test_subscribe_calls_subscribe
+    def test_create_calls_create
       arn = "arn123"
 
       TopicCreator.stubs(find_or_create: Topic.new(arn))
@@ -48,18 +48,18 @@ module Propono
 
       sns = mock()
       sns.expects(:subscribe).with(arn, Fog::AWS::SQS::Mock::QueueArn, 'sqs')
-      subscriber = QueueSubscriber.new("Some topic")
-      subscriber.stubs(sns: sns)
-      subscriber.subscribe
+      subscription = QueueSubscription.new("Some topic")
+      subscription.stubs(sns: sns)
+      subscription.create
     end
 
-    def test_subscribe_saves_queue
+    def test_create_saves_queue
       queue = Queue.new(Fog::AWS::SQS::Mock::QueueUrl)
 
       QueueCreator.expects(:find_or_create).returns(queue)
-      subscriber = QueueSubscriber.new("Some Topic")
-      subscriber.subscribe
-      assert_equal queue, subscriber.queue
+      subscription = QueueSubscription.new("Some Topic")
+      subscription.create
+      assert_equal queue, subscription.queue
     end
   end
 end

data/test/subscriber_test.rb

@@ -4,16 +4,16 @@ module Propono
   class SubscriberTest < Minitest::Test
 
     def test_subscribe_by_queue_calls_queue_subscriber
-      subscriber = QueueSubscriber.new("topic")
-      QueueSubscriber.expects(:new).with("topic").returns(subscriber)
-      QueueSubscriber.any_instance.expects(:subscribe)
+      subscriber = QueueSubscription.new("topic")
+      QueueSubscription.expects(:new).with("topic").returns(subscriber)
+      QueueSubscription.any_instance.expects(:create)
       Subscriber.subscribe_by_queue("topic")
     end
 
     def test_subscribe_by_post_calls_post_subscribe
-      subscriber = PostSubscriber.new("topic", 'endpoint')
-      PostSubscriber.expects(:new).with("topic", 'endpoint').returns(subscriber)
-      PostSubscriber.any_instance.expects(:subscribe)
+      subscriber = PostSubscription.new("topic", 'endpoint')
+      PostSubscription.expects(:new).with("topic", 'endpoint').returns(subscriber)
+      PostSubscription.any_instance.expects(:create)
       Subscriber.subscribe_by_post("topic", "endpoint")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - MalcyL
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -97,26 +97,26 @@ files:
 - README.md
 - Rakefile
 - lib/propono.rb
+- lib/propono/components/post_subscription.rb
 - lib/propono/components/queue.rb
+- lib/propono/components/queue_subscription.rb
 - lib/propono/components/sns.rb
 - lib/propono/components/sqs.rb
 - lib/propono/components/topic.rb
 - lib/propono/configuration.rb
-- lib/propono/services/post_subscriber.rb
 - lib/propono/services/publisher.rb
 - lib/propono/services/queue_creator.rb
 - lib/propono/services/queue_listener.rb
-- lib/propono/services/queue_subscriber.rb
 - lib/propono/services/subscriber.rb
 - lib/propono/services/topic_creator.rb
 - lib/propono/version.rb
 - propono.gemspec
 - test/configuration_test.rb
-- test/post_subscriber_test.rb
+- test/post_subscription_test.rb
 - test/publisher_test.rb
 - test/queue_creator_test.rb
 - test/queue_listener_test.rb
-- test/queue_subscriber_test.rb
+- test/queue_subscription_test.rb
 - test/queue_test.rb
 - test/sns_test.rb
 - test/sqs_test.rb
@@ -150,11 +150,11 @@ specification_version: 4
 summary: General purpose pub/sub library built on top of AWS SNS and SQS
 test_files:
 - test/configuration_test.rb
-- test/post_subscriber_test.rb
+- test/post_subscription_test.rb
 - test/publisher_test.rb
 - test/queue_creator_test.rb
 - test/queue_listener_test.rb
-- test/queue_subscriber_test.rb
+- test/queue_subscription_test.rb
 - test/queue_test.rb
 - test/sns_test.rb
 - test/sqs_test.rb