amq-client 0.7.0.alpha3 → 0.7.0.alpha4

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

@@ -2,9 +2,6 @@
 
 require "socket"
 require "amq/client"
-require "amq/client/channel"
-require "amq/client/exchange"
-require "amq/client/queue"
 require "amq/client/framing/io/frame"
 
 module AMQ
@@ -19,11 +16,6 @@ module AMQ
 
       self.sync = true
 
-      register_entity :channel,  AMQ::Client::Channel
-      register_entity :exchange, AMQ::Client::Exchange
-      register_entity :queue,    AMQ::Client::Queue
-
-
       #
       # API
       #
@@ -43,6 +35,15 @@ module AMQ
         raise exception
       end
 
+      def register_connection_callback(&block)
+        if block
+          block.call(self)
+          self.disconnect
+        else
+          self
+        end
+      end
+
       def connection
         @socket
       end # connection

data/lib/amq/client/channel.rb

@@ -1,12 +1,20 @@
 # encoding: utf-8
 
 require "amq/client/entity"
-require "amq/client/adapter"
+require "amq/client/queue"
+require "amq/client/exchange"
 
 module AMQ
   module Client
     class Channel < Entity
 
+      #
+      # Behaviors
+      #
+
+      register_entity :queue,    AMQ::Client::Queue
+      register_entity :exchange, AMQ::Client::Exchange
+
       #
       # API
       #
@@ -42,7 +50,11 @@ module AMQ
         # 65536 is here for cases when channel is opened without passing a callback in,
         # otherwise channel_mix would be nil and it causes a lot of needless headaches.
         # lets just have this default. MK.
-        channel_max = client.connection.channel_max || 65536
+        channel_max = if client.connection
+                        client.connection.channel_max || 65536
+                      else
+                        65536
+                      end
 
         if channel_max != 0 && !(0..channel_max).include?(id)
           raise ChannelOutOfBadError.new(channel_max, id)
@@ -195,6 +207,10 @@ module AMQ
         @flow_is_active
       end # flow_is_active?
 
+      # Defines a callback that will be executed when channel is closed after
+      # channel-level exception.
+      #
+      # @api public
       def on_error(&block)
         self.define_callback(:close, &block)
       end
@@ -244,9 +260,11 @@ module AMQ
       end # reset_state!
 
 
-      def on_connection_interruption(exception = nil)
+      def handle_connection_interruption(exception = nil)
         self.reset_state!
-      end # on_connection_interruption
+      end # handle_connection_interruption
+
+
 
       def handle_open_ok(method)
         self.status = :opened
@@ -262,7 +280,7 @@ module AMQ
         self.status = :closed
         self.exec_callback_once_yielding_self(:close, method)
 
-        self.on_connection_interruption(exception)
+        self.handle_connection_interruption(exception)
       end
 
       # === Handlers ===

data/lib/amq/client/connection.rb

@@ -191,11 +191,12 @@ module AMQ
       #
       # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.5.2.9)
       def handle_close(method)
-        self.channels.each { |key, value| value.on_connection_interruption }
+        self.handle_connection_interruption
 
         closed!
         # TODO: use proper exception class, provide protocol class (we know method.class_id and method.method_id) as well!
-        self.error RuntimeError.new(method.reply_text)
+        x = RuntimeError.new(method.reply_text)
+        self.error(x)
       end
 
       # Handles connection.close-ok
@@ -207,9 +208,9 @@ module AMQ
       end # handle_close_ok(method)
 
 
-      def on_connection_interruption
-        @channels.each { |n, c| c.on_connection_interruption }
-      end # on_connection_interruption
+      def handle_connection_interruption
+        @channels.each { |n, c| c.handle_connection_interruption }
+      end # handle_connection_interruption
 
 
 

data/lib/amq/client/entity.rb

@@ -4,48 +4,21 @@ require "amq/client/mixins/status"
 
 module AMQ
   module Client
-    # AMQ entities, as implemented by AMQ::Client, have callbacks and can run them
-    # when necessary.
-    #
-    # @note Exchanges and queues implementation is based on this class.
-    #
-    # @abstract
-    class Entity
-
-      #
-      # Behaviors
-      #
-
-      include StatusMixin
-
-      #
-      # API
-      #
-
-      # @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
-        # Be careful with default values for #ruby hashes: h = Hash.new(Array.new); h[:key] ||= 1
-        # won't assign anything to :key. MK.
-        @callbacks = Hash.new
+    module RegisterEntityMixin
+      # @example Registering Channel implementation
+      #  Adapter.register_entity(:channel, Channel)
+      #   # ... so then I can do:
+      #  channel = client.channel(1)
+      #  # instead of:
+      #  channel = Channel.new(client, 1)
+      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!
@@ -95,7 +68,49 @@ module AMQ
         callbacks = Array(self.callbacks.delete(name))
         callbacks.map { |c| c.call(self, *args, &block) } if callbacks.any?
       end
+    end
+
+    # AMQ entities, as implemented by AMQ::Client, have callbacks and can run them
+    # when necessary.
+    #
+    # @note Exchanges and queues implementation is based on this class.
+    #
+    # @abstract
+    class Entity
+
+      #
+      # Behaviors
+      #
+
+      include StatusMixin
+      include CallbacksMixin
+
+      extend RegisterEntityMixin
+
+      #
+      # API
+      #
 
+      # @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
+        # Be careful with default values for #ruby hashes: h = Hash.new(Array.new); h[:key] ||= 1
+        # won't assign anything to :key. MK.
+        @callbacks = Hash.new
+      end
 
 
       def error(exception)

data/lib/amq/client/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Client
-    VERSION = "0.7.0.alpha3"
+    VERSION = "0.7.0.alpha4"
   end
 end

data/spec/benchmarks/adapters.rb

@@ -11,7 +11,7 @@ TOTAL_MESSAGES = 10000
 # Short messages
 # Cool.io
 coolio_start = Time.now
-AMQ::Client::Coolio.connect(:port => 5672, :vhost => "/amq_client_testbed") do |client|
+AMQ::Client::CoolioClient.connect(:port => 5672, :vhost => "/amq_client_testbed") do |client|
   received_messages = 0
   channel = AMQ::Client::Channel.new(client, 1)
   channel.open { }

data/spec/integration/coolio/basic_ack_spec.rb

@@ -1,10 +1,7 @@
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
-require 'spec_helper'
-require 'integration/coolio/spec_helper'
-
-describe "AMQ::Client::Coolio", "Basic.Ack", :nojruby => true do
+describe "AMQ::Client::CoolioClient", "Basic.Ack", :nojruby => true do
   include EventedSpec::SpecHelper
   default_timeout 1
 

data/spec/integration/coolio/basic_get_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
-describe "AMQ::Client::Coolio", "Basic.Get", :nojruby => true do
+describe "AMQ::Client::CoolioClient", "Basic.Get", :nojruby => true do
   include EventedSpec::SpecHelper
   default_timeout 1
 

data/spec/integration/coolio/basic_return_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
-describe "AMQ::Client::Coolio", "Basic.Return", :nojruby => true do
+describe "AMQ::Client::CoolioClient", "Basic.Return", :nojruby => true do
   include EventedSpec::SpecHelper
   default_timeout 1.0
 

data/spec/integration/coolio/channel_close_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
-describe "AMQ::Client::Coolio", "Channel.Close", :nojruby => true do
+describe "AMQ::Client::CoolioClient", "Channel.Close", :nojruby => true do
   include EventedSpec::SpecHelper
   default_timeout 1
 

data/spec/integration/coolio/channel_flow_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
-describe "AMQ::Client::Coolio", "Channel.Flow", :nojruby => true do
+describe "AMQ::Client::CoolioClient", "Channel.Flow", :nojruby => true do
   include EventedSpec::SpecHelper
   default_timeout 1
 

data/spec/integration/coolio/spec_helper.rb

@@ -24,7 +24,7 @@ end
 
 def coolio_amqp_connect(&block)
   coolio do
-    AMQ::Client::Coolio.connect(:port => 5672, :vhost => "/amq_client_testbed", :frame_max => 2**16-1, :heartbeat_interval => 1) do |client|
+    AMQ::Client::CoolioClient.connect(:port => 5672, :vhost => "/amq_client_testbed", :frame_max => 2**16-1, :heartbeat_interval => 1) do |client|
       yield client
     end
   end

data/spec/integration/coolio/tx_commit_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
-describe "AMQ::Client::Coolio", "Tx.Commit", :nojruby => true do
+describe "AMQ::Client::CoolioClient", "Tx.Commit", :nojruby => true do
   include EventedSpec::SpecHelper
   default_timeout 2
   let(:message) { "Hello, world!" }

data/spec/integration/coolio/tx_rollback_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'integration/coolio/spec_helper'
 
-describe "AMQ::Client::Coolio", "Tx.Rollback", :nojruby => true do
+describe "AMQ::Client::CoolioClient", "Tx.Rollback", :nojruby => true do
   include EventedSpec::SpecHelper
   default_timeout 2
 

data/spec/regression/bad_frame_slicing_in_adapters_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'integration/coolio/spec_helper'
 require 'integration/eventmachine/spec_helper'
 
-describe "AMQ::Client::Coolio", :nojruby => true do
+describe "AMQ::Client::CoolioClient", :nojruby => true do
   include EventedSpec::SpecHelper
   default_timeout 1
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "bundler"
 Bundler.setup
 Bundler.require(:default, :test)
 
+require 'amq/client'
 #
 # Ruby version-specific
 #

data/spec/unit/client_spec.rb

@@ -5,7 +5,81 @@ require "spec_helper"
 require "amq/client"
 
 describe AMQ::Client do
+  if RUBY_PLATFORM =~ /java/
+    ADAPTERS = {
+      :event_machine => "EventMachineClient",
+      :socket        => "SocketClient"
+    }
+  else
+    ADAPTERS = {
+      :event_machine => "EventMachineClient",
+      :coolio        => "CoolioClient",
+      :socket        => "SocketClient"
+    }
+  end
+
   it "should have VERSION" do
     AMQ::Client::const_defined?(:VERSION).should be_true
   end
+
+  ADAPTERS.each do |adapter_name, adapter_const_name|
+    describe ".adapters" do
+      before(:all) do
+        @meta = AMQ::Client.adapters[adapter_name]
+      end
+
+      it "should provide info about path to the adapter" do
+        lambda { require @meta[:path] }.should_not raise_error
+      end
+
+      it "should provide info about const_name" do
+        @meta[:const_name].should eql(adapter_const_name)
+      end
+    end
+  end
+
+  describe ".connect(settings = nil, &block)" do
+    include EventedSpec::SpecHelper
+    default_timeout 1
+
+    context "with specified adapter" do
+      it "should connect using socket adapter" do
+        pending "Socket adapter is currently broken" do
+          AMQ::Client.connect(:adapter => :socket) do |client|
+            client.class.name.should eql("AMQ::Client::SocketClient")
+            done
+          end
+        end
+      end
+
+      it "should connect using event_machine adapter" do
+        em do
+          AMQ::Client.connect(:adapter => :event_machine) do |client|
+            client.class.name.should eql("AMQ::Client::EventMachineClient")
+            done
+          end
+        end
+      end
+
+      it "should connect using coolio adapter", :nojruby => true do
+        coolio do
+          AMQ::Client.connect(:adapter => :coolio) do |client|
+            client.class.name.should eql("AMQ::Client::CoolioClient")
+            done
+          end
+        end
+      end
+    end
+
+    context "without any specified adapter" do
+      it "should default to the socket adapter" do
+        pending "Socket adapter is currently broken" do
+          AMQ::Client.connect do |client|
+            client.class.name.should eql("AMQ::Client::SocketClient")
+            done
+          end
+        end
+      end
+    end
+  end
 end