propono 1.7.0 → 2.0.0.rc1

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "1.7.0"
+  VERSION = "2.0.0.rc1"
 end

data/propono.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "propono"
   spec.version       = Propono::VERSION
   spec.authors       = ["MalcyL", "iHiD"]
-  spec.email         = ["malcolm@landonsonline.me.uk", "jeremy@meducation.net"]
+  spec.email         = ["jez.walker@gmail.com", "c.p.care@gmail.com", "malcolm@landonsonline.me.uk"]
   spec.description   = %q{Pub / Sub Library using Amazon Web Services}
   spec.summary       = %q{General purpose pub/sub library built on top of AWS SNS and SQS}
   spec.homepage      = ""
@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "fog-aws"
+  spec.add_dependency "aws-sdk-sns"
+  spec.add_dependency "aws-sdk-sqs"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/components/aws_config_test.rb

@@ -15,11 +15,11 @@ module Propono
     end
 
     def test_access_key
-      assert_equal "test-access-key", @aws_config.aws_options[:aws_access_key_id]
+      assert_equal "test-access-key", @aws_config.aws_options[:access_key_id]
     end
 
     def test_secret_key
-      assert_equal "test-secret-key", @aws_config.aws_options[:aws_secret_access_key]
+      assert_equal "test-secret-key", @aws_config.aws_options[:secret_access_key]
     end
 
     def test_region
@@ -37,12 +37,12 @@ module Propono
 
     def test_selecting_use_iam_profile_results_in_no_access_key
       @config.use_iam_profile = true
-      assert ! @aws_config.aws_options.has_key?(:aws_access_key_id)
+      assert ! @aws_config.aws_options.has_key?(:access_key_id)
     end
 
     def test_selecting_use_iam_profile_results_in_no_secret_key
       @config.use_iam_profile = true
-      assert ! @aws_config.aws_options.has_key?(:aws_secret_access_key)
+      assert ! @aws_config.aws_options.has_key?(:secret_access_key)
     end
 
     def test_region_when_using_iam_profile

data/test/components/client_test.rb

@@ -0,0 +1,68 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Propono
+  class ClientTest < Minitest::Test
+
+    def test_publish_calls_publisher_publish
+      topic, message = "Foo", "Bar"
+      client = Propono::Client.new
+      Publisher.expects(:publish).with(
+        client.aws_client,
+        client.config,
+        topic,
+        message,
+        {}
+      )
+      client.publish(topic, message)
+    end
+
+    def test_publish_sets_suffix_publish
+      queue_suffix = "-bar"
+      topic = "foo"
+      message = "asdasdasda"
+
+      client = Propono::Client.new
+      client.config.queue_suffix = queue_suffix
+      Publisher.expects(:publish).with(
+        client.aws_client,
+        client.config,
+        "#{topic}#{queue_suffix}",
+        message,
+        {}
+      )
+      client.publish(topic, message)
+    end
+
+    def test_listen_calls_queue_listener
+      topic = 'foobar'
+
+      client = Propono::Client.new
+      QueueListener.expects(:listen).with(
+        client.aws_client,
+        client.config,
+        topic
+      )
+      client.listen(topic)
+    end
+
+    def test_drain_queue_calls_queue_listener
+      topic = 'foobar'
+
+      client = Propono::Client.new
+      QueueListener.expects(:drain).with(
+        client.aws_client,
+        client.config,
+        topic
+      )
+      client.drain_queue(topic)
+    end
+
+    def test_block_configuration_syntax
+      test_key = "foobar-123-access"
+      client = Propono::Client.new do |config|
+        config.access_key = test_key
+      end
+      assert_equal test_key, client.config.access_key
+    end
+  end
+end

data/test/components/queue_subscription_test.rb

@@ -5,108 +5,106 @@ module Propono
     def setup
       super
       @suffix = "-suf"
-      Propono.config.queue_suffix = @suffix
+      propono_config.queue_suffix = @suffix
     end
 
     def teardown
       super
-      Propono.config.queue_suffix = ""
+      propono_config.queue_suffix = ""
     end
 
-    def test_create_topic
-      topic_id = 'foobar'
-      topic = Topic.new(topic_id)
-      slow_topic_id = 'foobar-slow'
-      slow_topic = Topic.new(slow_topic_id)
-      TopicCreator.expects(:find_or_create).with("#{topic_id}#{@suffix}").returns(topic)
-      TopicCreator.expects(:find_or_create).with("#{topic_id}#{@suffix}-slow").returns(slow_topic)
-      QueueSubscription.create(topic_id)
+    def test_create_calls_submethods
+      subscription = QueueSubscription.new(aws_client, propono_config, "foobar")
+      subscription.expects(:create_and_subscribe_main_queue)
+      subscription.expects(:create_and_subscribe_slow_queue)
+      subscription.expects(:create_misc_queues)
+      subscription.create
     end
 
-    def test_sqs_create_is_called
-      topic_id = "Foobar"
-      subscription = QueueSubscription.new(topic_id)
-
-      TopicCreator.stubs(find_or_create: Topic.new("1123"))
+    def test_create_main_queue
+      policy = "Some policy"
+      topic_name = "SomeName"
 
+      subscription = QueueSubscription.new(aws_client, propono_config, topic_name)
+      subscription.stubs(:create_and_subscribe_slow_queue)
+      subscription.stubs(:create_misc_queues)
+      subscription.stubs(generate_policy: policy)
       queue_name = subscription.send(:queue_name)
 
-      sqs = Fog::AWS::SQS::Mock.new
-      sqs.expects(:create_queue).with(queue_name).returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
-      sqs.expects(:create_queue).with(queue_name + '-failed').returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
-      sqs.expects(:create_queue).with(queue_name + '-corrupt').returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
-      sqs.expects(:create_queue).with(queue_name + '-slow').returns(mock(body: {'QueueUrl' => Fog::AWS::SQS::Mock::QueueUrl}))
-      QueueCreator.any_instance.stubs(sqs: sqs)
+      topic = mock
+      queue = mock
+      aws_client.expects(:create_topic).with("#{topic_name}#{@suffix}").returns(topic)
+      aws_client.expects(:create_queue).with(queue_name).returns(queue)
+      aws_client.expects(:subscribe_sqs_to_sns).with(queue, topic)
+      aws_client.expects(:set_sqs_policy).with(queue, policy)
 
       subscription.create
+      assert_equal queue, subscription.queue
     end
 
-    def test_subscription_queue_name
-      Propono.config.application_name = "MyApp"
-
-      topic_id = "Foobar"
-      subscription = QueueSubscription.new(topic_id)
-
-      assert_equal "MyApp-Foobar#{@suffix}", subscription.send(:queue_name)
-    end
+    def test_create_slow_queue
+      policy = "Some policy"
+      topic_name = "SomeName"
+      slow_queue = mock
 
-    def test_subscription_queue_name_with_spaces
-      Propono.config.application_name = "My App"
+      subscription = QueueSubscription.new(aws_client, propono_config, topic_name)
+      subscription.stubs(:create_and_subscribe_main_queue)
+      subscription.stubs(:create_misc_queues)
+      subscription.stubs(generate_policy: policy)
+      queue_name = subscription.send(:queue_name)
 
-      topic_id = "Foobar"
-      subscription = QueueSubscription.new(topic_id)
+      topic = mock
+      slow_queue = mock
+      aws_client.expects(:create_topic).with("#{topic_name}#{@suffix}-slow").returns(topic)
+      aws_client.expects(:create_queue).with("#{queue_name}-slow").returns(slow_queue)
+      aws_client.expects(:subscribe_sqs_to_sns).with(slow_queue, topic)
+      aws_client.expects(:set_sqs_policy).with(slow_queue, policy)
 
-      assert_equal "My_App-Foobar#{@suffix}", subscription.send(:queue_name)
+      subscription.create
+      assert_equal slow_queue, subscription.slow_queue
     end
 
-    def test_create_calls_subscribe
-      arn = "arn123"
+    def test_create_misc_queues
+      policy = "Some policy"
+      topic_name = "SomeName"
+      failed_queue = mock
+      corrupt_queue = mock
 
-      TopicCreator.stubs(find_or_create: Topic.new(arn))
-      QueueCreator.stubs(find_or_create: Queue.new(Fog::AWS::SQS::Mock::QueueUrl))
+      subscription = QueueSubscription.new(aws_client, propono_config, topic_name)
+      subscription.stubs(:create_and_subscribe_main_queue)
+      subscription.stubs(:create_and_subscribe_slow_queue)
+      subscription.stubs(generate_policy: policy)
+      queue_name = subscription.send(:queue_name)
+
+      aws_client.expects(:create_queue).with("#{queue_name}-failed").returns(failed_queue)
+      aws_client.expects(:create_queue).with("#{queue_name}-corrupt").returns(corrupt_queue)
 
-      sns = mock()
-      sns.expects(:subscribe).with(arn, Fog::AWS::SQS::Mock::QueueArn, 'sqs').twice
-      subscription = QueueSubscription.new("Some topic")
-      subscription.stubs(sns: sns)
       subscription.create
+
+      assert_equal failed_queue, subscription.failed_queue
+      assert_equal corrupt_queue, subscription.corrupt_queue
     end
 
-    def test_create_calls_set_queue_attributes
-      arn = "arn123"
-      policy = "{foobar: 123}"
+    def test_subscription_queue_name
+      propono_config.application_name = "MyApp"
 
-      TopicCreator.stubs(find_or_create: Topic.new(arn))
-      QueueCreator.stubs(find_or_create: Queue.new(Fog::AWS::SQS::Mock::QueueUrl))
+      topic_name = "Foobar"
+      subscription = QueueSubscription.new(aws_client, propono_config, topic_name)
 
-      sqs = mock()
-      sqs.expects(:set_queue_attributes).with(Fog::AWS::SQS::Mock::QueueUrl, "Policy", policy).twice
-      subscription = QueueSubscription.new("Some topic")
-      subscription.stubs(sqs: sqs)
-      subscription.stubs(generate_policy: policy)
-      subscription.create
+      assert_equal "MyApp-Foobar#{@suffix}", subscription.send(:queue_name)
     end
 
-    def test_create_saves_queue
-      queue = Queue.new(Fog::AWS::SQS::Mock::QueueUrl)
-      failed_queue = Queue.new(Fog::AWS::SQS::Mock::QueueUrl)
-      corrupt_queue = Queue.new(Fog::AWS::SQS::Mock::QueueUrl)
-      slow_queue = Queue.new(Fog::AWS::SQS::Mock::QueueUrl)
-
-      QueueCreator.expects(:find_or_create).with('MyApp-SomeTopic-suf').returns(queue)
-      QueueCreator.expects(:find_or_create).with('MyApp-SomeTopic-suf-failed').returns(failed_queue)
-      QueueCreator.expects(:find_or_create).with('MyApp-SomeTopic-suf-corrupt').returns(corrupt_queue)
-      QueueCreator.expects(:find_or_create).with('MyApp-SomeTopic-suf-slow').returns(slow_queue)
-      subscription = QueueSubscription.new("SomeTopic")
-      subscription.create
+    def test_subscription_queue_name_with_spaces
+      propono_config.application_name = "My App"
 
-      assert_equal queue, subscription.queue
-      assert_equal failed_queue, subscription.failed_queue
-      assert_equal corrupt_queue, subscription.corrupt_queue
+      topic_name = "Foobar"
+      subscription = QueueSubscription.new(aws_client, propono_config, topic_name)
+
+      assert_equal "My_App-Foobar#{@suffix}", subscription.send(:queue_name)
     end
 
     def test_create_raises_with_nil_topic
-      subscription = QueueSubscription.new(nil)
+      subscription = QueueSubscription.new(aws_client, propono_config, nil)
       assert_raises ProponoError do
         subscription.create
       end
@@ -141,7 +139,7 @@ module Propono
 }
 EOS
 
-      assert_equal policy, QueueSubscription.new(nil).send(:generate_policy, queue, topic)
+      assert_equal policy, QueueSubscription.new(aws_client, propono_config, nil).send(:generate_policy, queue, topic)
     end
   end
 end

data/test/components/queue_test.rb

@@ -2,14 +2,17 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class QueueTest < Minitest::Test
-    def test_intialization_sets_url
+    def test_url
       url = 'foobar'
-      queue = Queue.new(url)
+      queue = Queue.new(url, nil)
       assert url, queue.url
     end
 
     def test_arn
-      skip
+      arn = 'foobar'
+      attributes = {"QueueArn" => arn}
+      queue = Queue.new(nil, attributes)
+      assert arn, queue.arn
     end
   end
 end

data/test/components/topic_test.rb

@@ -2,9 +2,11 @@ require File.expand_path('../../test_helper', __FILE__)
 
 module Propono
   class TopicTest < Minitest::Test
-    def test_intialization_sets_url
+    def test_arn
       arn = 'foobar'
-      topic = Topic.new(arn)
+      aws_topic = mock
+      aws_topic.expects(:topic_arn).returns(arn)
+      topic = Topic.new(aws_topic)
       assert arn, topic.arn
     end
   end

data/test/configuration_test.rb

@@ -9,118 +9,90 @@ module Propono
     end
 
     def test_obtaining_singletion
-      refute Propono.config.nil?
-    end
-
-    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
+      refute propono_config.nil?
     end
 
     def test_use_iam_profile_defaults_false
-      assert ! Propono.config.use_iam_profile
+      assert ! propono_config.use_iam_profile
     end
 
     def test_use_iam_profile
-      Propono.config.use_iam_profile = true
-      assert Propono.config.use_iam_profile
+      propono_config.use_iam_profile = true
+      assert propono_config.use_iam_profile
     end
 
     def test_access_key
       access_key = "test-access-key"
-      Propono.config.access_key = access_key
-      assert_equal access_key, Propono.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"
-      Propono.config.secret_key = secret_key
-      assert_equal secret_key, Propono.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"
-      Propono.config.queue_region = queue_region
-      assert_equal queue_region, Propono.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"
-      Propono.config.application_name = application_name
-      assert_equal application_name, Propono.config.application_name
+      propono_config.application_name = application_name
+      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
-      assert_equal val, Propono.config.udp_host
-    end
-
-    def test_udp_port
-      val = 10000
-      Propono.config.udp_port = val
-      assert_equal val, Propono.config.udp_port
-    end
-
-    def test_tcp_host
-      val = "test-application-name"
-      Propono.config.tcp_host = val
-      assert_equal val, Propono.config.tcp_host
-    end
-
-    def test_tcp_port
-      val = 9382
-      Propono.config.tcp_port = val
-      assert_equal val, Propono.config.tcp_port
+      propono_config.queue_suffix = queue_suffix
+      assert_equal queue_suffix, propono_config.queue_suffix
     end
 
     def test_num_messages_per_poll
       val = 3
-      Propono.config.num_messages_per_poll = val
-      assert_equal val, Propono.config.num_messages_per_poll
+      propono_config.num_messages_per_poll = val
+      assert_equal val, propono_config.num_messages_per_poll
     end
 
     def test_missing_access_key_throws_exception
       assert_raises(ProponoConfigurationError) do
-        Propono.config.access_key
+        propono_config.access_key
       end
     end
 
     def test_missing_secret_key_throws_exception
       assert_raises(ProponoConfigurationError) do
-        Propono.config.secret_key
+        propono_config.secret_key
       end
     end
 
     def test_missing_queue_region_throws_exception
       assert_raises(ProponoConfigurationError) do
-        Propono.config.queue_region
+        propono_config.queue_region
       end
     end
 
     def test_missing_application_name_throws_exception
       assert_raises(ProponoConfigurationError) do
-        Propono.config.application_name
+        propono_config.application_name
       end
     end
 
     def test_default_max_retries
-      assert_equal 0, Propono.config.max_retries
+      assert_equal 0, propono_config.max_retries
     end
 
     def test_max_retries
       val = 5
-      Propono.config.max_retries = val
-      assert_equal 5, Propono.config.max_retries
+      propono_config.max_retries = val
+      assert_equal 5, propono_config.max_retries
+    end
+
+    def propono_config
+      @propono_config ||= Propono::Configuration.new
     end
   end
 end