mercury_amqp 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43d54035bd40df4089510aa9839d554f2e715c8f
-  data.tar.gz: c8e309676dbdb1f4488a23c95a060ca4e2d78f3c
+  metadata.gz: 1e3452ba7fb74955df9eb81a1481fd48f7d7a060
+  data.tar.gz: 8e119f5f19189c9cee7095bb39990ce99c8575a4
 SHA512:
-  metadata.gz: c11bd808a2634847b2a7c1b97975a7c3f2601086a82c2b43ba4fc866aea0a068cae96d4d7ce5cd05a3c7678ff8beb69d17a1cc311a16f9c634ba0780184ef917
-  data.tar.gz: 0d458c16c5ea7706e56ec0d39549bb6cb762989b3c057c9426f5e401bccd05974b49f567cbdf9ec30d44c06d91caeca91d23d221d0074e59d8635b3c65b3e150
+  metadata.gz: dd514973a3c22508ca2f1f1d92799fdfc638fd4f64fd9d06d21b260b633b4ec793858394762fdc14be96afbd3ab306d9e0cdf016d80d94e19364b99c30f1d7c4
+  data.tar.gz: 62df2a2d2c51ca01be73aa439d45869ee82b38b63685c82757f9c6219069b11bf677fe2ad60b3ab52f44f8324185579b995049509b956040c4989af906bd4efc

data/lib/mercury/fake/queued_message.rb

@@ -9,7 +9,7 @@ class Mercury
 
       def initialize(queue, msg, tag, headers, is_ackable)
         metadata = Metadata.new(tag, headers, proc{queue.ack_or_reject_message(self)}, proc{queue.nack(self)})
-        @received_msg = ReceivedMessage.new(msg, metadata, work_queue_name: is_ackable ? queue.worker : nil)
+        @received_msg = ReceivedMessage.new(msg, metadata, nil, work_queue_name: is_ackable ? queue.worker : nil)
         @headers = headers
         @delivered = false
       end

data/lib/mercury/mercury.rb

@@ -72,6 +72,8 @@ class Mercury
   def republish(msg, &k)
     guard_public(k)
     raise 'Only messages from a work queue can be republished' unless msg.work_queue_name
+    raise 'A message can only be republished by the mercury instance that received it' unless msg.mercury_instance == self
+    raise "This message was already #{msg.action_taken}ed" if msg.action_taken
     headers = Mercury.increment_republish_count(msg).merge(ORIGINAL_TAG_HEADER => msg.tag)
     publish_internal(@channel.default_exchange, msg.content, msg.work_queue_name, headers) do
       msg.ack
@@ -212,7 +214,7 @@ class Mercury
   end
 
   def make_received_message(payload, metadata, work_queue_name: nil)
-    msg = ReceivedMessage.new(read(payload), metadata, work_queue_name: work_queue_name)
+    msg = ReceivedMessage.new(read(payload), metadata, self, work_queue_name: work_queue_name)
     Logatron.msg_id = msg.headers[LOGATRAON_MSG_ID_HEADER]
     msg
   end

data/lib/mercury/received_message.rb

@@ -1,10 +1,11 @@
 class Mercury
   class ReceivedMessage
-    attr_reader :content, :metadata, :action_taken, :work_queue_name
+    attr_reader :content, :metadata, :mercury_instance, :action_taken, :work_queue_name
 
-    def initialize(content, metadata, work_queue_name: nil)
+    def initialize(content, metadata, mercury_instance, work_queue_name: nil)
       @content = content
       @metadata = metadata
+      @mercury_instance = mercury_instance
       @work_queue_name = work_queue_name
     end
 
@@ -35,6 +36,11 @@ class Mercury
       metadata.reject(requeue: true)
     end
 
+    def republish(&k)
+      k ||= proc{}
+      mercury_instance.republish(self, &k)
+    end
+
     private
 
     def is_ackable

data/lib/mercury/version.rb

@@ -1,3 +1,3 @@
 class Mercury
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/spec/lib/mercury/monadic_spec.rb

@@ -149,6 +149,21 @@ describe Mercury::Monadic do
     end
   end
 
+  it 'cannot republish acked messages' do
+    test_with_mercury do |m|
+      msgs = []
+      seql do
+        and_then { m.start_worker(worker, source, &msgs.method(:push)) }
+        and_then { m.publish(source, msg, tag: 'foo', headers: {bar: 123}) }
+        and_then { wait_until { msgs.size == 1 } }
+        and_lift do
+          msgs[0].ack
+          expect{msgs[0].republish}.to raise_error /acked/
+        end
+      end
+    end
+  end
+
   it 'propagates logatron headers' do
     real_msg_id = SecureRandom.uuid
     Logatron.msg_id = real_msg_id

data/spec/lib/mercury/received_message_spec.rb

@@ -36,6 +36,19 @@ describe Mercury::ReceivedMessage do
     end
   end
 
+  describe '#republish' do
+    it 'calls Mercury#republish' do
+      mercury_instance = double
+      msg = Mercury::ReceivedMessage.new('hello', make_metadata, mercury_instance, work_queue_name: 'foo')
+      cont = proc{}
+      expect(mercury_instance).to receive(:republish) do |m, &k|
+        expect(m).to eql msg
+        expect(k).to eql cont
+      end
+      msg.republish(&cont)
+    end
+  end
+
   describe '#action_taken' do
     it 'returns the action taken' do
       a = make_actionable
@@ -56,11 +69,11 @@ describe Mercury::ReceivedMessage do
   end
 
   def make_actionable
-    Mercury::ReceivedMessage.new('hello', make_metadata, work_queue_name: 'foo')
+    Mercury::ReceivedMessage.new('hello', make_metadata, double, work_queue_name: 'foo')
   end
 
   def make_non_actionable
-    Mercury::ReceivedMessage.new('hello', make_metadata, work_queue_name: nil)
+    Mercury::ReceivedMessage.new('hello', make_metadata, double, work_queue_name: nil)
   end
 
   def make_metadata

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercury_amqp
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler