bunny 2.6.3 → 2.6.4

data/spec/higher_level_api/integration/tx_rollback_spec.rb

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

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#with_channel" 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/issues/issue100_spec.rb

@@ -3,11 +3,11 @@ require "spec_helper"
 unless ENV["CI"]
   describe Bunny::Channel, "#basic_publish" do
     before :all do
-      @connection = Bunny.new(:user     => "bunny_gem",
-                              :password => "bunny_password",
-                              :vhost    => "bunny_testbed",
-                              :write_timeout => 0,
-                              :read_timeout => 0)
+      @connection = Bunny.new(username: "bunny_gem",
+                              password: "bunny_password",
+                              vhost: "bunny_testbed",
+                              write_timeout: 0,
+                              read_timeout:  0)
       @connection.start
     end
 
@@ -23,13 +23,13 @@ unless ENV["CI"]
       it "successfully publishers them all" do
         ch = @connection.create_channel
 
-        q  = ch.queue("", :exclusive => true)
+        q  = ch.queue("", exclusive: true)
         x  = ch.default_exchange
 
         body = "x" * 1024
         m.times do |i|
           n.times do
-            x.publish(body, :routing_key => q.name)
+            x.publish(body, routing_key:  q.name)
           end
           puts "Published #{i * n} 1K messages..."
         end

data/spec/issues/issue141_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "Registering 2nd exclusive consumer on queue" do
     before :all do
-    @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    @connection = Bunny.new(:user => "bunny_gem", password:  "bunny_password", :vhost => "bunny_testbed")
     @connection.start
   end
 
@@ -19,13 +19,13 @@ describe "Registering 2nd exclusive consumer on queue" do
     q1  = ch1.queue("", :auto_delete => true)
     q2  = ch2.queue(q1.name, :auto_delete => true, :passive => true)
 
-    c1  = q1.subscribe(:exclusive => true) do |_, _, payload|
+    c1  = q1.subscribe(exclusive: true) do |_, _, payload|
       xs << payload
     end
     sleep 0.1
 
     expect do
-      q2.subscribe(:exclusive => true) do |_, _, _|
+      q2.subscribe(exclusive: true) do |_, _, _|
       end
     end.to raise_error(Bunny::AccessRefused)
 

data/spec/issues/issue224_spec.rb

@@ -5,7 +5,7 @@ unless ENV["CI"]
   describe "Message framing implementation" do
     let(:connection) do
       c = Bunny.new(:user     => "bunny_gem",
-        :password => "bunny_password",
+        password:  "bunny_password",
         :vhost    => "bunny_testbed",
         :port     => ENV.fetch("RABBITMQ_PORT", 5672))
       c.start
@@ -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" * 272179)
-        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

data/spec/issues/issue465_spec.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+
+describe Bunny::Session do
+  let(:connection) do
+    c = Bunny.new(
+        user: 'bunny_gem', password: 'bunny_password',
+        vhost: 'bunny_testbed',
+        port: ENV.fetch('RABBITMQ_PORT', 5672)
+    )
+    c.start
+    c
+  end
+
+  context 'after the connection has been manually closed' do
+    before :each do
+      connection.close
+    end
+
+    after :each do
+      connection.close if connection.open?
+    end
+
+    describe '#create_channel' do
+      it 'should raise an exception' do
+        expect {
+          connection.create_channel
+        }.to raise_error(Bunny::ConnectionAlreadyClosed)
+      end
+    end
+  end
+end

data/spec/issues/issue78_spec.rb

@@ -3,15 +3,16 @@ require "spec_helper"
 unless ENV["CI"]
   describe Bunny::Queue, "#subscribe" do
     before :all do
-      @connection1 = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+      @connection1 = Bunny.new(:user => "bunny_gem", password:  "bunny_password", :vhost => "bunny_testbed")
       @connection1.start
-      @connection2 = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+      @connection2 = Bunny.new(:user => "bunny_gem", password:  "bunny_password", :vhost => "bunny_testbed")
       @connection2.start
     end
 
     after :all do
-      @connection1.close if @connection1.open?
-      @connection2.close if @connection2.open?
+      [@connection1, @connection2].select { |c| !!c }.each do |c|
+        c.close if c.open?
+      end
     end
 
 
@@ -22,14 +23,14 @@ unless ENV["CI"]
         ch1 = @connection1.create_channel
         ch2 = @connection1.create_channel
 
-        q   = ch1.queue("", :exclusive => true)
-        q.subscribe(:manual_ack => false, :block => false) do |delivery_info, properties, payload|
+        q   = ch1.queue("", exclusive: true)
+        q.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
           delivered_data << payload
         end
         sleep 0.5
 
         x = ch2.default_exchange
-        x.publish("abc", :routing_key => q.name)
+        x.publish("abc", routing_key:  q.name)
         sleep 0.7
 
         expect(delivered_data).to eq ["abc"]
@@ -48,15 +49,15 @@ unless ENV["CI"]
         ch1 = @connection1.create_channel
         ch2 = @connection1.create_channel
 
-        q   = ch1.queue(queue_name, :exclusive => true)
+        q   = ch1.queue(queue_name, exclusive: true)
         x = ch2.default_exchange
         3.times do |i|
-          x.publish("data#{i}", :routing_key => queue_name)
+          x.publish("data#{i}", routing_key:  queue_name)
         end
         sleep 0.7
         expect(q.message_count).to eq 3
 
-        q.subscribe(:manual_ack => false, :block => false) do |delivery_info, properties, payload|
+        q.subscribe(manual_ack: false, block: false) do |delivery_info, properties, payload|
           delivered_data << payload
         end
         sleep 0.7

data/spec/issues/issue83_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Bunny::Channel, "#open" do
   before :all do
-    @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
+    @connection = Bunny.new(:user => "bunny_gem", password:  "bunny_password", :vhost => "bunny_testbed")
     @connection.start
   end
 

data/spec/issues/issue97_spec.rb

@@ -2,10 +2,10 @@ require "spec_helper"
 
 describe "Message framing implementation" do
     before :all do
-    @connection = Bunny.new(:user     => "bunny_gem",
-                  :password => "bunny_password",
-                  :vhost    => "bunny_testbed",
-                  :port     => ENV.fetch("RABBITMQ_PORT", 5672))
+    @connection = Bunny.new(username: "bunny_gem",
+      password:  "bunny_password",
+      vhost: "bunny_testbed",
+      port: ENV.fetch("RABBITMQ_PORT", 5672))
     @connection.start
   end
 
@@ -19,11 +19,11 @@ describe "Message framing implementation" do
       it "successfully frames the message" do
         ch = @connection.create_channel
 
-        q  = ch.queue("", :exclusive => true)
+        q  = ch.queue("", exclusive: true)
         x  = ch.default_exchange
 
         body = IO.read("spec/issues/issue97_attachment.json")
-        x.publish(body, :routing_key => q.name, :persistent => true)
+        x.publish(body, routing_key: q.name, persistent: true)
 
         sleep(1)
         expect(q.message_count).to eq 1
@@ -39,11 +39,11 @@ describe "Message framing implementation" do
     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 + 2823777))
-      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
@@ -61,10 +61,10 @@ describe "Message framing implementation" do
     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 => true)
+      x.publish("", routing_key: q.name, persistent: true)
 
       sleep(1)
       expect(q.message_count).to eq 1
@@ -86,11 +86,11 @@ describe "Message framing implementation" do
     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 * 128 - 2)
-      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
@@ -104,11 +104,11 @@ describe "Message framing implementation" do
     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 * 128 - 1)
-      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
@@ -122,11 +122,11 @@ describe "Message framing implementation" do
     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 * 128)
-      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
@@ -141,11 +141,11 @@ describe "Message framing implementation" do
     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 * 128 + 1)
-      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
@@ -159,11 +159,11 @@ describe "Message framing implementation" do
     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 * 128 + 2)
-      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

data/spec/stress/channel_close_stress_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "Rapidly closing lots of temporary channels" do
   before :all do
-    @connection = Bunny.new(:automatic_recovery => false).tap do |c|
+    @connection = Bunny.new(automatic_recovery: false).tap do |c|
       c.start
     end
   end
@@ -21,7 +21,7 @@ describe "Rapidly closing lots of temporary channels" do
         n.times do
           t = Thread.new do
             @connection.with_channel do |ch1|
-              q   = ch1.queue("", :exclusive => true)
+              q   = ch1.queue("", exclusive: true)
               q.delete
               ch1.close
             end
@@ -49,7 +49,7 @@ describe "Rapidly closing lots of temporary channels" do
           t = Thread.new do
             3.times do
               @connection.with_channel do |ch|
-                x  = ch.topic('bunny.stress.topics.t2', :durable => false)
+                x  = ch.topic('bunny.stress.topics.t2', durable: false)
               end
             end
           end

data/spec/stress/channel_open_stress_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe "Rapidly opening and closing lots of channels" do
   before :all do
-    @connection = Bunny.new(:automatic_recovery => false).tap do |c|
+    @connection = Bunny.new(automatic_recovery: false).tap do |c|
       c.start
     end
   end
@@ -42,7 +42,7 @@ describe "Rapidly opening and closing lots of channels" do
         n.times do
           t = Thread.new do
             ch1 = @connection.create_channel
-            q   = ch1.queue("", :exclusive => true)
+            q   = ch1.queue("", exclusive: true)
             q.delete
             ch1.close
 
@@ -69,7 +69,7 @@ describe "Rapidly opening and closing lots of channels" do
           t = Thread.new do
             3.times do
               ch = @connection.create_channel
-              x  = ch.topic('bunny.stress.topics.t2', :durable => false)
+              x  = ch.topic('bunny.stress.topics.t2', durable: false)
               ch.close
             end
           end

data/spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb

@@ -3,7 +3,8 @@ require "spec_helper"
 unless ENV["CI"]
   describe "Rapidly opening and closing lots of channels on a non-threaded connection" do
     before :all do
-      @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatic_recovery => false, :threaded => false)
+      @connection = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+        automatic_recovery: false, threaded: false)
       @connection.start
     end
 

data/spec/stress/concurrent_consumers_stress_spec.rb

@@ -4,8 +4,8 @@ require "spec_helper"
 unless ENV["CI"]
   describe "Concurrent consumers sharing a connection" do
     before :all do
-      @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed",
-                    :automatic_recovery => false)
+      @connection = Bunny.new(username: "bunny_gem", password: "bunny_password", vhost: "bunny_testbed",
+                    automatic_recovery: false)
       @connection.start
     end
 
@@ -27,7 +27,7 @@ unless ENV["CI"]
         ch0  = @connection.create_channel
         ch0.confirm_select
         body = "абвг"
-        x    = ch0.topic("bunny.stress.concurrent.consumers.topic", :durable => true)
+        x    = ch0.topic("bunny.stress.concurrent.consumers.topic", durable: true)
 
         chs  = {}
         n.times do |i|
@@ -39,8 +39,8 @@ unless ENV["CI"]
           t = Thread.new do
             cht = chs[i]
 
-            q = cht.queue("", :exclusive => true)
-            q.bind(x.name, :routing_key => colors.sample).subscribe do |delivery_info, meta, payload|
+            q = cht.queue("", exclusive: true)
+            q.bind(x.name, routing_key: colors.sample).subscribe do |delivery_info, meta, payload|
               # no-op
             end
             qs << q
@@ -52,7 +52,7 @@ unless ENV["CI"]
 
         5.times do |i|
           m.times do
-            x.publish(body, :routing_key => colors.sample)
+            x.publish(body, routing_key: colors.sample)
           end
           puts "Published #{(i + 1) * m} messages..."
           ch0.wait_for_confirms

data/spec/stress/concurrent_publishers_stress_spec.rb

@@ -4,7 +4,8 @@ require "spec_helper"
 unless ENV["CI"]
   describe "Concurrent publishers sharing a connection" do
     before :all do
-      @connection = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatically_recover => false)
+      @connection = Bunny.new(username: "bunny_gem", password: "bunny_password",
+        vhost: "bunny_testbed", automatically_recover: false)
       @connection.start
     end
 

data/spec/stress/connection_open_close_spec.rb

@@ -13,7 +13,7 @@ unless defined?(JRUBY_VERSION) && !ENV["FORCE_JRUBY_RUN"]
 
     n.times do |i|
       it "can be closed (automatic recovery disabled, take #{i})" do
-        c  = Bunny.new(:automatically_recover => false)
+        c  = Bunny.new(automatically_recover: false)
         c.start
         ch = c.create_channel
 
@@ -25,7 +25,7 @@ unless defined?(JRUBY_VERSION) && !ENV["FORCE_JRUBY_RUN"]
 
     n.times do |i|
       it "can be closed (automatic recovery enabled, take #{i})" do
-        c  = Bunny.new(:automatically_recover => true)
+        c  = Bunny.new(automatically_recover: true)
         c.start
         ch = c.create_channel
 
@@ -38,7 +38,7 @@ unless defined?(JRUBY_VERSION) && !ENV["FORCE_JRUBY_RUN"]
     context "in the single threaded mode" do
       n.times do |i|
         it "can be closed (single threaded mode, take #{i})" do
-          c  = Bunny.new(:automatically_recover => false, :threaded => false)
+          c  = Bunny.new(automatically_recover: false, threaded: false)
           c.start
           ch = c.create_channel