bunny 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a93cb605a6fdd64b33d36cf15c2348e3a63d1f4
-  data.tar.gz: fb0cf9a5bbfa5d87a01a3e88ac5b4e194912cb6a
+  metadata.gz: b96591dc64422653dd1e514413d72e086cd2943b
+  data.tar.gz: b7b4930751e88b767acaa8ab7d6db95098cb7b26
 SHA512:
-  metadata.gz: 9dddb5e6345033db760b2b12be7c5bd61831d5a68d64b6b471c22557beae60d2a48aec300becea2509bfe66b5acf25ce606e7f8ed6a37c9be279ffb365da326c
-  data.tar.gz: eaf13dac3eb2d00be80afd360890dc85633054ff2acdb899fb0166958e4ca0a2ec5dd09fa1bc9d71f8e6e1d464773398e5d4d3673283eb081cb5e89baa157f9c
+  metadata.gz: e28a7d255892d518d0be18155546ab62702d59605219d736008552fd9e463e66d28ab768065eb81e08062d9ef08e01b8f8ef0ebe5a4873ae08edab5c9a2b0d08
+  data.tar.gz: 2a51e2d4c244f06c69b71cf1465c3fdff9a8d1d6b54069e2a62a7c26ce3f447df3aa209b67efd77e5925d46478d4c8f76b219bda6bb42ed6b454572be14b96be

data/.travis.yml

@@ -1,3 +1,4 @@
+language: ruby
 bundler_args: --without development
 before_script: "./bin/ci/before_build.sh"
 script: "bundle exec rspec -cfs spec"

data/ChangeLog.md

@@ -1,3 +1,56 @@
+## Changes between Bunny 1.0.0.rc2 and 1.0.0.rc3
+
+### Support [Authentication Failure Notification](http://www.rabbitmq.com/auth-notification.html)
+
+`Bunny::AuthenticationFailureError` is a new auth failure exception
+that subclasses `Bunny::PossibleAuthenticationFailureError` for
+backwards compatibility.
+
+As such, `Bunny::PossibleAuthenticationFailureError`'s error message
+has changed.
+
+This extension is available in RabbitMQ 3.2+.
+
+
+### Bunny::Session#exchange_exists?
+
+`Bunny::Session#exchange_exists?` is a new predicate that makes it
+easier to check if a exchange exists.
+
+It uses a one-off channel and `exchange.declare` with `passive` set to true
+under the hood.
+
+### Bunny::Session#queue_exists?
+
+`Bunny::Session#queue_exists?` is a new predicate that makes it
+easier to check if a queue exists.
+
+It uses a one-off channel and `queue.declare` with `passive` set to true
+under the hood.
+
+
+### Inline TLS Certificates and Keys
+
+It is now possible to provide inline client
+certificate and private key (as strings) instead
+of filesystem paths. The options are the same:
+
+ * `:tls` which, when set to `true`, will set SSL context up and switch to TLS port (5671)
+ * `:tls_cert` which now can be a client certificate (public key) in PEM format
+ * `:tls_key` which now can be a client key (private key) in PEM format
+ * `:tls_ca_certificates` which is an array of string paths to CA certificates in PEM format
+
+For example:
+
+``` ruby
+conn = Bunny.new(:tls                   => true,
+                 :tls_cert              => ENV["TLS_CERTIFICATE"],
+                 :tls_key               => ENV["TLS_PRIVATE_KEY"],
+                 :tls_ca_certificates   => ["./examples/tls/cacert.pem"])
+```
+
+
+
 ## Changes between Bunny 1.0.0.rc1 and 1.0.0.rc2
 
 ### Ruby 1.8.7 Compatibility Fixes

data/Gemfile

@@ -30,7 +30,7 @@ group :development do
   gem "redcarpet", :platform => :mri
   gem "ruby-prof", :platform => :mri
 
-  gem "json"
+  gem "json",      :platform => :ruby_18
 end
 
 group :test do

data/README.md

@@ -61,11 +61,13 @@ Bunny `0.7.x` and earlier versions support RabbitMQ 1.x and 2.x.
 
 ## Project Maturity
 
-Bunny is a pretty old (started circa late 2008) library that, before
-version 0.9, **a lot** of missing functionality. Version 0.9 can be
-considered to be "second birthday" for Bunny as it was rewritten from
-scratch with over a dozen of preview releases over the course of about
-a year.
+Bunny is a mature library (started in early 2009) library with
+a stable public API.
+
+Before version 0.9, **a lot** of functionality was missing.  Version
+0.9 can be considered to be "second birthday" for Bunny as it was
+rewritten from scratch with over a dozen of preview releases over the
+course of about a year.
 
 We (the maintainers) made our best effort to keep the new version as
 backwards compatible as possible but within reason.
@@ -90,7 +92,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", ">= 1.0.0.rc1"
+gem "bunny", ">= 1.0.0.rc2"
 ```
 
 
@@ -177,15 +179,21 @@ More detailed announcements can be found in the blogs
 
 ### Reporting Issues
 
-If you find a bug, poor default, missing feature or find any part of the API inconvenient, please [file an issue](http://github.com/ruby-amqp/bunny/issues) on GitHub.
-When filing an issue, please specify which Bunny and RabbitMQ versions you are using, provide recent RabbitMQ log file contents if possible,
-and try to explain what behavior you expected and why. Bonus points for contributing failing test cases.
+If you find a bug, poor default, missing feature or find any part of
+the API inconvenient, please [file an
+issue](http://github.com/ruby-amqp/bunny/issues) on GitHub.  When
+filing an issue, please specify which Bunny and RabbitMQ versions you
+are using, provide recent RabbitMQ log file contents if possible, and
+try to explain what behavior you expected and why. Bonus points for
+contributing failing test cases.
 
 
 ## Other Ruby RabbitMQ Clients
 
-Other widely used Ruby RabbitMQ clients are [Hot Bunnies](http://github.com/ruby-amqp/hot_bunnies) (JRuby-only) and [amqp gem](http://rubyamqp.info).
-Both are mature libraries and require RabbitMQ 2.x or 3.x.
+Other widely used Ruby RabbitMQ clients are [March
+Hare](http://rubymarchhare.info) (JRuby-only) and [amqp
+gem](http://rubyamqp.info).  Both are mature libraries and require
+RabbitMQ 2.x or 3.x.
 
 
 ## Contributing
@@ -202,7 +210,7 @@ then set up RabbitMQ vhosts with
 
 and then run tests with
 
-    ./bin/rspec -cfs spec
+    CI=true ./bin/rspec -cfs spec
 
 After that create a branch and make your changes on it. Once you are done with your changes and all tests pass, submit a pull request
 on GitHub.

data/lib/bunny/channel.rb

@@ -157,6 +157,7 @@ module Bunny
     # @return [Hash<String, Bunny::Consumer>] Consumer instances declared on this channel
     attr_reader :consumers
 
+    DEFAULT_CONTENT_TYPE = "application/octet-stream".freeze
 
     # @param [Bunny::Session] connection AMQP 0.9.1 connection
     # @param [Integer] id Channel id, pass nil to make Bunny automatically allocate it
@@ -524,23 +525,25 @@ module Bunny
              else
                1
              end
-      meta = { :priority => 0, :delivery_mode => mode, :content_type => "application/octet-stream" }.
-        merge(opts)
+
+      opts[:delivery_mode] ||= mode
+      opts[:content_type]  ||= DEFAULT_CONTENT_TYPE
+      opts[:priority]      ||= 0
 
       if @next_publish_seq_no > 0
         @unconfirmed_set.add(@next_publish_seq_no)
         @next_publish_seq_no += 1
       end
 
-      m = AMQ::Protocol::Basic::Publish.encode(@id,
+      frames = AMQ::Protocol::Basic::Publish.encode(@id,
         payload,
-        meta,
+        opts,
         exchange_name,
         routing_key,
-        meta[:mandatory],
+        opts[:mandatory],
         false,
         @connection.frame_max)
-      @connection.send_frameset_without_timeout(m, self)
+      @connection.send_frameset_without_timeout(frames, self)
 
       self
     end
@@ -789,8 +792,8 @@ module Bunny
     #
     # @param [String, Bunny::Queue] queue Queue to consume from
     # @param [String] consumer_tag Consumer tag (unique identifier), generated by Bunny by default
-    # @param [Boolean] no_ack (false) If false, delivered messages will be automatically acknowledged.
-    #                                 If true, manual acknowledgements will be necessary.
+    # @param [Boolean] no_ack (false) If true, delivered messages will be automatically acknowledged.
+    #                                 If false, manual acknowledgements will be necessary.
     # @param [Boolean] exclusive (false) Should this consumer be exclusive?
     # @param [Hash] arguments (nil) Optional arguments that may be used by RabbitMQ extensions, etc
     #

data/lib/bunny/compatibility.rb

@@ -9,7 +9,6 @@ module Bunny
     # API
     #
 
-    # @api public
     # @private
     def channel_from(channel_or_connection)
       # Bunny 0.8.x and earlier completely hide channels from the API. So, queues and exchanges are

data/lib/bunny/consumer.rb

@@ -26,8 +26,8 @@ module Bunny
     # @param [Bunny::Queue,String] queue Queue messages will be consumed from
     # @param [String] consumer_tag Consumer tag (unique identifier). Generally it is better to let Bunny generate one.
     #                              Empty string means RabbitMQ will generate consumer tag.
-    # @param [Boolean] no_ack (false) If false, delivered messages will be automatically acknowledged.
-    #                                 If true, manual acknowledgements will be necessary.
+    # @param [Boolean] no_ack (true) If true, delivered messages will be automatically acknowledged.
+    #                                 If false, manual acknowledgements will be necessary.
     # @param [Boolean] exclusive (false) Should this consumer be exclusive?
     # @param [Hash] arguments (nil) Optional arguments that may be used by RabbitMQ extensions, etc
     # @api public
@@ -93,13 +93,13 @@ module Bunny
     # @return [Boolean] true if this consumer uses automatic acknowledgement mode
     # @api public
     def automatic_acknowledgement?
-      @no_ack == false
+      @no_ack == true
     end
 
     # @return [Boolean] true if this consumer uses manual (explicit) acknowledgement mode
     # @api public
     def manual_acknowledgement?
-      @no_ack == true
+      @no_ack == false
     end
 
     #

data/lib/bunny/exceptions.rb

@@ -87,11 +87,31 @@ module Bunny
       @username = username
       @vhost    = vhost
 
-      super("RabbitMQ closed TCP connection before authentication succeeded: this usually means authentication failure due to misconfiguration or that RabbitMQ version does not support AMQP 0.9.1. Please check your configuration. Username: #{username}, vhost: #{vhost}, password length: #{password_length}")
+      super("Authentication with RabbitMQ failed. Please check your connection settings. Username: #{username}, vhost: #{vhost}, password length: #{password_length}")
     end # initialize(settings)
   end # PossibleAuthenticationFailureError
 
 
+  # Raised when RabbitMQ closes TCP connection due to an authentication failure.
+  # Relies on RabbitMQ 3.2 Authentication Failure Notifications extension:
+  # http://www.rabbitmq.com/auth-notification.html
+  class AuthenticationFailureError < PossibleAuthenticationFailureError
+
+    #
+    # API
+    #
+
+    attr_reader :username, :vhost
+
+    def initialize(username, vhost, password_length)
+      @username = username
+      @vhost    = vhost
+
+      super(username, vhost, password_length)
+    end # initialize(settings)
+  end # AuthenticationFailureError
+
+
   # backwards compatibility
   # @private
   ConnectionError = TCPConnectionFailed
@@ -206,4 +226,11 @@ module Bunny
   class ConnectionForced < ConnectionLevelException
   end
 
+  # @private
+  class MissingTLSCertificateFile < Exception
+  end
+
+  # @private
+  class MissingTLSKeyFile < Exception
+  end
 end

data/lib/bunny/queue.rb

@@ -92,7 +92,6 @@ module Bunny
       @arguments
     end
 
-
     # Binds queue to an exchange
     #
     # @param [Bunny::Exchange,String] exchange Exchange to bind to

data/lib/bunny/session.rb

@@ -20,7 +20,7 @@ require "amq/protocol/client"
 require "amq/settings"
 
 module Bunny
-  # Represents AMQP 0.9.1 connection (connection to RabbitMQ).
+  # Represents AMQP 0.9.1 connection (to a RabbitMQ node).
   # @see http://rubybunny.info/articles/connecting.html Connecting to RabbitMQ guide
   class Session
 
@@ -51,11 +51,13 @@ module Bunny
     # RabbitMQ client metadata
     DEFAULT_CLIENT_PROPERTIES = {
       :capabilities => {
-        :publisher_confirms         => true,
-        :consumer_cancel_notify     => true,
-        :exchange_exchange_bindings => true,
-        :"basic.nack"               => true,
-        :"connection.blocked"       => true
+        :publisher_confirms           => true,
+        :consumer_cancel_notify       => true,
+        :exchange_exchange_bindings   => true,
+        :"basic.nack"                 => true,
+        :"connection.blocked"         => true,
+        # See http://www.rabbitmq.com/auth-notification.html
+        :authentication_failure_close => true
       },
       :product      => "Bunny",
       :platform     => ::RUBY_DESCRIPTION,
@@ -98,10 +100,12 @@ module Bunny
     # @option connection_string_or_opts [String] :password ("guest") Password
     # @option connection_string_or_opts [String] :vhost ("/") Virtual host to use
     # @option connection_string_or_opts [Integer] :heartbeat (600) Heartbeat interval. 0 means no heartbeat.
+    # @option connection_string_or_opts [Integer] :network_recovery_interval (4) Recovery interval periodic network recovery will use. This includes initial pause after network failure.
     # @option connection_string_or_opts [Boolean] :tls (false) Should TLS/SSL be used?
     # @option connection_string_or_opts [String] :tls_cert (nil) Path to client TLS/SSL certificate file (.pem)
     # @option connection_string_or_opts [String] :tls_key (nil) Path to client TLS/SSL private key file (.pem)
     # @option connection_string_or_opts [Array<String>] :tls_ca_certificates Array of paths to TLS/SSL CA files (.pem), by default detected from OpenSSL configuration
+    # @option connection_string_or_opts [Integer] :continuation_timeout (4000) Timeout for client operations that expect a response (e.g. {Bunny::Queue#get}), in milliseconds.
     #
     # @option optz [String] :auth_mechanism ("PLAIN") Authentication mechanism, PLAIN or EXTERNAL
     # @option optz [String] :locale ("PLAIN") Locale RabbitMQ should use
@@ -296,7 +300,7 @@ module Bunny
     def with_channel(n = nil)
       ch = create_channel(n)
       yield ch
-      ch.close
+      ch.close if ch.open?
 
       self
     end
@@ -306,10 +310,12 @@ module Bunny
       status == :connecting
     end
 
+    # @return [Boolean] true if this AMQP 0.9.1 connection is closed
     def closed?
       status == :closed
     end
 
+    # @return [Boolean] true if this AMQP 0.9.1 connection is open
     def open?
       (status == :open || status == :connected || status == :connecting) && @transport.open?
     end
@@ -390,6 +396,46 @@ module Bunny
       AMQ::Settings.parse_amqp_url(uri)
     end
 
+    # Checks if a queue with given name exists.
+    #
+    # Implemented using queue.declare
+    # with passive set to true and a one-off (short lived) channel
+    # under the hood.
+    #
+    # @param [String] name Queue name
+    # @return [Boolean] true if queue exists
+    def queue_exists?(name)
+      ch = create_channel
+      begin
+        ch.queue(name, :passive => true)
+        true
+      rescue Bunny::NotFound => _
+        false
+      ensure
+        ch.close if ch.open?
+      end
+    end
+
+    # Checks if a exchange with given name exists.
+    #
+    # Implemented using exchange.declare
+    # with passive set to true and a one-off (short lived) channel
+    # under the hood.
+    #
+    # @param [String] name Exchange name
+    # @return [Boolean] true if exchange exists
+    def exchange_exists?(name)
+      ch = create_channel
+      begin
+        ch.exchange(name, :passive => true)
+        true
+      rescue Bunny::NotFound => _
+        false
+      ensure
+        ch.close if ch.open?
+      end
+    end
+
 
     #
     # Implementation
@@ -442,6 +488,13 @@ module Bunny
       end
     end
 
+    # Handles incoming frames and dispatches them.
+    #
+    # Channel methods (`channel.open-ok`, `channel.close-ok`) are
+    # handled by the session itself.
+    # Connection level errors result in exceptions being raised.
+    # Deliveries and other methods are passed on to channels to dispatch.
+    #
     # @private
     def handle_frame(ch_number, method)
       @logger.debug "Session#handle_frame on #{ch_number}: #{method.inspect}"
@@ -782,6 +835,19 @@ module Bunny
       end
     end # send_frameset_without_timeout(frames)
 
+    # @private
+    def send_raw_without_timeout(data, channel)
+      # some developers end up sharing channels between threads and when multiple
+      # threads publish on the same channel aggressively, at some point frames will be
+      # delivered out of order and broker will raise 505 UNEXPECTED_FRAME exception.
+      # If we synchronize on the channel, however, this is both thread safe and pretty fine-grained
+      # locking. Note that "single frame" methods do not need this kind of synchronization. MK.
+      channel.synchronize do
+        @transport.write(data)
+        signal_activity!
+      end
+    end # send_frameset_without_timeout(frames)
+
     # @return [String]
     # @api public
     def to_s
@@ -823,7 +889,16 @@ module Bunny
         raise Bunny::PossibleAuthenticationFailureError.new(self.user, self.vhost, self.password.size)
       end
 
-      connection_tune       = frame.decode_payload
+      response = frame.decode_payload
+      if response.is_a?(AMQ::Protocol::Connection::Close)
+        @state = :closed
+        @logger.error "Authentication with RabbitMQ failed: #{response.reply_code} #{response.reply_text}"
+        raise Bunny::AuthenticationFailureError.new(self.user, self.vhost, self.password.size)
+      end
+
+
+
+      connection_tune       = response
 
       @frame_max            = negotiate_value(@client_frame_max, connection_tune.frame_max)
       @channel_max          = negotiate_value(@client_channel_max, connection_tune.channel_max)

data/lib/bunny/system_timer.rb

@@ -7,7 +7,7 @@ module Bunny
   class SystemTimer
     # Executes a block of code, raising if the execution does not finish
     # in the alloted period of time, in seconds.
-    def self.timeout(seconds, exception)
+    def self.timeout(seconds, exception = nil)
       if seconds
         ::SystemTimer.timeout_after(seconds, exception) do
           yield

data/lib/bunny/transport.rb

@@ -5,7 +5,7 @@ require "monitor"
 begin
   require "openssl"
 rescue LoadError => le
-  puts "Could not load OpenSSL"
+  $stderr.puts "Could not load OpenSSL"
 end
 
 require "bunny/exceptions"
@@ -19,8 +19,10 @@ module Bunny
     # API
     #
 
+    # Default TCP connection timeout
     DEFAULT_CONNECTION_TIMEOUT = 5.0
-    # same as in RabbitMQ Java client
+    # Default TLS protocol version to use.
+    # Currently SSLv3, same as in RabbitMQ Java client
     DEFAULT_TLS_PROTOCOL       = "SSLv3"
 
 
@@ -36,21 +38,6 @@ module Bunny
 
       @logger                = session.logger
       @tls_enabled           = tls_enabled?(opts)
-      @tls_certificate_path  = tls_certificate_path_from(opts)
-      @tls_key_path          = tls_key_path_from(opts)
-      @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]
-
-      default_ca_file = ENV[OpenSSL::X509::DEFAULT_CERT_FILE_ENV] || OpenSSL::X509::DEFAULT_CERT_FILE
-      default_ca_path = ENV[OpenSSL::X509::DEFAULT_CERT_DIR_ENV] || OpenSSL::X509::DEFAULT_CERT_DIR
-      @tls_ca_certificates   = opts.fetch(:tls_ca_certificates, [
-        default_ca_file,
-        File.join(default_ca_path, 'ca-certificates.crt'), # Ubuntu/Debian
-        File.join(default_ca_path, 'ca-bundle.crt'), # Amazon Linux & Fedora/RHEL
-        File.join(default_ca_path, 'ca-bundle.pem') # OpenSUSE
-      ])
-      @verify_peer           = opts[:verify_ssl] || opts[:verify_peer]
 
       @read_write_timeout = opts[:socket_timeout] || 3
       @read_write_timeout = nil if @read_write_timeout == 0
@@ -61,10 +48,9 @@ module Bunny
       @writes_mutex       = @session.mutex_impl.new
 
       maybe_initialize_socket
-      prepare_tls_context if @tls_enabled
+      prepare_tls_context(opts) if @tls_enabled
     end
 
-
     def hostname
       @host
     end
@@ -234,7 +220,7 @@ module Bunny
     def self.reacheable?(host, port, timeout)
       begin
         s = Bunny::Socket.open(host, port,
-                               :socket_timeout => timeout)
+          :socket_timeout => timeout)
 
         true
       rescue SocketError, Timeout::Error => e
@@ -252,8 +238,8 @@ module Bunny
       begin
         @socket = Bunny::Timeout.timeout(@connect_timeout, ClientTimeout) do
           Bunny::Socket.open(@host, @port,
-                             :keepalive      => @opts[:keepalive],
-                             :socket_timeout => @connect_timeout)
+            :keepalive      => @opts[:keepalive],
+            :socket_timeout => @connect_timeout)
         end
       rescue StandardError, ClientTimeout => e
         @status = :not_connected
@@ -289,8 +275,49 @@ module Bunny
       opts[:tls_key] || opts[:ssl_key] || opts[:tls_key_path] || opts[:ssl_key_path]
     end
 
-    def prepare_tls_context
-      read_tls_keys!
+    def tls_certificate_from(opts)
+      begin
+        read_client_certificate!
+      rescue MissingTLSCertificateFile => e
+        inline_client_certificate_from(opts)
+      end
+    end
+
+    def tls_key_from(opts)
+      begin
+        read_client_key!
+      rescue MissingTLSKeyFile => e
+        inline_client_key_from(opts)
+      end
+    end
+
+
+    def inline_client_certificate_from(opts)
+      opts[:tls_certificate] || opts[:ssl_cert_string]
+    end
+
+    def inline_client_key_from(opts)
+      opts[:tls_key] || opts[:ssl_key_string]
+    end
+
+    def prepare_tls_context(opts)
+      # client cert/key paths
+      @tls_certificate_path  = tls_certificate_path_from(opts)
+      @tls_key_path          = tls_key_path_from(opts)
+      # client cert/key
+      @tls_certificate       = tls_certificate_from(opts)
+      @tls_key               = tls_key_from(opts)
+      @tls_certificate_store = opts[:tls_certificate_store]
+
+      default_ca_file = ENV[OpenSSL::X509::DEFAULT_CERT_FILE_ENV] || OpenSSL::X509::DEFAULT_CERT_FILE
+      default_ca_path = ENV[OpenSSL::X509::DEFAULT_CERT_DIR_ENV] || OpenSSL::X509::DEFAULT_CERT_DIR
+      @tls_ca_certificates   = opts.fetch(:tls_ca_certificates, [
+          default_ca_file,
+          File.join(default_ca_path, 'ca-certificates.crt'), # Ubuntu/Debian
+          File.join(default_ca_path, 'ca-bundle.crt'), # Amazon Linux & Fedora/RHEL
+          File.join(default_ca_path, 'ca-bundle.pem') # OpenSUSE
+        ])
+      @verify_peer           = opts[:verify_ssl] || opts[:verify_peer]
 
       @tls_context = initialize_tls_context(OpenSSL::SSL::SSLContext.new)
     end
@@ -304,17 +331,24 @@ module Bunny
       s
     end
 
-    def check_local_path!(s)
-      raise ArgumentError, "cannot read TLS certificate or key from #{s}" unless File.file?(s) && File.readable?(s)
+    def check_local_certificate_path!(s)
+      raise MissingTLSCertificateFile, "cannot read client TLS certificate from #{s}" unless File.file?(s) && File.readable?(s)
     end
 
-    def read_tls_keys!
+    def check_local_key_path!(s)
+      raise MissingTLSKeyFile, "cannot read client TLS private key from #{s}" unless File.file?(s) && File.readable?(s)
+    end
+
+    def read_client_certificate!
       if @tls_certificate_path
-        check_local_path!(@tls_certificate_path)
+        check_local_certificate_path!(@tls_certificate_path)
         @tls_certificate = File.read(@tls_certificate_path)
       end
+    end
+
+    def read_client_key!
       if @tls_key_path
-        check_local_path!(@tls_key_path)
+        check_local_key_path!(@tls_key_path)
         @tls_key         = File.read(@tls_key_path)
       end
     end

data/lib/bunny/version.rb

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

data/repl

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+bundle exec irb -Ilib -r'bunny'

data/spec/higher_level_api/integration/connection_spec.rb

@@ -14,18 +14,18 @@ describe Bunny::Session do
     context "when schema is not one of [amqp, amqps]" do
       it "raises ArgumentError" do
         expect {
-          described_class.new("http://dev.rabbitmq.com")
+          described_class.new("http://127.0.0.1")
         }.to raise_error(ArgumentError, /amqp or amqps schema/)
       end
     end
 
 
     it "handles amqp:// URIs w/o path part" do
-      session = described_class.new("amqp://dev.rabbitmq.com")
+      session = described_class.new("amqp://127.0.0.1")
       session.start
 
       session.vhost.should == "/"
-      session.host.should == "dev.rabbitmq.com"
+      session.host.should == "127.0.0.1"
       session.port.should == 5672
       session.ssl?.should be_false
 
@@ -35,9 +35,9 @@ describe Bunny::Session do
 
     context "when URI ends in a slash" do
       it "parses vhost as an empty string" do
-        session = described_class.new("amqp://dev.rabbitmq.com/")
+        session = described_class.new("amqp://127.0.0.1/")
 
-        session.hostname.should == "dev.rabbitmq.com"
+        session.hostname.should == "127.0.0.1"
         session.port.should == 5672
         session.vhost.should == ""
       end

data/spec/higher_level_api/integration/exchange_delete_spec.rb

@@ -18,67 +18,88 @@ describe Bunny::Exchange, "#delete" do
       x  = ch.fanout("bunny.tests.exchanges.fanout#{rand}")
 
       x.delete
-      expect {
-        x.delete
-      }.to raise_error(Bunny::NotFound)
-      
+      # no exception as of RabbitMQ 3.2. MK.
+      x.delete
+
       ch.exchanges.size.should == 0
     end
   end
 
 
   context "with a name of a non-existent exchange" do
-    it "raises an exception" do
+    it "DOES NOT rais an exception" do
       ch = connection.create_channel
 
-      expect {
-        ch.exchange_delete("sdkhflsdjflskdjflsd#{rand}")
-      }.to raise_error(Bunny::NotFound)
+      # no exception as of RabbitMQ 3.2. MK.
+      ch.exchange_delete("sdkhflsdjflskdjflsd#{rand}")
+      ch.exchange_delete("sdkhflsdjflskdjflsd#{rand}")
+      ch.exchange_delete("sdkhflsdjflskdjflsd#{rand}")
+      ch.exchange_delete("sdkhflsdjflskdjflsd#{rand}")
     end
   end
-  
+
   context "with a name of 'amq.direct'" do
     it "does not delete the exchange" do
       ch = connection.create_channel
       x  = ch.direct('amq.direct')
-      
+
       x.delete.should == nil
     end
   end
-  
+
   context "with a name of 'amq.fanout'" do
     it "does not delete the exchange" do
       ch = connection.create_channel
       x  = ch.fanout('amq.fanout')
-      
+
       x.delete.should == nil
     end
   end
-  
+
   context "with a name of 'amq.topic'" do
     it "does not delete the exchange" do
       ch = connection.create_channel
       x  = ch.topic('amq.topic')
-      
+
       x.delete.should == nil
     end
   end
-  
+
   context "with a name of 'amq.headers'" do
     it "does not delete the exchange" do
       ch = connection.create_channel
       x  = ch.headers('amq.headers')
-      
+
       x.delete.should == nil
     end
   end
-  
+
   context "with a name of 'amq.match'" do
     it "does not delete the exchange" do
       ch = connection.create_channel
       x  = ch.headers('amq.match')
-      
+
       x.delete.should == nil
     end
   end
+
+
+  describe "#exchange_exists?" do
+    context "when a exchange exists" do
+      it "returns true" do
+        ch = connection.create_channel
+
+        connection.exchange_exists?("amq.fanout").should be_true
+        connection.exchange_exists?("amq.direct").should be_true
+        connection.exchange_exists?("amq.topic").should be_true
+        connection.exchange_exists?("amq.match").should be_true
+      end
+    end
+
+    context "when a exchange DOES NOT exist" do
+      it "returns false" do
+        connection.exchange_exists?("suf89u9a4jo3ndnakls##{Time.now.to_i}").should be_false
+      end
+    end
+  end
 end

data/spec/higher_level_api/integration/queue_declare_spec.rb

@@ -136,6 +136,25 @@ describe Bunny::Queue do
   end
 
 
+  describe "#queue_exists?" do
+    context "when a queue exists" do
+      it "returns true" do
+        ch = connection.create_channel
+        q  = ch.queue("", :exlusive => true)
+
+        connection.queue_exists?(q.name).should be_true
+      end
+    end
+
+    context "when a queue DOES NOT exist" do
+      it "returns false" do
+        connection.queue_exists?("suf89u9a4jo3ndnakls##{Time.now.to_i}").should be_false
+      end
+    end
+  end
+
+
+
   unless ENV["CI"]
     # requires RabbitMQ 3.1+
     context "when queue is declared with bounded length" do

data/spec/higher_level_api/integration/queue_delete_spec.rb

@@ -19,9 +19,8 @@ describe Bunny::Queue, "#delete" do
       q  = ch.queue("")
 
       q.delete
-      expect {
-        q.delete
-      }.to raise_error(Bunny::NotFound)
+      # no exception as of RabbitMQ 3.2. MK.
+      q.delete
 
       ch.queues.size.should == 0
     end
@@ -29,12 +28,14 @@ describe Bunny::Queue, "#delete" do
 
 
   context "with a name of an existing queue" do
-    it "raises an exception" do
+    it "DOES NOT raise an exception" do
       ch = connection.create_channel
 
-      expect {
-        ch.queue_delete("sdkhflsdjflskdjflsd#{rand}")
-      }.to raise_error(Bunny::NotFound)
+      # no exception as of RabbitMQ 3.2. MK.
+      ch.queue_delete("sdkhflsdjflskdjflsd#{rand}")
+      ch.queue_delete("sdkhflsdjflskdjflsd#{rand}")
+      ch.queue_delete("sdkhflsdjflskdjflsd#{rand}")
+      ch.queue_delete("sdkhflsdjflskdjflsd#{rand}")
     end
   end
 end

data/spec/higher_level_api/integration/queue_unbind_spec.rb

@@ -47,8 +47,8 @@ describe Bunny::Queue, "NOT bound to an exchange" do
     x  = ch.fanout("amq.fanout")
     q  = ch.queue("", :exclusive => true)
 
-    lambda {
-      q.unbind(x)
-    }.should raise_error(Bunny::NotFound, /no binding/)
+    # No exception as of RabbitMQ 3.2. MK.
+    q.unbind(x)
+    q.unbind(x)
   end
 end

data/spec/higher_level_api/integration/tls_connection_spec.rb

@@ -2,24 +2,9 @@
 require "spec_helper"
 
 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_cert.pem",
-                    :tls_key               => "spec/tls/client_key.pem",
-                    :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
-      c.start
-      c
-    end
-
-    after :each do
-      connection.close
-    end
-
-    it "provides the same API as a regular connection" do
+  shared_examples_for "successful TLS connection" do
+    it "succeeds" do
+      connection.should be_tls
       ch = connection.create_channel
 
       q  = ch.queue("", :exclusive => true)
@@ -46,13 +31,15 @@ unless ENV["CI"]
   end
 
 
-  describe "TLS connection to RabbitMQ without client certificates" do
+  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_ca_certificates   => ["./spec/tls/cacert.pem"])
+        :password => "bunny_password",
+        :vhost    => "bunny_testbed",
+        :tls                   => true,
+        :tls_cert              => "spec/tls/client_cert.pem",
+        :tls_key               => "spec/tls/client_key.pem",
+        :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
       c.start
       c
     end
@@ -61,30 +48,26 @@ unless ENV["CI"]
       connection.close
     end
 
-    it "provides the same API as a regular connection" do
-      ch = connection.create_channel
-
-      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)
+    include_examples "successful TLS connection"
+  end
 
-      sleep 0.5
-      q.message_count.should == 4
 
-      i = 0
-      q.subscribe do |delivery_info, _, payload|
-        i += 1
-      end
-      sleep 1.0
-      i.should == 4
-      q.message_count.should == 0
+  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/cacert.pem"])
+      c.start
+      c
+    end
 
-      ch.close
+    after :each do
+      connection.close
     end
+
+    include_examples "successful TLS connection"
   end
 
 
@@ -102,30 +85,43 @@ unless ENV["CI"]
       connection.close
     end
 
-    it "provides the same API as a regular connection" do
-      connection.should be_tls
-      ch = connection.create_channel
+    include_examples "successful TLS connection"
+  end
 
-      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)
+  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/cacert.pem"])
+      c.start
+      c
+    end
 
-      sleep 0.5
-      q.message_count.should == 4
+    after :each do
+      connection.close
+    end
 
-      i = 0
-      q.subscribe do |delivery_info, _, payload|
-        i += 1
-      end
-      sleep 1.0
-      i.should == 4
-      q.message_count.should == 0
+    include_examples "successful TLS connection"
+  end
 
-      ch.close
+
+  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_cert.pem"),
+        :tls_key               => File.read("./spec/tls/client_key.pem"),
+        :tls_ca_certificates   => ["./spec/tls/cacert.pem"])
+      c.start
+      c
     end
+
+    after :each do
+      connection.close
+    end
+
+    include_examples "successful TLS connection"
   end
 end

data/spec/unit/system_timer_spec.rb

@@ -0,0 +1,10 @@
+require "spec_helper"
+
+if RUBY_VERSION.to_f < 1.9
+  describe Bunny::SystemTimer do
+    it 'supports being called with a single argument' do
+      lambda {Bunny::SystemTimer::timeout(1) {}}.should_not raise_error
+      lambda {Bunny::SystemTimer::timeout(1, nil) {}}.should_not raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -129,6 +129,7 @@ files:
 - lib/bunny/version.rb
 - lib/bunny/versioned_delivery_tag.rb
 - profiling/basic_publish/with_4K_messages.rb
+- repl
 - spec/compatibility/queue_declare_spec.rb
 - spec/compatibility/queue_declare_with_default_channel_spec.rb
 - spec/higher_level_api/integration/basic_ack_spec.rb
@@ -197,6 +198,7 @@ files:
 - spec/unit/concurrent/condition_spec.rb
 - spec/unit/concurrent/linked_continuation_queue_spec.rb
 - spec/unit/concurrent/synchronized_sorted_set_spec.rb
+- spec/unit/system_timer_spec.rb
 homepage: http://rubybunny.info
 licenses:
 - MIT
@@ -217,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
@@ -290,4 +292,5 @@ test_files:
 - spec/unit/concurrent/condition_spec.rb
 - spec/unit/concurrent/linked_continuation_queue_spec.rb
 - spec/unit/concurrent/synchronized_sorted_set_spec.rb
+- spec/unit/system_timer_spec.rb
 has_rdoc: true