pwwka 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5765ddd484db315254a41e9d4e445ca89d7fef1af2f24619de73bf1699f5ae5e
-  data.tar.gz: 7544a009754d7094524a6732a5ea40844abb324e14e97fcbaccb10c3f28f56aa
+  metadata.gz: f3112d40e1055cea1ee6a8d1335933a40d8bb8676eee3e59f8143c5bcc5ec945
+  data.tar.gz: 3ff10bab3455edb15cbca6ae7d7ef67c2e9a6ad58fb678fa31a3b8cd74f9f648
 SHA512:
-  metadata.gz: 9e86c5de727b0d355fa2af8cb5bd3bc99da6f34d539d3f65f025012f47e9fa7517d91d571cb28d778f3dabcb3caa88498a5ad8ce1509e42f941f05d34d6eb985
-  data.tar.gz: 2cfedd5609d5c3b13c8beb42a0873798cc6ae6d5a4309a5bb15138b88e4e6a1f259689494a23254c70693d4f7f46f7e7d3a894cfff6d794c5747fecdf24aa4d8
+  metadata.gz: 77c1ba64026ff171573ac521e0245dadf23aa7a9f76abafe1205f79af3753d78a59139bc7c93565a5f1bc86fbf5184e74d8dd54c665ba281e0329df37f980b91
+  data.tar.gz: 65fe34a0aca0e31ed8210939268df9852c986a34d60d198ed785d43e6a49a7da7f57435bb7d37b4ecb456165301d3569667aa80f029441ab2950174cb90671c7

data/lib/pwwka/receiver.rb

@@ -47,6 +47,7 @@ module Pwwka
       rescue Interrupt => _
         # TODO: trap TERM within channel.work_pool
         info "Interrupting queue #{queue_name} subscriber safely"
+      ensure
         receiver.channel_connector.connection_close
       end
       return receiver

data/lib/pwwka/transmitter.rb

@@ -121,10 +121,11 @@ module Pwwka
       )
       logf "START Transmitting Message on id[%{id}] %{routing_key} -> %{payload}", id: publish_options.message_id, routing_key: routing_key, payload: payload
       channel_connector.topic_exchange.publish(payload.to_json, publish_options.to_h)
-      channel_connector.connection_close
       # if it gets this far it has succeeded
       logf "END Transmitting Message on id[%{id}] %{routing_key} -> %{payload}", id: publish_options.message_id, routing_key: routing_key, payload: payload
       true
+    ensure
+      channel_connector.connection_close
     end
 
 
@@ -140,10 +141,11 @@ module Pwwka
       logf "START Transmitting Delayed Message on id[%{id}] %{routing_key} -> %{payload}", id: publish_options.message_id, routing_key: routing_key, payload: payload
       channel_connector.create_delayed_queue
       channel_connector.delayed_exchange.publish(payload.to_json,publish_options.to_h)
-      channel_connector.connection_close
       # if it gets this far it has succeeded
       logf "END Transmitting Delayed Message on id[%{id}] %{routing_key} -> %{payload}", id: publish_options.message_id, routing_key: routing_key, payload: payload
       true
+    ensure
+      channel_connector.connection_close
     end
 
   end

data/lib/pwwka/version.rb

@@ -1,3 +1,3 @@
 module Pwwka
-  VERSION = '0.19.0'
+  VERSION = '0.20.0'
 end

data/spec/unit/receiver_spec.rb

@@ -1,17 +1,46 @@
 require 'spec_helper.rb'
 
 describe Pwwka::Receiver do
-  describe "#new" do 
-    let(:channel_connector) { double(Pwwka::ChannelConnector)}
+  describe "#new" do
+    let(:handler_klass) { double('HandlerKlass') }
+    let(:channel_connector) { double(Pwwka::ChannelConnector, topic_exchange: topic_exchange, channel: channel)}
+    let(:topic_exchange) { double("topic exchange") }
+    let(:channel) { double('channel', queue: queue) }
+    let(:queue) { double('queue') }
+    let(:queue_name) { 'test_queue_name' }
+
+    subject {
+      described_class.subscribe(
+        handler_klass,
+        queue_name
+      )
+    }
 
     before do
-      allow(Pwwka::ChannelConnector).to receive(:new).with(prefetch: nil, connection_name: "c: test_queue_name").and_return(channel_connector)
-      allow(channel_connector).to receive(:channel)
-      allow(channel_connector).to receive(:topic_exchange)
+      allow(Pwwka::ChannelConnector).to receive(:new).and_return(channel_connector)
+      allow(handler_klass).to receive(:handle!)
+      allow(channel_connector).to receive(:connection_close)
+      allow(queue).to receive(:bind)
+      allow(queue).to receive(:subscribe).and_yield({}, {}, '{}')
+    end
+
+    it 'sets the correct connection_name' do
+      subject
+      expect(Pwwka::ChannelConnector).to have_received(:new).with(prefetch: nil, connection_name: "c: #{queue_name}")
+    end
+
+    it 'closes the conenction on an error' do
+      error = 'oh no'
+      allow(handler_klass).to receive(:handle!).and_raise(error)
+      begin; subject; rescue; end
+      expect(channel_connector).to have_received(:connection_close)
     end
 
-    it "should set the connection_name" do
-      Pwwka::Receiver.new("test_queue_name", "test.routing.key")
+    it 'logs on interrupt' do
+      allow(handler_klass).to receive(:handle!).and_raise(Interrupt)
+      allow(described_class).to receive(:info)
+      begin; subject; rescue; end
+      expect(described_class).to have_received(:info).with(/Interrupting queue #{queue_name}/)
     end
   end
 end

data/spec/unit/transmitter_spec.rb

@@ -327,8 +327,25 @@ describe Pwwka::Transmitter do
       expect(channel_connector).to have_received(:connection_close)
     end
 
-    context "with only basic required arguments" do
+    context 'when an error is raised' do
+      subject { transmitter.send_message!(payload,routing_key) }
+      let(:error) { 'oh no' }
+
+      before do
+        allow(topic_exchange).to receive(:publish).and_raise(error)
+      end
+
+      it 'should raise the error' do
+        expect { subject } .to raise_error(error)
+      end
 
+      it 'should close the channel connector' do
+        begin; subject; rescue; end
+        expect(channel_connector).to have_received(:connection_close)
+      end
+    end
+
+    context "with only basic required arguments" do
       before do
         transmitter.send_message!(payload,routing_key)
       end
@@ -337,6 +354,7 @@ describe Pwwka::Transmitter do
         let(:exchange) { topic_exchange }
       end
     end
+
     context "with everything overridden" do
       before do
         transmitter.send_message!(
@@ -369,6 +387,24 @@ describe Pwwka::Transmitter do
         expect(channel_connector).to have_received(:create_delayed_queue)
       end
 
+      context 'when an error is raised' do
+        subject { transmitter.send_delayed_message!(payload,routing_key) }
+        let(:error) { 'oh no' }
+
+        before do
+          allow(delayed_exchange).to receive(:publish).and_raise(error)
+        end
+
+        it 'should raise the error' do
+          expect { subject } .to raise_error(error)
+        end
+
+        it 'should close the channel connector' do
+          begin; subject; rescue; end
+          expect(channel_connector).to have_received(:connection_close)
+        end
+      end
+
       context "with only basic required arguments" do
         before do
           transmitter.send_delayed_message!(payload,routing_key,5_000)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwwka
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Stitch Fix Engineering
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny