propono 0.5.6 → 0.6.0

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

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class QueueSubscriptionTest < Minitest::Test
@@ -23,7 +23,7 @@ module Propono
     end
 
     def test_subscription_queue_name
-      config.application_name = "MyApp"
+      Propono.config.application_name = "MyApp"
 
       topic_id = "Foobar"
       subscription = QueueSubscription.new(topic_id)
@@ -32,7 +32,7 @@ module Propono
     end
 
     def test_subscription_queue_name_with_spaces
-      config.application_name = "My App"
+      Propono.config.application_name = "My App"
 
       topic_id = "Foobar"
       subscription = QueueSubscription.new(topic_id)

data/test/{queue_test.rb → components/queue_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class QueueTest < Minitest::Test

data/test/{sns_test.rb → components/sns_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class SnsTest < Minitest::Test
@@ -7,9 +7,9 @@ module Propono
     end
 
     def setup
-      config.access_key = "test-access-key"
-      config.secret_key = "test-secret-key"
-      config.queue_region = "test-queue-region"
+      Propono.config.access_key = "test-access-key"
+      Propono.config.secret_key = "test-secret-key"
+      Propono.config.queue_region = "test-queue-region"
     end
 
     def test_sns
@@ -20,11 +20,5 @@ module Propono
 
       SnsTestClass.new.send :sns
     end
-
-    private
-
-    def config
-      Configuration.instance
-    end
   end
 end

data/test/{sqs_test.rb → components/sqs_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class SqsTest < Minitest::Test
@@ -7,9 +7,9 @@ module Propono
     end
 
     def setup
-      config.access_key = "test-access-key"
-      config.secret_key = "test-secret-key"
-      config.queue_region = "us-east-1"
+      Propono.config.access_key = "test-access-key"
+      Propono.config.secret_key = "test-secret-key"
+      Propono.config.queue_region = "us-east-1"
     end
 
     def test_sqs
@@ -20,12 +20,6 @@ module Propono
 
       SqsTestClass.new.send :sqs
     end
-
-    private
-
-    def config
-      Configuration.instance
-    end
   end
 end
 

data/test/{topic_test.rb → components/topic_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class TopicTest < Minitest::Test

data/test/config.yml.example

@@ -0,0 +1,4 @@
+access_key: test-aws-access-key
+secret_key: test-aws-secret-key
+queue_region: test-aws-region
+application_name: tests-yourinitials

data/test/configuration_test.rb

@@ -2,65 +2,68 @@ require File.expand_path('../test_helper', __FILE__)
 
 module Propono
   class ConfigurationTest < Minitest::Test
-    def config
-      @config ||= Configuration.send(:new)
+
+    def setup
+      Propono.instance_variable_set("@config", nil)
     end
 
     def test_obtaining_singletion
-      refute config.nil?
+      refute Propono.config.nil?
     end
 
-    def test_unable_to_create_instance
-      assert_raises(NoMethodError) do
-        config = Configuration.new
+    def test_block_syntax
+      test_key = "foobar-123-access"
+      Propono.config do |config|
+        config.access_key = test_key
       end
+      assert_equal test_key, Propono.config.access_key
     end
 
     def test_access_key
       access_key = "test-access-key"
-      config.access_key = access_key
-      assert_equal access_key, config.access_key
+      Propono.config.access_key = access_key
+      assert_equal access_key, Propono.config.access_key
     end
 
     def test_secret_key
       secret_key = "test-secret-key"
-      config.secret_key = secret_key
-      assert_equal secret_key, config.secret_key
+      Propono.config.secret_key = secret_key
+      assert_equal secret_key, Propono.config.secret_key
     end
 
     def test_queue_region
       queue_region = "test-queue-region"
-      config.queue_region = queue_region
-      assert_equal queue_region, config.queue_region
+      Propono.config.queue_region = queue_region
+      assert_equal queue_region, Propono.config.queue_region
     end
 
     def test_application_name
       application_name = "test-application-name"
-      config.application_name = application_name
-      assert_equal application_name, config.application_name
+      Propono.config.application_name = application_name
+      assert_equal application_name, Propono.config.application_name
     end
 
     def test_missing_access_key_throws_exception
-      assert_raises(ConfigurationError) do
-        config.access_key
+      assert_raises(ProponoConfigurationError) do
+        Propono.config.access_key
       end
     end
 
     def test_missing_secret_key_throws_exception
-      assert_raises(ConfigurationError) do
-        config.secret_key
+      assert_raises(ProponoConfigurationError) do
+        Propono.config.secret_key
       end
     end
 
     def test_missing_queue_region_throws_exception
-      assert_raises(ConfigurationError) do
-        config.queue_region
+      assert_raises(ProponoConfigurationError) do
+        Propono.config.queue_region
       end
     end
 
     def test_missing_application_name_throws_exception
-      assert_raises(ConfigurationError) do
-        config.application_name
+      assert_raises(ProponoConfigurationError) do
+        Propono.config.application_name
       end
     end
   end

data/test/integration/integration_test.rb

@@ -0,0 +1,31 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Propono
+  class IntegrationTest < Minitest::Test
+    def setup
+      super
+      Fog.unmock!
+
+      config_file = YAML.load_file( File.expand_path('../../config.yml', __FILE__))
+      Propono.config do |config|
+        config.access_key = config_file['access_key']
+        config.secret_key = config_file['secret_key']
+        config.queue_region = config_file['queue_region']
+        config.application_name = config_file['application_name']
+        config.udp_host = "localhost"
+        config.udp_port = 12543
+      end
+    end
+
+    # Wait a max of 30secs before failing the test
+    def wait_for_thread(thread)
+      300.times do |x|
+        return true unless thread.alive?
+        sleep(0.1)
+      end
+      false
+    end
+  end
+end
+
+

data/test/integration/sns_to_sqs_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path('../integration_test', __FILE__)
+
+module Propono
+  class SnsToSqsTest < IntegrationTest
+    def test_the_message_gets_there
+      topic = "test-topic"
+      text = "This is my message"
+
+      thread = Thread.new do
+        Propono.listen_to_queue(topic) do |message|
+          assert_equal text, message
+          break
+        end
+      end
+      Propono.publish(topic, text)
+      flunk unless wait_for_thread(thread)
+    ensure
+      thread.terminate
+    end
+  end
+end

data/test/integration/udp_proxy_test.rb

@@ -0,0 +1,27 @@
+require File.expand_path('../integration_test', __FILE__)
+
+module Propono
+  class UdpProxyTest < IntegrationTest
+    def test_the_message_gets_there
+      topic = "test-topic"
+      message = "This is my message"
+
+      udp_thread = Thread.new do
+        Propono.proxy_udp
+      end
+
+      sqs_thread = Thread.new do
+        Propono.listen_to_queue(topic) do |sqs_message|
+          assert_equal message, sqs_message
+          sqs_thread.terminate
+        end
+      end
+
+      Propono.publish(topic, message, protocol: :udp)
+      flunk unless wait_for_thread(sqs_thread)
+    ensure
+      udp_thread.terminate
+      sqs_thread.terminate
+    end
+  end
+end

data/test/integration/udp_to_sqs_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../integration_test', __FILE__)
+
+module Propono
+  class UdpToSqsTest < IntegrationTest
+    def test_the_message_gets_there
+      topic = "test-topic"
+      message = "This is my message"
+
+      udp_thread = Thread.new do
+        Propono.listen_to_udp do |udp_topic, udp_message|
+          Propono.publish(udp_topic, udp_message)
+          udp_thread.terminate
+        end
+      end
+
+      sqs_thread = Thread.new do
+        Propono.listen_to_queue(topic) do |sqs_message|
+          assert_equal message, sqs_message
+          sqs_thread.terminate
+        end
+      end
+
+      Propono.publish(topic, message, protocol: :udp)
+      flunk unless wait_for_thread(udp_thread) && wait_for_thread(sqs_thread)
+    ensure
+      udp_thread.terminate
+      sqs_thread.terminate
+    end
+  end
+end

data/test/logger_test.rb

@@ -0,0 +1,35 @@
+require File.expand_path('../test_helper', __FILE__)
+
+module Propono
+  class LoggerTest < Minitest::Test
+    def setup
+      super
+      @logger = Logger.new
+    end
+
+    def test_debug
+      $stdout.expects(:puts).with("foobar")
+      @logger.debug "foobar"
+    end
+
+    def test_info
+      $stdout.expects(:puts).with("foobar")
+      @logger.info "foobar"
+    end
+
+    def test_warn
+      $stdout.expects(:puts).with("foobar")
+      @logger.warn "foobar"
+    end
+
+    def test_error
+      $stderr.expects(:puts).with("foobar")
+      @logger.error "foobar"
+    end
+
+    def test_fatal
+      $stderr.expects(:puts).with("foobar")
+      @logger.fatal "foobar"
+    end
+  end
+end

data/test/propono_test.rb

@@ -3,25 +3,46 @@ require File.expand_path('../test_helper', __FILE__)
 module Propono
   class ProponoTest < Minitest::Test
 
-    def setup
-      super
-      @var1 = "Foobar"
-      @var2 = 123
+    def test_publish_calls_publisher_publish
+      topic, message = "Foo", "Bar"
+      Publisher.expects(:publish).with(topic, message, {})
+      Propono.publish(topic, message)
     end
 
-    def test_publish_calls_publisher_public
-      Publisher.expects(:publish).with(@var1, @var2)
-      Propono.publish(@var1, @var2)
+    def test_subscribe_by_queue_calls_subscribe
+      topic = 'foobar'
+      Subscriber.expects(:subscribe_by_queue).with(topic)
+      Propono.subscribe_by_queue(topic)
+    end
+
+    def test_subscribe_by_post_calls_subscribe
+      topic, endpoint = 'foo', 'bar'
+      Subscriber.expects(:subscribe_by_post).with(topic, endpoint)
+      Propono.subscribe_by_post(topic, endpoint)
     end
 
     def test_listen_to_queue_calls_queue_listener
-      QueueListener.expects(:listen).with(@var1, @var2)
-      Propono.listen_to_queue(@var1, @var2)
+      topic = 'foobar'
+      QueueListener.expects(:listen).with(topic)
+      Propono.listen_to_queue(topic)
     end
 
     def test_listen_to_udp_calls_udp_listener
-      UdpListener.expects(:listen).with(@var1, @var2)
-      Propono.listen_to_udp(@var1, @var2)
+      UdpListener.expects(:listen).with()
+      Propono.listen_to_udp()
+    end
+
+    def test_proxy_udp_calls_listen
+      UdpListener.expects(:listen).with()
+      Propono.proxy_udp()
+    end
+
+    def test_proxy_udp_calls_publish_in_the_block
+      topic = "foobar"
+      message = "message"
+      Propono.stubs(:listen_to_udp).yields(topic, message)
+      Publisher.expects(:publish).with(topic, message, {})
+      Propono.proxy_udp
     end
   end
 end

data/test/{publisher_test.rb → services/publisher_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class PublisherTest < Minitest::Test
@@ -52,6 +52,21 @@ module Propono
       publisher.send(:publish_via_sns)
     end
 
+    def test_publish_via_sns_should_accept_a_hash_for_message
+      topic = "topic123"
+      message = {something: ['some', 123, true]}
+      topic_arn = "arn123"
+      topic = Topic.new(topic_arn)
+
+      TopicCreator.stubs(find_or_create: topic)
+
+      sns = mock()
+      sns.expects(:publish).with(topic_arn, message.to_json)
+      publisher = Publisher.new(topic, message)
+      publisher.stubs(sns: sns)
+      publisher.send(:publish_via_sns)
+    end
+
     def test_publish_via_sns_should_propogate_exception_on_topic_creation_error
       TopicCreator.stubs(:find_or_create).raises(TopicCreatorError)
 
@@ -79,8 +94,8 @@ module Propono
     def test_udp_uses_correct_message_host_and_port
       host = "http://meducation.net"
       port = 1234
-      config.udp_host = host
-      config.udp_port = port
+      Propono.config.udp_host = host
+      Propono.config.udp_port = port
       topic_id = "my-fav-topic"
       message = "foobar"
       payload = {topic: topic_id, message: message}.to_json
@@ -93,14 +108,12 @@ module Propono
     def test_client_with_bad_host_logs_error
       host = "http://meducation.net"
       port = 1234
-      config.udp_host = host
-      config.udp_port = port
+      Propono.config.udp_host = host
+      Propono.config.udp_port = port
 
       client = Publisher.new("topic_id", "message")
-      _, err = capture_io do
-        client.send(:publish_via_udp)
-      end
-      assert_match("Udp2sqs failed to send : getaddrinfo:", err)
+      Propono.config.logger.expects(:error).with() {|x| x =~ /^Propono failed to send : getaddrinfo:.*/}
+      client.send(:publish_via_udp)
     end
 
     def test_publish_should_raise_exception_if_topic_is_nil

data/test/{queue_creator_test.rb → services/queue_creator_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class QueueCreatorTest < Minitest::Test

data/test/services/queue_listener_test.rb

@@ -0,0 +1,90 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Propono
+  class QueueListenerTest < Minitest::Test
+
+    def setup
+      super
+      @topic_id = "some-topic"
+
+      @receipt_handle1 = "test-receipt-handle1"
+      @receipt_handle2 = "test-receipt-handle2"
+      @message1 = "Foobar 123"
+      @message2 = "Barfoo 543"
+      @sqs_message1 = { "ReceiptHandle" => @receipt_handle1, "Body" => {"Message" => @message1}.to_json}
+      @sqs_message2 = { "ReceiptHandle" => @receipt_handle2, "Body" => {"Message" => @message2}.to_json}
+      @messages = { "Message" => [ @sqs_message1, @sqs_message2 ] }
+      @sqs_response = mock().tap{|m|m.stubs(body: @messages)}
+      @sqs = mock()
+      @sqs.stubs(receive_message: @sqs_response)
+      @sqs.stubs(:delete_message)
+
+      @listener = QueueListener.new(@topic_id) {}
+      @listener.stubs(sqs: @sqs)
+    end
+
+    def test_listen_should_loop
+      @listener.expects(:loop)
+      @listener.listen
+    end
+
+    def test_read_messages_should_subscribe
+      QueueSubscription.expects(create: mock(queue: mock(url: {})))
+      @listener.send(:read_messages)
+    end
+
+    def test_read_message_from_sqs
+      queue_url = @listener.send(:queue_url)
+      options = { 'MaxNumberOfMessages' => 10 }
+      @sqs.expects(:receive_message).with(queue_url, options).returns(@sqs_response)
+      @listener.send(:read_messages)
+    end
+
+    def test_read_messages_calls_process_message_for_each_msg
+      @listener.expects(:process_sqs_message).with(@sqs_message1)
+      @listener.expects(:process_sqs_message).with(@sqs_message2)
+      @listener.send(:read_messages)
+    end
+
+    def test_read_messages_does_not_call_process_messages_if_there_are_none
+      @sqs_response.stubs(body: {"Message" => []})
+      @listener.expects(:process_sqs_message).never
+      @listener.send(:read_messages)
+    end
+
+    def test_exception_from_sqs_is_logged
+      @listener.stubs(queue_url: "http://example.com")
+      @sqs.stubs(:receive_message).raises(StandardError)
+      Propono.config.logger.expects(:error).with("Unexpected error reading from queue http://example.com")
+      Propono.config.logger.expects(:error).with() {|x| x.is_a?(StandardError)}
+      @listener.send(:read_messages)
+    end
+
+    def test_exception_from_sqs_returns_false
+      @sqs.stubs(:receive_message).raises(StandardError)
+      refute @listener.send(:read_messages)
+    end
+
+    def test_each_message_processor_is_yielded
+      messages_yielded = [ ]
+      @listener = QueueListener.new(@topic_id) { |m| messages_yielded.push(m) }
+      @listener.stubs(sqs: @sqs)
+
+      @listener.send(:read_messages)
+
+      assert_equal messages_yielded.size, 2
+      assert messages_yielded.include?(@message1)
+      assert messages_yielded.include?(@message2)
+    end
+
+    def test_each_message_is_deleted
+      queue_url = "test-queue-url"
+
+      @sqs.expects(:delete_message).with(queue_url, @receipt_handle1)
+      @sqs.expects(:delete_message).with(queue_url, @receipt_handle2)
+
+      @listener.stubs(queue_url: queue_url)
+      @listener.send(:read_messages)
+    end
+  end
+end

data/test/{subscriber_test.rb → services/subscriber_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class SubscriberTest < Minitest::Test

data/test/{topic_creator_test.rb → services/topic_creator_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class TopicCreatorTest < Minitest::Test

data/test/{udp_listener.rb → services/udp_listener_test.rb}

@@ -1,16 +1,11 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class UdpListenerTest < Minitest::Test
 
     def test_intialize_sets_locals
-      host = "my-host"
-      port = 1234
       block = Proc.new {}
-
-      listener = UdpListener.new(host, port, &block)
-      assert_equal host, listener.instance_variable_get("@host")
-      assert_equal port, listener.instance_variable_get("@port")
+      listener = UdpListener.new(&block)
       assert_equal block, listener.instance_variable_get("@processor")
     end
 
@@ -18,31 +13,45 @@ module Propono
       host = "my-host"
       port = 1234
 
+      Propono.config.udp_host = host
+      Propono.config.udp_port = port
+
       UDPSocket.any_instance.expects(:bind).with(host, port)
 
-      listener = UdpListener.new(host, port) {}
+      listener = UdpListener.new() {}
       socket = listener.send(:socket)
     end
 
     def test_initialize_should_fail_without_a_block
       assert_raises(UdpListenerError) do
-        UdpListener.new("qwe", 123)
+        UdpListener.new
       end
     end
 
     def test_message_is_processed
-      text = "Foobar123"
+      udp_msg = "Foobar"
       processor = Proc.new {}
-      server = UdpListener.new("qwewqe", 123, &processor)
-      socket = mock(recvfrom: [text])
+      server = UdpListener.new(&processor)
+      socket = mock(recvfrom: [udp_msg])
       server.stubs(socket: socket)
-      processor.expects(:call).with(text)
+      server.expects(:process_udp_data).with(udp_msg)
       thread = server.send(:receive_and_process)
       thread.join
     end
 
+    def test_processor_is_called_correctly
+      topic = "my-topic"
+      message = "my-message"
+      processor = Proc.new {}
+      udp_data = {topic: topic, message: message}.to_json
+      processor.expects(:call).with(topic, message)
+
+      server = UdpListener.new(&processor)
+      server.send(:process_udp_data, udp_data)
+    end
+
     def test_listen_should_loop
-      listener = UdpListener.new("qwewqe", 123) {}
+      listener = UdpListener.new {}
       listener.expects(:loop)
       listener.listen
     end