amq-client 0.9.4 → 0.9.5

data/.gitignore

@@ -8,3 +8,4 @@ doc/*
 Gemfile.lock
 vendor
 .rbx/*
+bin/*

data/.travis.yml

@@ -19,4 +19,7 @@ branches:
   only:
     - master
     - 0.9.x-stable
-    - 0.8.x-stable
+    - 0.8.x-stable
+
+services:
+  - rabbitmq

data/lib/amq/client/async/channel.rb

@@ -412,7 +412,13 @@ module AMQ
         # @private
         def handle_close(channel_close)
           self.status = :closed
+          # Confirm closing the channel so that the broker will actually release all resources.
+          # TODO: channel.close-ok in the Java client takes no arguments. Almost certainly
+          #       this is an issue with our code generator. MK.
+          @connection.send_frame(Protocol::Channel::CloseOk.encode(@id))
+          
           self.connection.clear_frames_on(self.id)
+
           self.exec_callback_yielding_self(:error, channel_close)
 
           self.handle_connection_interruption(channel_close)

data/lib/amq/client/async/consumer.rb

@@ -83,6 +83,7 @@ module AMQ
           @connection.send_frame(Protocol::Basic::Cancel.encode(@channel.id, @consumer_tag, nowait))
           self.clear_callbacks(:delivery)
           self.clear_callbacks(:consume)
+          self.clear_callbacks(:scancel)
 
           self.unregister_with_channel
           self.unregister_with_queue

data/lib/amq/client/async/extensions/rabbitmq/cancel.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+
+require "amq/client/async/channel"
+
+# Basic.Cancel
+module AMQ
+  module Client
+    module Async
+      module Extensions
+        module RabbitMQ
+          module Basic
+            module ConsumerMixin
+              
+              def on_cancel(&block)
+                self.append_callback(:scancel, &block)
+
+                self
+              end # on_cancel(&block)
+              
+              def handle_cancel(basic_cancel)
+                self.exec_callback(:scancel, basic_cancel)
+              end # handle_cancel(basic_cancel)
+              
+              def self.included receiver
+                receiver.handle(Protocol::Basic::Cancel) do |connection, method_frame|
+                  channel      = connection.channels[method_frame.channel]
+                  basic_cancel = method_frame.decode_payload
+                  consumer     = channel.consumers[basic_cancel.consumer_tag]
+
+                  # Handle the delivery only if the consumer still exists.
+                  consumer.handle_cancel(basic_cancel) if consumer
+                end
+              end
+              
+            end # ConsumerMixin
+            
+            module QueueMixin
+              
+              # @api public
+              def on_cancel(&block)
+                @default_consumer.on_cancel(&block)
+              end # on_cancel(&block)
+            end
+            
+          end # Basic
+        end # RabbitMQ
+      end # Extensions
+
+      class Consumer
+        include Extensions::RabbitMQ::Basic::ConsumerMixin
+      end # Consumer
+
+      class Queue
+        include Extensions::RabbitMQ::Basic::QueueMixin
+      end # Queue
+
+    end # Async
+  end # Client
+end # AMQ

data/lib/amq/client/extensions/rabbitmq.rb

@@ -2,4 +2,5 @@
 
 # http://www.rabbitmq.com/extensions.html
 require "amq/client/extensions/rabbitmq/basic"
+require "amq/client/extensions/rabbitmq/cancel"
 require "amq/client/extensions/rabbitmq/confirm"

data/lib/amq/client/extensions/rabbitmq/cancel.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require "amq/client/async/extensions/rabbitmq/cancel"
+
+# Basic.Nack
+module AMQ
+  module Client
+    # backwards compatibility
+    # @private
+    Extensions = Async::Extensions unless defined?(Extensions)
+    
+    module Settings
+      puts "Updating client properties"
+      CLIENT_PROPERTIES[:capabilities] ||= {}
+      CLIENT_PROPERTIES[:capabilities][:consumer_cancel_notify] = true
+    end
+  end # Client
+end # AMQ

data/lib/amq/client/settings.rb

@@ -45,14 +45,15 @@ module AMQ
         }
       end
 
-
+      CLIENT_PROPERTIES = {
+        :platform     => ::RUBY_DESCRIPTION,
+        :product      => "AMQ Client",
+        :information  => "http://github.com/ruby-amqp/amq-client",
+        :version      => AMQ::Client::VERSION
+      }
+      
       def self.client_properties
-        @client_properties ||= {
-          :platform    => ::RUBY_DESCRIPTION,
-          :product     => "AMQ Client",
-          :information => "http://github.com/ruby-amqp/amq-client",
-          :version     => AMQ::Client::VERSION
-        }
+        @client_properties ||= CLIENT_PROPERTIES
       end
 
 

data/lib/amq/client/version.rb

@@ -2,6 +2,6 @@
 
 module AMQ
   module Client
-    VERSION = "0.9.4"
+    VERSION = "0.9.5"
   end
 end

data/spec/integration/coolio/exchange_declare_spec.rb

@@ -34,7 +34,6 @@ describe "AMQ::Client::CoolioClient", "Exchange.Declare", :nojruby => true do
               exchange.declare(true, false, false, false) do
                 @callback_fired = true
               end
-              delayed(0.1) { exchange.delete }
               done(0.5)
             end
           end

data/spec/integration/eventmachine/exchange_declare_spec.rb

@@ -65,7 +65,6 @@ describe AMQ::Client::EventMachineClient, "Exchange.Declare" do
               exchange.declare(true, false, false, false) do
                 @callback_fired = true
               end
-              delayed(0.1) { exchange.delete }
               done(0.3)
             end
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amq-client
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Jakub Stastny
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-05 00:00:00 Z
+date: 2012-10-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -157,6 +157,7 @@ files:
 - lib/amq/client/async/entity.rb
 - lib/amq/client/async/exchange.rb
 - lib/amq/client/async/extensions/rabbitmq/basic.rb
+- lib/amq/client/async/extensions/rabbitmq/cancel.rb
 - lib/amq/client/async/extensions/rabbitmq/confirm.rb
 - lib/amq/client/async/queue.rb
 - lib/amq/client/callbacks.rb
@@ -167,6 +168,7 @@ files:
 - lib/amq/client/exchange.rb
 - lib/amq/client/extensions/rabbitmq.rb
 - lib/amq/client/extensions/rabbitmq/basic.rb
+- lib/amq/client/extensions/rabbitmq/cancel.rb
 - lib/amq/client/extensions/rabbitmq/confirm.rb
 - lib/amq/client/framing/io/frame.rb
 - lib/amq/client/framing/string/frame.rb