bunny 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8837b72e1a3b2ce162fc168eb298bcc9089f1d1
-  data.tar.gz: 22a780ffdeff22a180470071ab8c90da2ef0ed81
+  metadata.gz: f5ad0826b1b08b783d21d44c8314e0e8e48d37ed
+  data.tar.gz: e8f88ee2ec853d851ddd2df9724e8eaa85c9f175
 SHA512:
-  metadata.gz: 35bb0e4f3cc1dbd35d1fe9e135059b695f2fde65f188265a685d35c11ecad0460409215235ff3b108474e0a6304cca1f00a43d477ca129f4c1f3ea0d50615e33
-  data.tar.gz: aa3ee730eb9f096e0f9268e3187741752f80877a5bea078039133ae830a83e177c435120f369953b122bb8c6bdb7250cf81a167675f1b6d8e22b1e74c9e0b466
+  metadata.gz: ea456c7e95e6aa2ecd8ed507c899414e4b5db536a10a9626aab01750749684cb6d2572b477943b9eb621d8b5dc42af8c5543e78525b248949e50c986df1ab87c
+  data.tar.gz: c0c8d03011b55a020549dc35ecdc44ec9a5595603f79f912359169c5bcecfdf0949f01958e65a67cdd00565e8268ed681d2ee6218ed5990fdac342b325aff9f0

data/ChangeLog.md

@@ -1,3 +1,32 @@
+## Changes between Bunny 1.0.5 and 1.0.6
+
+### Better Exception Handling in Consumers
+
+Consumer work pools will now correctly catch all exceptions
+when dispatching submitted operations, not just `Bunny::Exception`
+subclasses.
+
+### TLS Without Peer Verification
+
+Bunny now successfully performs TLS upgrade when peer verification
+is disabled.
+
+Contribute by Jordan Curzon.
+
+### Bunny::Session#with_channel Ensures the Channel is Closed
+
+`Bunny::Session#with_channel` now makes sure the channel is closed
+even if provided block raises an exception
+
+Contributed by Carl Hoerberg.
+
+
+### Channel Number = 0 is Rejected
+
+`Bunny::Session#create_channel` will now reject channel number 0.
+
+
+
 ## Changes between Bunny 1.0.4 and 1.0.5
 
 ### Single Threaded Mode Fixes

data/lib/bunny/consumer_work_pool.rb

@@ -82,10 +82,10 @@ module Bunny
 
           begin
             callable.call
-          rescue Exception => e
-            # TODO
-            puts e.class.name
-            puts e.message
+          rescue ::Exception => e
+            # TODO: use connection logger
+            $stderr.puts e.class.name
+            $stderr.puts e.message
           end
         end
       end

data/lib/bunny/session.rb

@@ -272,6 +272,8 @@ module Bunny
     #
     # @return [Bunny::Channel] Newly opened channel
     def create_channel(n = nil, consumer_pool_size = 1)
+      raise ArgumentError, "channel number 0 is reserved in the protocol and cannot be used" if 0 == n
+
       if n && (ch = @channels[n])
         ch
       else
@@ -305,8 +307,11 @@ module Bunny
     # @return [Bunny::Session] self
     def with_channel(n = nil)
       ch = create_channel(n)
-      yield ch
-      ch.close if ch.open?
+      begin
+        yield ch
+      ensure
+        ch.close if ch.open?
+      end
 
       self
     end

data/lib/bunny/transport.rb

@@ -368,7 +368,14 @@ module Bunny
       # setting TLS/SSL version only works correctly when done
       # vis set_params. MK.
       ctx.set_params(:ssl_version => @opts.fetch(:tls_protocol, DEFAULT_TLS_PROTOCOL))
-      ctx.set_params(:verify_mode => OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT) if @verify_peer
+     
+      verify_mode = if @verify_peer
+        OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
+      else
+        OpenSSL::SSL::VERIFY_NONE
+      end
+
+      ctx.set_params(:verify_mode => verify_mode)
 
       ctx
     end

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/spec/higher_level_api/integration/channel_open_spec.rb

@@ -21,6 +21,15 @@ describe Bunny::Channel, "when opened" do
     end
   end
 
+  context "with an explicitly provided id = 0" do
+    it "raises ArgumentError" do
+      connection.should be_connected
+      expect {
+        connection.create_channel(0)
+      }.to raise_error(ArgumentError)
+    end
+  end
+
 
   context "with explicitly provided id" do
     it "uses that id and is successfully opened" do

data/spec/higher_level_api/integration/with_channel_spec.rb

@@ -0,0 +1,25 @@
+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.start
+    c
+  end
+
+  after :each do
+    connection.close if connection.open?
+  end
+
+  it "closes if the block throws an exception" do
+    ch = nil
+    begin
+      connection.with_channel do |wch|
+        ch = wch
+        raise Exception.new
+      end
+    rescue Exception
+    end
+    ch.should be_closed
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -177,6 +177,7 @@ files:
 - spec/higher_level_api/integration/tls_connection_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
+- spec/higher_level_api/integration/with_channel_spec.rb
 - spec/issues/issue100_spec.rb
 - spec/issues/issue141_spec.rb
 - spec/issues/issue78_spec.rb
@@ -272,6 +273,7 @@ test_files:
 - spec/higher_level_api/integration/tls_connection_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
+- spec/higher_level_api/integration/with_channel_spec.rb
 - spec/issues/issue100_spec.rb
 - spec/issues/issue141_spec.rb
 - spec/issues/issue78_spec.rb