pebbles-river 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 180179a2522d8ec5edf083a8da61221e80f554b9
-  data.tar.gz: 69812a2f7efc266e3223f84673a2f287783f4ef2
+  metadata.gz: 849ea26964c3aa0eca352aafc7642748c4eb587f
+  data.tar.gz: f94b8412cffeffc29b4bffcddef89aaf7a7c91d4
 SHA512:
-  metadata.gz: ccd1ef949b1f682232581df8adaed5a1b48da30bf4cff853f025e47fbe0b8841ff0f253a67101c2a9ec5cd9579e51b6492822dd71b57c62e741e060eb772690a
-  data.tar.gz: e985b7b0739159fd549c64751b7744c919aeaa223fb43978c5bb83217a1694befcfdebcc02b6b3cf0970beec99ee7ca53480b1d941ab51fdb840d1dd7d85b1cd
+  metadata.gz: 795e37fc7303ae8811a3ee0754090ac6b4c4938cb1d51e760dc7c76fecf95dd00651ab400e5ace6370939d0760b79af60486bbd2508b7c1d82fb4ad49972b8ec
+  data.tar.gz: bfdd4900bb2eb74905cc3b6e0eab54251910c0fab32f49c750ca0ec24b3715ea351e72d593f3cbbfec9f7ff798817c28c515d689e4387ae836e50b94c7da580b

data/lib/pebbles/river/river.rb

@@ -77,7 +77,7 @@ module Pebbles
 
       def queue(options = {})
         options.assert_valid_keys(:name, :ttl, :event, :path, :klass,
-          :dead_letter_routing_key, :routing_key)
+          :dead_letter_routing_key, :routing_key, :no_default_routing_keys)
 
         raise ArgumentError.new 'Queue must be named' unless options[:name]
 
@@ -96,8 +96,10 @@ module Pebbles
         if (routing_key = options[:routing_key])
           queue.bind(exchange.name, key: routing_key)
         end
-        Routing.binding_routing_keys_for(options.slice(:event, :class, :path)).each do |key|
-          queue.bind(exchange.name, key: key)
+        unless options[:no_default_routing_keys]
+          Routing.binding_routing_keys_for(options.slice(:event, :class, :path)).each do |key|
+            queue.bind(exchange.name, key: key)
+          end
         end
         queue
       end

data/lib/pebbles/river/routing.rb

@@ -15,13 +15,11 @@ module Pebbles
       def self.binding_routing_keys_for(options)
         options.assert_valid_keys(:path, :class, :event)
         keys = []
-        if options[:event] or options[:path] or options[:class]
-          element_to_routing_key_parts(options[:event]).each do |event|
-            element_to_routing_key_parts(options[:class]).each do |klass|
-              element_to_routing_key_parts(options[:path]).each do |pathspec|
-                path_to_routing_key_parts(pathspec).each do |path|
-                  keys << [event, klass, path].join('._.')
-                end
+        element_to_routing_key_parts(options[:event]).each do |event|
+          element_to_routing_key_parts(options[:class]).each do |klass|
+            element_to_routing_key_parts(options[:path]).each do |pathspec|
+              path_to_routing_key_parts(pathspec).each do |path|
+                keys << [event, klass, path].join('._.')
               end
             end
           end

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.3.3'
+    VERSION = '0.3.4'
   end
 end

data/lib/pebbles/river/worker.rb

@@ -181,16 +181,8 @@ module Pebbles
             if @logger
               @logger.error("Connection error (#{exception.class}): #{exception}")
             end
-
             @rate_limiter.increment
-
-            if @queue
-              ignore_exceptions do
-                @queue.close
-              end
-              @queue = nil
-            end
-
+            @queue = nil
             @river.disconnect
           rescue Timeout::Error
             if @logger

data/spec/lib/routing_spec.rb

@@ -39,7 +39,7 @@ describe Pebbles::River::Routing do
       end
 
       specify 'match nothing if not specified' do
-        expect(subject.binding_routing_keys_for({})).to eq []
+        expect(subject.binding_routing_keys_for({})).to eq ["#._.#._.#"]
       end
     end
 

data/spec/lib/worker_spec.rb

@@ -56,6 +56,7 @@ describe Worker do
 
   let :channel do
     channel = double('Bunny::Channel')
+    channel.stub(:reject) { }
     channel.stub(:ack) { }
     channel.stub(:nack) { }
     channel
@@ -63,7 +64,6 @@ describe Worker do
 
   let :queue do
     queue = double('Bunny::Queue')
-    queue.stub(:close) { nil }
     queue.stub(:pop) { |&block|
       block.call(*raw_message)
     }
@@ -151,8 +151,6 @@ describe Worker do
 
     context 'when handler is successful' do
       it 'acks the message' do
-        expect(queue).to_not receive(:close)
-
         expect(channel).to receive(:ack).at_least(1).times
         expect(channel).to_not receive(:nack)
 
@@ -166,9 +164,7 @@ describe Worker do
     context 'when handler returns false' do
       if false  # Needs Bunny 0.9+
         it 'nacks the message' do
-          expect(queue).to_not receive(:close)
-
-          expect(channel).to receive(:nack).at_least(1).times
+            expect(channel).to receive(:nack).at_least(1).times
           expect(channel).to_not receive(:ack)
 
           expect(river).to receive(:connected?).with(no_args).at_least(1).times
@@ -179,9 +175,7 @@ describe Worker do
       else
         it 'leaves the message un-acked' do
           expect(queue).to_not receive(:ack)
-          expect(queue).to_not receive(:close)
-
-          expect(river).to receive(:connected?).with(no_args).at_least(1).times
+            expect(river).to receive(:connected?).with(no_args).at_least(1).times
           expect(river).to_not receive(:connect)
 
           subject.new(false_handler, queue: {name: 'foo'}).run_once
@@ -200,16 +194,12 @@ describe Worker do
       if false  # Needs Bunny 0.9+
         it 'nacks the message' do
           expect(queue).to receive(:nack).at_least(1).times
-          expect(queue).to_not receive(:close)
-
-          subject.new(io_error_raising_handler, queue: {name: 'foo'}).run_once
+            subject.new(io_error_raising_handler, queue: {name: 'foo'}).run_once
         end
       else
         it 'leaves the message un-acked' do
           expect(queue).to_not receive(:ack)
-          expect(queue).to_not receive(:close)
-
-          subject.new(io_error_raising_handler, queue: {name: 'foo'}).run_once
+            subject.new(io_error_raising_handler, queue: {name: 'foo'}).run_once
         end
       end
 
@@ -236,8 +226,6 @@ describe Worker do
           end
 
           it "performs connection reset on #{exception_class}" do
-            expect(queue).to receive(:close).at_least(1).times
-
             expect(handler).to receive(:call).with(message)
 
             expect(river).to receive(:connected?).with(no_args).at_least(1).times
@@ -253,8 +241,6 @@ describe Worker do
             on_exception_callback.stub(:call) { }
             expect(on_exception_callback).to_not receive(:call)
 
-            expect(queue).to receive(:close).at_least(1).times
-
             expect(handler).to receive(:call).at_least(1).times
 
             expect(river).to receive(:connected?).with(no_args).at_least(1).times
@@ -287,7 +273,6 @@ describe Worker do
 
       context 'non-connection exception' do
         it "calls #on_exception" do
-          expect(queue).to_not receive(:close)
           expect(on_exception_callback).to receive(:call).with(io_error)
 
           subject.new(io_error_raising_handler,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Alexander Staubo