bunny 2.6.3 → 2.6.4

data/spec/higher_level_api/integration/queue_bind_spec.rb

@@ -2,14 +2,14 @@ require "spec_helper"
 
 describe "A client-named", Bunny::Queue 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
 
   it "can be bound to a pre-declared exchange" do
     ch = connection.create_channel
-    q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
+    q  = ch.queue("bunny.tests.queues.client-named#{rand}", exclusive: true)
     expect(q).not_to be_server_named
 
     expect(q.bind("amq.fanout")).to eq q
@@ -19,7 +19,7 @@ describe "A client-named", Bunny::Queue do
 
   it "can be unbound from a pre-declared exchange" do
     ch = connection.create_channel
-    q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
+    q  = ch.queue("bunny.tests.queues.client-named#{rand}", exclusive: true)
     expect(q).not_to be_server_named
 
     q.bind("amq.fanout")
@@ -30,7 +30,7 @@ describe "A client-named", Bunny::Queue do
 
   it "can be bound to a custom exchange" do
     ch = connection.create_channel
-    q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
+    q  = ch.queue("bunny.tests.queues.client-named#{rand}", exclusive: true)
 
     x  = ch.fanout("bunny.tests.exchanges.fanout#{rand}")
     expect(q.bind(x)).to eq q
@@ -41,10 +41,10 @@ describe "A client-named", Bunny::Queue do
 
   it "can be unbound from a custom exchange" do
     ch = connection.create_channel
-    q  = ch.queue("bunny.tests.queues.client-named#{rand}", :exclusive => true)
+    q  = ch.queue("bunny.tests.queues.client-named#{rand}", exclusive: true)
     expect(q).not_to be_server_named
 
-    x  = ch.fanout("bunny.tests.fanout", :auto_delete => true, :durable => false)
+    x  = ch.fanout("bunny.tests.fanout", auto_delete: true, durable: false)
 
     q.bind(x)
     expect(q.unbind(x)).to eq q
@@ -64,7 +64,7 @@ describe "A server-named", Bunny::Queue do
 
   it "can be bound to a pre-declared exchange" do
     ch = connection.create_channel
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
     expect(q).to be_server_named
 
     expect(q.bind("amq.fanout")).to eq q
@@ -74,7 +74,7 @@ describe "A server-named", Bunny::Queue do
 
   it "can be unbound from a pre-declared exchange" do
     ch = connection.create_channel
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
     expect(q).to be_server_named
 
     q.bind("amq.fanout")
@@ -85,7 +85,7 @@ describe "A server-named", Bunny::Queue do
 
   it "can be bound to a custom exchange" do
     ch = connection.create_channel
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
 
     x  = ch.fanout("bunny.tests.exchanges.fanout#{rand}")
     expect(q.bind(x)).to eq q
@@ -96,7 +96,7 @@ describe "A server-named", Bunny::Queue do
 
   it "can be bound from a custom exchange" do
     ch   = connection.create_channel
-    q    = ch.queue("", :exclusive => true)
+    q    = ch.queue("", exclusive: true)
 
     name = "bunny.tests.exchanges.fanout#{rand}"
     x    = ch.fanout(name)

data/spec/higher_level_api/integration/queue_declare_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Queue do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    c = Bunny.new(user: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -55,7 +55,7 @@ describe Bunny::Queue do
     it "declares it as durable" do
       ch   = connection.create_channel
 
-      q = ch.queue("bunny.tests.queues.durable", :durable => true)
+      q = ch.queue("bunny.tests.queues.durable", durable: true)
       expect(q).to be_durable
       expect(q).not_to be_auto_delete
       expect(q).not_to be_exclusive
@@ -71,7 +71,7 @@ describe Bunny::Queue do
     it "declares it as exclusive" do
       ch   = connection.create_channel
 
-      q = ch.queue("bunny.tests.queues.exclusive", :exclusive => true)
+      q = ch.queue("bunny.tests.queues.exclusive", exclusive: true)
       expect(q).to be_exclusive
       expect(q).not_to be_durable
       q.delete
@@ -85,7 +85,7 @@ describe Bunny::Queue do
     it "declares it as auto-delete" do
       ch   = connection.create_channel
 
-      q = ch.queue("bunny.tests.queues.auto-delete", :auto_delete => true)
+      q = ch.queue("bunny.tests.queues.auto-delete", auto_delete: true)
       expect(q).to be_auto_delete
       expect(q).not_to be_exclusive
       expect(q).not_to be_durable
@@ -101,10 +101,10 @@ describe Bunny::Queue do
     it "raises an exception" do
       ch   = connection.create_channel
 
-      q = ch.queue("bunny.tests.queues.auto-delete", :auto_delete => true, :durable => false)
+      q = ch.queue("bunny.tests.queues.auto-delete", auto_delete: true, durable: false)
       expect {
         # force re-declaration
-        ch.queue_declare("bunny.tests.queues.auto-delete", :auto_delete => false, :durable => true)
+        ch.queue_declare("bunny.tests.queues.auto-delete", auto_delete: false, durable: true)
       }.to raise_error(Bunny::PreconditionFailed)
 
       expect(ch).to be_closed
@@ -121,7 +121,7 @@ describe Bunny::Queue do
     it "causes all messages in it to have a TTL" do
       ch   = connection.create_channel
 
-      q = ch.queue("bunny.tests.queues.with-arguments.ttl", :arguments => args, :exclusive => true)
+      q = ch.queue("bunny.tests.queues.with-arguments.ttl", arguments:  args, exclusive: true)
       expect(q.arguments).to eq args
 
       q.publish("xyzzy")
@@ -142,10 +142,13 @@ describe Bunny::Queue do
     end
 
     it "enables priority implementation" do
-      ch   = connection.create_channel
+      c = Bunny.new(user: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed")
+      c.start
+
+      ch   = c.create_channel
       ch.confirm_select
 
-      q = ch.queue("bunny.tests.queues.with-arguments.priority", :arguments => args, :exclusive => true)
+      q = ch.queue("bunny.tests.queues.with-arguments.priority #{rand}", arguments: args, exclusive: true)
       expect(q.arguments).to eq args
 
       q.publish("xyzzy")
@@ -168,7 +171,7 @@ describe Bunny::Queue do
     context "when a queue exists" do
       it "returns true" do
         ch = connection.create_channel
-        q  = ch.queue("", :exlusive => true)
+        q  = ch.queue("", exlusive: true)
 
         expect(connection.queue_exists?(q.name)).to eq true
       end
@@ -196,7 +199,7 @@ describe Bunny::Queue do
       it "causes the queue to be bounded" do
         ch   = connection.create_channel
 
-        q = ch.queue("bunny.tests.queues.with-arguments.max-length", :arguments => args, :exclusive => true)
+        q = ch.queue("bunny.tests.queues.with-arguments.max-length", arguments:  args, exclusive: true)
         expect(q.arguments).to eq args
 
         (n * 10).times do

data/spec/higher_level_api/integration/queue_delete_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Queue, "#delete" 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

data/spec/higher_level_api/integration/queue_purge_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Queue 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
@@ -15,10 +15,10 @@ describe Bunny::Queue do
   it "can be purged" do
     ch = connection.create_channel
 
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
     x  = ch.default_exchange
 
-    x.publish("xyzzy", :routing_key => q.name)
+    x.publish("xyzzy", routing_key: q.name)
     sleep(0.5)
 
     expect(q.message_count).to eq 1

data/spec/higher_level_api/integration/queue_unbind_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Queue, "bound to an exchange" 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
@@ -15,7 +15,7 @@ describe Bunny::Queue, "bound to an exchange" do
   it "can be unbound from an exchange it was bound to" do
     ch = connection.create_channel
     x  = ch.fanout("amq.fanout")
-    q  = ch.queue("", :exclusive => true).bind(x)
+    q  = ch.queue("", exclusive: true).bind(x)
 
     x.publish("")
     sleep 0.3
@@ -32,7 +32,7 @@ end
 
 describe Bunny::Queue, "NOT bound to an exchange" 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
@@ -45,7 +45,7 @@ describe Bunny::Queue, "NOT bound to an exchange" do
   it "is idempotent (succeeds)" do
     ch = connection.create_channel
     x  = ch.fanout("amq.fanout")
-    q  = ch.queue("", :exclusive => true)
+    q  = ch.queue("", exclusive: true)
 
     # No exception as of RabbitMQ 3.2. MK.
     q.unbind(x)

data/spec/higher_level_api/integration/read_only_consumer_spec.rb

@@ -2,13 +2,13 @@ require "spec_helper"
 
 describe Bunny::Queue, "#subscribe" do
   let(:publisher_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
 
   let(:consumer_connection) do
-    c = Bunny.new(:user => "bunny_reader", :password => "reader_password", :vhost => "bunny_testbed")
+    c = Bunny.new(username: "bunny_reader", password: "reader_password", vhost: "bunny_testbed")
     c.start
     c
   end
@@ -28,7 +28,7 @@ describe Bunny::Queue, "#subscribe" do
       ch = publisher_connection.create_channel
       # declare the queue because the read-only user won't be able to issue
       # queue.declare
-      q  = ch.queue(queue_name, :auto_delete => true, :durable => false)
+      q  = ch.queue(queue_name, auto_delete: true, durable: false)
 
       t = Thread.new do
         # give the main thread a bit of time to declare the queue
@@ -36,8 +36,8 @@ describe Bunny::Queue, "#subscribe" do
         ch = consumer_connection.create_channel
         # this connection is read only, use passive declare to only get
         # a reference to the queue
-        q  = ch.queue(queue_name, :auto_delete => true, :durable => false, :passive => true)
-        q.subscribe(:exclusive => false) do |delivery_info, properties, payload|
+        q  = ch.queue(queue_name, auto_delete: true, durable: false, passive: true)
+        q.subscribe(exclusive: false) do |delivery_info, properties, payload|
           delivered_keys << delivery_info.routing_key
           delivered_data << payload
         end
@@ -46,13 +46,13 @@ describe Bunny::Queue, "#subscribe" do
       sleep 0.5
 
       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

data/spec/higher_level_api/integration/sender_selected_distribution_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "Sender-selected distribution" 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
@@ -14,14 +14,14 @@ describe "Sender-selected distribution" do
   it "lets publishers specify additional routing keys using CC and BCC headers" do
     ch   = connection.create_channel
     x    = ch.direct("bunny.tests.ssd.exchange")
-    q1   = ch.queue("", :exclusive => true).bind(x, :routing_key => "one")
-    q2   = ch.queue("", :exclusive => true).bind(x, :routing_key => "two")
-    q3   = ch.queue("", :exclusive => true).bind(x, :routing_key => "three")
-    q4   = ch.queue("", :exclusive => true).bind(x, :routing_key => "four")
+    q1   = ch.queue("", exclusive: true).bind(x, routing_key: "one")
+    q2   = ch.queue("", exclusive: true).bind(x, routing_key: "two")
+    q3   = ch.queue("", exclusive: true).bind(x, routing_key: "three")
+    q4   = ch.queue("", exclusive: true).bind(x, routing_key: "four")
 
     n    = 10
     n.times do |i|
-      x.publish("Message #{i}", :routing_key => "one", :headers => {"CC" => ["two", "three"]})
+      x.publish("Message #{i}", routing_key: "one", headers: {"CC" => ["two", "three"]})
     end
 
     sleep 0.5

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -7,13 +7,13 @@ unless ENV["CI"]
       expect(connection).to be_tls
       ch = connection.create_channel
 
-      q  = ch.queue("", :exclusive => true)
+      q  = ch.queue("", exclusive: true)
       x  = ch.default_exchange
 
-      x.publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name).
-        publish("xyzzy", :routing_key => q.name)
+      x.publish("xyzzy", routing_key: q.name).
+        publish("xyzzy", routing_key: q.name).
+        publish("xyzzy", routing_key: q.name).
+        publish("xyzzy", routing_key: q.name)
 
       sleep 0.5
       expect(q.message_count).to eq 4
@@ -33,14 +33,14 @@ unless ENV["CI"]
 
   describe "TLS connection to RabbitMQ with client certificates" do
     let(:connection) do
-      c = Bunny.new(:user     => "bunny_gem",
-        :password => "bunny_password",
-        :vhost    => "bunny_testbed",
-        :tls                   => true,
-        :tls_cert              => "spec/tls/client_certificate.pem",
-        :tls_key               => "spec/tls/client_key.pem",
-        :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"],
-        :verify_peer           => false)
+      c = Bunny.new(username: "bunny_gem",
+        password: "bunny_password",
+        vhost: "bunny_testbed",
+        tls: true,
+        tls_cert: "spec/tls/client_certificate.pem",
+        tls_key: "spec/tls/client_key.pem",
+        tls_ca_certificates: ["./spec/tls/ca_certificate.pem"],
+        verify_peer: false)
       c.start
       c
     end
@@ -55,12 +55,12 @@ unless ENV["CI"]
 
   describe "TLS connection to RabbitMQ without client certificates" do
     let(:connection) do
-      c = Bunny.new(:user     => "bunny_gem",
-        :password => "bunny_password",
-        :vhost    => "bunny_testbed",
-        :tls                   => true,
-        :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"],
-        :verify_peer           => false)
+      c = Bunny.new(username: "bunny_gem",
+        password: "bunny_password",
+        vhost: "bunny_testbed",
+        tls: true,
+        tls_ca_certificates: ["./spec/tls/ca_certificate.pem"],
+        verify_peer: false)
       c.start
       c
     end
@@ -76,10 +76,10 @@ unless ENV["CI"]
   describe "TLS connection to RabbitMQ with a connection string" do
     let(:connection) do
       c = Bunny.new("amqps://bunny_gem:bunny_password@127.0.0.1/bunny_testbed",
-        :tls_cert              => "spec/tls/client_certificate.pem",
-        :tls_key               => "spec/tls/client_key.pem",
-        :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"],
-        :verify_peer           => false)
+        tls_cert: "spec/tls/client_certificate.pem",
+        tls_key: "spec/tls/client_key.pem",
+        tls_ca_certificates: ["./spec/tls/ca_certificate.pem"],
+        verify_peer: false)
       c.start
       c
     end
@@ -95,8 +95,8 @@ unless ENV["CI"]
   describe "TLS connection to RabbitMQ with a connection string and w/o client certificate and key" do
     let(:connection) do
       c = Bunny.new("amqps://bunny_gem:bunny_password@127.0.0.1/bunny_testbed",
-        :tls_ca_certificates   => ["./spec/tls/ca_certificate.pem"],
-        :verify_peer           => false)
+        tls_ca_certificates: ["./spec/tls/ca_certificate.pem"],
+        verify_peer: false)
       c.start
       c
     end
@@ -111,14 +111,14 @@ unless ENV["CI"]
 
   describe "TLS connection to RabbitMQ with client certificates provided inline" do
     let(:connection) do
-      c = Bunny.new(:user    => "bunny_gem",
-        :password            => "bunny_password",
-        :vhost               => "bunny_testbed",
-        :tls                 => true,
-        :tls_cert            => File.read("./spec/tls/client_certificate.pem"),
-        :tls_key             => File.read("./spec/tls/client_key.pem"),
-        :tls_ca_certificates => ["./spec/tls/ca_certificate.pem"],
-        :verify_peer         => false)
+      c = Bunny.new(username: "bunny_gem",
+        password: "bunny_password",
+        vhost: "bunny_testbed",
+        tls: true,
+        tls_cert: File.read("./spec/tls/client_certificate.pem"),
+        tls_key: File.read("./spec/tls/client_key.pem"),
+        tls_ca_certificates: ["./spec/tls/ca_certificate.pem"],
+        verify_peer: false)
       c.start
       c
     end
@@ -132,13 +132,13 @@ unless ENV["CI"]
 
   describe "TLS connection to RabbitMQ with tls_version TLSv1 specified" do
     let(:connection) do
-      c = Bunny.new(:user    => "bunny_gem",
-        :password            => "bunny_password",
-        :vhost               => "bunny_testbed",
-        :tls                 => true,
-        :tls_protocol        => :TLSv1,
-        :tls_ca_certificates => ["./spec/tls/ca_certificate.pem"],
-        :verify_peer         => false)
+      c = Bunny.new(username: "bunny_gem",
+        password: "bunny_password",
+        vhost: "bunny_testbed",
+        tls: true,
+        tls_protocol: :TLSv1,
+        tls_ca_certificates: ["./spec/tls/ca_certificate.pem"],
+        verify_peer: false)
       c.start
       c
     end

data/spec/higher_level_api/integration/tx_commit_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#tx_commit" 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