amq-client 1.0.0.pre2 → 1.0.0

data/.gitignore

@@ -1,10 +1,13 @@
-/*.gem
+bin/*
 .bundle
-vendor/bundle
-.yardoc/*
 doc/*
-.rvmrc
+/*.gem
 # see http://bit.ly/h2WJPm for reasoning
 Gemfile.lock
-vendor
+.rbenv-gemsets
+.rbenv-version
 .rbx/*
+.rvmrc
+vendor
+vendor/bundle
+.yardoc/*

data/.travis.yml

@@ -18,4 +18,7 @@ branches:
   only:
     - master
     - 0.9.x-stable
-    - 0.8.x-stable
+    - 0.8.x-stable
+
+services:
+  - rabbitmq

data/amq-client.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Dependencies
   s.add_dependency "eventmachine"
-  s.add_dependency "amq-protocol", ">= 0.9.4"
+  s.add_dependency "amq-protocol", ">= 1.2.0"
 
 
   # RubyForge

data/bin/ci/before_build.sh

@@ -1,24 +1,26 @@
 #!/bin/sh
 
+${RABBITMQCTL:="sudo rabbitmqctl"}
+
 # guest:guest has full access to /
 
-sudo rabbitmqctl add_vhost /
-sudo rabbitmqctl add_user guest guest
-sudo rabbitmqctl set_permissions -p / guest ".*" ".*" ".*"
+$RABBITMQCTL add_vhost /
+$RABBITMQCTL add_user guest guest
+$RABBITMQCTL set_permissions -p / guest ".*" ".*" ".*"
 
 
 # guest:guest has full access to amq_client_testbed
 # amq_client_gem:amq_client_gem has full access to /amq_client_testbed
 
-sudo rabbitmqctl delete_vhost "amq_client_testbed"
-sudo rabbitmqctl add_vhost "amq_client_testbed"
-sudo rabbitmqctl delete_user amq_client_gem
-sudo rabbitmqctl add_user amq_client_gem amq_client_gem_password
-sudo rabbitmqctl set_permissions -p amq_client_testbed guest ".*" ".*" ".*"
-sudo rabbitmqctl set_permissions -p amq_client_testbed amq_client_gem ".*" ".*" ".*"
+$RABBITMQCTL delete_vhost "amq_client_testbed"
+$RABBITMQCTL add_vhost "amq_client_testbed"
+$RABBITMQCTL delete_user amq_client_gem
+$RABBITMQCTL add_user amq_client_gem amq_client_gem_password
+$RABBITMQCTL set_permissions -p amq_client_testbed guest ".*" ".*" ".*"
+$RABBITMQCTL set_permissions -p amq_client_testbed amq_client_gem ".*" ".*" ".*"
 
 
 # amqp_gem_reader:reader_password has read access to amq_client_testbed
 
-sudo rabbitmqctl add_user amq_client_gem_reader reader_password
-sudo rabbitmqctl set_permissions -p amq_client_testbed amq_client_gem_reader "^---$" "^---$" ".*"
+$RABBITMQCTL add_user amq_client_gem_reader reader_password
+$RABBITMQCTL set_permissions -p amq_client_testbed amq_client_gem_reader "^---$" "^---$" ".*"

data/lib/amq/client/async/adapter.rb

@@ -2,6 +2,7 @@
 
 require "amq/client/logging"
 require "amq/client/settings"
+require "amq/client/async/auth_mechanism_adapter"
 require "amq/client/async/entity"
 require "amq/client/async/channel"
 
@@ -274,13 +275,13 @@ module AMQ
         # @return  [Fixnum]  Heartbeat interval this client uses, in seconds.
         # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.4.2.6)
         def heartbeat_interval
-          @settings[:heartbeat] || @settings[:heartbeat_interval] || 0
+          @heartbeat_interval
         end # heartbeat_interval
 
         # Returns true if heartbeats are enabled (heartbeat interval is greater than 0)
         # @return [Boolean]
         def heartbeats_enabled?
-          self.heartbeat_interval > 0
+          @heartbeat_interval && (@heartbeat_interval > 0)
         end
 
 
@@ -368,6 +369,8 @@ module AMQ
         # @private
         # @api plugin
         def handle_connection_interruption
+          self.cancel_heartbeat_sender
+
           @channels.each { |n, c| c.handle_connection_interruption }
           self.exec_callback_yielding_self(:after_connection_interruption)
         end # handle_connection_interruption
@@ -509,9 +512,17 @@ module AMQ
         # @api plugin
         # @see http://tools.ietf.org/rfc/rfc2595.txt RFC 2595
         def encode_credentials(username, password)
-          "\0#{username}\0#{password}"
+          auth_mechanism_adapter.encode_credentials(username, password)
         end # encode_credentials(username, password)
 
+        # Retrieves an AuthMechanismAdapter that will encode credentials for
+        # this Adapter.
+        #
+        # @api plugin
+        def auth_mechanism_adapter
+          @auth_mechanism_adapter ||= AuthMechanismAdapter.for_adapter(self)
+        end
+
 
         # Processes a single frame.
         #
@@ -600,7 +611,7 @@ module AMQ
           # @status undefined. So lets do this. MK.
           opening!
 
-          self.send_frame(Protocol::Connection::StartOk.encode(@client_properties, @mechanism, self.encode_credentials(username, password), @locale))
+          self.send_frame(Protocol::Connection::StartOk.encode(@client_properties, mechanism, self.encode_credentials(username, password), @locale))
         end
 
 
@@ -608,12 +619,16 @@ module AMQ
         #
         # @api plugin
         # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.4.2.6)
-        def handle_tune(tune_ok)
-          @channel_max        = tune_ok.channel_max.freeze
-          @frame_max          = tune_ok.frame_max.freeze
-          @heartbeat_interval = self.heartbeat_interval || tune_ok.heartbeat
+        def handle_tune(connection_tune)
+          @channel_max        = connection_tune.channel_max.freeze
+          @frame_max          = connection_tune.frame_max.freeze
+
+          client_heartbeat    = @settings[:heartbeat] || @settings[:heartbeat_interval] || 0
+
+          @heartbeat_interval = negotiate_heartbeat_value(client_heartbeat, connection_tune.heartbeat)
 
           self.send_frame(Protocol::Connection::TuneOk.encode(@channel_max, [settings[:frame_max], @frame_max].min, @heartbeat_interval))
+          self.initialize_heartbeat_sender if heartbeats_enabled?
         end # handle_tune(method)
 
 
@@ -652,6 +667,14 @@ module AMQ
 
         protected
 
+        def negotiate_heartbeat_value(client_value, server_value)
+          if client_value == 0 || server_value == 0
+            [client_value, server_value].max
+          else
+            [client_value, server_value].min
+          end
+        end
+
         # Returns next frame from buffer whenever possible
         #
         # @api private

data/lib/amq/client/async/adapters/coolio.rb

@@ -275,6 +275,10 @@ module AMQ
           AMQ::Client::TCPConnectionFailed
         end # self.tcp_connection_failure_exception_class
 
+        def initialize_heartbeat_sender
+          # TODO
+        end
+
         def handle_skipped_hearbeats
           # TODO
         end

data/lib/amq/client/async/adapters/event_machine.rb

@@ -31,10 +31,10 @@ module AMQ
         # @option settings [String] :vhost ("/") Virtual host to use.
         # @option settings [String] :user ("guest") Username to use for authentication.
         # @option settings [String] :pass ("guest") Password to use for authentication.
+        # @option settings [String] :auth_mechanism ("PLAIN") SASL authentication mechanism to use.
         # @option settings [String] :ssl (false) Should be use TLS (SSL) for connection?
         # @option settings [String] :timeout (nil) Connection timeout.
-        # @option settings [String] :logging (false) Turns logging on or off.
-        # @option settings [String] :broker (nil) Broker name (use if you intend to use broker-specific features).
+        # @option settings [Fixnum] :heartbeat (0) Connection heartbeat, in seconds.
         # @option settings [Fixnum] :frame_max (131072) Maximum frame size to use. If broker cannot support frames this large, broker's maximum value will be used instead.
         #
         # @param [Hash] settings
@@ -164,7 +164,7 @@ module AMQ
             raise self.class.authentication_failure_exception_class.new(settings)
           }
 
-          @mechanism         = "PLAIN"
+          @mechanism         = @settings.fetch(:auth_mechanism, "PLAIN")
           @locale            = @settings.fetch(:locale, "en_GB")
           @client_properties = Settings.client_properties.merge(@settings.fetch(:client_properties, Hash.new))
 
@@ -172,8 +172,6 @@ module AMQ
 
           self.reset
           self.set_pending_connect_timeout((@settings[:timeout] || 3).to_f) unless defined?(JRUBY_VERSION)
-
-          self.initialize_heartbeat_sender if self.heartbeats_enabled?
         end # initialize(*args)
 
 
@@ -267,8 +265,6 @@ module AMQ
           @handling_skipped_hearbeats        = false
           @last_server_heartbeat             = Time.now
 
-          self.initialize_heartbeat_sender if self.heartbeat_interval > 0
-
           self.handshake
         end
 
@@ -356,7 +352,7 @@ module AMQ
         def handle_skipped_hearbeats
           if !@handling_skipped_hearbeats && @tcp_connection_established && !@intentionally_closing_connection
             @handling_skipped_hearbeats = true
-            @heartbeats_timer.cancel
+            self.cancel_heartbeat_sender
 
             self.run_skipped_heartbeats_callbacks
           end
@@ -368,6 +364,11 @@ module AMQ
           @heartbeats_timer      = EventMachine::PeriodicTimer.new(self.heartbeat_interval, &method(:send_heartbeat))
         end
 
+        # @private
+        def cancel_heartbeat_sender
+          @heartbeats_timer.cancel if @heartbeats_timer
+        end
+
 
 
         self.handle(Protocol::Connection::Start) do |connection, frame|

data/lib/amq/client/async/auth_mechanism_adapter.rb

@@ -0,0 +1,69 @@
+# encoding: utf-8
+
+module AMQ::Client::Async
+  # Provides a flexible method for encoding AMQP credentials. PLAIN and
+  # EXTERNAL are provided by this gem. In order to implement a new
+  # authentication mechanism, create a subclass like so:
+  #
+  #   class MyAuthMechanism < AMQ::Client::Async::AuthMechanismAdapter
+  #     auth_mechanism "X-MYAUTH"
+  #
+  #     def encode_credentials(username, password)
+  #       # ...
+  #     end
+  #   end
+  class AuthMechanismAdapter
+
+    # Find and instantiate an AuthMechanismAdapter.
+    #
+    # @param [Adapter] adapter The Adapter for which to encode credentials.
+    # @return [AuthMechanismAdapter] An AuthMechanismAdapter that can encode
+    #   credentials for the Adapter.
+    # @raise [NotImplementedError] The Adapter's mechanism does not
+    #   correspond to any known AuthMechanismAdapter.
+    def self.for_adapter(adapter)
+      registry[adapter.mechanism].new adapter
+    end
+
+    protected
+
+      # Used by subclasses to declare the mechanisms that an
+      # AuthMechanismAdapter understands.
+      #
+      # @param [Array<String>] mechanisms One or more mechanisms that can be
+      #   handled by the subclass.
+      def self.auth_mechanism(*mechanisms)
+        mechanisms.each {|mechanism| registry[mechanism] = self}
+      end
+
+    private
+
+      # Accesses the registry of AuthMechanismAdapter subclasses. Keys in
+      # this hash are the names of the authentication mechanisms; values are
+      # the classes that handle them. Referencing an unknown mechanism from
+      # this Hash will raise NotImplementedError.
+      def self.registry
+        @@registry ||= Hash.new {raise NotImplementedError}
+      end
+
+    public
+
+      # The Adapter that this AuthMechanismAdapter operates on behalf of.
+      attr_reader :adapter
+
+    private
+
+      # Create a new AuthMechanismAdapter. Users of this class should instead
+      # retrieve an instance through for_adapter.
+      def initialize(adapter)
+        @adapter = adapter
+      end
+  end
+end
+
+# pre-require builtin auth mechanisms
+Dir[File.join(File.dirname(__FILE__),
+              File.basename(__FILE__, '.rb'),
+              '*')].each do |f|
+  require f
+end

data/lib/amq/client/async/auth_mechanism_adapter/external.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+module AMQ::Client::Async
+
+  # Manages the encoding of credentials for the EXTERNAL authentication
+  # mechanism.
+  class AuthMechanismAdapter::External < AuthMechanismAdapter
+
+    auth_mechanism "EXTERNAL"
+
+    # Encodes a username and password for the EXTERNAL mechanism. Since
+    # authentication is handled by an encapsulating protocol like SSL or
+    # UNIX domain sockets, EXTERNAL doesn't pass along any username or
+    # password information at all and this method always returns the
+    # empty string.
+    #
+    # @param [String] username The username to encode. This parameter is
+    #   ignored.
+    # @param [String] password The password to encode. This parameter is
+    #   ignored.
+    # @return [String] The username and password, encoded for the
+    #   EXTERNAL mechanism. This is always the empty string.
+    def encode_credentials(username, password)
+      ""
+    end
+  end
+end

data/lib/amq/client/async/auth_mechanism_adapter/plain.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+module AMQ::Client::Async
+
+  # Manages the encoding of credentials for the PLAIN authentication
+  # mechanism.
+  class AuthMechanismAdapter::Plain < AuthMechanismAdapter
+
+    auth_mechanism "PLAIN"
+
+    # Encodes credentials for the given username and password. This
+    # involves sending the password across the wire in plaintext, so
+    # PLAIN authentication should only be used over a secure transport
+    # layer.
+    #
+    # @param [String] username The username to encode.
+    # @param [String] password The password to encode.
+    # @return [String] The username and password, encoded for the PLAIN
+    #   mechanism.
+    def encode_credentials(username, password)
+      "\0#{username}\0#{password}"
+    end
+  end
+end

data/lib/amq/client/async/channel.rb

@@ -133,7 +133,7 @@ module AMQ
         # Acknowledge one or all messages on the channel.
         #
         # @api public
-        # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.8.3.13.)
+        # @see files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol reference (Section 1.8.3.13.)
         def acknowledge(delivery_tag, multiple = false)
           @connection.send_frame(Protocol::Basic::Ack.encode(self.id, delivery_tag, multiple))
 
@@ -143,7 +143,7 @@ module AMQ
         # Reject a message with given delivery tag.
         #
         # @api public
-        # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.8.3.14.)
+        # @see files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol reference (Section 1.8.3.14.)
         def reject(delivery_tag, requeue = true)
           @connection.send_frame(Protocol::Basic::Reject.encode(self.id, delivery_tag, requeue))
 
@@ -156,7 +156,7 @@ module AMQ
         # @return [Channel]  self
         #
         # @note RabbitMQ as of 2.3.1 does not support basic.recover with requeue = false.
-        # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.8.3.16.)
+        # @see files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol reference (Section 1.8.3.16.)
         # @api public
         def recover(requeue = true, &block)
           @connection.send_frame(Protocol::Basic::Recover.encode(@id, requeue))
@@ -181,7 +181,7 @@ module AMQ
 
           self.redefine_callback :qos, &block
           self
-        end # qos(prefetch_size = 4096, prefetch_count = 32, global = false, &block)
+        end # qos
 
         # Asks the peer to pause or restart the flow of content data sent to a consumer.
         # This is a simple flow­control mechanism that a peer can use to avoid overflowing its
@@ -191,7 +191,7 @@ module AMQ
         #
         # @param [Boolean] active Desired flow state.
         #
-        # @see http://bit.ly/amqp091reference AMQP 0.9.1 protocol reference (Section 1.5.2.3.)
+        # @see files.travis-ci.org/docs/amqp/0.9.1/AMQP091Reference.pdf AMQP 0.9.1 protocol reference (Section 1.5.2.3.)
         # @api public
         def flow(active = false, &block)
           @connection.send_frame(Protocol::Channel::Flow.encode(@id, active))
@@ -413,6 +413,7 @@ module AMQ
         def handle_close(channel_close)
           self.status = :closed
           self.connection.clear_frames_on(self.id)
+
           self.exec_callback_yielding_self(:error, channel_close)
 
           self.handle_connection_interruption(channel_close)

data/lib/amq/client/async/extensions/rabbitmq/cancel.rb

@@ -10,17 +10,17 @@ module AMQ
         module RabbitMQ
           module Basic
             module ConsumerMixin
-              
+
               def on_cancel(&block)
                 self.append_callback(:scancel, &block)
 
                 self
               end # on_cancel(&block)
-              
+
               def handle_cancel(basic_cancel)
                 self.exec_callback(:scancel, basic_cancel)
               end # handle_cancel(basic_cancel)
-              
+
               def self.included receiver
                 receiver.handle(Protocol::Basic::Cancel) do |connection, method_frame|
                   channel      = connection.channels[method_frame.channel]
@@ -31,17 +31,17 @@ module AMQ
                   consumer.handle_cancel(basic_cancel) if consumer
                 end
               end
-              
+
             end # ConsumerMixin
-            
+
             module QueueMixin
-              
+
               # @api public
               def on_cancel(&block)
                 @default_consumer.on_cancel(&block)
               end # on_cancel(&block)
             end
-            
+
           end # Basic
         end # RabbitMQ
       end # Extensions

data/lib/amq/client/extensions/rabbitmq/cancel.rb

@@ -2,13 +2,13 @@
 
 require "amq/client/async/extensions/rabbitmq/cancel"
 
-# Basic.Nack
+# Basic.Cancel
 module AMQ
   module Client
     # backwards compatibility
     # @private
     Extensions = Async::Extensions unless defined?(Extensions)
-    
+
     module Settings
       CLIENT_PROPERTIES[:capabilities] ||= {}
       CLIENT_PROPERTIES[:capabilities][:consumer_cancel_notify] = true

data/lib/amq/client/settings.rb

@@ -23,9 +23,10 @@ module AMQ
           :port  => AMQ::Protocol::DEFAULT_PORT,
 
           # login
-          :user  => "guest",
-          :pass  => "guest",
-          :vhost => "/",
+          :user           => "guest",
+          :pass           => "guest",
+          :auth_mechanism => "PLAIN",
+          :vhost          => "/",
 
           # connection timeout
           :timeout => nil,
@@ -51,7 +52,7 @@ module AMQ
         :information  => "http://github.com/ruby-amqp/amq-client",
         :version      => AMQ::Client::VERSION
       }
-      
+
       def self.client_properties
         @client_properties ||= CLIENT_PROPERTIES
       end

data/lib/amq/client/version.rb

@@ -2,6 +2,6 @@
 
 module AMQ
   module Client
-    VERSION = "1.0.0.pre2"
+    VERSION = "1.0.0"
   end
 end

data/spec/integration/coolio/basic_return_spec.rb

@@ -15,7 +15,7 @@ describe "AMQ::Client::CoolioClient", "Basic.Return", :nojruby => true do
       coolio_amqp_connect do |client|
         channel = AMQ::Client::Channel.new(client, 1)
         channel.open do
-          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, false)
 
           # need to delete the queue manually because we don't start consumption,
           # hence, no auto-delete
@@ -26,14 +26,14 @@ describe "AMQ::Client::CoolioClient", "Basic.Return", :nojruby => true do
           end
 
           messages.each do |message|
-            exchange.publish(message, AMQ::Protocol::EMPTY_STRING, {}, false, true)
+            exchange.publish(message, AMQ::Protocol::EMPTY_STRING, {}, true, false)
           end
         end
 
         done(0.6) { @returned_messages.size == messages.size }
       end
 
-      @returned_messages.should == ["NO_CONSUMERS"] * messages.size
+      @returned_messages.should == ["NO_ROUTE"] * messages.size
     end
   end
-end
+end

data/spec/integration/coolio/exchange_declare_spec.rb

@@ -34,7 +34,6 @@ describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
               exchange.declare(true, false, false, false) do
                 @callback_fired = true
               end
-              delayed(0.1) { exchange.delete }
               done(0.5)
             end
           end

data/spec/integration/eventmachine/basic_publish_with_framing_spec.rb

@@ -10,7 +10,7 @@ describe AMQ::Client::EventMachineClient, "Basic.Publish" do
   default_timeout 21.0
 
   context "when message size exceeds negotiated frame size" do
-    let(:message) { "z" * 1024 * 1024 * 8 }
+    let(:message) { "z" * 1024 * 1024 * 2 }
 
     it "correctly frames things" do
       @received_messages = []
@@ -41,11 +41,13 @@ describe AMQ::Client::EventMachineClient, "Basic.Publish" do
             end
           end
 
-          done(14.0) {
+          delayed(15.0) {
             # we don't care about the exact number, just the fact that there are
             # no UNEXPECTED_FRAME connection-level exceptions. MK.
             @received_messages.size.should > 10
             @received_messages.all? {|m| m == message}.should be_true
+
+            done
           }
         end
       end # em_amqp_connect

data/spec/integration/eventmachine/basic_return_spec.rb

@@ -25,7 +25,7 @@ describe AMQ::Client::EventMachineClient, "Basic.Return" do
           end
 
           messages.each do |message|
-            exchange.publish(message, AMQ::Protocol::EMPTY_STRING, {}, false, true)
+            exchange.publish(message, AMQ::Protocol::EMPTY_STRING, {}, true, false)
           end
         end
 
@@ -34,7 +34,7 @@ describe AMQ::Client::EventMachineClient, "Basic.Return" do
         }
       end
 
-      @returned_messages.should == ["NO_CONSUMERS"] * messages.size
+      @returned_messages.should == ["NO_ROUTE"] * messages.size
     end
   end
-end
+end

data/spec/integration/eventmachine/concurrent_basic_publish_spec.rb

@@ -57,7 +57,7 @@ if mri?
                 30.times do
                   Thread.new do
                     messages.each do |message|
-                      exchange.publish(message, queue.name, {}, false, true)
+                      exchange.publish(message, queue.name, {}, false, false)
                     end
                   end
                 end
@@ -76,4 +76,4 @@ if mri?
       end # it
     end # context
   end # describe
-end
+end

data/spec/integration/eventmachine/connection_start_spec.rb

@@ -10,6 +10,69 @@ describe AMQ::Client::EventMachineClient, "Connection.Start" do
   include EventedSpec::SpecHelper
   default_timeout 0.5
 
+  it "uses PLAIN authentication by default" do
+    em do
+      AMQ::Client::EventMachineClient.new(0).mechanism.should eq "PLAIN"
+      done
+    end
+  end
+
+  it "uses PLAIN authentication when explicitly set" do
+    em do
+      AMQ::Client::EventMachineClient.new(0, :auth_mechanism => "PLAIN").mechanism.should eq "PLAIN"
+      done
+    end
+  end
+
+  it "properly encodes username and password for PLAIN authentication" do
+    em do
+      client = AMQ::Client::EventMachineClient.new 0, :auth_mechanism => "PLAIN"
+      client.encode_credentials("user", "pass").should eq "\0user\0pass"
+      done
+    end
+  end
+
+  it "uses EXTERNAL authentication when explicitly set" do
+    em do
+      AMQ::Client::EventMachineClient.new(0, :auth_mechanism => "EXTERNAL").mechanism.should eq "EXTERNAL"
+      done
+    end
+  end
+
+  it "skips encoding username and password for EXTERNAL authentication" do
+    em do
+      client = AMQ::Client::EventMachineClient.new 0, :auth_mechanism => "EXTERNAL"
+      client.encode_credentials("user", "pass").should eq ""
+      done
+    end
+  end
+
+  it "allows user-defined authentication mechanisms" do
+    Class.new AMQ::Client::Async::AuthMechanismAdapter do
+      auth_mechanism "FOO"
+
+      def encode_credentials(username, password)
+        "foo"
+      end
+    end
+
+    em do
+      client = AMQ::Client::EventMachineClient.new 0, :auth_mechanism => "FOO"
+      client.encode_credentials("user", "pass").should eq "foo"
+      done
+    end
+  end
+
+  it "fails for unimplemented authentication mechanisms" do
+    em do
+      client = AMQ::Client::EventMachineClient.new 0, :auth_mechanism => "BAR"
+      expect do
+        client.encode_credentials("user", "pass")
+      end.to raise_error(NotImplementedError)
+      done
+    end
+  end
+
   context "with valid credentials" do
     it "should trigger the callback" do
       em do

data/spec/integration/eventmachine/consumer_cancellation_notification_spec.rb

@@ -0,0 +1,76 @@
+# encoding: utf-8
+
+require 'spec_helper'
+require 'integration/eventmachine/spec_helper'
+
+require "amq/client/extensions/rabbitmq"
+
+describe AMQ::Client::EventMachineClient, "basic.cancel notification" do
+  include EventedSpec::SpecHelper
+  default_timeout 4
+
+  let(:messages) { (0..99).map {|i| "Message #{i}" } }
+
+  it "works for default consumer" do
+    @received_basic_cancel_ok = false
+    em_amqp_connect do |client|
+      channel = AMQ::Client::Channel.new(client, 1)
+      channel.open do
+        queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+        queue.bind("amq.fanout")
+        exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+
+        queue.consume(true) do |amq_method|
+          messages.each do |message|
+            exchange.publish(message)
+          end
+        end
+
+        queue.default_consumer.on_cancel do |basic_cancel|
+          @received_basic_cancel_ok = true
+        end
+
+        delayed(1.0) { queue.delete }
+
+        done(2.5) {
+          @received_basic_cancel_ok.should be_true
+        }
+      end
+    end
+  end # it
+
+  it "works for other consumers" do
+    @cancellation_notifications = []
+
+    em_amqp_connect do |client|
+      channel = AMQ::Client::Channel.new(client, 1)
+      channel.open do
+        queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+        queue.bind("amq.fanout")
+        exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
+
+        consumer1 = AMQ::Client::Async::Consumer.new(channel, queue, "#{queue.name}-consumer-#{Time.now}-#{rand}")
+        consumer2 = AMQ::Client::Async::Consumer.new(channel, queue, "#{queue.name}-consumer-#{Time.now}-#{rand}")
+        consumer1.consume do |_|
+          messages.each do |message|
+            exchange.publish(message)
+          end
+        end
+        consumer2.consume
+
+        consumer1.on_cancel do |basic_cancel|
+          @cancellation_notifications << 1
+        end
+        consumer2.on_cancel do |basic_cancel|
+          @cancellation_notifications << 2
+        end
+
+        delayed(1.0) { queue.delete }
+
+        done(2.5) {
+          @cancellation_notifications.sort.should == [1, 2]
+        }
+      end
+    end
+  end # it
+end # describe AMQ::Client::EventMachineClient, "Basic.Consume"

data/spec/integration/eventmachine/exchange_declare_spec.rb

@@ -65,7 +65,6 @@ describe AMQ::Client::EventMachineClient, "Exchange.Declare" do
               exchange.declare(true, false, false, false) do
                 @callback_fired = true
               end
-              delayed(0.1) { exchange.delete }
               done(0.3)
             end
           end

metadata

@@ -1,73 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amq-client
-version: !ruby/object:Gem::Version 
-  hash: -1880058884
-  prerelease: 6
-  segments: 
-  - 1
-  - 0
-  - 0
-  - pre
-  - 2
-  version: 1.0.0.pre2
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease:
 platform: ruby
-authors: 
+authors:
 - Jakub Stastny
 - Michael S. Klishin
 - Theo Hultberg
 - Mark Abramov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-07-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: amq-protocol
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    none: false
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
 description: amq-client is a fully-featured, low-level AMQP 0.9.1 client with pluggable networking I/O adapters (EventMachine, cool.io, Eventpanda and so on) and supposed to back more opinionated AMQP clients (such as amqp gem) or be used directly in cases when access to more advanced AMQP 0.9.1 features is more important that convenient APIs
-email: 
-- stastny@101ideas.cz
+email:
+- !binary |-
+  c3Rhc3RueUAxMDFpZGVhcy5jeg==
 - michael@novemberain.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
-- .gitignore
-- .gitmodules
-- .rspec
-- .travis.yml
-- .yardopts
+files:
+- ".gitignore"
+- ".gitmodules"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE
 - README.textile
@@ -153,6 +148,9 @@ files:
 - lib/amq/client/async/adapters/coolio.rb
 - lib/amq/client/async/adapters/event_machine.rb
 - lib/amq/client/async/adapters/eventmachine.rb
+- lib/amq/client/async/auth_mechanism_adapter.rb
+- lib/amq/client/async/auth_mechanism_adapter/external.rb
+- lib/amq/client/async/auth_mechanism_adapter/plain.rb
 - lib/amq/client/async/callbacks.rb
 - lib/amq/client/async/channel.rb
 - lib/amq/client/async/consumer.rb
@@ -210,6 +208,7 @@ files:
 - spec/integration/eventmachine/concurrent_basic_publish_spec.rb
 - spec/integration/eventmachine/connection_close_spec.rb
 - spec/integration/eventmachine/connection_start_spec.rb
+- spec/integration/eventmachine/consumer_cancellation_notification_spec.rb
 - spec/integration/eventmachine/exchange_declare_spec.rb
 - spec/integration/eventmachine/queue_declare_spec.rb
 - spec/integration/eventmachine/regressions/amqp_gem_issue66_spec.rb
@@ -227,39 +226,29 @@ files:
 - tasks.rb
 homepage: http://github.com/ruby-amqp/amq-client
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
 requirements: []
-
 rubyforge_project: amq-client
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: amq-client is a fully-featured, low-level AMQP 0.9.1 client
 test_files: []
-
-has_rdoc: 
+has_rdoc: