bunny 2.6.3 → 2.6.4

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Consumer, "#cancel" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -19,8 +19,8 @@ describe Bunny::Consumer, "#cancel" do
 
       t = Thread.new do
         ch         = connection.create_channel
-        q          = ch.queue(queue_name, :auto_delete => true, :durable => false)
-        consumer = q.subscribe(:block => false) do |_, _, payload|
+        q          = ch.queue(queue_name, auto_delete: true, durable: false)
+        consumer = q.subscribe(block: false) do |_, _, payload|
           delivered_data << payload
         end
 
@@ -34,7 +34,7 @@ describe Bunny::Consumer, "#cancel" do
       sleep 0.5
 
       ch = connection.create_channel
-      ch.default_exchange.publish("", :routing_key => queue_name)
+      ch.default_exchange.publish("", routing_key: queue_name)
 
       sleep 0.7
       expect(delivered_data).to be_empty
@@ -51,14 +51,14 @@ describe Bunny::Consumer, "#cancel" do
 
       t = Thread.new do
         ch         = connection.create_channel
-        q          = ch.queue(queue_name, :auto_delete => true, :durable => false)
+        q          = ch.queue(queue_name, auto_delete: true, durable: false)
 
         consumer   = Bunny::Consumer.new(ch, q)
         consumer.on_delivery do |_, _, payload|
           delivered_data << payload
         end
 
-        q.subscribe_with(consumer, :block => false)
+        q.subscribe_with(consumer, block: false)
       end
       t.abort_on_exception = true
       sleep 1.0
@@ -67,7 +67,7 @@ describe Bunny::Consumer, "#cancel" do
       sleep 1.0
 
       ch = connection.create_channel
-      ch.default_exchange.publish("", :routing_key => queue_name)
+      ch.default_exchange.publish("", routing_key: queue_name)
 
       sleep 0.7
       expect(delivered_data).to be_empty
@@ -83,7 +83,7 @@ describe Bunny::Consumer, "#cancel" do
 
       t = Thread.new do
         ch         = connection.create_channel(nil, 1, false, 5)
-        q          = ch.queue(queue_name, :auto_delete => true, :durable => false)
+        q          = ch.queue(queue_name, auto_delete: true, durable: false)
 
         consumer   = Bunny::Consumer.new(ch, q)
         consumer.on_delivery do |_, _, payload|
@@ -91,14 +91,14 @@ describe Bunny::Consumer, "#cancel" do
           delivered_data << payload
         end
 
-        q.subscribe_with(consumer, :block => false)
+        q.subscribe_with(consumer, block: false)
       end
       t.abort_on_exception = true
       sleep 1.0
 
       ch = connection.create_channel
       ch.confirm_select
-      ch.default_exchange.publish("", :routing_key => queue_name)
+      ch.default_exchange.publish("", routing_key: queue_name)
       ch.wait_for_confirms
       sleep 0.5
 
@@ -114,7 +114,7 @@ describe Bunny::Consumer, "#cancel" do
 
       t = Thread.new do
         ch         = connection.create_channel(nil, 1, false, 1)
-        q          = ch.queue(queue_name, :auto_delete => true, :durable => false)
+        q          = ch.queue(queue_name, auto_delete: true, durable: false)
 
         consumer   = Bunny::Consumer.new(ch, q)
         consumer.on_delivery do |_, _, payload|
@@ -122,14 +122,14 @@ describe Bunny::Consumer, "#cancel" do
           delivered_data << payload
         end
 
-        q.subscribe_with(consumer, :block => false)
+        q.subscribe_with(consumer, block: false)
       end
       t.abort_on_exception = true
       sleep 1.0
 
       ch = connection.create_channel
       ch.confirm_select
-      ch.default_exchange.publish("", :routing_key => queue_name)
+      ch.default_exchange.publish("", routing_key: queue_name)
       ch.wait_for_confirms
       sleep 0.5
 

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -3,7 +3,7 @@ require "set"
 
 describe Bunny::Queue, "#subscribe" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -21,8 +21,8 @@ describe Bunny::Queue, "#subscribe" do
 
       t = Thread.new do
         ch = connection.create_channel
-        q = ch.queue(queue_name, :auto_delete => true, :durable => false)
-        q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+        q = ch.queue(queue_name, auto_delete: true, durable: false)
+        q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
@@ -32,13 +32,13 @@ describe Bunny::Queue, "#subscribe" do
 
       ch = connection.create_channel
       x  = ch.default_exchange
-      x.publish("hello", :routing_key => queue_name)
+      x.publish("hello", routing_key: queue_name)
 
       sleep 0.7
       expect(delivered_keys).to include(queue_name)
       expect(delivered_data).to include("hello")
 
-      expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+      expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
       ch.close
     end
@@ -50,8 +50,8 @@ describe Bunny::Queue, "#subscribe" do
         delivery_tags = SortedSet.new
 
         cch = connection.create_channel
-        q = cch.queue(queue_name, :auto_delete => true, :durable => false)
-        q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+        q = cch.queue(queue_name, auto_delete: true, durable: false)
+        q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
           delivery_tags << delivery_info.delivery_tag
         end
         sleep 0.5
@@ -59,13 +59,13 @@ describe Bunny::Queue, "#subscribe" do
         ch = connection.create_channel
         x  = ch.default_exchange
         100.times do
-          x.publish("hello", :routing_key => queue_name)
+          x.publish("hello", routing_key: queue_name)
         end
 
         sleep 1.0
         expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
 
-        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+        expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
         ch.close
       end
@@ -79,10 +79,10 @@ describe Bunny::Queue, "#subscribe" do
         delivery_tags = SortedSet.new
 
         cch = connection.create_channel
-        q   = cch.queue(queue_name, :auto_delete => true, :durable => false)
+        q   = cch.queue(queue_name, auto_delete: true, durable: false)
 
         7.times do
-          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+          q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
             delivery_tags << delivery_info.delivery_tag
           end
         end
@@ -91,13 +91,13 @@ describe Bunny::Queue, "#subscribe" do
         ch = connection.create_channel
         x  = ch.default_exchange
         100.times do
-          x.publish("hello", :routing_key => queue_name)
+          x.publish("hello", routing_key: queue_name)
         end
 
         sleep 1.5
         expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
 
-        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+        expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
         ch.close
       end
@@ -113,8 +113,8 @@ describe Bunny::Queue, "#subscribe" do
 
       t = Thread.new do
         ch = connection.create_channel
-        q = ch.queue(queue_name, :auto_delete => true, :durable => false)
-        q.subscribe(:exclusive => false, :manual_ack => true) do |delivery_info, properties, payload|
+        q = ch.queue(queue_name, auto_delete: true, durable: false)
+        q.subscribe(exclusive: false, manual_ack: true) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
 
@@ -126,13 +126,13 @@ describe Bunny::Queue, "#subscribe" do
 
       ch = connection.create_channel
       x  = ch.default_exchange
-      x.publish("hello", :routing_key => queue_name)
+      x.publish("hello", routing_key: queue_name)
 
       sleep 0.7
       expect(delivered_keys).to include(queue_name)
       expect(delivered_data).to include("hello")
 
-      expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+      expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
       ch.close
     end
@@ -147,10 +147,10 @@ describe Bunny::Queue, "#subscribe" do
         delivered_data = []
 
         ch = connection.create_channel
-        q  = ch.queue(queue_name, :auto_delete => true, :durable => false)
+        q  = ch.queue(queue_name, auto_delete: true, durable: false)
         x  = ch.default_exchange
         100.times do
-          x.publish("hello", :routing_key => queue_name)
+          x.publish("hello", routing_key: queue_name)
         end
 
         sleep 0.7
@@ -158,8 +158,8 @@ describe Bunny::Queue, "#subscribe" do
 
         t = Thread.new do
           ch = connection.create_channel
-          q = ch.queue(queue_name, :auto_delete => true, :durable => false)
-          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+          q = ch.queue(queue_name, auto_delete: true, durable: false)
+          q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
             delivered_keys << delivery_info.routing_key
             delivered_data << payload
           end
@@ -170,7 +170,7 @@ describe Bunny::Queue, "#subscribe" do
         expect(delivered_keys).to include(queue_name)
         expect(delivered_data).to include("hello")
 
-        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+        expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
         ch.close
       end
@@ -189,17 +189,17 @@ describe Bunny::Queue, "#subscribe" do
         ch = connection.create_channel
         q  = ch.queue(queue_name)
 
-        c1  = q.subscribe(:exclusive => false, :manual_ack => false, :block => false) do |delivery_info, properties, payload|
+        c1  = q.subscribe(exclusive: false, manual_ack: false, block: false) do |delivery_info, properties, payload|
         end
         c1.cancel
 
-        c2  = q.subscribe(:exclusive => false, :manual_ack => false, :block => false) do |delivery_info, properties, payload|
+        c2  = q.subscribe(exclusive: false, manual_ack: false, block: false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
         c2.cancel
 
-        q.subscribe(:exclusive => false, :manual_ack => false, :block => true) do |delivery_info, properties, payload|
+        q.subscribe(exclusive: false, manual_ack: false, block: true) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
@@ -209,7 +209,7 @@ describe Bunny::Queue, "#subscribe" do
 
       ch = connection.create_channel
       x  = ch.default_exchange
-      x.publish("hello", :routing_key => queue_name)
+      x.publish("hello", routing_key: queue_name)
 
       sleep 0.7
       expect(delivered_keys).to include(queue_name)
@@ -231,13 +231,13 @@ describe Bunny::Queue, "#subscribe" do
         caught = nil
         t = Thread.new do
           ch = connection.create_channel
-          q  = ch.queue(queue_name, :auto_delete => true, :durable => false)
+          q  = ch.queue(queue_name, auto_delete: true, durable: false)
 
           ch.on_uncaught_exception do |e, consumer|
             caught = e
           end
 
-          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+          q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
             raise RuntimeError.new(queue_name)
           end
         end
@@ -246,7 +246,7 @@ describe Bunny::Queue, "#subscribe" do
 
         ch     = connection.create_channel
         x  = ch.default_exchange
-        x.publish("hello", :routing_key => queue_name)
+        x.publish("hello", routing_key: queue_name)
         sleep 0.5
 
         expect(caught.message).to eq queue_name
@@ -265,9 +265,9 @@ describe Bunny::Queue, "#subscribe" do
           allow(connection.logger).to receive(:error) { |x| caughts << x }
 
           ch = connection.create_channel
-          q  = ch.queue(queue_name, :auto_delete => true, :durable => false)
+          q  = ch.queue(queue_name, auto_delete: true, durable: false)
 
-          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+          q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
             raise RuntimeError.new(queue_name)
           end
         end
@@ -276,7 +276,7 @@ describe Bunny::Queue, "#subscribe" do
 
         ch     = connection.create_channel
         x  = ch.default_exchange
-        5.times { x.publish("hello", :routing_key => queue_name) }
+        5.times { x.publish("hello", routing_key: queue_name) }
         sleep 1.5
 
         expect(caughts.size).to eq(5)
@@ -293,8 +293,8 @@ describe Bunny::Queue, "#subscribe" do
         delivery_tags = SortedSet.new
 
         cch = connection.create_channel
-        q = cch.queue(queue_name, :auto_delete => true, :durable => false)
-        q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+        q = cch.queue(queue_name, auto_delete: true, durable: false)
+        q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
           delivery_tags << delivery_info.delivery_tag
         end
         sleep 0.5
@@ -302,13 +302,13 @@ describe Bunny::Queue, "#subscribe" do
         ch = connection.create_channel
         x  = ch.default_exchange
         100.times do
-          x.publish("hello", :routing_key => queue_name)
+          x.publish("hello", routing_key: queue_name)
         end
 
         sleep 1.0
         expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
 
-        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+        expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
         ch.close
       end
@@ -322,10 +322,10 @@ describe Bunny::Queue, "#subscribe" do
         delivery_tags = SortedSet.new
 
         cch = connection.create_channel
-        q   = cch.queue(queue_name, :auto_delete => true, :durable => false)
+        q   = cch.queue(queue_name, auto_delete: true, durable: false)
 
         7.times do
-          q.subscribe(:exclusive => false, :manual_ack => false) do |delivery_info, properties, payload|
+          q.subscribe(exclusive: false, manual_ack: false) do |delivery_info, properties, payload|
             delivery_tags << delivery_info.delivery_tag
           end
         end
@@ -334,13 +334,13 @@ describe Bunny::Queue, "#subscribe" do
         ch = connection.create_channel
         x  = ch.default_exchange
         100.times do
-          x.publish("hello", :routing_key => queue_name)
+          x.publish("hello", routing_key: queue_name)
         end
 
         sleep 1.5
         expect(delivery_tags).to eq SortedSet.new(Range.new(1, 100).to_a)
 
-        expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
+        expect(ch.queue(queue_name, auto_delete: true, durable: false).message_count).to eq 0
 
         ch.close
       end

data/spec/higher_level_api/integration/basic_consume_with_objects_spec.rb

@@ -3,7 +3,7 @@ require "set"
 
 describe Bunny::Queue, "#subscribe_with" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -32,19 +32,19 @@ describe Bunny::Queue, "#subscribe_with" do
     it "requeues messages on channel closure" do
       ch1  = connection.create_channel
       ch2  = connection.create_channel
-      q1   = ch1.queue("bunny.tests.consumer_object1", :exclusive => true)
-      q2   = ch2.queue("bunny.tests.consumer_object1", :exclusive => true)
+      q1   = ch1.queue("bunny.tests.consumer_object1", exclusive: true)
+      q2   = ch2.queue("bunny.tests.consumer_object1", exclusive: true)
       ec   = ExampleConsumer.new(ch1, q1, "", false)
       x    = ch2.default_exchange
 
       t = Thread.new do
         50.times do
-          x.publish("hello", :routing_key => q2.name)
+          x.publish("hello", routing_key: q2.name)
         end
       end
       t.abort_on_exception = true
 
-      q1.subscribe_with(ec, :manual_ack => true)
+      q1.subscribe_with(ec, manual_ack: true)
       sleep 2
       ch1.close
 

data/spec/higher_level_api/integration/basic_get_spec.rb

@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe Bunny::Queue, "#pop" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed",
-                  :automatically_recover => false)
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+                  automatically_recover: false)
     c.start
     c
   end
@@ -16,11 +16,11 @@ describe Bunny::Queue, "#pop" do
     it "fetches a messages which is automatically acknowledged" do
       ch = connection.create_channel
 
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       x  = ch.default_exchange
 
       msg = "xyzzy"
-      x.publish(msg, :routing_key => q.name)
+      x.publish(msg, routing_key: q.name)
 
       sleep(0.5)
       get_ok, properties, content = q.pop
@@ -41,7 +41,7 @@ describe Bunny::Queue, "#pop" do
     it "returns an empty response" do
       ch = connection.create_channel
 
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       q.purge
 
       get_empty, properties, content = q.pop

data/spec/higher_level_api/integration/basic_nack_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#nack" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -17,20 +17,20 @@ describe Bunny::Channel, "#nack" do
 
   context "with requeue = false" do
     it "rejects a message" do
-      q = subject.queue("bunny.basic.nack.with-requeue-false", :exclusive => true)
+      q = subject.queue("bunny.basic.nack.with-requeue-false", exclusive: true)
       x = subject.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep(0.5)
       expect(q.message_count).to eq 1
-      delivery_info, _, content = q.pop(:manual_ack => true)
+      delivery_info, _, content = q.pop(manual_ack: true)
 
       subject.nack(delivery_info.delivery_tag, false, false)
       sleep(0.5)
       subject.close
 
       ch = connection.create_channel
-      q = ch.queue("bunny.basic.nack.with-requeue-false", :exclusive => true)
+      q = ch.queue("bunny.basic.nack.with-requeue-false", exclusive: true)
       expect(q.message_count).to eq 0
       ch.close
     end
@@ -38,17 +38,17 @@ describe Bunny::Channel, "#nack" do
 
   context "with multiple = true" do
     it "rejects multiple messages" do
-q = subject.queue("bunny.basic.nack.with-requeue-true-multi-true", :exclusive => true)
+q = subject.queue("bunny.basic.nack.with-requeue-true-multi-true", exclusive: true)
       x = subject.default_exchange
 
       3.times do
-        x.publish("bunneth", :routing_key => q.name)
+        x.publish("bunneth", routing_key: q.name)
       end
       sleep(0.5)
       expect(q.message_count).to eq 3
-      _, _, _ = q.pop(:manual_ack => true)
-      _, _, _ = q.pop(:manual_ack => true)
-      delivery_info, _, content = q.pop(:manual_ack => true)
+      _, _, _ = q.pop(manual_ack: true)
+      _, _, _ = q.pop(manual_ack: true)
+      delivery_info, _, content = q.pop(manual_ack: true)
 
       subject.nack(delivery_info.delivery_tag, true, true)
       sleep(0.5)
@@ -61,13 +61,13 @@ q = subject.queue("bunny.basic.nack.with-requeue-true-multi-true", :exclusive =>
 
   context "with an invalid (random) delivery tag" do
     it "causes a channel-level error" do
-      q = subject.queue("bunny.basic.nack.unknown-delivery-tag", :exclusive => true)
+      q = subject.queue("bunny.basic.nack.unknown-delivery-tag", exclusive: true)
       x = subject.default_exchange
 
-      x.publish("bunneth", :routing_key => q.name)
+      x.publish("bunneth", routing_key: q.name)
       sleep(0.25)
       expect(q.message_count).to eq 1
-      _, _, content = q.pop(:manual_ack => true)
+      _, _, content = q.pop(manual_ack: true)
 
       subject.on_error do |ch, channel_close|
         @channel_close = channel_close