action_subscriber 5.1.0.pre-java → 5.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 8c6a4db4087f78e1c16c2ad21e25d45c7e062d1767e1e6c4f2d29518e93bdfa2
-  data.tar.gz: 3d5819a42753bb06ee490e66293565fb1e636d547735fc7d4bcf06ce6c88502b
+SHA1:
+  metadata.gz: 9d12c0bd459bf3cf6fe2b0d44f36aec3f8eb4c5f
+  data.tar.gz: 8433d4975c8761882b911de975eb7109bb1b93f5
 SHA512:
-  metadata.gz: e093f13797fdf8ca5afba83a20bd575b5fe791692e36ebc0bb9c33a8a32742ecaf6a352a5ad1273818557d497bed790219c048afdc90f3a2ef2eb51ec5094030
-  data.tar.gz: 3dec8b008760311b7d7959d5b2805bd16b8dae8c05ad67e8f27f6abc39ae5975dfcbfe2381bf35d9d69452afc492f138a7d1e7c5b1c14ef1d8b47a0e32d337db
+  metadata.gz: c3a82ecf93d01ffdaced3b78158f395fafb19cfb80df7b80f944078b881780f2e3270b638016aff13ebabeadbe5c415b61e9c0c8edbf847f0fcd4908582fa200
+  data.tar.gz: fae306be8aae1ebbc5a2b29589d7ff6f7708b66a04f8960eb32d9aeca8f292a54de67618947cfaa8d41d53308801941245ca79aee2b7f25c5e148e4d8d9a8892

data/lib/action_subscriber/middleware/env.rb

@@ -46,14 +46,21 @@ module ActionSubscriber
 
       def acknowledge
         fail ::RuntimeError, "you can't acknowledge messages under the polling API" unless @channel
+        return true if @has_been_acked
         acknowledge_multiple_messages = false
         @has_been_acked = true
         @channel.ack(@delivery_tag, acknowledge_multiple_messages)
         true
       end
 
+      def channel_open?
+        return false unless @channel
+        @channel.open?
+      end
+
       def nack
         fail ::RuntimeError, "you can't acknowledge messages under the polling API" unless @channel
+        return true if @has_been_nacked
         nack_multiple_messages = false
         requeue_message = true
         @has_been_nacked = true
@@ -63,6 +70,7 @@ module ActionSubscriber
 
       def reject
         fail ::RuntimeError, "you can't acknowledge messages under the polling API" unless @channel
+        return true if @has_been_rejected
         requeue_message = true
         @has_been_rejected = true
         @channel.reject(@delivery_tag, requeue_message)
@@ -70,15 +78,15 @@ module ActionSubscriber
       end
 
       def safe_acknowledge
-        acknowledge if uses_acknowledgements? && @channel && !has_used_delivery_tag?
+        acknowledge if uses_acknowledgements? && channel_open? && !has_used_delivery_tag?
       end
 
       def safe_nack
-        nack if uses_acknowledgements? && @channel && !has_used_delivery_tag?
+        nack if uses_acknowledgements? && channel_open? && !has_used_delivery_tag?
       end
 
       def safe_reject
-        reject if uses_acknowledgements? && @channel && !has_used_delivery_tag?
+        reject if uses_acknowledgements? && channel_open? && !has_used_delivery_tag?
       end
 
       def to_hash

data/lib/action_subscriber/middleware/error_handler.rb

@@ -22,7 +22,14 @@ module ActionSubscriber
           logger.error { "ActionSubscriber error handler raised error, but should never raise. Error: #{inner_error}" }
         end
       ensure
-        env.safe_nack # Make sure we attempt to `nack` a message that did not get processed if something fails
+        # This second rescue is a little extreme, but we need to be very cautious here to avoid errors
+        # being sent back to bunny or march_hare land.
+        begin
+          # Make sure we attempt to `nack` a message that did not get processed if something fails
+          env.safe_nack
+        rescue Exception => inner_error
+          logger.error { "ActionSubscriber error handler raised error while nack-ing message. Error: #{inner_error}" }
+        end
       end
     end
   end

data/lib/action_subscriber/rspec.rb

@@ -3,10 +3,18 @@ require 'rspec/core'
 module ActionSubscriber
   module RSpec
     class FakeChannel # A class that quacks like a RabbitMQ Channel
+      def initialize(opts = {})
+        @open = opts.fetch(:open, true)
+      end
+
       def ack(delivery_tag, acknowledge_multiple)
         true
       end
 
+      def open?
+        @open
+      end
+
       def nack(delivery_tag, acknowledge_multiple, requeue_message)
         true
       end
@@ -76,9 +84,10 @@ end
   shared_context 'action subscriber middleware env' do
     let(:app) { Proc.new { |inner_env| inner_env } }
     let(:env) { ActionSubscriber::Middleware::Env.new(UserSubscriber, 'encoded payload', message_properties) }
+    let(:channel) { ::ActionSubscriber::RSpec::FakeChannel.new }
     let(:message_properties) {{
       :action => :created,
-      :channel => ::ActionSubscriber::RSpec::FakeChannel.new,
+      :channel => channel,
       :content_type => "text/plain",
       :delivery_tag => "XYZ",
       :exchange => "events",

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "5.1.0.pre"
+  VERSION = "5.1.1"
 end

data/spec/lib/action_subscriber/middleware/error_handler_spec.rb

@@ -9,6 +9,26 @@ describe ActionSubscriber::Middleware::ErrorHandler do
 
   let(:load_error) { ::LoadError.new("Boom!") }
   let(:runtime_error) { ::RuntimeError.new("Boom!") }
+  let(:message_properties) {{
+    :action => :created,
+    :channel => channel,
+    :content_type => "text/plain",
+    :delivery_tag => "XYZ",
+    :exchange => "events",
+    :headers => {},
+    :message_id => "MSG-123",
+    :routing_key => "amigo.user.created",
+    :queue => "test.amigo.user.created",
+    :uses_acknowledgements => true,
+  }}
+
+  it "calls safe_nack after successful execution" do
+    expect(env).to receive(:safe_nack).and_call_original
+    expect(env).to_not receive(:nack)
+
+    env.acknowledge
+    subject.call(env)
+  end
 
   context "when an exception occurs" do
     context "LoadError" do
@@ -23,18 +43,31 @@ describe ActionSubscriber::Middleware::ErrorHandler do
 
     context "RuntimError" do
       before { allow(app).to receive(:call).and_raise(runtime_error) }
+
       it "calls the exception handler with a RuntimeError" do
         handler = ::ActionSubscriber.configuration.error_handler
         expect(handler).to receive(:call).with(runtime_error, env.to_h)
 
         subject.call(env)
       end
-    end
 
-    it "calls safe_nack after execution" do
-      expect(env).to receive(:safe_nack)
+      it "calls safe_nack after execution" do
+        expect(env).to receive(:safe_nack).and_call_original
+        expect(env).to receive(:nack)
 
-      subject.call(env)
+        subject.call(env)
+      end
+
+      context "when the channel is closed without an ack" do
+        let(:channel) { ::ActionSubscriber::RSpec::FakeChannel.new(:open => false) }
+
+        it "calls safe_nack after execution" do
+          expect(env).to receive(:safe_nack).and_call_original
+          expect(env).to_not receive(:nack)
+
+          subject.call(env)
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 5.1.0.pre
+  version: 5.1.1
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -292,12 +292,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from