amq-client 0.7.0.alpha25 → 0.7.0.alpha26

data/lib/amq/client/settings.rb

@@ -10,7 +10,7 @@ module AMQ
       #
       # @see AMQ::Client::Settings.configure
       def self.default
-        {
+        @default ||= {
           # server
           :host  => "127.0.0.1",
           :port  => AMQ::Protocol::DEFAULT_PORT,
@@ -37,6 +37,17 @@ module AMQ
         }
       end
 
+
+      def self.client_properties
+        @client_properties ||= {
+          :platform    => ::RUBY_DESCRIPTION,
+          :product     => "AMQ Client",
+          :information => "http://github.com/ruby-amqp/amq-client",
+          :version     => AMQ::Client::VERSION
+        }
+      end
+
+
       # Merges given configuration parameters with defaults and returns
       # the result.
       #

data/lib/amq/client/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Client
-    VERSION = "0.7.0.alpha25"
+    VERSION = "0.7.0.alpha26"
   end
 end

data/spec/integration/coolio/connection_close_spec.rb

@@ -7,14 +7,14 @@ describe "AMQ::Client::CoolioClient", "Connection.Close", :nojruby => true do
 
   it "should issue a callback and close connection" do
     coolio do
-      AMQ::Client::CoolioClient.connect do |client|
-        @client = client
-        client.should be_opened
-        client.close do
+      AMQ::Client::CoolioClient.connect do |connection|
+        @connection = connection
+        connection.should be_opened
+        connection.disconnect do
           done
         end
       end
     end
-    @client.should be_closed
+    @connection.should be_closed
   end
 end

data/spec/integration/coolio/connection_start_spec.rb

@@ -34,12 +34,15 @@ describe "AMQ::Client::CoolioClient", "Connection.Start", :nojruby => true do
       it "should raise an error" do
         expect {
           coolio do
-            AMQ::Client::CoolioClient.connect(:port => 12938) { }
-            done(0.5)
+            begin
+              AMQ::Client::CoolioClient.connect(:port => 12938) { }
+              done
+            rescue Exception => e
+              done(0.5)
+            end
           end
         }.to raise_error(AMQ::Client::TCPConnectionFailed)
       end
-    end
-  end
-
-end
+    end # context
+  end # context
+end # describe

data/spec/integration/eventmachine/channel_close_spec.rb

@@ -7,14 +7,14 @@ describe AMQ::Client::EventMachineClient, "Channel.Close" do
 
   it "should close the channel" do
     @events = []
-    em_amqp_connect do |client|
+    em_amqp_connect do |connection|
       @events << :connect
-      channel = AMQ::Client::Channel.new(client, 1)
+      channel = AMQ::Client::Channel.new(connection, 1)
       channel.open do
         @events << :open
         channel.close do
           @events << :close
-          client.disconnect do
+          connection.disconnect do
             @events << :disconnect
             done
           end
@@ -23,4 +23,4 @@ describe AMQ::Client::EventMachineClient, "Channel.Close" do
     end
     @events.should == [:connect, :open, :close, :disconnect]
   end
-end
+end

data/spec/integration/eventmachine/connection_close_spec.rb

@@ -7,14 +7,14 @@ describe AMQ::Client::EventMachineClient, "Connection.Close" do
 
   it "should issue a callback and close connection" do
     em do
-      AMQ::Client::EventMachineClient.connect do |client|
-        @client = client
-        client.should be_opened
-        client.close do
+      AMQ::Client::EventMachineClient.connect do |connection|
+        @connection = connection
+        connection.should be_opened
+        connection.disconnect do
           done
         end
       end
     end
-    @client.should be_closed
+    @connection.should be_closed
   end
 end

data/spec/unit/client/entity_spec.rb

@@ -53,15 +53,10 @@ describe AMQ::Client::Entity do
 
 
     it "should pass arguments to the callback" do
-      subject.define_callback :init, Proc.new { |*args| args.first }
+      f = Proc.new { |*args| args.first }
+      subject.define_callback :init, f
 
-      subject.exec_callback(:init, 1).should eql([1])
-    end
-
-    it "should pass block to the callback" do
-      subject.define_callback :init, Proc.new { |*args, &block| block.call }
-
-      subject.exec_callback(:init) { "block" }.should == ["block"]
+      subject.exec_callback(:init, 1).should eql([f])
     end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: -3702664418
+  hash: -3702664424
   prerelease: 6
   segments: 
   - 0
   - 7
   - 0
   - alpha
-  - 25
-  version: 0.7.0.alpha25
+  - 26
+  version: 0.7.0.alpha26
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -154,7 +154,6 @@ files:
 - lib/amq/client/adapters/event_machine.rb
 - lib/amq/client/callbacks.rb
 - lib/amq/client/channel.rb
-- lib/amq/client/connection.rb
 - lib/amq/client/entity.rb
 - lib/amq/client/exceptions.rb
 - lib/amq/client/exchange.rb
@@ -251,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amq-client
-rubygems_version: 1.8.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: amq-client is a fully-featured, low-level AMQP 0.9.1 client

data/lib/amq/client/connection.rb

@@ -1,246 +0,0 @@
-# encoding: utf-8
-
-require "amq/client"
-require "amq/client/entity"
-
-module AMQ
-  module Client
-    # AMQP connection object handles various connection lifecycle events
-    # (for example, Connection.Start-Ok, Connection.Tune-Ok and Connection.Close
-    # methods)
-    #
-    # AMQP connection has multiple channels accessible via {Connection#channels} reader.
-    class Connection
-
-      #
-      # Behaviors
-      #
-
-      include Entity
-      extend ProtocolMethodHandlers
-
-      #
-      # API
-      #
-
-      DEFAULT_CLIENT_PROPERTIES = {
-        :platform    => ::RUBY_DESCRIPTION,
-        :product     => "AMQ Client",
-        :information => "http://github.com/ruby-amqp/amq-client",
-        :version     => AMQ::Client::VERSION
-      }
-
-
-      # Client capabilities
-      #
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.2.1)
-      attr_accessor :client_properties
-
-      # Server capabilities
-      #
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.1.3)
-      attr_reader :server_properties
-
-      # Authentication mechanism used.
-      #
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.2)
-      attr_reader :mechanism
-
-      # Security response data.
-      #
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Sections 1.4.2.2 and 1.4.2.4.1)
-      attr_reader :response
-
-      # The locale defines the language in which the server will send reply texts.
-      #
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.2)
-      attr_reader :locale
-
-      # Channels within this connection.
-      #
-      # @see http://bit.ly/hw2ELX AMQP 0.9.1 specification (Section 2.2.5)
-      attr_reader :channels
-
-      # Maximum channel number that the server permits this connection to use.
-      # Usable channel numbers are in the range 1..channel_max.
-      # Zero indicates no specified limit.
-      #
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Sections 1.4.2.5.1 and 1.4.2.6.1)
-      attr_accessor :channel_max
-
-      # Maximum frame size that the server permits this connection to use.
-      #
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Sections 1.4.2.5.2 and 1.4.2.6.2)
-      attr_accessor :frame_max
-
-      # The delay, in seconds, of the connection heartbeat that the server wants.
-      # Zero means the server does not want a heartbeat.
-      #
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.5.3)
-      attr_accessor :heartbeat_interval
-
-      attr_reader :known_hosts
-
-
-
-      # @api public
-      def initialize(client, mechanism, response, locale, client_properties = {})
-        @mechanism         = mechanism
-        @response          = response
-        @locale            = locale
-
-        @channels          = Hash.new
-        @client_properties = DEFAULT_CLIENT_PROPERTIES.merge(client_properties)
-
-        reset_state!
-
-        super(client)
-
-        @client.connections.push(self)
-
-        # Default errback.
-        # You might want to override it, otherwise it'll
-        # crash your program. It's the expected behaviour
-        self.define_callback(:close) { |exception| raise(exception) }
-      end
-
-      # @api public
-      def settings
-        @client.settings
-      end # settings
-
-
-
-      #
-      # Connection class methods
-      #
-
-
-      # Sends connection.open to the server.
-      #
-      # @api public
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.7)
-      def open(vhost = "/")
-        @client.send Protocol::Connection::Open.encode(vhost)
-      end
-
-
-      # Sends connection.close to the server.
-      #
-      # @api public
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.9)
-      def close(reply_code = 200, reply_text = "Goodbye", class_id = 0, method_id = 0)
-        @client.send Protocol::Connection::Close.encode(reply_code, reply_text, class_id, method_id)
-        closing!
-      end
-
-      # @api public
-      def reset_state!
-      end # reset_state!
-
-
-
-      #
-      # Implementation
-      #
-
-
-      # Handles Connection.Start.
-      #
-      # @api plugin
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.1.)
-      def start_ok(method)
-        @server_properties = method.server_properties
-
-        # It's not clear whether we should transition to :opening state here
-        # or in #open but in case authentication fails, it would be strange to have
-        # @status undefined. So lets do this. MK.
-        opening!
-
-        @client.send Protocol::Connection::StartOk.encode(@client_properties, @mechanism, @response, @locale)
-      end
-
-
-      # Handles Connection.Open-Ok.
-      #
-      # @api plugin
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.8.)
-      def handle_open_ok(method)
-        @known_hosts = method.known_hosts
-
-        opened!
-        @client.connection_successful if @client.respond_to?(:connection_successful)
-      end
-
-      # Handles Connection.Tune-Ok.
-      #
-      # @api plugin
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.6)
-      def handle_tune(method)
-        @channel_max        = method.channel_max
-        @frame_max          = method.frame_max
-        @heartbeat_interval = @client.heartbeat_interval || method.heartbeat
-
-        @client.send Protocol::Connection::TuneOk.encode(@channel_max, [settings[:frame_max], @frame_max].min, @heartbeat_interval)
-      end # handle_tune(method)
-
-
-      # Handles Connection.Close.
-      #
-      # @api plugin
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.5.2.9)
-      def handle_close(method)
-        self.handle_connection_interruption
-
-        closed!
-        # TODO: use proper exception class, provide protocol class (we know method.class_id and method.method_id) as well!
-        error = RuntimeError.new(method.reply_text)
-        self.error(error)
-      end
-
-      # Handles Connection.Close-Ok.
-      #
-      # @api plugin
-      # @see http://bit.ly/htCzCX AMQP 0.9.1 protocol documentation (Section 1.4.2.10)
-      def handle_close_ok(method)
-        closed!
-        @client.disconnection_successful
-      end # handle_close_ok(method)
-
-      # @api plugin
-      def handle_connection_interruption
-        @channels.each { |n, c| c.handle_connection_interruption }
-      end # handle_connection_interruption
-
-
-
-      #
-      # Handlers
-      #
-
-      self.handle(Protocol::Connection::Start) do |client, frame|
-        client.connection.start_ok(frame.decode_payload)
-      end
-
-      self.handle(Protocol::Connection::Tune) do |client, frame|
-        client.connection.handle_tune(frame.decode_payload)
-
-        client.connection.open(client.settings[:vhost] || "/")
-      end
-
-      self.handle(Protocol::Connection::OpenOk) do |client, frame|
-        client.connection.handle_open_ok(frame.decode_payload)
-      end
-
-      self.handle(Protocol::Connection::Close) do |client, frame|
-        client.connection.handle_close(frame.decode_payload)
-      end
-
-      self.handle(Protocol::Connection::CloseOk) do |client, frame|
-        client.connection.handle_close_ok(frame.decode_payload)
-      end
-
-
-    end # Connection
-  end # Client
-end # AMQ