amq-client 0.7.0.alpha21 → 0.7.0.alpha22

data/examples/eventmachine_adapter/authentication/connection_open_failure_due_to_invalid_vhost.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+__dir = File.join(File.dirname(File.expand_path(__FILE__)), "..")
+require File.join(__dir, "example_helper")
+
+begin
+  EventMachine.run do
+
+    show_stopper = Proc.new {
+      EM.stop
+    }
+
+    Signal.trap "INT",  show_stopper
+    Signal.trap "TERM", show_stopper
+
+    EventMachine.add_timer(4, show_stopper)
+
+    AMQ::Client::EventMachineClient.connect(:port     => 9689,
+                                            :vhost    => "/a/b/c/#{rand}/d/#{Time.now.to_i}",
+                                            :user     => "amq_client_gem",
+                                            :password => "amq_client_gem_password",
+                                            :timeout        => 0.3) do |client|
+      raise "Connected, authenticated. This is not what this example is supposed to do!"
+    end
+  end
+rescue AMQ::Client::TCPConnectionFailed => e
+  puts "TCP connection has failed, as expected. Shutting down…"
+  EventMachine.stop if EventMachine.reactor_running?
+end

data/examples/eventmachine_adapter/basic_return.rb

@@ -10,8 +10,9 @@ amq_client_example "basic.return example" do |client|
     queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
 
     exchange = AMQ::Client::Exchange.new(client, channel, "amq.fanout", :fanout)
-    exchange.on_return do |method|
+    exchange.on_return do |method, header, body|
       puts "Handling a returned message: exchange = #{method.exchange}, reply_code = #{method.reply_code}, reply_text = #{method.reply_text}"
+      puts "Body of the returned message: #{body}"
     end
 
     10.times do |i|

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

@@ -154,21 +154,18 @@ module AMQ
         define_callback :tcp_connection_failure, &block
       end
 
-      # Sets a callback for successful connection (after we receive tune-ok)
-      #
-      # @api public
-      def on_open(&block)
-        define_callback :open, &block
-      end # on_open(&block)
-
 
       # Called by AMQ::Client::Connection after we receive connection.open-ok.
       #
       # @api private
       def connection_successful
+        @authenticating = false
+        opened!
+
         exec_callback_yielding_self(:connect)
       end
 
+
       # Called by AMQ::Client::Connection after we receive connection.close-ok.
       #
       # @api private
@@ -178,14 +175,6 @@ module AMQ
         closed!
       end
 
-      # Called by AMQ::Client::Connection after we receive connection.tune.
-      #
-      # @api private
-      def open_successful
-        @authenticating = false
-        opened!
-        exec_callback_yielding_self(:open)
-      end # open_successful
 
       # Called by Socket if it could not connect.
       #

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

@@ -59,26 +59,16 @@ module AMQ
       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.
+      # Defines a callback that will be executed when AMQP connection is considered open:
+      # client and broker has agreed on max channel identifier and maximum allowed frame
+      # size and authentication succeeds. You can define more than one callback.
       #
-      # @see #on_open
+      # @see on_possible_authentication_failure
       # @api public
       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.
       #
@@ -283,18 +273,11 @@ module AMQ
       # Called by AMQ::Client::Connection after we receive connection.open-ok.
       # @api public
       def connection_successful
-        @connection_deferrable.succeed
-      end # connection_successful
-
-
-      # Called by AMQ::Client::Connection after we receive connection.tune.
-      # @api public
-      def open_successful
         @authenticating = false
-        @connection_opened_deferrable.succeed
-
         opened!
-      end # open_successful
+
+        @connection_deferrable.succeed
+      end # connection_successful
 
 
       # Called by AMQ::Client::Connection after we receive connection.close-ok.
@@ -344,9 +327,6 @@ module AMQ
         @chunk_buffer                 = ""
         @connection_deferrable        = Deferrable.new
         @disconnection_deferrable     = Deferrable.new
-        # succeeds when connection is open, that is, vhost is selected
-        # and client is given green light to proceed.
-        @connection_opened_deferrable = Deferrable.new
 
         # used to track down whether authentication succeeded. AMQP 0.9.1 dictates
         # that on authentication failure broker must close TCP connection without sending

data/lib/amq/client/connection.rb

@@ -234,7 +234,6 @@ module AMQ
         client.connection.handle_tune(frame.decode_payload)
 
         client.connection.open(client.settings[:vhost] || "/")
-        client.open_successful
       end
 
       self.handle(Protocol::Connection::OpenOk) do |client, frame|

data/lib/amq/client/exchange.rb

@@ -150,12 +150,15 @@ module AMQ
       end # handle
 
 
-      self.handle(Protocol::Basic::Return) do |client, frame|
+      self.handle(Protocol::Basic::Return) do |client, frame, content_frames|
         channel  = client.connection.channels[frame.channel]
         method   = frame.decode_payload
         exchange = channel.find_exchange(method.exchange)
 
-        exchange.exec_callback(:return, method)
+        header   = content_frames.shift
+        body     = content_frames.map { |frame| frame.payload }.join
+
+        exchange.exec_callback(:return, method, header, body)
       end
 
     end # Exchange

data/lib/amq/client/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Client
-    VERSION = "0.7.0.alpha21"
+    VERSION = "0.7.0.alpha22"
   end
 end

data/spec/integration/coolio/basic_return_spec.rb

@@ -19,7 +19,7 @@ describe "AMQ::Client::CoolioClient", "Basic.Return", :nojruby => true do
           # hence, no auto-delete
           delayed(0.4) { queue.delete }
 
-          exchange = AMQ::Client::Exchange.new(client, channel, "direct-exchange", :direct).declare.on_return do |method|
+          exchange = AMQ::Client::Exchange.new(client, channel, "direct-exchange", :direct).declare.on_return do |method, header, body|
             @returned_messages << method.reply_text
           end
 

data/spec/integration/eventmachine/basic_return_spec.rb

@@ -18,7 +18,7 @@ describe AMQ::Client::EventMachineClient, "Basic.Return" do
           # hence, no auto-delete
           delayed(0.4) { queue.delete }
 
-          exchange = AMQ::Client::Exchange.new(client, channel, "direct-exchange", :direct).declare.on_return do |method|
+          exchange = AMQ::Client::Exchange.new(client, channel, "direct-exchange", :direct).declare.on_return do |method, header, body|
             @returned_messages << method.reply_text
           end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: -3702664442
+  hash: -3702664448
   prerelease: 6
   segments: 
   - 0
   - 7
   - 0
   - alpha
-  - 21
-  version: 0.7.0.alpha21
+  - 22
+  version: 0.7.0.alpha22
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 Z
+date: 2011-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -80,7 +80,6 @@ files:
 - LICENSE
 - README.textile
 - amq-client.gemspec
-- bin/jenkins.sh
 - bin/set_test_suite_realms_up.sh
 - examples/coolio_adapter/basic_consume.rb
 - examples/coolio_adapter/basic_consume_with_acknowledgements.rb
@@ -93,6 +92,7 @@ files:
 - examples/coolio_adapter/queue_bind.rb
 - examples/coolio_adapter/queue_purge.rb
 - examples/coolio_adapter/queue_unbind.rb
+- examples/eventmachine_adapter/authentication/connection_open_failure_due_to_invalid_vhost.rb
 - examples/eventmachine_adapter/authentication/plain_password_with_custom_role_credentials.rb
 - examples/eventmachine_adapter/authentication/plain_password_with_default_role_credentials.rb
 - examples/eventmachine_adapter/authentication/plain_password_with_incorrect_credentials_handled_with_a_callback.rb
@@ -253,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amq-client
-rubygems_version: 1.8.1
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: amq-client is a fully-featured, low-level AMQP 0.9.1 client

data/bin/jenkins.sh

@@ -1,23 +0,0 @@
-#!/bin/bash
-
-echo -e "\n\n==== Setup ===="
-source /etc/profile
-git fetch && git reset origin/master --hard
-
-echo -e "\n\n==== Ruby 1.9.2 Head ===="
-rvm use 1.9.2-head@ruby-amqp
-gem install bundler --no-ri --no-rdoc
-bundle install --path vendor/bundle/1.9.2 --without development; echo
-bundle update amq-protocol evented-spec; echo
-bundle exec rspec spec
-return_status=$?
-
-echo -e "\n\n==== Ruby 1.8.7 ===="
-rvm use 1.8.7@ruby-amqp
-gem install bundler --no-ri --no-rdoc
-bundle install --path vendor/bundle/1.8.7 --without development; echo
-bundle update; echo
-bundle exec rspec spec
-return_status=$(expr $return_status + $?)
-
-test $return_status -eq 0