amq-client 0.7.0.alpha23 → 0.7.0.alpha24

data/README.textile

@@ -27,11 +27,10 @@ conciseness.
 
 h2. Adapters
 
-Version 1.0 will feature 3 adapters:
+Currently implemented adapters:
 
- * EventMachine (asynchronous)
- * cool.io (asynchronous)
- * TCP sockets (synchronous)
+ * "EventMachine":http://github.com/eventmachine/eventmachine
+ * "cool.io":http://coolio.github.com/
 
 h3. EventMachine adapter
 
@@ -46,11 +45,6 @@ cool.io adapter is on par with EventMachine but is not used by any popular libra
 Note that cool.io doesn't work on JRuby and Microsoft Windows(tm).
 
 
-h3. TCP socket adapter
-
-TCP socket adapter is largely incomplete.
-
-
 h2. Installation
 
 amq-client is available from rubygems.org:

data/lib/amq/client.rb

@@ -2,6 +2,7 @@
 
 require "amq/client/version"
 require "amq/client/exceptions"
+require "amq/client/handlers_registry"
 require "amq/client/adapter"
 require "amq/client/channel"
 require "amq/client/exchange"
@@ -23,8 +24,8 @@ module AMQ
     # where metadata are hash with :path and :const_name keys.
     #
     # @example
-    #   AMQ::Client.adapters[:socket]
-    #   # => {path: full_path, const_name: "SocketClient"}}
+    #   AMQ::Client.adapters[:event_machine] # => {path: "...", const_name: "EventMachineClient"}}
+    #
     # @return [Hash]
     # @api public
     def self.adapters
@@ -50,7 +51,7 @@ module AMQ
     # @param [Hash] Connection parameters, including :adapter to use.
     # @api public
     def self.connect(settings = nil, &block)
-      adapter  = (settings && settings.delete(:adapter)) || :socket
+      adapter  = (settings && settings.delete(:adapter))
       adapter  = load_adapter(adapter)
       adapter.connect(settings, &block)
     end
@@ -66,5 +67,5 @@ module AMQ
     rescue LoadError
       raise InvalidAdapterNameError.new(adapter)
     end
-  end
-end
+  end # Client
+end # AMQ

data/lib/amq/client/adapter.rb

@@ -16,29 +16,6 @@ module AMQ
     # * #estabilish_connection(settings)
     # * #close_connection
     #
-    # Adapters also must indicate whether they operate in asynchronous or synchronous mode
-    # using AMQ::Client::Adapter.sync accessor:
-    #
-    # @example EventMachine adapter indicates that it is asynchronous
-    #  module AMQ
-    #    module Client
-    #      class EventMachineClient
-    #
-    #        #
-    #        # Behaviors
-    #        #
-    #
-    #        include AMQ::Client::Adapter
-    #        include EventMachine::Deferrable
-    #
-    #         self.sync = false
-    #
-    #         # the rest of implementation code ...
-    #
-    #       end
-    #     end
-    #   end
-    #
     # @abstract
     module Adapter
 
@@ -126,27 +103,6 @@ module AMQ
           instance
         end
 
-        # @see AMQ::Client::Adapter
-        def sync=(boolean)
-          @sync = boolean
-        end
-
-        # Use this method to detect whether adapter is synchronous or asynchronous.
-        #
-        # @return [Boolean] true if this adapter is synchronous
-        # @api plugin
-        # @see AMQ::Client::Adapter
-        def sync?
-          @sync == true
-        end
-
-        # @see #sync?
-        # @api plugin
-        # @see AMQ::Client::Adapter
-        def async?
-          !sync?
-        end
-
 
         # Can be overriden by higher-level libraries like amqp gem or bunny.
         # Defaults to AMQ::Client::TCPConnectionFailed.
@@ -170,7 +126,7 @@ module AMQ
       # Behaviors
       #
 
-      include AMQ::Client::StatusMixin
+      include AMQ::Client::Openable
 
       extend RegisterEntityMixin
 
@@ -201,10 +157,6 @@ module AMQ
       def handshake(mechanism = "PLAIN", response = "\0guest\0guest", locale = "en_GB")
         self.send_preamble
         self.connection = AMQ::Client::Connection.new(self, mechanism, response, locale)
-        if self.sync?
-          self.receive # Start/Start-Ok
-          self.receive # Tune/Tune-Ok
-        end
       end
 
       # Properly close connection with AMQ broker, as described in
@@ -279,7 +231,7 @@ module AMQ
         if Protocol::HeartbeatFrame === frame
           @last_server_heartbeat = Time.now
         else
-          callable = AMQ::Client::Entity.handlers[frame.method_class]
+          callable = AMQ::Client::HandlersRegistry.find(frame.method_class)
           if callable
             callable.call(self, frames.first, frames[1..-1])
           else
@@ -299,20 +251,6 @@ module AMQ
       end # send_heartbeat
 
 
-      # @see .sync?
-      # @api plugin
-      # @see AMQ::Client::Adapter
-      def sync?
-        self.class.sync?
-      end
-
-      # @see .async?
-      # @api plugin
-      # @see AMQ::Client::Adapter
-      def async?
-        self.class.async?
-      end
-
       # Returns heartbeat interval this client uses, in seconds.
       # This value may or may not be used depending on broker capabilities.
       #

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

@@ -78,9 +78,8 @@ module AMQ
       #
 
       include AMQ::Client::Adapter
-      include AMQ::Client::CallbacksMixin
+      include AMQ::Client::Callbacks
 
-      self.sync = false
 
       #
       # API

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

@@ -18,7 +18,6 @@ module AMQ
 
       include AMQ::Client::Adapter
 
-      self.sync = false
 
       #
       # API
@@ -119,7 +118,7 @@ module AMQ
 
       def initialize(*args)
         super(*args)
-
+        opening!
         @connections                        = Array.new
         # track TCP connection state, used to detect initial TCP connection failures.
         @tcp_connection_established       = false
@@ -250,11 +249,7 @@ module AMQ
         # in the authentication stage. If so, it is likely to signal an authentication
         # issue. Java client behaves the same way. MK.
         if authenticating? && !@intentionally_closing_connection
-          if sync?
-            raise PossibleAuthenticationFailureError.new(@settings)
-          else
-            @on_possible_authentication_failure.call(@settings) if @on_possible_authentication_failure
-          end
+          @on_possible_authentication_failure.call(@settings) if @on_possible_authentication_failure
         end
       end # unbind
 

data/lib/amq/client/callbacks.rb

@@ -0,0 +1,60 @@
+module AMQ
+  module Client
+    module Callbacks
+
+      def redefine_callback(event, callable = nil, &block)
+        f = (callable || block)
+        # yes, re-assign!
+        @callbacks[event] = [f]
+
+        self
+      end
+
+      def define_callback(event, callable = nil, &block)
+        f = (callable || block)
+
+        @callbacks[event] ||= []
+        @callbacks[event] << f if f
+
+        self
+      end # define_callback(event, &block)
+      alias append_callback define_callback
+
+      def prepend_callback(event, &block)
+        @callbacks[event] ||= []
+        @callbacks[event].unshift(block)
+
+        self
+      end # prepend_callback(event, &block)
+
+      def clear_callbacks(event)
+        @callbacks[event].clear if @callbacks[event]
+      end # clear_callbacks(event)
+
+
+      def exec_callback(name, *args, &block)
+        callbacks = Array(self.callbacks[name])
+        callbacks.map { |c| c.call(*args, &block) } if callbacks.any?
+      end
+
+      def exec_callback_once(name, *args, &block)
+        callbacks = Array(self.callbacks.delete(name))
+        callbacks.map { |c| c.call(*args, &block) } if callbacks.any?
+      end
+
+      def exec_callback_yielding_self(name, *args, &block)
+        callbacks = Array(self.callbacks[name])
+        callbacks.map { |c| c.call(self, *args, &block) } if callbacks.any?
+      end
+
+      def exec_callback_once_yielding_self(name, *args, &block)
+        callbacks = Array(self.callbacks.delete(name))
+        callbacks.map { |c| c.call(self, *args, &block) } if callbacks.any?
+      end
+
+      def has_callback?(name)
+        self.callbacks[name] && !self.callbacks[name].empty?
+      end # has_callback?
+    end # Callbacks
+  end # Client
+end # AMQ

data/lib/amq/client/channel.rb

@@ -6,12 +6,16 @@ require "amq/client/exchange"
 
 module AMQ
   module Client
-    class Channel < Entity
+    class Channel
 
       #
       # Behaviors
       #
 
+      extend RegisterEntityMixin
+      include Entity
+      extend ProtocolMethodHandlers
+
       register_entity :queue,    AMQ::Client::Queue
       register_entity :exchange, AMQ::Client::Exchange
 

data/lib/amq/client/connection.rb

@@ -10,26 +10,26 @@ module AMQ
     # methods)
     #
     # AMQP connection has multiple channels accessible via {Connection#channels} reader.
-    class Connection < Entity
+    class Connection
 
       #
       # Behaviors
       #
 
-      include StatusMixin
-
+      include Entity
+      extend ProtocolMethodHandlers
 
       #
       # API
       #
 
-      # TODO: make it possible to override these from, say, amqp gem or bunny
-      CLIENT_PROPERTIES = {
-        :platform => ::RUBY_DESCRIPTION,
-        :product  => "AMQ Client",
-        :version  => AMQ::Client::VERSION,
-        :homepage => "https://github.com/ruby-amqp/amq-client"
-      }.freeze
+      DEFAULT_CLIENT_PROPERTIES = {
+        :platform    => ::RUBY_DESCRIPTION,
+        :product     => "AMQ Client",
+        :information => "http://github.com/ruby-amqp/amq-client",
+        :version     => AMQ::Client::VERSION
+      }
+
 
       # Client capabilities
       #
@@ -84,18 +84,13 @@ module AMQ
 
 
       # @api public
-      def initialize(client, mechanism, response, locale, client_properties = nil)
+      def initialize(client, mechanism, response, locale, client_properties = {})
         @mechanism         = mechanism
         @response          = response
         @locale            = locale
 
         @channels          = Hash.new
-        @client_properties = client_properties || {
-          :platform    => "Ruby #{RUBY_VERSION}",
-          :product     => "AMQ Client",
-          :information => "http://github.com/ruby-amqp/amq-client",
-          :version     => AMQ::Client::VERSION
-        }
+        @client_properties = DEFAULT_CLIENT_PROPERTIES.merge(client_properties)
 
         reset_state!
 
@@ -106,8 +101,6 @@ module AMQ
         # Default errback.
         # You might want to override it, otherwise it'll
         # crash your program. It's the expected behaviour
-        # if it's a synchronous one, but not if you use
-        # some kind of event loop like EventMachine etc.
         self.define_callback(:close) { |exception| raise(exception) }
       end
 
@@ -117,6 +110,7 @@ module AMQ
       end # settings
 
 
+
       #
       # Connection class methods
       #
@@ -175,8 +169,6 @@ module AMQ
         @known_hosts = method.known_hosts
 
         opened!
-        # async adapters need this callback to proceed with
-        # Adapter.connect block evaluation
         @client.connection_successful if @client.respond_to?(:connection_successful)
       end
 

data/lib/amq/client/entity.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-require "amq/client/mixins/status"
+require "amq/client/callbacks"
+require "amq/client/openable"
 
 module AMQ
   module Client
@@ -14,65 +15,20 @@ module AMQ
       def register_entity(name, klass)
         define_method(name) do |*args, &block|
           klass.new(self, *args, &block)
-        end
-      end
-    end
-
-    module CallbacksMixin
-      def redefine_callback(event, callable = nil, &block)
-        f = (callable || block)
-        # yes, re-assign!
-        @callbacks[event] = [f]
+        end # define_method
+      end # register_entity
+    end # RegisterEntityMixin
 
-        self
+    module ProtocolMethodHandlers
+      def handle(klass, &block)
+        AMQ::Client::HandlersRegistry.register(klass, &block)
       end
 
-      def define_callback(event, callable = nil, &block)
-        f = (callable || block)
-
-        @callbacks[event] ||= []
-        @callbacks[event] << f if f
-
-        self
-      end # define_callback(event, &block)
-      alias append_callback define_callback
-
-      def prepend_callback(event, &block)
-        @callbacks[event] ||= []
-        @callbacks[event].unshift(block)
-
-        self
-      end # prepend_callback(event, &block)
-
-      def clear_callbacks(event)
-        @callbacks[event].clear if @callbacks[event]
-      end # clear_callbacks(event)
-
-
-      def exec_callback(name, *args, &block)
-        callbacks = Array(self.callbacks[name])
-        callbacks.map { |c| c.call(*args, &block) } if callbacks.any?
+      def handlers
+        AMQ::Client::HandlersRegistry.handlers
       end
+    end # ProtocolMethodHandlers
 
-      def exec_callback_once(name, *args, &block)
-        callbacks = Array(self.callbacks.delete(name))
-        callbacks.map { |c| c.call(*args, &block) } if callbacks.any?
-      end
-
-      def exec_callback_yielding_self(name, *args, &block)
-        callbacks = Array(self.callbacks[name])
-        callbacks.map { |c| c.call(self, *args, &block) } if callbacks.any?
-      end
-
-      def exec_callback_once_yielding_self(name, *args, &block)
-        callbacks = Array(self.callbacks.delete(name))
-        callbacks.map { |c| c.call(self, *args, &block) } if callbacks.any?
-      end
-
-      def has_callback?(name)
-        self.callbacks[name] && !self.callbacks[name].empty?
-      end # has_callback?
-    end
 
     # AMQ entities, as implemented by AMQ::Client, have callbacks and can run them
     # when necessary.
@@ -80,16 +36,14 @@ module AMQ
     # @note Exchanges and queues implementation is based on this class.
     #
     # @abstract
-    class Entity
+    module Entity
 
       #
       # Behaviors
       #
 
-      include StatusMixin
-      include CallbacksMixin
-
-      extend RegisterEntityMixin
+      include Openable
+      include Callbacks
 
       #
       # API
@@ -98,16 +52,6 @@ module AMQ
       # @return [Array<#call>]
       attr_reader :callbacks
 
-      @@handlers ||= Hash.new
-
-      def self.handle(klass, &block)
-        @@handlers[klass] = block
-      end
-
-      def self.handlers
-        @@handlers
-      end
-
 
       def initialize(client)
         @client    = client
@@ -118,18 +62,12 @@ module AMQ
 
 
       def error(exception)
-        if client.sync? # DO NOT DO THIS, just add a default errback to do exactly this, so if someone wants to use begin/rescue, he'll just ignore the errbacks.
-          # Synchronous error handling.
-          # Just use begin/rescue in the main loop.
-          raise exception
-        else
-          # Asynchronous error handling.
-          # Set callback for given class (Queue for example)
-          # or for the Connection class (or instance, of course).
-          callbacks = [self.callbacks[:close], self.client.connection.callbacks[:close]].flatten.compact
+        # Asynchronous error handling.
+        # Set callback for given class (Queue for example)
+        # or for the Connection class (or instance, of course).
+        callbacks = [self.callbacks[:close], self.client.connection.callbacks[:close]].flatten.compact
 
-          callbacks.map { |c| c.call(exception) } if callbacks.any?
-        end
+        callbacks.map { |c| c.call(exception) } if callbacks.any?
       end
     end
   end

data/lib/amq/client/exchange.rb

@@ -1,18 +1,22 @@
 # encoding: utf-8
 
 require "amq/client/entity"
-require "amq/client/mixins/anonymous_entity"
+require "amq/client/server_named_entity"
 
 module AMQ
   module Client
-    class Exchange < Entity
-      include AnonymousEntityMixin
+    class Exchange
+
+
+      include Entity
+      include ServerNamedEntity
+      extend ProtocolMethodHandlers
 
       TYPES = [:fanout, :direct, :topic, :headers].freeze
 
       class IncompatibleExchangeTypeError < StandardError
         def initialize(types, given)
-          super("Exchange types are #{TYPES.inspect}, #{given.inspect} given.")
+          super("#{given.inspect} exchange type is unknown. Standard types are #{TYPES.inspect}, custom exchange types must begin with x-, for example: x-recent-history")
         end
       end
 
@@ -31,7 +35,7 @@ module AMQ
       attr_reader :type
 
       def initialize(client, channel, name, type = :fanout)
-        unless TYPES.include?(type.to_sym)
+        if !(TYPES.include?(type.to_sym) || type.to_s =~ /^x-.+/i)
           raise IncompatibleExchangeTypeError.new(TYPES, type)
         end
 
@@ -71,11 +75,6 @@ module AMQ
           @channel.exchanges_awaiting_declare_ok.push(self)
         end
 
-
-        if @client.sync?
-          @client.read_until_receives(Protocol::Exchange::DeclareOk) unless nowait
-        end
-
         self
       end
 

data/lib/amq/client/handlers_registry.rb

@@ -0,0 +1,30 @@
+module AMQ
+  module Client
+    class HandlersRegistry
+
+      @@handlers ||= Hash.new
+
+
+      #
+      # API
+      #
+
+
+      def self.register(klass, &block)
+        @@handlers[klass] = block
+      end
+      class << self
+        alias handle register
+      end
+
+      def self.find(klass)
+        @@handlers[klass]
+      end
+
+      def self.handlers
+        @@handlers
+      end
+
+    end # HandlersRegistry
+  end # Client
+end # AMQ

data/lib/amq/client/{mixins/status.rb → openable.rb}

@@ -2,12 +2,12 @@
 
 module AMQ
   module Client
-    module StatusMixin
+    module Openable
       VALUES = [:opened, :closed, :opening, :closing].freeze
 
       class ImproperStatusError < ArgumentError
         def initialize(value)
-          super("Value #{value.inspect} isn't permitted. Choose one of: #{AMQ::Client::StatusMixin::VALUES.inspect}")
+          super("Value #{value.inspect} isn't permitted. Choose one of: #{AMQ::Client::Openable::VALUES.inspect}")
         end
       end
 

data/lib/amq/client/queue.rb

@@ -2,18 +2,20 @@
 
 require "amq/client/entity"
 require "amq/client/adapter"
-require "amq/client/mixins/anonymous_entity"
-require "amq/client/protocol/get_response"
+require "amq/client/server_named_entity"
+require "amq/protocol/get_response"
 
 module AMQ
   module Client
-    class Queue < Entity
+    class Queue
 
       #
       # Behaviors
       #
 
-      include AnonymousEntityMixin
+      include Entity
+      include ServerNamedEntity
+      extend ProtocolMethodHandlers      
 
 
       #
@@ -92,10 +94,6 @@ module AMQ
           @channel.queues_awaiting_declare_ok.push(self)
         end
 
-        if @client.sync?
-          @client.read_until_receives(Protocol::Queue::DeclareOk) unless nowait
-        end
-
         self
       end
 

data/lib/amq/client/{mixins/anonymous_entity.rb → server_named_entity.rb}

@@ -3,19 +3,21 @@
 module AMQ
   module Client
     # Common behavior of AMQ entities that can be either client or server-named, for example, exchanges and queues.
-    module AnonymousEntityMixin
+    module ServerNamedEntity
 
       # @return [Boolean] true if this entity is anonymous (server-named)
-      def anonymous?
+      def server_named?
         @name.nil? or @name.empty?
       end
+      # backwards compabitility. MK.
+      alias anonymous? server_named?
 
       def dup
-        if anonymous?
+        if server_named?
           raise RuntimeError.new("You can't clone anonymous queue until it receives back the name in Queue.Declare-Ok response. Move the code with #dup to the callback for the #declare method.") # TODO: that's not true in all cases, imagine the user didn't call #declare yet.
         end
         super
       end
-    end # AnonymousEntityMixin
+    end # ServerNamedEntity
   end # Client
 end # AMQ

data/lib/amq/client/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Client
-    VERSION = "0.7.0.alpha23"
+    VERSION = "0.7.0.alpha24"
   end
 end

data/spec/client/protocol/get_response_spec.rb

@@ -3,7 +3,7 @@
 require "spec_helper"
 
 require "amq/protocol/client"
-require "amq/client/protocol/get_response"
+require "amq/protocol/get_response"
 # require "amq/protocol/frame"
 #
 # # We have to use Kernel#load so extensions to the

data/spec/integration/eventmachine/exchange_declare_spec.rb

@@ -2,14 +2,45 @@ require 'spec_helper'
 require 'integration/eventmachine/spec_helper'
 
 describe AMQ::Client::EventMachineClient, "Exchange.Declare" do
+
+  #
+  # Environment
+  #
+
   include EventedSpec::SpecHelper
   default_timeout 1
   let(:exchange_name) { "amq-client.testexchange.#{Time.now.to_i}" }
+
+
+
+  #
+  # Examples
+  #
+
+  context "when exchange type is non-standard" do
+    context "and DOES NOT begin with x-" do
+      it "raises an exception" do
+        em_amqp_connect do |client|
+          channel = AMQ::Client::Channel.new(client, 1)
+          channel.open do
+            begin
+              AMQ::Client::Exchange.new(client, channel, exchange_name, "my_shiny_metal_exchange_type")
+            rescue AMQ::Client::Exchange::IncompatibleExchangeTypeError => e
+              done
+            end
+          end # channel.open
+        end # em_amqp_connect
+      end # it
+    end # context
+  end # context
+
+
+
   it "should create an exchange and trigger a callback" do
     em_amqp_connect do |client|
       channel = AMQ::Client::Channel.new(client, 1)
       channel.open do
-        exchange = AMQ::Client::Exchange.new(client, channel, exchange_name, :fanout)
+        exchange = AMQ::Client::Exchange.new(client, channel, exchange_name, "fanout")
         exchange.declare do
           exchange.delete
           done(0.2)

data/spec/unit/client/entity_spec.rb

@@ -4,8 +4,15 @@ require "spec_helper"
 require "amq/client/entity"
 
 describe AMQ::Client::Entity do
+  let(:klazz) do
+    Class.new do
+      include AMQ::Client::Entity
+    end
+  end
+
+
   subject do
-    AMQ::Client::Entity.new(Object.new)
+    klazz.new(Object.new)
   end
 
   it "should maintain an associative array of callbacks" do

data/spec/unit/client/mixins/status_spec.rb

@@ -1,11 +1,11 @@
 # encoding: utf-8
 
 require "spec_helper"
-require "amq/client/mixins/status"
+require "amq/client/openable"
 
-describe AMQ::Client::StatusMixin do
+describe AMQ::Client::Openable do
   subject do
-    Class.new { include AMQ::Client::StatusMixin }.new
+    Class.new { include AMQ::Client::Openable }.new
   end
 
   describe "#status=" do
@@ -17,7 +17,7 @@ describe AMQ::Client::StatusMixin do
 
     context "when given value isn't in the permitted values" do
       it "should raise ImproperStatusError" do
-        lambda { subject.status = :sleepy }.should raise_error(AMQ::Client::StatusMixin::ImproperStatusError)
+        lambda { subject.status = :sleepy }.should raise_error(AMQ::Client::Openable::ImproperStatusError)
       end
     end
   end

data/spec/unit/client_spec.rb

@@ -7,14 +7,12 @@ require "amq/client"
 describe AMQ::Client do
   if RUBY_PLATFORM =~ /java/
     ADAPTERS = {
-      :event_machine => "EventMachineClient",
-      :socket        => "SocketClient"
+      :event_machine => "EventMachineClient"
     }
   else
     ADAPTERS = {
       :event_machine => "EventMachineClient",
-      :coolio        => "CoolioClient",
-      :socket        => "SocketClient"
+      :coolio        => "CoolioClient"
     }
   end
 
@@ -29,7 +27,7 @@ describe AMQ::Client do
       end
 
       it "should provide info about path to the adapter" do
-        lambda { require @meta[:path] }.should_not raise_error
+        require @meta[:path]
       end
 
       it "should provide info about const_name" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: -3702664446
+  hash: -3702664420
   prerelease: 6
   segments: 
   - 0
   - 7
   - 0
   - alpha
-  - 23
-  version: 0.7.0.alpha23
+  - 24
+  version: 0.7.0.alpha24
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 Z
+date: 2011-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -127,9 +127,6 @@ files:
 - examples/eventmachine_adapter/tx_commit.rb
 - examples/eventmachine_adapter/tx_rollback.rb
 - examples/eventmachine_adapter/tx_select.rb
-- examples/socket_adapter/basics.rb
-- examples/socket_adapter/connection.rb
-- examples/socket_adapter/multiple_connections.rb
 - examples/tls_certificates/client/cert.pem
 - examples/tls_certificates/client/key.pem
 - examples/tls_certificates/client/keycert.p12
@@ -155,7 +152,7 @@ files:
 - lib/amq/client/adapter.rb
 - lib/amq/client/adapters/coolio.rb
 - lib/amq/client/adapters/event_machine.rb
-- lib/amq/client/adapters/socket.rb
+- lib/amq/client/callbacks.rb
 - lib/amq/client/channel.rb
 - lib/amq/client/connection.rb
 - lib/amq/client/entity.rb
@@ -166,13 +163,14 @@ files:
 - lib/amq/client/extensions/rabbitmq/confirm.rb
 - lib/amq/client/framing/io/frame.rb
 - lib/amq/client/framing/string/frame.rb
+- lib/amq/client/handlers_registry.rb
 - lib/amq/client/logging.rb
-- lib/amq/client/mixins/anonymous_entity.rb
-- lib/amq/client/mixins/status.rb
-- lib/amq/client/protocol/get_response.rb
+- lib/amq/client/openable.rb
 - lib/amq/client/queue.rb
+- lib/amq/client/server_named_entity.rb
 - lib/amq/client/settings.rb
 - lib/amq/client/version.rb
+- lib/amq/protocol/get_response.rb
 - spec/benchmarks/adapters.rb
 - spec/client/framing/io_frame_spec.rb
 - spec/client/framing/string_frame_spec.rb

data/examples/socket_adapter/basics.rb

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require "bundler"
-
-Bundler.setup
-Bundler.require(:default)
-
-$LOAD_PATH.unshift(File.expand_path("../../../lib", __FILE__))
-
-require "amq/client/adapters/socket"
-
-AMQ::Client::SocketClient.connect(:host => "localhost") do |client|
-  # Socket API is synchronous, so we don't need any callback here:
-  tasks = client.queue("tasks", 1)
-  tasks.consume do |headers, message| # TODO: this is async, we need to use a loop
-    puts ""
-  end
-end

data/examples/socket_adapter/connection.rb

@@ -1,53 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-require "bundler"
-
-Bundler.setup
-Bundler.require(:default)
-
-$LOAD_PATH.unshift(File.expand_path("../../../lib", __FILE__))
-
-require "amq/client/adapters/socket"
-require "amq/client/amqp/queue"
-require "amq/client/amqp/exchange"
-
-AMQ::Client::SocketClient.connect(:port => 5672) do |client|
-  begin
-    client.handshake
-
-    # Ruby developers are used to use blocks usually synchronously
-    # (so they are called +/- immediately), but this is NOT the case!
-    # We always have to wait for the response from the broker, so think
-    # about the following blocks are true callbacks as you know them
-    # from JavaScript (i. e. window.onload = function () {}).
-
-    # The only exception is when you use {nowait: true}, then the
-    # callback is called immediately.
-    channel = AMQ::Client::Channel.new(client, 1)
-    channel.open { puts "Channel #{channel.id} opened!" }
-
-    queue = AMQ::Client::Queue.new(client, "", channel)
-    queue.declare { puts "Queue #{queue.name.inspect} declared!" }
-
-    exchange = AMQ::Client::Exchange.new(client, "tasks", :fanout, channel)
-    exchange.declare { puts "Exchange #{exchange.name.inspect} declared!" }
-
-    until client.connection.closed?
-      client.receive_async
-      sleep 1
-    end
-  rescue Interrupt
-    warn "Manually interrupted, terminating ..."
-  rescue Exception => exception
-    STDERR.puts "\n\e[1;31m[#{exception.class}] #{exception.message}\e[0m"
-    exception.backtrace.each do |line|
-      line = "\e[0;36m#{line}\e[0m" if line.match(Regexp::quote(File.basename(__FILE__)))
-      STDERR.puts "  - " + line
-    end
-  end
-end
-
-# TODO:
-# AMQ::Client.connect(:adapter => :socket)
-# Support for frame_max, heartbeat from Connection.Tune

data/examples/socket_adapter/multiple_connections.rb

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-# Each connection respond to a TCP connection,
-# hence we need to use more client.connect calls.
-
-Thread.new do
-  AMQ::Client::SocketClient.connect(:port => 5672) do |client|
-    # ...
-  end
-end
-
-Thread.new do
-  AMQ::Client::SocketClient.connect(:port => 5672) do |client|
-    # ...
-  end
-end

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

@@ -1,90 +0,0 @@
-# encoding: utf-8
-
-require "socket"
-require "amq/client"
-require "amq/client/framing/io/frame"
-
-module AMQ
-  module Client
-    class SocketClient
-
-      #
-      # Behaviors
-      #
-
-      include AMQ::Client::Adapter
-
-      self.sync = true
-
-      #
-      # API
-      #
-
-      def establish_connection(settings)
-        # NOTE: this doesn't work with "localhost", I don't know why:
-        settings[:host] = "127.0.0.1" if settings[:host] == "localhost"
-        @socket         = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
-        sockaddr        = Socket.pack_sockaddr_in(settings[:port], settings[:host])
-
-        @socket.connect(sockaddr)
-      rescue Errno::ECONNREFUSED => exception
-        message = "Don't forget to start an AMQP broker first!\nThe original message: #{exception.message}"
-        raise exception.class.new(message)
-      rescue Exception => exception
-        self.disconnect if self.connected?
-        raise exception
-      end
-
-      def register_connection_callback(&block)
-        if block
-          block.call(self)
-          self.disconnect
-        else
-          self
-        end
-      end
-
-      def connection
-        @socket
-      end # connection
-
-      def connected?
-        @socket && !@socket.closed?
-      end
-
-      def close_connection
-        @socket.close
-      end
-
-      def send_raw(data)
-        @socket.write(data)
-      end
-
-      def receive
-        frame = AMQ::Client::Framing::IO::Frame.decode(@socket)
-        self.receive_frame(frame)
-        frame
-      end
-
-      def receive_async
-        # NOTE: this might work with Socket#eof? as well, it can be better ...
-        # self.receive unless @socket.eof?
-
-        @sockets ||= [@socket] # It'll be always only one socket, but we don't want to create many arrays, mind the GC!
-        array = IO.select(@sockets, nil, nil, nil)
-        array[0].each do |socket|
-          res = self.receive
-        end
-        res
-      end
-
-      def read_until_receives(klass)
-        if self.sync?
-          until (frame = self.receive) && frame.is_a?(Protocol::MethodFrame) && frame.method_class == klass
-            sleep 0.1
-          end
-        end
-      end
-    end
-  end
-end