mercury_amqp 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fd7b0dd970c7160af30546770764c5fc2725bc6
-  data.tar.gz: a702ad714aba8bd83308c19905841f0cec380430
+  metadata.gz: 6ce3a4a09a924946d240cfbabeea944dffba4ec7
+  data.tar.gz: 772194f0c84be6d336fc16b2821f0e728e8b1f4b
 SHA512:
-  metadata.gz: ef2d9c3392044008379014cfe5a12d22849c5f36a0852a3f36dccc6a6677f8b1d65f3c51143dacf9607077164abfb10874f369dc0f62246edc5a2b04fb5c757c
-  data.tar.gz: 687e95ee42e0e32aaf9290669ed11ba2e68f3b1b1acf43195990158a2724e285f708028e1ab43d20cfd5d5953c5bd1fbae4a98c75c31a33bc34f0c2123d64c98
+  metadata.gz: ab8452d14bdb64949877c748bd8eafbe37c5bd5ff652772950025f63b70f3db9d0754397606a9d223292d33142c2561d88f410cf4b9c9dd7acc416e0a7b1290b
+  data.tar.gz: b63c33292ee6299d6b5832d2c1157fc6a229b281266e6fc7489dec4fed6f8126b4d023fce49abe2f40132816022c3411230d1ec078547b7fe910a8b8837a1db0

data/lib/mercury/mercury.rb

@@ -8,8 +8,7 @@ class Mercury
   attr_reader :amqp, :channel, :logger
 
   def self.open(logger: Logatron, **kws, &k)
-    @logger = logger
-    new(**kws, &k)
+    new(logger: logger, **kws, &k)
     nil
   end
 
@@ -27,7 +26,9 @@ class Mercury
                  parallelism: 1,
                  on_error: nil,
                  wait_for_publisher_confirms: true,
+                 logger: logger,
                  &k)
+    @logger = logger
     @on_error = on_error
     AMQP.connect(host: host, port: port, vhost: vhost, username: username, password: password,
                  on_tcp_connection_failure: server_down_error_handler) do |amqp|
@@ -226,7 +227,7 @@ class Mercury
       # failure handlers are invoked from EventMachine's `ensure`.)
       current_exception = $!
       unless current_exception
-        Logatron.error(msg)
+        @logger.error(msg)
         if @on_error.respond_to?(:call)
           @on_error.call(msg)
         else

data/lib/mercury/received_message.rb

@@ -1,6 +1,6 @@
 class Mercury
   class ReceivedMessage
-    attr_reader :content, :metadata
+    attr_reader :content, :metadata, :action_taken
 
     def initialize(content, metadata, is_ackable: false)
       @content = content
@@ -17,18 +17,28 @@ class Mercury
     end
 
     def ack
-      @is_ackable or raise 'This message is not ackable'
+      performing_action(:ack)
       metadata.ack
     end
 
     def reject
-      @is_ackable or raise 'This message is not rejectable'
+      performing_action(:reject)
       metadata.reject(requeue: false)
     end
 
     def nack
-      @is_ackable or raise 'This message is not nackable'
+      performing_action(:nack)
       metadata.reject(requeue: true)
     end
+
+    private
+
+    def performing_action(action)
+      @is_ackable or raise "This message is not #{action}able"
+      if @action_taken
+        raise "This message was already #{@action_taken}ed"
+      end
+      @action_taken = action
+    end
   end
 end

data/lib/mercury/version.rb

@@ -1,3 +1,3 @@
 class Mercury
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/spec/lib/mercury/monadic_spec.rb

@@ -274,19 +274,14 @@ describe Mercury::Monadic do
   end
 
   it 'raises when an error occurs' do
-    # verify it registers a handler
-    expect_any_instance_of(AMQP::Channel).to receive(:on_error) {|&b| @handler = b}
-
-    # verify the handler raises an error
     expect do
       em do
-        Mercury.open do
-          ch = double
-          info = double(reply_code: 'code', reply_text: 'text')
-          @handler.call(ch, info)
+        Mercury.open do |m|
+          ch = m.instance_variable_get(:@channel)
+          ch.acknowledge(42) # force a channel error
         end
       end
-    end.to raise_error 'An error occurred: code - text'
+    end.to raise_error 'An error occurred: 406 - PRECONDITION_FAILED - unknown delivery tag 42'
   end
 
   describe '#delete_source' do

data/spec/lib/mercury/received_message_spec.rb

@@ -0,0 +1,72 @@
+require 'rspec'
+require 'mercury/received_message'
+
+describe Mercury::ReceivedMessage do
+
+  describe '#ack' do
+    it 'raises an error if the message is not actionable' do
+      expect{make_non_actionable.ack}.to raise_error /not ackable/
+    end
+    it 'raises an error if an action was already taken' do
+      msg = make_actionable
+      msg.reject
+      expect { msg.ack }.to raise_error /already rejected/
+    end
+  end
+
+  describe '#nack' do
+    it 'raises an error if the message is not actionable' do
+      expect{make_non_actionable.nack}.to raise_error /not nackable/
+    end
+    it 'raises an error if an action was already taken' do
+      msg = make_actionable
+      msg.ack
+      expect { msg.nack }.to raise_error /already acked/
+    end
+  end
+
+  describe '#reject' do
+    it 'raises an error if the message is not actionable' do
+      expect{make_non_actionable.reject}.to raise_error /not rejectable/
+    end
+    it 'raises an error if an action was already taken' do
+      msg = make_actionable
+      msg.nack
+      expect { msg.reject }.to raise_error /already nacked/
+    end
+  end
+
+  describe '#action_taken' do
+    it 'returns the action taken' do
+      a = make_actionable
+      expect(a.action_taken).to eql nil
+
+      b = make_actionable
+      b.ack
+      expect(b.action_taken).to eql :ack
+
+      c = make_actionable
+      c.nack
+      expect(c.action_taken).to eql :nack
+
+      d = make_actionable
+      d.reject
+      expect(d.action_taken).to eql :reject
+    end
+  end
+
+  def make_actionable
+    Mercury::ReceivedMessage.new('hello', make_metadata, is_ackable: true)
+  end
+
+  def make_non_actionable
+    Mercury::ReceivedMessage.new('hello', make_metadata, is_ackable: false)
+  end
+
+  def make_metadata
+    m = double
+    allow(m).to receive(:ack)
+    allow(m).to receive(:reject)
+    m
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercury_amqp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Peter Winton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -213,6 +213,7 @@ files:
 - spec/lib/mercury/cps_spec.rb
 - spec/lib/mercury/mercury_spec.rb
 - spec/lib/mercury/monadic_spec.rb
+- spec/lib/mercury/received_message_spec.rb
 - spec/lib/mercury/sync_spec.rb
 - spec/lib/mercury/utils_spec.rb
 - spec/lib/mercury/wire_serializer_spec.rb
@@ -245,6 +246,7 @@ test_files:
 - spec/lib/mercury/cps_spec.rb
 - spec/lib/mercury/mercury_spec.rb
 - spec/lib/mercury/monadic_spec.rb
+- spec/lib/mercury/received_message_spec.rb
 - spec/lib/mercury/sync_spec.rb
 - spec/lib/mercury/utils_spec.rb
 - spec/lib/mercury/wire_serializer_spec.rb