bunny 2.6.3 → 2.6.4

data/spec/higher_level_api/integration/exchange_bind_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::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
@@ -14,10 +14,10 @@ describe Bunny::Exchange do
   it "binds two existing exchanges" do
     ch          = connection.create_channel
 
-    source      = ch.fanout("bunny.exchanges.source", :auto_delete => true)
-    destination = ch.fanout("bunny.exchanges.destination", :auto_delete => true)
+    source      = ch.fanout("bunny.exchanges.source", auto_delete: true)
+    destination = ch.fanout("bunny.exchanges.destination", auto_delete: true)
 
-    queue       = ch.queue("", :exclusive => true)
+    queue       = ch.queue("", exclusive: true)
     queue.bind(destination)
 
     destination.bind(source)

data/spec/higher_level_api/integration/exchange_declare_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::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
@@ -67,7 +67,7 @@ describe Bunny::Exchange do
         ch = connection.create_channel
 
         name = "bunny.tests.exchanges.durable"
-        x    = ch.fanout(name, :durable => true)
+        x    = ch.fanout(name, durable: true)
         expect(x.name).to eq name
         expect(x).to be_durable
         expect(x).not_to be_auto_delete
@@ -83,12 +83,12 @@ describe Bunny::Exchange do
         ch = connection.create_channel
 
         name = "bunny.tests.exchanges.auto-delete"
-        x    = ch.fanout(name, :auto_delete => true)
+        x    = ch.fanout(name, auto_delete: true)
         expect(x.name).to eq name
         expect(x).not_to be_durable
         expect(x).to be_auto_delete
 
-        ch.exchange(name, :type => :fanout, :auto_delete => true)
+        ch.exchange(name, type: :fanout, auto_delete: true)
 
         x.delete
         ch.close
@@ -100,15 +100,15 @@ describe Bunny::Exchange do
       it "raises an exception" do
         ch   = connection.create_channel
 
-        x = ch.fanout("bunny.tests.exchanges.fanout", :auto_delete => true, :durable => false)
+        x = ch.fanout("bunny.tests.exchanges.fanout", auto_delete: true, durable: false)
         expect {
           # force re-declaration
-          ch.exchange_declare("bunny.tests.exchanges.fanout", :direct, :auto_delete => false, :durable => true)
+          ch.exchange_declare("bunny.tests.exchanges.fanout", :direct, auto_delete: false, durable: true)
         }.to raise_error(Bunny::PreconditionFailed)
 
         expect(ch).to be_closed
         expect {
-          ch.fanout("bunny.tests.exchanges.fanout", :auto_delete => true, :durable => false)
+          ch.fanout("bunny.tests.exchanges.fanout", auto_delete: true, durable: false)
         }.to raise_error(Bunny::ChannelAlreadyClosed)
       end
     end
@@ -123,7 +123,7 @@ describe Bunny::Exchange do
         x    = ch.direct(name)
         expect(x.name).to eq name
 
-        ch.exchange(name, :type => :direct)
+        ch.exchange(name, type: :direct)
 
         x.delete
         ch.close
@@ -152,7 +152,7 @@ describe Bunny::Exchange do
         x    = ch.topic(name)
         expect(x.name).to eq name
 
-        ch.exchange(name, :type => :topic)
+        ch.exchange(name, type: :topic)
 
         x.delete
         ch.close
@@ -215,7 +215,7 @@ describe Bunny::Exchange do
   context "that is internal" do
     it "can be declared" do
       ch = connection.create_channel
-      x  = ch.fanout("bunny.tests.exchanges.internal", :internal => true)
+      x  = ch.fanout("bunny.tests.exchanges.internal", internal: true)
       expect(x).to be_internal
       x.delete
 

data/spec/higher_level_api/integration/exchange_delete_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Exchange, "#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/exchange_unbind_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::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
@@ -17,7 +17,7 @@ describe Bunny::Exchange do
     source      = ch.fanout("bunny.exchanges.source#{rand}")
     destination = ch.fanout("bunny.exchanges.destination#{rand}")
 
-    queue       = ch.queue("", :exclusive => true)
+    queue       = ch.queue("", exclusive: true)
     queue.bind(destination)
 
     destination.bind(source)
@@ -25,7 +25,7 @@ describe Bunny::Exchange do
     sleep 0.5
 
     expect(queue.message_count).to eq 1
-    queue.pop(:manual_ack => true)
+    queue.pop(manual_ack: true)
 
     destination.unbind(source)
     source.publish("")

data/spec/higher_level_api/integration/exclusive_queue_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
@@ -14,13 +14,13 @@ describe Bunny::Queue do
   it "is closed when the connection it was declared on is closed" do
     ch1 = connection.create_channel
     ch2 = connection.create_channel
-    q   = ch1.queue("", :exclusive => true)
+    q   = ch1.queue("", exclusive: true)
 
-    ch1.queue_declare(q.name, :passive => true)
-    ch2.queue_declare(q.name, :passive => true)
+    ch1.queue_declare(q.name, passive: true)
+    ch2.queue_declare(q.name, passive: true)
 
     ch1.close
-    ch2.queue_declare(q.name, :passive => true)
+    ch2.queue_declare(q.name, passive: true)
 
     ch2.queue_delete(q.name)
     ch2.close

data/spec/higher_level_api/integration/heartbeat_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "Client-defined heartbeat interval" do
   context "with value > 0" do
     let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :heartbeat_interval => 4)
+      c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_interval: 4)
       c.start
       c
     end
@@ -18,8 +18,8 @@ describe "Client-defined heartbeat interval" do
   # issue 267
   context "with value = 0" do
     let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed",
-        :heartbeat_interval => 0, :automatically_recover => false)
+      c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+        heartbeat_interval: 0, automatically_recover: false)
       c.start
       c
     end
@@ -35,7 +35,7 @@ end
 
 describe "Server-defined heartbeat interval" do
   let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :heartbeat_interval => :server)
+    c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", heartbeat_interval: :server)
     c.start
     c
   end

data/spec/higher_level_api/integration/merry_go_round_spec.rb

@@ -2,31 +2,31 @@ require "spec_helper"
 
 describe "A message that is proxied by multiple intermediate consumers" do
   let(:c1) 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(:c2) 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(:c3) 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(:c4) 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(:c5) 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,25 +45,25 @@ describe "A message that is proxied by multiple intermediate consumers" do
     xs  = []
 
     ch1 = c1.create_channel
-    q1  = ch1.queue("", :exclusive => true)
+    q1  = ch1.queue("", exclusive: true)
     q1.subscribe do |_, _, payload|
       xs << payload
     end
 
     ch2 = c2.create_channel
-    q2  = ch2.queue("", :exclusive => true)
+    q2  = ch2.queue("", exclusive: true)
     q2.subscribe do |_, _, payload|
       q1.publish(payload)
     end
 
     ch3 = c3.create_channel
-    q3  = ch2.queue("", :exclusive => true)
+    q3  = ch2.queue("", exclusive: true)
     q3.subscribe do |_, _, payload|
       q2.publish(payload)
     end
 
     ch4 = c4.create_channel
-    q4  = ch2.queue("", :exclusive => true)
+    q4  = ch2.queue("", exclusive: true)
     q4.subscribe do |_, _, payload|
       q3.publish(payload)
     end
@@ -72,7 +72,7 @@ describe "A message that is proxied by multiple intermediate consumers" do
     x   = ch5.default_exchange
 
     n.times do |i|
-      x.publish("msg #{i}", :routing_key => q4.name)
+      x.publish("msg #{i}", routing_key: q4.name)
     end
 
     t = n / 1000 * 3.0

data/spec/higher_level_api/integration/message_properties_access_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 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
@@ -20,8 +20,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 => true, :manual_ack => false) do |delivery_info, properties, payload|
+      q = ch.queue(queue_name, auto_delete: true, durable: false)
+      q.subscribe(exclusive: true, manual_ack: false) do |delivery_info, properties, payload|
         metadata = properties
         envelope = delivery_info
       end
@@ -32,28 +32,28 @@ describe Bunny::Queue, "#subscribe" do
     ch = connection.create_channel
     x  = ch.default_exchange
     x.publish("hello",
-              :routing_key => queue_name,
-              :app_id      => "bunny.example",
-              :priority    => 8,
-              :type        => "kinda.checkin",
+              routing_key: queue_name,
+              app_id: "bunny.example",
+              priority: 8,
+              type: "kinda.checkin",
               # headers table keys can be anything
-              :headers     => {
-                :coordinates => {
-                  :latitude  => 59.35,
-                  :longitude => 18.066667
+              headers: {
+                coordinates: {
+                  latitude: 59.35,
+                  longitude: 18.066667
                 },
-                :time         => @now,
-                :participants => 11,
-                :venue        => "Stockholm",
-                :true_field   => true,
-                :false_field  => false,
-                :nil_field    => nil,
-                :ary_field    => ["one", 2.0, 3, [{"abc" => 123}]]
+                time: @now,
+                participants: 11,
+                venue: "Stockholm",
+                true_field: true,
+                false_field: false,
+                nil_field: nil,
+                ary_field: ["one", 2.0, 3, [{"abc" => 123}]]
               },
-              :timestamp      => @now.to_i,
-              :reply_to       => "a.sender",
-              :correlation_id => "r-1",
-              :message_id     => "m-1")
+              timestamp: @now.to_i,
+              reply_to: "a.sender",
+              correlation_id: "r-1",
+              message_id: "m-1")
 
     sleep 0.7
 

data/spec/higher_level_api/integration/predeclared_exchanges_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "amq.* exchanges" 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/publisher_confirms_spec.rb

@@ -16,11 +16,11 @@ describe Bunny::Channel do
         ch.confirm_select
         expect(ch).to be_using_publisher_confirmations
 
-        q  = ch.queue("", :exclusive => true)
+        q  = ch.queue("", exclusive: true)
         x  = ch.default_exchange
 
         n.times do
-          x.publish("xyzzy", :routing_key => q.name)
+          x.publish("xyzzy", routing_key: q.name)
         end
 
         expect(ch.next_publish_seq_no).to eq n + 1
@@ -41,11 +41,11 @@ describe Bunny::Channel do
           ch.confirm_select
           expect(ch).to be_using_publisher_confirmations
 
-          q  = ch.queue("", :exclusive => true)
+          q  = ch.queue("", exclusive: true)
           x  = ch.default_exchange
 
           n.times do
-            x.publish("xyzzy", :routing_key => q.name)
+            x.publish("xyzzy", routing_key: q.name)
           end
 
           expect(ch.next_publish_seq_no).to eq n + 1
@@ -82,11 +82,11 @@ describe Bunny::Channel do
           ch.confirm_select
           expect(ch).to be_using_publisher_confirmations
 
-          q  = ch.queue("", :exclusive => true)
+          q  = ch.queue("", exclusive: true)
           x  = ch.default_exchange
 
           n.times do
-            x.publish("xyzzy", :routing_key => q.name)
+            x.publish("xyzzy", routing_key: q.name)
           end
 
           #be sneaky to simulate a nack
@@ -118,7 +118,7 @@ describe Bunny::Channel do
 
   context "with a multi-threaded connection" do
     let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :continuation_timeout => 10000)
+      c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", continuation_timeout: 10000)
       c.start
       c
     end
@@ -181,7 +181,7 @@ describe Bunny::Channel do
 
   context "with a single-threaded connection" do
     let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :continuation_timeout => 10000, :threaded => false)
+      c = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed", continuation_timeout: 10000, threaded: false)
       c.start
       c
     end

data/spec/higher_level_api/integration/publishing_edge_cases_spec.rb

@@ -4,10 +4,10 @@ require "spec_helper"
 unless ENV["CI"]
   describe "Message framing implementation" do
     let(:connection) do
-      c = Bunny.new(:user     => "bunny_gem",
-        :password => "bunny_password",
-        :vhost    => "bunny_testbed",
-        :port     => ENV.fetch("RABBITMQ_PORT", 5672))
+      c = Bunny.new(username: "bunny_gem",
+        password: "bunny_password",
+        vhost: "bunny_testbed",
+        port: ENV.fetch("RABBITMQ_PORT", 5672))
       c.start
       c
     end
@@ -21,11 +21,11 @@ unless ENV["CI"]
       it "successfully frames the message" do
         ch = connection.create_channel
 
-        q  = ch.queue("", :exclusive => true)
+        q  = ch.queue("", exclusive: true)
         x  = ch.default_exchange
 
         as = ("a" * (1024 * 1024 * 4 + 28237777))
-        x.publish(as, :routing_key => q.name, :persistent => true)
+        x.publish(as, routing_key: q.name, persistent: true)
 
         sleep(1)
         expect(q.message_count).to eq 1
@@ -42,11 +42,11 @@ unless ENV["CI"]
       it "successfully frames the message" do
         ch = connection.create_channel
 
-        q  = ch.queue("", :exclusive => true)
+        q  = ch.queue("", exclusive: true)
         x  = ch.default_exchange
 
         as = "кириллца, йо" * (1024 * 1024)
-        x.publish(as, :routing_key => q.name, :persistent => true)
+        x.publish(as, routing_key: q.name, persistent: true)
 
         sleep(1)
         expect(q.message_count).to eq 1
@@ -64,10 +64,10 @@ unless ENV["CI"]
       it "successfully publishes the message" do
         ch = connection.create_channel
 
-        q  = ch.queue("", :exclusive => true)
+        q  = ch.queue("", exclusive: true)
         x  = ch.default_exchange
 
-        x.publish("", :routing_key => q.name, :persistent => false, :mandatory => true)
+        x.publish("", routing_key: q.name, persistent: false, mandatory: true)
 
         sleep(0.5)
         expect(q.message_count).to eq 1