amq-client 0.7.0.alpha9 → 0.7.0.alpha10

data/lib/amq/client/adapter.rb

@@ -146,6 +146,15 @@ module AMQ
         def async?
           !sync?
         end
+
+
+        # Can be overriden by higher-level libraries like amqp gem or bunny.
+        # Defaults to AMQ::Client::TCPConnectionFailed.
+        #
+        # @return [Exception]
+        def tcp_connection_failure_exception_class
+          @tcp_connection_failure_exception_class ||= AMQ::Client::TCPConnectionFailed
+        end # tcp_connection_failure_exception_class
       end # ClassMethods
 
 

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

@@ -24,6 +24,9 @@ module AMQ
       # API
       #
 
+      attr_reader :connections
+
+
       def self.connect(settings = nil, &block)
         @settings = Settings.configure(settings)
 
@@ -55,11 +58,57 @@ module AMQ
         EventMachine.reconnect(@settings[:host], @settings[:port], self)
       end
 
-      # For EventMachine adapter, this is a no-op.
+
+      # Defines a callback that will be executed when AMQP connection is considered open,
+      # after client and broker has agreed on max channel identifier and maximum allowed frame
+      # size. You can define more than one callback.
+      #
+      # @see #on_open
       # @api public
-      def establish_connection(settings)
-        # Unfortunately there doesn't seem to be any sane way
-        # how to get EventMachine connect to the instance level.
+      def on_connection(&block)
+        @connection_deferrable.callback(&block)
+      end # on_connection(&block)
+
+      # Defines a callback that will be executed when AMQP connection is considered open,
+      # before client and broker has agreed on max channel identifier and maximum allowed frame
+      # size. You can define more than one callback.
+      #
+      # @see #on_connection
+      # @api public
+      def on_open(&block)
+        @connection_opened_deferrable.callback(&block)
+      end # on_open(&block)
+
+      # Defines a callback that will be run when broker confirms connection termination
+      # (client receives connection.close-ok). You can define more than one callback.
+      #
+      # @api public
+      def on_disconnection(&block)
+        @disconnection_deferrable.callback(&block)
+      end # on_disconnection(&block)
+
+      # Defines a callback that will be run when initial TCP connection fails.
+      # You can define only one callback.
+      #
+      # @api public
+      def on_tcp_connection_failure(&block)
+        @on_tcp_connection_failure = block
+      end
+
+      # Defines a callback that will be run when initial TCP connection fails.
+      # You can define only one callback.
+      #
+      # @api public
+      def on_tcp_connection_loss(&block)
+        @on_tcp_connection_loss = block
+      end
+
+      # Defines a callback that will be run when TCP connection is closed before authentication
+      # finishes. Usually this means authentication failure. You can define only one callback.
+      #
+      # @api public
+      def on_possible_authentication_failure(&block)
+        @on_possible_authentication_failure = block
       end
 
       # @see #on_connection
@@ -76,9 +125,6 @@ module AMQ
       end
 
 
-      attr_reader :connections
-
-
       def initialize(*args)
         super(*args)
 
@@ -93,7 +139,7 @@ module AMQ
         @settings                           = args.first
         @on_possible_authentication_failure = @settings[:on_possible_authentication_failure]
         @on_tcp_connection_failure          = @settings[:on_tcp_connection_failure] || Proc.new { |settings|
-          raise AMQ::Client::TCPConnectionFailed.new(settings)
+          raise self.class.tcp_connection_failure_exception_class.new(settings)
         }
 
         self.reset
@@ -125,6 +171,15 @@ module AMQ
         @tcp_connection_established
       end # tcp_connection_established?
 
+      # For EventMachine adapter, this is a no-op.
+      # @api public
+      def establish_connection(settings)
+        # Unfortunately there doesn't seem to be any sane way
+        # how to get EventMachine connect to the instance level.
+      end
+
+
+
       #
       # Implementation
       #
@@ -221,15 +276,6 @@ module AMQ
         end
       end
 
-      # Defines a callback that will be executed when AMQP connection is considered open,
-      # after client and broker has agreed on max channel identifier and maximum allowed frame
-      # size. You can define more than one callback.
-      #
-      # @see #on_open
-      # @api public
-      def on_connection(&block)
-        @connection_deferrable.callback(&block)
-      end # on_connection(&block)
 
       # Called by AMQ::Client::Connection after we receive connection.open-ok.
       # @api public
@@ -238,16 +284,6 @@ module AMQ
       end # connection_successful
 
 
-      # Defines a callback that will be executed when AMQP connection is considered open,
-      # before client and broker has agreed on max channel identifier and maximum allowed frame
-      # size. You can define more than one callback.
-      #
-      # @see #on_connection
-      # @api public
-      def on_open(&block)
-        @connection_opened_deferrable.callback(&block)
-      end # on_open(&block)
-
       # Called by AMQ::Client::Connection after we receive connection.tune.
       # @api public
       def open_successful
@@ -258,14 +294,6 @@ module AMQ
       end # open_successful
 
 
-      # Defines a callback that will be run when broker confirms connection termination
-      # (client receives connection.close-ok). You can define more than one callback.
-      #
-      # @api public
-      def on_disconnection(&block)
-        @disconnection_deferrable.callback(&block)
-      end # on_disconnection(&block)
-
       # Called by AMQ::Client::Connection after we receive connection.close-ok.
       #
       # @api public
@@ -278,43 +306,16 @@ module AMQ
       end # disconnection_successful
 
 
-      # Defines a callback that will be run when initial TCP connection fails.
-      # You can define only one callback.
-      #
-      # @api public
-      def on_tcp_connection_failure(&block)
-        @on_tcp_connection_failure = block
-      end
-
-      # Called when initial TCP connection fails.
-      # @api public
-      def tcp_connection_failed
-        @on_tcp_connection_failure.call(@settings) if @on_tcp_connection_failure
-      end
-
-
-      # Defines a callback that will be run when initial TCP connection fails.
-      # You can define only one callback.
-      #
-      # @api public
-      def on_tcp_connection_loss(&block)
-        @on_tcp_connection_loss = block
-      end
-
       # Called when initial TCP connection fails.
       # @api public
       def tcp_connection_lost
         @on_tcp_connection_loss.call(self, @settings) if @on_tcp_connection_loss
       end
 
-
-
-      # Defines a callback that will be run when TCP connection is closed before authentication
-      # finishes. Usually this means authentication failure. You can define only one callback.
-      #
+      # Called when initial TCP connection fails.
       # @api public
-      def on_possible_authentication_failure(&block)
-        @on_possible_authentication_failure = block
+      def tcp_connection_failed
+        @on_tcp_connection_failure.call(@settings) if @on_tcp_connection_failure
       end
 
 
@@ -379,7 +380,7 @@ module AMQ
         elsif tls_options
           start_tls
         end
-      end
+      end # upgrade_to_tls_if_necessary
     end # EventMachineClient
   end # Client
 end # AMQ

data/lib/amq/client/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Client
-    VERSION = "0.7.0.alpha9"
+    VERSION = "0.7.0.alpha10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amq-client
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha9
+  version: 0.7.0.alpha10
   prerelease: 6
 platform: ruby
 authors:
@@ -12,12 +12,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2011-04-22 00:00:00.000000000 +04:00
+date: 2011-04-23 00:00:00.000000000 +04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152222340 !ruby/object:Gem::Requirement
+  requirement: &2152494160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -25,10 +25,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152222340
+  version_requirements: *2152494160
 - !ruby/object:Gem::Dependency
   name: amq-protocol
-  requirement: &2152457200 !ruby/object:Gem::Requirement
+  requirement: &2152717940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,7 +36,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152457200
+  version_requirements: *2152717940
 description: amq-client supports multiple networking adapters (EventMachine, TCP sockets,
   cool.io) and supposed to back more opinionated AMQP clients (such as amqp gem, bunny,
   et cetera) or be used directly in cases when access to more advanced AMQP 0.9.1