propono 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e710ca6ba4c443fffc8bbba2d2bd4e4ef66076d7
-  data.tar.gz: 8cbf1af85c9b35a9d4d910246eb265aa04e03526
+  metadata.gz: 013ba7a6dc0e9ffb8fa06aefbec64ee0c398f933
+  data.tar.gz: 1fd1f5e5b5cca50704e67bc874e33c79360c846a
 SHA512:
-  metadata.gz: ec8b8482933b9cdb185f36e73934b3724fd256d66af004bf7da4debd848272b8428ead2507ca3c209f9ccda71e301d2894c3e1b45c7c45a2ddd36e1b77483e65
-  data.tar.gz: 530ac7d70e78c004d509b9e0dc68086394d4c7f42bda7ef0913bbc2a8903f93cb0e7e8f612a6fb6bb2ee341d471d78195a30c49e9190465736d20f53a81c356d
+  metadata.gz: b5a91dcbc2c42611e718affa73fd7be0a16f8d59d7585384dff86c272bece9d47d2d46dcf45466b8acb515778b181059e63d60cffd40e250643d8e6e2052b334
+  data.tar.gz: 44ff1b11418f68dca4f5886a66f8c709251310f362f1ec24bf1c450a76e3d42b0e628a6ee93546c7841b56e431b17f9030b7e2a292aa7ec7655a1d1acd589173

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.7.0 / 2017-01-17
+* [FEATURE] Added num_messages_per_poll config option to allow you to change how many messages you pull from AWS per poll cycle.
+
 # 1.6.0 / 2015-06-05
 * [FEATURE] Require fog-aws gem instead of fog  (:blue_heart: @mhuggins)
 * [FEATURE] Change licence to MIT  (:blue_heart: @BiggerNoise)

data/README.md

@@ -144,7 +144,7 @@ Propono.config do |config|
   config.secret_key = "A AWS secret key"
   # Or use AWS IAM profile of the machine
   config.use_iam_profile = true
-  
+
   config.queue_region = "An AWS queue region"
   config.application_name = "A name unique in your network"
   config.udp_host = "The host of a machine used for UDP proxying"
@@ -152,6 +152,9 @@ Propono.config do |config|
   config.tcp_host = "The host of a machine used for TCP proxying"
   config.tcp_port = "The port of a machine used for TCP proxying"
   config.logger = "A logger such as Log4r or Rails.logger"
+
+  config.max_retries = "The number of retries if a message raises an exception before being placed on the failed queue"
+  config.num_messages_per_poll = "The number of messages retrieved per poll to SQS"
 end
 ```
 
@@ -169,7 +172,7 @@ We'd love to have you involved. Please read our [contributing guide](https://git
 
 ### Contributors
 
-This project is managed by the [Meducation team](http://company.meducation.net/about#team). 
+This project is managed by the [Meducation team](http://company.meducation.net/about#team).
 
 These individuals have come up with the ideas and written the code that made this possible:
 

data/lib/propono/configuration.rb

@@ -11,7 +11,7 @@ module Propono
       :udp_host, :udp_port,
       :tcp_host, :tcp_port,
       :logger,
-      :max_retries
+      :max_retries, :num_messages_per_poll
     ]
     attr_writer *SETTINGS
 
@@ -20,6 +20,7 @@ module Propono
       self.queue_suffix = ""
       self.use_iam_profile = false
       self.max_retries = 0
+      self.num_messages_per_poll = 10
     end
 
     SETTINGS.each do |setting|

data/lib/propono/services/queue_listener.rb

@@ -35,7 +35,7 @@ module Propono
     private
 
     def read_messages
-      read_messages_from_queue(main_queue_url, 10) || read_messages_from_queue(slow_queue_url, 1)
+      read_messages_from_queue(main_queue_url, Propono.config.num_messages_per_poll) || read_messages_from_queue(slow_queue_url, 1)
     end
 
     def read_messages_from_queue(queue_url, num_messages)

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/test/configuration_test.rb

@@ -83,6 +83,12 @@ module Propono
       assert_equal val, Propono.config.tcp_port
     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
+    end
+
     def test_missing_access_key_throws_exception
       assert_raises(ProponoConfigurationError) do
         Propono.config.access_key
@@ -110,7 +116,7 @@ module Propono
     def test_default_max_retries
       assert_equal 0, Propono.config.max_retries
     end
-    
+
     def test_max_retries
       val = 5
       Propono.config.max_retries = val

data/test/services/queue_listener_test.rb

@@ -26,6 +26,8 @@ module Propono
       @listener = QueueListener.new(@topic_id) {}
       @listener.stubs(sqs: @sqs)
 
+      Propono.config.num_messages_per_poll = 14
+
       Propono.config.max_retries = 0
     end
 
@@ -60,30 +62,32 @@ module Propono
     end
 
     def test_read_message_from_sqs
+      max_number_of_messages = 5
       queue_url = @listener.send(:main_queue_url)
-      options = { 'MaxNumberOfMessages' => 10 }
+      options = { 'MaxNumberOfMessages' => max_number_of_messages }
       @sqs.expects(:receive_message).with(queue_url, options).returns(@sqs_response)
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, max_number_of_messages)
     end
 
     def test_log_message_from_sqs
       queue_url = @listener.send(:main_queue_url)
       Propono.config.logger.expects(:info).with() {|x| x == "Propono [#{@message1_id}]: Received from sqs."}
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_read_messages_calls_process_message_for_each_msg
+
       queue_url = @listener.send(:main_queue_url)
       @listener.expects(:process_raw_message).with(@sqs_message1, queue_url)
       @listener.expects(:process_raw_message).with(@sqs_message2, queue_url)
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_read_messages_does_not_call_process_messages_if_there_are_none
       queue_url = @listener.send(:main_queue_url)
       @sqs_response.stubs(body: {"Message" => []})
       @listener.expects(:process_message).never
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_exception_from_sqs_is_logged
@@ -92,7 +96,7 @@ module Propono
       @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_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_forbidden_error_is_logged_and_re_raised
@@ -102,7 +106,7 @@ module Propono
       Propono.config.logger.expects(:error).with("Forbidden error caught and re-raised. http://example.com")
       Propono.config.logger.expects(:error).with() {|x| x.is_a?(Excon::Errors::Forbidden)}
       assert_raises Excon::Errors::Forbidden do
-        @listener.send(:read_messages_from_queue, queue_url, 10)
+        @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
       end
     end
 
@@ -140,7 +144,7 @@ module Propono
       @sqs.expects(:delete_message).with(queue_url, @receipt_handle2)
 
       @listener.stubs(queue_url: queue_url)
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_messages_are_deleted_if_there_is_an_exception_processing
@@ -155,7 +159,7 @@ module Propono
       @listener.stubs(sqs: @sqs)
       @listener.stubs(:requeue_message_on_failure).with(SqsMessage.new(@sqs_message1), exception)
       @listener.stubs(:requeue_message_on_failure).with(SqsMessage.new(@sqs_message2), exception)
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_messages_are_retried_or_abandoned_on_failure
@@ -166,7 +170,7 @@ module Propono
       @listener.expects(:requeue_message_on_failure).with(SqsMessage.new(@sqs_message1), exception)
       @listener.expects(:requeue_message_on_failure).with(SqsMessage.new(@sqs_message2), exception)
       @listener.stubs(sqs: @sqs)
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_failed_on_moving_to_failed_queue_does_not_delete
@@ -179,7 +183,7 @@ module Propono
       @listener.expects(:delete_message).with(@sqs_message1).never
       @listener.expects(:delete_message).with(@sqs_message2).never
       @listener.stubs(sqs: @sqs)
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_messages_are_moved_to_corrupt_queue_if_there_is_an_parsing_exception
@@ -191,7 +195,7 @@ module Propono
 
       @listener.expects(:move_to_corrupt_queue).with(sqs_message1)
       @listener.expects(:move_to_corrupt_queue).with(sqs_message2)
-      @listener.send(:read_messages_from_queue, queue_url, 10)
+      @listener.send(:read_messages_from_queue, queue_url, Propono.config.num_messages_per_poll)
     end
 
     def test_message_moved_to_failed_queue_if_there_is_an_exception_and_retry_count_is_zero
@@ -200,7 +204,7 @@ module Propono
     end
 
     def test_message_requeued_if_there_is_an_exception_but_failure_count_less_than_retry_count
-      Propono.config.max_retries = 5
+      Propono.config.max_retries = Propono.config.num_messages_per_poll
       message = SqsMessage.new(@sqs_message1)
       message.stubs(failure_count: 4)
       @sqs.expects(:send_message).with(regexp_matches(/https:\/\/queue.amazonaws.com\/[0-9]+\/MyApp-some-topic$/), anything)
@@ -208,9 +212,9 @@ module Propono
     end
 
     def test_message_requeued_if_there_is_an_exception_but_failure_count_exceeds_than_retry_count
-      Propono.config.max_retries = 5
+      Propono.config.max_retries = Propono.config.num_messages_per_poll
       message = SqsMessage.new(@sqs_message1)
-      message.stubs(failure_count: 5)
+      message.stubs(failure_count: Propono.config.num_messages_per_poll)
       @sqs.expects(:send_message).with(regexp_matches(/https:\/\/queue.amazonaws.com\/[0-9]+\/MyApp-some-topic-failed/), anything)
       @listener.send(:requeue_message_on_failure, message, StandardError.new)
     end
@@ -226,7 +230,7 @@ module Propono
       slow_queue_url = "http://slow.com"
       @listener.stubs(slow_queue_url: slow_queue_url)
 
-      @listener.expects(:read_messages_from_queue).with(main_queue_url, 10).returns(false)
+      @listener.expects(:read_messages_from_queue).with(main_queue_url, Propono.config.num_messages_per_poll).returns(false)
       @listener.expects(:read_messages_from_queue).with(slow_queue_url, 1)
       @listener.send(:read_messages)
     end
@@ -235,7 +239,7 @@ module Propono
       main_queue_url = "http://normal.com"
       @listener.stubs(main_queue_url: main_queue_url)
 
-      @listener.expects(:read_messages_from_queue).with(main_queue_url, 10).returns(true)
+      @listener.expects(:read_messages_from_queue).with(main_queue_url, Propono.config.num_messages_per_poll).returns(true)
       @listener.send(:read_messages)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - MalcyL
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2017-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: General purpose pub/sub library built on top of AWS SNS and SQS