bunny 1.0.0.pre3 → 1.0.0.pre4

data/lib/bunny/transport.rb

@@ -41,7 +41,12 @@ module Bunny
       @tls_certificate       = opts[:tls_certificate] || opts[:ssl_cert_string]
       @tls_key               = opts[:tls_key]         || opts[:ssl_key_string]
       @tls_certificate_store = opts[:tls_certificate_store]
-      @tls_ca_certificates   = opts.fetch(:tls_ca_certificates, [])
+      @tls_ca_certificates   = opts.fetch(:tls_ca_certificates, [
+        '/etc/ssl/certs/ca-certificates.crt', # Ubuntu/Debian
+        '/etc/ssl/certs/ca-bundle.crt', # Amazon Linux
+        '/etc/ssl/ca-bundle.pem', # OpenSUSE
+        '/etc/pki/tls/certs/ca-bundle.crt' # Fedora/RHEL
+      ])
       @verify_peer           = opts[:verify_ssl] || opts[:verify_peer]
 
       @read_write_timeout = opts[:socket_timeout] || 3
@@ -339,6 +344,10 @@ module Bunny
     end
 
     def initialize_tls_certificate_store(certs)
+      certs = certs.select { |path| File.readable? path }
+      if certs.empty?
+        @logger.error "No CA certificates found, add one with :tls_ca_certificates"
+      end
       OpenSSL::X509::Store.new.tap do |store|
         certs.each { |path| store.add_file(path) }
       end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.0.0.pre3"
+  VERSION = "1.0.0.pre4"
 end

data/spec/higher_level_api/integration/basic_cancel_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Consumer, "#cancel" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_consume_spec.rb

@@ -8,7 +8,7 @@ describe Bunny::Queue, "#subscribe" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_nack_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel, "#nack" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/basic_publish_spec.rb

@@ -8,7 +8,7 @@ if RUBY_VERSION <= "1.9"
       c
     end
 
-    after :all do
+    after :each do
       connection.close if connection.open?
     end
 

data/spec/higher_level_api/integration/basic_qos_spec.rb

@@ -7,25 +7,22 @@ describe Bunny::Channel, "#prefetch" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
-
-  subject do
-    connection.create_channel
-  end
-
   context "with a positive integer" do
     it "sets that prefetch level via basic.qos" do
-      subject.prefetch(10).should be_instance_of(AMQ::Protocol::Basic::QosOk)
+      ch = connection.create_channel
+      ch.prefetch(10).should be_instance_of(AMQ::Protocol::Basic::QosOk)
     end
   end
 
   context "with a negative integer" do
     it "raises an ArgumentError" do
+      ch = connection.create_channel
       expect {
-        subject.prefetch(-2)
+        ch.prefetch(-2)
       }.to raise_error(ArgumentError)
     end
   end

data/spec/higher_level_api/integration/basic_reject_spec.rb

@@ -7,65 +7,64 @@ describe Bunny::Channel, "#reject" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 
-  subject do
-    connection.create_channel
-  end
-
   context "with requeue = true" do
     it "requeues a message" do
-      q = subject.queue("bunny.basic.reject.manual-acks", :exclusive => true)
-      x = subject.default_exchange
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.reject.manual-acks", :exclusive => true)
+      x  = ch.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
       q.message_count.should == 1
       delivery_info, _, _ = q.pop(:ack => true)
 
-      subject.reject(delivery_info.delivery_tag, true)
+      ch.reject(delivery_info.delivery_tag, true)
       sleep(0.5)
       q.message_count.should == 1
 
-      subject.close
+      ch.close
     end
   end
 
   context "with requeue = false" do
     it "rejects a message" do
-      q = subject.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
-      x = subject.default_exchange
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.reject.with-requeue-false", :exclusive => true)
+      x  = ch.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.5)
       q.message_count.should == 1
       delivery_info, _, _ = q.pop(:ack => true)
 
-      subject.reject(delivery_info.delivery_tag, false)
+      ch.reject(delivery_info.delivery_tag, false)
       sleep(0.5)
       q.message_count.should == 0
 
-      subject.close
+      ch.close
     end
   end
 
 
   context "with an invalid (random) delivery tag" do
     it "causes a channel-level error" do
-      q = subject.queue("bunny.basic.reject.unknown-delivery-tag", :exclusive => true)
-      x = subject.default_exchange
+      ch = connection.create_channel
+      q  = ch.queue("bunny.basic.reject.unknown-delivery-tag", :exclusive => true)
+      x  = ch.default_exchange
 
       x.publish("bunneth", :routing_key => q.name)
       sleep(0.25)
       q.message_count.should == 1
       _, _, content = q.pop(:ack => true)
 
-      subject.on_error do |ch, channel_close|
+      ch.on_error do |ch, channel_close|
         @channel_close = channel_close
       end
-      subject.reject(82, true)
+      ch.reject(82, true)
 
       sleep 0.5
 

data/spec/higher_level_api/integration/basic_return_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange, "#publish" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/channel_close_spec.rb

@@ -7,21 +7,17 @@ describe Bunny::Channel, "when closed" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
-
-  subject do
-    connection.create_channel
-  end
-
   it "releases the id" do
-    n = subject.number
+    ch = connection.create_channel
+    n = ch.number
 
-    subject.should be_open
-    subject.close
-    subject.should be_closed
+    ch.should be_open
+    ch.close
+    ch.should be_closed
 
     # a new channel with the same id can be created
     connection.create_channel(n)

data/spec/higher_level_api/integration/channel_flow_spec.rb

@@ -7,18 +7,15 @@ describe Bunny::Channel, "#flow" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
-
-  subject do
-    connection.create_channel
-  end
-
   it "is supported" do
-    subject.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
-    subject.flow(false).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
-    subject.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+    ch = connection.create_channel
+
+    ch.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+    ch.flow(false).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
+    ch.flow(true).should be_instance_of(AMQ::Protocol::Channel::FlowOk)
   end
 end

data/spec/higher_level_api/integration/channel_open_spec.rb

@@ -7,51 +7,42 @@ describe Bunny::Channel, "when opened" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end
 
   context "without explicitly provided id" do
-    subject do
-      connection.create_channel
-    end
-
     it "gets an allocated id and is successfully opened" do
       connection.should be_connected
-      subject.should be_open
+      ch = connection.create_channel
+      ch.should be_open
 
-      subject.id.should be > 0
+      ch.id.should be > 0
     end
   end
 
 
   context "with explicitly provided id" do
-    subject do
-      connection.create_channel(767)
-    end
-
     it "uses that id and is successfully opened" do
+      ch = connection.create_channel(767)
       connection.should be_connected
-      subject.should be_open
+      ch.should be_open
 
-      subject.id.should == 767
+      ch.id.should == 767
     end
   end
 
 
 
   context "with explicitly provided id that is already taken" do
-    subject do
-      connection.create_channel(767)
-    end
-
     it "reuses the channel that is already opened" do
+      ch = connection.create_channel(767)
       connection.should be_connected
-      subject.should be_open
+      ch.should be_open
 
-      subject.id.should == 767
+      ch.id.should == 767
 
-      connection.create_channel(767).should == subject
+      connection.create_channel(767).should == ch
     end
   end
 end

data/spec/higher_level_api/integration/confirm_select_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel, "#confirm_select" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/connection_spec.rb

@@ -284,7 +284,7 @@ describe Bunny::Session do
 
 
   context "initialized with :host => 127.0.0.1 and non-default credentials (take 2)" do
-    after :all do
+    after :each do
       subject.close if subject.open?
     end
 

data/spec/higher_level_api/integration/connection_stop_spec.rb

@@ -11,3 +11,16 @@ describe Bunny::Session do
     c.should be_closed
   end
 end
+
+
+describe Bunny::Session, "in a single threaded mode" do
+  it "can be closed" do
+    c  = Bunny.new(:automatically_recover => false, :threaded => false)
+    c.start
+    ch = c.create_channel
+
+    c.should be_connected
+    c.stop
+    c.should be_closed
+  end
+end

data/spec/higher_level_api/integration/consistent_hash_exchange_spec.rb

@@ -9,7 +9,7 @@ unless ENV["CI"]
       c
     end
 
-    after :all do
+    after :each do
       connection.close
     end
 

data/spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Channel do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 
@@ -80,4 +80,49 @@ describe Bunny::Channel do
       ch.close
     end
   end
+
+
+
+  context "with consumer re-registration" do
+    class ExampleConsumerThatReregisters < Bunny::Consumer
+      def handle_cancellation(_)
+        @queue = @channel.queue("basic.consume.after_cancellation", :auto_delete => true)
+        @channel.basic_consume_with(self)
+      end
+    end
+
+    let(:queue_name) { "basic.consume#{rand}" }
+
+    it "works correctly" do
+      consumer = nil
+      xs       = []
+
+      ch = connection.create_channel
+      t  = Thread.new do
+        ch2 = connection.create_channel
+        q   = ch2.queue(queue_name, :auto_delete => true)
+
+        consumer = ExampleConsumerThatReregisters.new(ch2, q, "")
+        consumer.on_delivery do |_, _, payload|
+          xs << payload
+        end
+        q.subscribe_with(consumer)
+      end
+      t.abort_on_exception = true
+
+      sleep 0.5
+      x = ch.default_exchange
+      x.publish("abc", :routing_key => queue_name)
+
+      sleep 0.5
+      ch.queue(queue_name, :auto_delete => true).delete
+
+      x.publish("abc", :routing_key => queue_name)
+      sleep 0.5
+      q = ch.queue("basic.consume.after_cancellation", :auto_delete => true)
+      xs.should == ["abc"]
+
+      ch.close
+    end
+  end
 end

data/spec/higher_level_api/integration/dead_lettering_spec.rb

@@ -7,7 +7,7 @@ describe "A message" do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/exchange_bind_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange do
     c
   end
 
-  after :all do
+  after :each do
     connection.close if connection.open?
   end
 

data/spec/higher_level_api/integration/exchange_declare_spec.rb

@@ -7,7 +7,7 @@ describe Bunny::Exchange do
     c
   end
 
-  after :all do
+  after :each do
     connection.close
   end