propono 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a38b1949af11e63f303a09478759c077f484d95d
-  data.tar.gz: 7d937ce9d0e24a3e764705ed5d9f21203d094d28
+  metadata.gz: b1a85c42b5fc2bc691203ab82f348535476bdf35
+  data.tar.gz: af8fc9263c84a713779bee0e019258220102549f
 SHA512:
-  metadata.gz: 21de4b1f7ea789868a848ae044ef43ec01dacf8869a3a89a1a33d9aab04a5ab3d6ce4a17aacf4c701262fa2a6b8bb605327c82d4294bd76ee2c7410165165e32
-  data.tar.gz: c39b68a06d648db435b3811cba44a81811702f0aea2a87d8fa4f48d8864a047d400b34540fe7510105d7e7939313698fcd2db42f0ee5b84918f66b2402ee79cf
+  metadata.gz: b80edaee162402a479bff3a14cf05b56fd3e37bd5838faf7fbc040194028aa7451e12bf6b9bf551ca25fa1903a104a68083c5514b6afd6e9e137e955bcedeeb4
+  data.tar.gz: 994bdbb18b1cde05e45415d90ef435545a5e5647c1d8d466eee912e2b62a318677c1a0af658b1a718caee78fbcb6ffa1b46ac64707922cbc3c37f017d4ab811c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.9.0 / Unreleased
+
+* [FEATURE] Add message ids that track throughout Propono
+
 # 0.8.2 / 2013-11-01
 
 * [BUGFIX] Replace thread library with standard ruby threads to fix Unicorn problems.

data/README.md

@@ -104,6 +104,7 @@ You then simply pass the `:udp` protocol into `publish`:
 
 ```ruby
 Propono.publish('some-topic', message, protocol: :udp)
+```
 
 As per the `listen_to_tcp` method explained above, you now listen to udp or use the proxy method:
 

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 namespace :test do
   Rake::TestTask.new(:local) do |t|
-    t.pattern = "test/{components/,services/,}*_test.rb"
+    t.pattern = "test/{components/,services/,helpers/,}*_test.rb"
   end
 end
 

data/lib/propono.rb

@@ -1,12 +1,13 @@
 # Propono
 #
 # Propono is a pub/sub gem built on top of Amazon Web Services (AWS). It uses Simple Notification Service (SNS) and Simple Queue Service (SQS) to seamlessly pass messages throughout your infrastructure.
-
 require "propono/version"
 require 'propono/propono_error'
 require 'propono/logger'
 require 'propono/configuration'
 
+require "propono/helpers/hash"
+
 require 'propono/components/sns'
 require 'propono/components/sqs'
 require "propono/components/queue"
@@ -130,8 +131,8 @@ module Propono
   # This method uses #listen_to_udp and #publish to proxy
   # messages from UDP onto the queue.
   def self.proxy_udp
-    Propono.listen_to_udp do |topic, message|
-      Propono.publish(topic, message)
+    Propono.listen_to_udp do |topic, message, options = {}|
+      Propono.publish(topic, message, options)
     end
   end
 
@@ -140,8 +141,8 @@ module Propono
   # This method uses #listen_to_tcp and #publish to proxy
   # messages from TCP onto the queue.
   def self.proxy_tcp
-    Propono.listen_to_tcp do |topic, message|
-      Propono.publish(topic, message)
+    Propono.listen_to_tcp do |topic, message, options = {}|
+      Propono.publish(topic, message, options)
     end
   end
 end

data/lib/propono/helpers/hash.rb

@@ -0,0 +1,10 @@
+class Hash
+  def symbolize_keys
+    inject({}) do |result, (key, value)|
+      new_key = key.is_a?(String) ? key.to_sym : key
+      new_value = value.is_a?(Hash) ? value.symbolize_keys : value
+      result[new_key] = new_value
+      result
+    end
+  end
+end

data/lib/propono/services/publisher.rb

@@ -11,19 +11,23 @@ module Propono
       new(topic_id, message, options).publish
     end
 
-    attr_reader :topic_id, :message, :protocol
+    attr_reader :topic_id, :message, :protocol, :id
 
     def initialize(topic_id, message, options = {})
       raise PublisherError.new("Topic is nil") if topic_id.nil?
       raise PublisherError.new("Message is nil") if message.nil?
 
+      options = options.symbolize_keys
+
       @topic_id = topic_id
       @message = message
       @protocol = options.fetch(:protocol, :sns).to_sym
+      @id = SecureRandom.hex(3)
+      @id = "#{options[:id]}-#{@id}" if options[:id]
     end
 
     def publish
-      Propono.config.logger.info "Propono: Publishing #{message} to #{topic_id} via #{protocol}"
+      Propono.config.logger.info "Propono [#{id}]: Publishing #{message} to #{topic_id} via #{protocol}"
       send("publish_via_#{protocol}")
     end
 
@@ -31,31 +35,37 @@ module Propono
 
     def publish_via_sns
       topic = TopicCreator.find_or_create(topic_id)
-      msg = message.is_a?(String) ? message : message.to_json
       Thread.new do
         begin
-          sns.publish(topic.arn, msg)
+          sns.publish(topic.arn, body.to_json)
         rescue => e
-          Propono.config.logger.error "Propono failed to send via sns : #{e}"
+          Propono.config.logger.error "Propono [#{id}]: Failed to send via sns : #{e}"
         end
       end
     end
 
     def publish_via_udp
-      payload = {topic: topic_id, message: message}.to_json
+      payload = body.merge(topic: topic_id).to_json
       UDPSocket.new.send(payload, 0, Propono.config.udp_host, Propono.config.udp_port)
     rescue => e
-      Propono.config.logger.error "Propono failed to send : #{e}"
+      Propono.config.logger.error "Propono [#{id}]: Failed to send : #{e}"
     end
 
     def publish_via_tcp
-      payload = {topic: topic_id, message: message}.to_json
+      payload = body.merge(topic: topic_id).to_json
 
       socket = TCPSocket.new(Propono.config.tcp_host, Propono.config.tcp_port)
       socket.write payload
       socket.close
     rescue => e
-      Propono.config.logger.error "Propono failed to send : #{e}"
+      Propono.config.logger.error "Propono [#{id}]: Failed to send : #{e}"
+    end
+
+    def body
+      {
+        id: id,
+        message: message
+      }
     end
   end
 end

data/lib/propono/services/queue_listener.rb

@@ -36,8 +36,20 @@ module Propono
     end
 
     def process_sqs_message(sqs_message)
-      message = JSON.parse(sqs_message["Body"])["Message"]
-      @message_processor.call(message)
+      body = JSON.parse(sqs_message["Body"])["Message"]
+
+      # Legacy syntax is covered in the rescue statement
+      # This begin/rescue dance and the rescue block will be removed in v1.
+      begin
+        body = JSON.parse(body)
+        context = body.symbolize_keys
+        message = context.delete(:message)
+        Propono.config.logger.info "Propono [#{context[:id]}]: Received from sqs."
+        @message_processor.call(message, context)
+      rescue
+        Propono.config.logger.info("Sending and recieving messags without ids is deprecated")
+        @message_processor.call(body)
+      end
       sqs.delete_message(queue_url, sqs_message['ReceiptHandle'])
     end
 

data/lib/propono/services/tcp_listener.rb

@@ -29,8 +29,16 @@ module Propono
     end
 
     def process_tcp_data(tcp_data)
-      json = JSON.parse(tcp_data)
-      @processor.call(json['topic'], json['message'])
+      json = JSON.parse(tcp_data).symbolize_keys
+
+      # Legacy syntax is covered in the else statement
+      # This conditional and the else block will be removed in v1.
+      if json[:id]
+        @processor.call(json[:topic], json[:message], id: json[:id])
+      else
+        Propono.config.logger.info("Sending and recieving messags without ids is deprecated")
+        @processor.call(json[:topic], json[:message])
+      end
     end
 
     def server

data/lib/propono/services/udp_listener.rb

@@ -27,8 +27,16 @@ module Propono
     end
 
     def process_udp_data(udp_data)
-      json = JSON.parse(udp_data)
-      @processor.call(json['topic'], json['message'])
+      json = JSON.parse(udp_data).symbolize_keys
+
+      # Legacy syntax is covered in the else statement
+      # This conditional and the else block will be removed in v1.
+      if json[:id]
+        @processor.call(json[:topic], json[:message], id: json[:id])
+      else
+        Propono.config.logger.info("Sending and recieving messags without ids is deprecated")
+        @processor.call(json[:topic], json[:message])
+      end
     end
 
     def socket

data/lib/propono/version.rb

@@ -1,3 +1,3 @@
 module Propono
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/test/helpers/hash_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+module Propono
+  class HashTest < Minitest::Test
+    def test_symbolize_keys_works
+      input = {
+        "foo" => "bar",
+        cat: 1,
+        "nest" => {
+          "dog" => [
+            {"mouse" => true}
+          ]
+        }
+      }
+      expected = {
+        foo: 'bar',
+        cat: 1,
+        nest: {
+          dog: [
+            {"mouse" => true}
+          ]
+        }
+      }
+
+      assert_equal expected, input.symbolize_keys
+    end
+  end
+end
+
+

data/test/integration/sns_to_sqs_test.rb

@@ -5,20 +5,29 @@ module Propono
     def test_the_message_gets_there
       topic = "test-topic"
       text = "This is my message"
+      flunks = []
 
       Propono.subscribe_by_queue(topic)
 
       thread = Thread.new do
-        Propono.listen_to_queue(topic) do |message|
-          assert_equal text, message
-          break
+        begin
+          Propono.listen_to_queue(topic) do |message, context|
+            flunks << "Wrong message" unless message == text
+            flunks << "Wrong id" unless context[:id] =~ Regexp.new("[a-z0-9]{6}")
+            break
+          end
+        rescue => e
+          flunks << e.message
+        ensure
+          thread.terminate
         end
       end
 
       sleep(2) # Make sure the listener has started
 
       Propono.publish(topic, text)
-      flunk("Test Timeout") unless wait_for_thread(thread)
+      flunks << "Test Timeout" unless wait_for_thread(thread)
+      flunk(flunks.join("\n")) unless flunks.empty?
     ensure
       thread.terminate
     end

data/test/integration/tcp_to_sqs_test.rb

@@ -5,14 +5,22 @@ module Propono
     def test_the_message_gets_there
       topic = "test-topic"
       message = "This is my message"
+      flunks = []
+
       Propono.config.tcp_host = "localhost"
       Propono.config.tcp_port = 20009
 
       Propono.subscribe_by_queue(topic)
 
       sqs_thread = Thread.new do
-        Propono.listen_to_queue(topic) do |sqs_message|
-          assert_equal message, sqs_message
+        begin
+          Propono.listen_to_queue(topic) do |sqs_message|
+            flunks << "Wrong message" unless message == sqs_message
+            sqs_thread.terminate
+          end
+        rescue => e
+          flunks << e.message
+        ensure
           sqs_thread.terminate
         end
       end
@@ -26,7 +34,8 @@ module Propono
       sleep(2) # Make sure the listener has started
 
       Propono.publish(topic, message, protocol: :tcp)
-      flunk("Test Timeout") unless wait_for_thread(tcp_thread) && wait_for_thread(sqs_thread)
+      flunks << "Test Timeout" unless wait_for_thread(tcp_thread) && wait_for_thread(sqs_thread)
+      flunk(flunks.join("\n")) unless flunks.empty?
     ensure
       tcp_thread.terminate
       sqs_thread.terminate

data/test/integration/udp_proxy_test.rb

@@ -4,14 +4,23 @@ module Propono
   class UdpProxyTest < IntegrationTest
     def test_the_message_gets_there
       topic = "test-topic"
-      message = "This is my message"
+      text = "This is my message"
+      flunks = []
+
       Propono.config.udp_port = 20001
 
       Propono.subscribe_by_queue(topic)
 
       sqs_thread = Thread.new do
-        Propono.listen_to_queue(topic) do |sqs_message|
-          assert_equal message, sqs_message
+        begin
+          Propono.listen_to_queue(topic) do |message, context|
+            flunks << "Wrong message" unless text == message
+            flunks << "Wrong id" unless context[:id] =~ Regexp.new("[a-z0-9]{6}-[a-z0-9]{6}")
+            break
+          end
+        rescue => e
+          flunks << e.message
+        ensure
           sqs_thread.terminate
         end
       end
@@ -22,8 +31,9 @@ module Propono
 
       sleep(2) # Make sure the proxy has started
 
-      Propono.publish(topic, message, protocol: :udp)
-      flunk("Test timeout") unless wait_for_thread(sqs_thread)
+      Propono::Publisher.publish(topic, text, protocol: :udp)
+      flunks << "Test timeout" unless wait_for_thread(sqs_thread)
+      flunk(flunks.join("\n")) unless flunks.empty?
     ensure
       udp_thread.terminate
       sqs_thread.terminate

data/test/integration/udp_to_sqs_test.rb

@@ -5,13 +5,21 @@ module Propono
     def test_the_message_gets_there
       topic = "test-topic"
       message = "This is my message"
+      flunks = []
+
       Propono.config.udp_port = 20002
 
       Propono.subscribe_by_queue(topic)
 
       sqs_thread = Thread.new do
-        Propono.listen_to_queue(topic) do |sqs_message|
-          assert_equal message, sqs_message
+        begin
+          Propono.listen_to_queue(topic) do |sqs_message|
+            assert_equal message, sqs_message
+            sqs_thread.terminate
+          end
+        rescue => e
+          flunks << e.message
+        ensure
           sqs_thread.terminate
         end
       end
@@ -26,7 +34,8 @@ module Propono
       sleep(2) # Make sure the listener has started
 
       Propono.publish(topic, message, protocol: :udp)
-      flunk("Test Timeout") unless wait_for_thread(udp_thread) && wait_for_thread(sqs_thread)
+      flunks << "Test Timeout" unless wait_for_thread(udp_thread) && wait_for_thread(sqs_thread)
+      flunk(flunks.join("\n")) unless flunks.empty?
     ensure
       udp_thread.terminate
       sqs_thread.terminate

data/test/propono_test.rb

@@ -45,8 +45,9 @@ module Propono
     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, {})
+      options = {id: "catdog"}
+      Propono.stubs(:listen_to_udp).yields(topic, message, options)
+      Publisher.expects(:publish).with(topic, message, options)
       Propono.proxy_udp
     end
 
@@ -58,8 +59,9 @@ module Propono
     def test_proxy_tcp_calls_publish_in_the_block
       topic = "foobar"
       message = "message"
-      Propono.stubs(:listen_to_tcp).yields(topic, message)
-      Publisher.expects(:publish).with(topic, message, {})
+      options = {id: "catdog"}
+      Propono.stubs(:listen_to_tcp).yields(topic, message, options)
+      Publisher.expects(:publish).with(topic, message, options)
       Propono.proxy_tcp
     end
   end

data/test/services/publisher_test.rb

@@ -15,6 +15,17 @@ module Propono
       Publisher.publish(topic, message)
     end
 
+    def test_initializer_generates_an_id
+      publisher = Publisher.new('x','y')
+      assert publisher.instance_variable_get(:@id)
+    end
+
+    def test_initializer_concats_an_id
+      id = "q1w2e3"
+      publisher = Publisher.new('x','y', id: id)
+      assert publisher.id =~ Regexp.new("^#{id}-[a-z0-9]{6}$")
+    end
+
     def test_self_publish_calls_publish
       Publisher.any_instance.expects(:publish)
       Publisher.publish("topic", "message")
@@ -26,9 +37,10 @@ module Propono
     end
 
     def test_publish_logs
-      client = Publisher.new("foo", "bar")
-      Propono.config.logger.expects(:info).with() {|x| x =~ /^Propono: Publishing bar to foo via sns.*/}
-      client.send(:publish)
+      publisher = Publisher.new("foo", "bar")
+      publisher.instance_variable_set(:@id, 'abc')
+      Propono.config.logger.expects(:info).with() {|x| x =~ /^Propono \[abc\]: Publishing bar to foo via sns.*/}
+      publisher.send(:publish)
     end
 
     def test_publish_proxies_to_sns
@@ -45,6 +57,7 @@ module Propono
 
     def test_publish_via_sns_should_call_sns_on_correct_topic_and_message
       topic = "topic123"
+      id = "f123"
       message = "message123"
       topic_arn = "arn123"
       topic = Topic.new(topic_arn)
@@ -52,41 +65,45 @@ module Propono
       TopicCreator.stubs(find_or_create: topic)
 
       sns = mock()
-      sns.expects(:publish).with(topic_arn, message)
+      sns.expects(:publish).with(topic_arn, {id: id, message: message}.to_json)
       publisher = Publisher.new(topic, message)
-      publisher.stubs(sns: sns)
+      publisher.stubs(id: id, sns: sns)
       thread = publisher.send(:publish_via_sns)
       thread.join
     end
 
     def test_publish_via_sns_should_accept_a_hash_for_message
       topic = "topic123"
+      id = "foobar123"
       message = {something: ['some', 123, true]}
+      body = {id: id, message: message}
+
       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)
+      sns.expects(:publish).with(topic_arn, body.to_json)
       publisher = Publisher.new(topic, message)
-      publisher.stubs(sns: sns)
+      publisher.stubs(id: id, sns: sns)
       thread = publisher.send(:publish_via_sns)
       thread.join
     end
 
     def test_publish_via_sns_should_return_future_of_the_sns_response
       topic = "topic123"
+      id = "foobar123"
       message = "message123"
+      body = {id: id, message: message}
+
       topic_arn = "arn123"
       topic = Topic.new(topic_arn)
-
       TopicCreator.stubs(find_or_create: topic)
 
       sns = mock()
-      sns.expects(:publish).with(topic_arn, message).returns(:response)
+      sns.expects(:publish).with(topic_arn, body.to_json).returns(:response)
       publisher = Publisher.new(topic, message)
-      publisher.stubs(sns: sns)
+      publisher.stubs(id: id, sns: sns)
       assert_same :response, publisher.send(:publish_via_sns).value
     end
 
@@ -109,7 +126,6 @@ module Propono
       sns = mock()
       sns.stubs(:publish)
       publisher = Publisher.new(topic_id, "Foobar")
-      publisher.stubs(sns: sns)
 
       publisher.send(:publish_via_sns)
     end
@@ -120,11 +136,14 @@ module Propono
       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
+
+      id = "foobar123"
+      message = "cat dog mouse"
+      payload = {id: id, message: message, topic: topic_id}.to_json
       UDPSocket.any_instance.expects(:send).with(payload, 0, host, port)
 
       publisher = Publisher.new(topic_id, message)
+      publisher.stubs(id: id)
       publisher.send(:publish_via_udp)
     end
 
@@ -134,9 +153,10 @@ module Propono
       Propono.config.udp_host = host
       Propono.config.udp_port = port
 
-      client = Publisher.new("topic_id", "message")
-      Propono.config.logger.expects(:error).with() {|x| x =~ /^Propono failed to send : getaddrinfo:.*/}
-      client.send(:publish_via_udp)
+      publisher = Publisher.new("topic_id", "message")
+      publisher.stubs(id: '123asd')
+      Propono.config.logger.expects(:error).with() {|x| x =~ /^Propono \[123asd\]: Failed to send : getaddrinfo:.*/}
+      publisher.send(:publish_via_udp)
     end
 
     def test_publish_should_raise_exception_if_topic_is_nil
@@ -149,8 +169,9 @@ module Propono
       Propono.config.tcp_host = "http://meducation.net"
       Propono.config.tcp_port = 1234
       topic_id = "my-fav-topic"
+      id = "qweqw2312"
       message = "foobar"
-      payload = {topic: topic_id, message: message}.to_json
+      payload = {id: id, message: message, topic: topic_id}.to_json
 
       socket = mock()
       socket.expects(:write).with(payload)
@@ -158,6 +179,7 @@ module Propono
       TCPSocket.stubs(new: socket)
 
       publisher = Publisher.new(topic_id, message)
+      publisher.stubs(id: id)
       publisher.send(:publish_via_tcp)
     end
 
@@ -180,9 +202,10 @@ module Propono
       Propono.config.tcp_host = host
       Propono.config.tcp_port = port
 
-      client = Publisher.new("topic_id", "message")
-      Propono.config.logger.expects(:error).with() {|x| x =~ /^Propono failed to send : getaddrinfo:.*/}
-      client.send(:publish_via_tcp)
+      publisher = Publisher.new("topic_id", "message")
+      publisher.stubs(id: '123asd')
+      Propono.config.logger.expects(:error).with() {|x| x =~ /^Propono \[123asd\]: Failed to send : getaddrinfo:.*/}
+      publisher.send(:publish_via_tcp)
     end
 
     def test_publish_should_raise_exception_if_topic_is_nil

data/test/services/queue_listener_test.rb

@@ -9,10 +9,14 @@ module Propono
 
       @receipt_handle1 = "test-receipt-handle1"
       @receipt_handle2 = "test-receipt-handle2"
-      @message1 = "Foobar 123"
+      @message1 = {cat: "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}
+      @message1_id = "abc123"
+      @message1_id = "987whf"
+      @body1 = {id: @message1_id, message: @message1}
+      @body2 = {id: @message2_id, message: @message2}
+      @sqs_message1 = { "ReceiptHandle" => @receipt_handle1, "Body" => {"Message" => @body1.to_json}.to_json}
+      @sqs_message2 = { "ReceiptHandle" => @receipt_handle2, "Body" => {"Message" => @body2.to_json}.to_json}
       @messages = { "Message" => [ @sqs_message1, @sqs_message2 ] }
       @sqs_response = mock().tap{|m|m.stubs(body: @messages)}
       @sqs = mock()
@@ -40,6 +44,11 @@ module Propono
       @listener.send(:read_messages)
     end
 
+    def test_log_message_from_sqs
+      Propono.config.logger.expects(:info).with() {|x| x == "Propono [#{@message1_id}]: Received from sqs."}
+      @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)
@@ -66,10 +75,9 @@ module Propono
     end
 
     def test_each_message_processor_is_yielded
-      messages_yielded = [ ]
-      @listener = QueueListener.new(@topic_id) { |m| messages_yielded.push(m) }
+      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
@@ -77,6 +85,17 @@ module Propono
       assert messages_yielded.include?(@message2)
     end
 
+    def test_each_message_processor_context
+      contexts = []
+      @listener = QueueListener.new(@topic_id) { |_, context| contexts << context }
+      @listener.stubs(sqs: @sqs)
+      @listener.send(:read_messages)
+
+      assert_equal contexts.size, 2
+      assert contexts.include?({id: @message1_id})
+      assert contexts.include?({id: @message2_id})
+    end
+
     def test_each_message_is_deleted
       queue_url = "test-queue-url"
 
@@ -87,4 +106,43 @@ module Propono
       @listener.send(:read_messages)
     end
   end
+  class QueueListenerLegacySyntaxTest < Minitest::Test
+
+    def setup
+      super
+      @topic_id = "some-topic"
+
+      @receipt_handle1 = "test-receipt-handle1"
+      @receipt_handle2 = "test-receipt-handle2"
+      @message1 = {'cat' => "Foobar 123"} 
+      @message2 = "qwertyuiop"
+      @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_old_syntax_has_deprecation_warning
+      Propono.config.logger.expects(:info).with("Sending and recieving messags without ids is deprecated")
+      @listener.stubs(sqs: @sqs)
+      @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
+  end
 end

data/test/services/tcp_listener_test.rb

@@ -45,9 +45,10 @@ module Propono
     def test_processor_is_called_correctly
       topic = "my-topic"
       message = "my-message"
+      id = "qwe123"
       processor = Proc.new {}
-      tcp_data = {topic: topic, message: message}.to_json
-      processor.expects(:call).with(topic, message)
+      tcp_data = {topic: topic, message: message, id: id}.to_json
+      processor.expects(:call).with(topic, message, {id: id})
 
       listener = TcpListener.new(&processor)
       listener.send(:process_tcp_data, tcp_data)
@@ -59,5 +60,17 @@ module Propono
       listener.listen
     end
   end
-end
 
+  class TcpListenerLegacyTest < Minitest::Test
+    def test_processor_is_called_correctly
+      topic = "my-topic"
+      message = "my-message"
+      processor = Proc.new {}
+      tcp_data = {topic: topic, message: message}.to_json
+      processor.expects(:call).with(topic, message)
+
+      listener = TcpListener.new(&processor)
+      listener.send(:process_tcp_data, tcp_data)
+    end
+  end
+end

data/test/services/udp_listener_test.rb

@@ -42,9 +42,10 @@ module Propono
     def test_processor_is_called_correctly
       topic = "my-topic"
       message = "my-message"
+      id = "123asd"
       processor = Proc.new {}
-      udp_data = {topic: topic, message: message}.to_json
-      processor.expects(:call).with(topic, message)
+      udp_data = {topic: topic, message: message, id: id}.to_json
+      processor.expects(:call).with(topic, message, {id: id})
 
       server = UdpListener.new(&processor)
       server.send(:process_udp_data, udp_data)
@@ -56,4 +57,17 @@ module Propono
       listener.listen
     end
   end
+
+  class UdpListenerLegacyTest < Minitest::Test
+    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
+  end
 end

data/test/test_helper.rb

@@ -22,6 +22,7 @@ class Minitest::Test
       config.application_name = "MyApp"
 
       config.logger.stubs(:debug)
+      config.logger.stubs(:info)
       config.logger.stubs(:error)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: propono
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - MalcyL
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -119,6 +119,7 @@ files:
 - lib/propono/components/sqs.rb
 - lib/propono/components/topic.rb
 - lib/propono/configuration.rb
+- lib/propono/helpers/hash.rb
 - lib/propono/logger.rb
 - lib/propono/propono_error.rb
 - lib/propono/services/publisher.rb
@@ -138,6 +139,7 @@ files:
 - test/components/topic_test.rb
 - test/config.yml.example
 - test/configuration_test.rb
+- test/helpers/hash_test.rb
 - test/integration/integration_test.rb
 - test/integration/sns_to_sqs_test.rb
 - test/integration/tcp_to_sqs_test.rb
@@ -173,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: General purpose pub/sub library built on top of AWS SNS and SQS
@@ -186,6 +188,7 @@ test_files:
 - test/components/topic_test.rb
 - test/config.yml.example
 - test/configuration_test.rb
+- test/helpers/hash_test.rb
 - test/integration/integration_test.rb
 - test/integration/sns_to_sqs_test.rb
 - test/integration/tcp_to_sqs_test.rb