amqp 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7cd9670c82561f472831d5844d8aedf21704384
-  data.tar.gz: 72de0158e4620a8c11468fa6ae141770f5eb5c40
+  metadata.gz: a27af25790fbbfceee41b2ed96246b3e3736624a
+  data.tar.gz: 2dbac00d7f5e582cb91c6b6fa4ee4510fcceb8df
 SHA512:
-  metadata.gz: 0590210e5493862466fc7c5bfaae3322f4fcd4c738f57eba25e811d4d76205b51b6bf327c44941f59a6b93a24436d6961baaafefeaf64c88b378a7faa6a24dba
-  data.tar.gz: b579abed8e4432158e908dd6d4e992c17e815029b89b3ccb6b0a7b15483eb2bb21a7dc49df7fe389e4d9adc04660b19d0dd8ef620a15578d880b18181932cfa9
+  metadata.gz: 8f218bcdf94cd7e0a02a82717860c63d8476a7a48ab08c965a9639197d6cdb815a3fb18ca4c7ac4de73bd8ef78aae594b8cca4fd6c3c25ce59499ef2ee9acddf
+  data.tar.gz: 21df041f087ba88c6fd67f64c9a12869c411f48cdd270d9e16fe6578df5d80f7631094de05e7cc920bc9c9fdf7c5be07f6a0be55bdfe424b2aa432e3a04bc98b

data/ChangeLog.md

@@ -1,3 +1,11 @@
+## Changes Between 1.3.x and 1.4.0
+
+### connection.blocked Support
+
+[connection.blocked](https://www.rabbitmq.com/connection-blocked.html) notifications
+are now correctly supported by the library.
+
+
 ## Changes Between 1.2.x and 1.3.0
 
 ### Exchange-to-Exchange Bindings Support

data/README.md

@@ -1,20 +1,26 @@
 # Ruby amqp gem: the asynchronous Ruby RabbitMQ client
 
-[Ruby amqp gem](http://rubyamqp.info) is a widely used, feature-rich, well-maintained asynchronous RabbitMQ client with batteries included.
-This library works with
+[Ruby amqp gem](http://rubyamqp.info) is a feature-rich,
+EventMachine-based RabbitMQ client with batteries included.
+
+It implement [AMQP
+0.9.1](http://www.rabbitmq.com/tutorials/amqp-concepts.html) and
+support [RabbitMQ extensions to AMQP
+0.9.1](http://www.rabbitmq.com/extensions.html).
 
- * Ruby 2.1
- * Ruby 2.0
- * Ruby 1.9.3
- * [JRuby](http://jruby.org)
- * [Rubinius](http://rubini.us)
- * Ruby 1.9.2
- * Ruby 1.8.7
- * [REE](http://www.rubyenterpriseedition.com),
 
-and is licensed under the [Ruby License](http://www.ruby-lang.org/en/LICENSE.txt)
+## A Word of Warning: Use This Only If You Already Use EventMachine
 
-0.8.0 and later versions of amqp gem implement [AMQP 0.9.1](http://www.rabbitmq.com/tutorials/amqp-concepts.html) (see also [AMQP 0.9.1 spec document](http://bit.ly/amqp091spec)) and support [RabbitMQ extensions to AMQP 0.9.1](http://www.rabbitmq.com/extensions.html).
+Unless you **already use EventMachine**, there is no real reason to
+use this client. Consider [Bunny](http://rubybunny.info) or [March Hare](http://rubymarchhare.info) instead.
+
+amqp gem brings in a fair share of EventMachine complexity which
+cannot be fully eliminated. Event loop blocking, writes that happen
+at the end of loop tick, uncaught exceptions in event loop silently killing it:
+it's not worth the pain unless you've already deeply invested in EventMachine
+and understand how it works.
+
+So, just use Bunny or March Hare. You will be much happier.
 
 
 ## I know what RabbitMQ is, how do I get started?
@@ -126,6 +132,20 @@ and is written in a form of a tutorial. See [AMQP 0.9.1 Model Explained](http://
 to learn more about RabbitMQ protocol principles & concepts.
 
 
+## Supported Ruby Versions
+
+This library works with
+
+ * Ruby 2.1
+ * Ruby 2.0
+ * Ruby 1.9.3
+ * [JRuby](http://jruby.org)
+ * [Rubinius](http://rubini.us)
+ * Ruby 1.9.2
+ * Ruby 1.8.7
+ * [REE](http://www.rubyenterpriseedition.com),
+
+
 
 ## Documentation: tutorials, guides & API reference
 
@@ -211,7 +231,7 @@ amqp gem is maintained by [Michael Klishin](http://twitter.com/michaelklishin).
 
 ## License ##
 
-AMQP gem is licensed under the [Ruby License](http://www.ruby-lang.org/en/LICENSE.txt).
+amqp gem is licensed under the [Ruby License](http://www.ruby-lang.org/en/LICENSE.txt).
 
 
 
@@ -247,34 +267,6 @@ Special thanks to Dmitriy Samovskiy, Ben Hood and Tony Garnock-Jones.
 
 
 
-## (Very) Short FAQ ##
-
-### So, does amqp gem only work with RabbitMQ?
-
-This library is developed and tested primarily with [RabbitMQ](http://rabbitmq.com), although it should be compatible with any
-server implementing the [AMQP 0.9.1 spec](http://bit.ly/hw2ELX). For AMQP 0.8 brokers, use amqp gem version 0.7.x.
-
-### Why isn't Ruby 1.8.7-p249 supported? Will it be supported in the future?
-
-In order to make code like the following (pseudo-synchronous) work
-
-``` ruby
-conn = AMQP.connect
-ch   = AMQP::Channel.new(conn)
-
-ex   = ch.default_exchange
-ex.publish(some_data)
-```
-
-and not be affected by this [Ruby 1.8.7-p249-specific bug (super called outside of method)](http://bit.ly/iONBmH), we need to
-avoid any inheritance for key amqp gem classes: Channel, Queue, Exchange, Consumer. This will take a significant refactoring effort and
-we do not expect this to change at this time.
-
-
-### How does amqp gem relate to amq-client gem, amq-protocol and libraries like Bunny?
-
-See [this page about AMQP gems family](https://github.com/ruby-amqp/amq-client/blob/master/README.textile)
-
 
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ruby-amqp/amqp/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 

data/lib/amqp/consumer.rb

@@ -113,13 +113,6 @@ module AMQP
       @channel.once_open do
         @queue.once_declared do
           @connection.send_frame(AMQ::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
-
           if !nowait
             self.redefine_callback(:cancel, &block)
             @channel.consumers_awaiting_cancel_ok.push(self)
@@ -304,6 +297,11 @@ module AMQP
     end # handle_consume_ok(consume_ok)
 
     def handle_cancel_ok(cancel_ok)
+      self.exec_callback_once(:cancel, cancel_ok)
+
+      self.unregister_with_channel
+      self.unregister_with_queue
+
       @consumer_tag = nil
 
       # detach from object graph so that this object will be garbage-collected
@@ -311,7 +309,10 @@ module AMQP
       @channel      = nil
       @connection   = nil
 
-      self.exec_callback_once(:cancel, cancel_ok)
+      self.clear_callbacks(:delivery)
+      self.clear_callbacks(:consume)
+      self.clear_callbacks(:cancel)
+      self.clear_callbacks(:scancel)
     end # handle_cancel_ok(method)
 
 

data/lib/amqp/session.rb

@@ -396,6 +396,18 @@ module AMQP
     # @endgroup
 
 
+    # @group Blocked connection notifications
+
+    def on_blocked(&fn)
+      @on_blocked = fn
+    end
+
+    def on_unblocked(&fn)
+      @on_unblocked = fn
+    end
+
+    # @endgroup
+
 
     #
     # Implementation
@@ -600,7 +612,7 @@ module AMQP
       # now we can set it. MK.
       @had_successfully_connected_before = true
       @reconnecting                      = false
-      @handling_skipped_hearbeats        = false
+      @handling_skipped_heartbeats       = false
       @last_server_heartbeat             = Time.now
 
       self.handshake
@@ -687,9 +699,9 @@ module AMQP
     # heartbeat interval set via :heartbeat_interval option on connection.
     #
     # @api plugin
-    def handle_skipped_hearbeats
-      if !@handling_skipped_hearbeats && @tcp_connection_established && !@intentionally_closing_connection
-        @handling_skipped_hearbeats = true
+    def handle_skipped_heartbeats
+      if !@handling_skipped_heartbeats && @tcp_connection_established && !@intentionally_closing_connection
+        @handling_skipped_heartbeats = true
         self.cancel_heartbeat_sender
 
         self.run_skipped_heartbeats_callbacks
@@ -963,10 +975,10 @@ module AMQP
     # Sends a heartbeat frame if connection is open.
     # @api plugin
     def send_heartbeat
-      if tcp_connection_established? && !@handling_skipped_hearbeats && @last_server_heartbeat
+      if tcp_connection_established? && !@handling_skipped_heartbeats && @last_server_heartbeat
         if @last_server_heartbeat < (Time.now - (self.heartbeat_interval * 2)) && !reconnecting?
           logger.error "[amqp] Detected missing server heartbeats"
-          self.handle_skipped_hearbeats
+          self.handle_skipped_heartbeats
         end
         send_frame(AMQ::Protocol::HeartbeatFrame)
       end
@@ -1055,6 +1067,13 @@ module AMQP
     end # handle_close_ok(close_ok)
 
 
+    def handle_connection_blocked(connection_blocked)
+      @on_blocked.call(self, connection_blocked) if @on_blocked
+    end
+
+    def handle_connection_unblocked(connection_unblocked)
+      @on_unblocked.call(self, connection_unblocked) if @on_unblocked
+    end
 
     protected
 
@@ -1125,6 +1144,13 @@ module AMQP
       connection.handle_close_ok(frame.decode_payload)
     end
 
+    self.handle(AMQ::Protocol::Connection::Blocked) do |connection, frame|
+      connection.handle_connection_blocked(frame.decode_payload)
+    end
+
+    self.handle(AMQ::Protocol::Connection::Unblocked) do |connection, frame|
+      connection.handle_connection_unblocked(frame.decode_payload)
+    end
 
 
 

data/lib/amqp/settings.rb

@@ -45,7 +45,15 @@ module AMQP
       :platform    => ::RUBY_DESCRIPTION,
       :product     => "amqp gem",
       :information => "http://github.com/ruby-amqp/amqp",
-      :version     => AMQP::VERSION
+      :version     => AMQP::VERSION,
+      :capabilities => {
+        :publisher_confirms           => true,
+        :consumer_cancel_notify       => true,
+        :exchange_exchange_bindings   => true,
+        :"basic.nack"                 => true,
+        :"connection.blocked"         => true,
+        :authentication_failure_close => true
+      }
     }
 
     def self.client_properties

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

data/spec/integration/exchange_to_exchange_binding_spec.rb

@@ -54,7 +54,7 @@ describe AMQP::Channel do
             source.publish("x")
           end
         end
-        done(0.1) { messages.should == ["x"] }
+        done(0.5) { messages.should == ["x"] }
       end
 
       it "can be unbound" do
@@ -82,7 +82,7 @@ describe AMQP::Channel do
         destination.bind(source, :nowait => true) do
           callback_called = true
         end
-        done(0.1) { callback_called.should be_false}
+        done(0.5) { callback_called.should be_false}
       end
 
     end #context
@@ -92,16 +92,15 @@ describe AMQP::Channel do
         source = @channel.topic("topic-exchange-source")
         destination = @channel.topic("topic-exchange-destination")
         messages = []
-        destination.bind(source) do
+        destination.bind(source, :routing_key => "#") do
           queue = @channel.queue("ex-to-ex-default-key", :auto_delete => true)
-          queue.subscribe do |metadata, payload|
+          queue.bind(destination, :routing_key => "#").subscribe do |metadata, payload|
             messages << payload
           end
-          queue.bind(destination, :routing_key => "#") do
-            source.publish("a", :routing_key => "lalalala")
-          end
+
+          source.publish("a", :routing_key => "lalalala")
         end
-        done(0.1) { messages.should == ["a"] }
+        done(0.5) { messages.should == ["a"] }
       end
 
       it "using routing key 'foo'" do
@@ -117,7 +116,7 @@ describe AMQP::Channel do
             source.publish("b", :routing_key => "foo")
           end
         end
-        done(0.1) { messages.should == ["b"]}
+        done(0.5) { messages.should == ["b"]}
       end
     end #context
   end # describe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amqp
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Aman Gupta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -324,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: amqp
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Widely used, feature-rich asynchronous RabbitMQ client with batteries included