amqp 0.8.0 → 0.8.1

data/.travis.yml

@@ -17,4 +17,5 @@ notifications:
 branches:
   only:
     - master
+    - 0.8.x-stable
     - 0.7.x-stable

data/CHANGELOG

@@ -1,3 +1,7 @@
+= Version 0.8.1 (not yet released)
+
+  * [API] AMQP::Channel#reuse allows channel instance to be reused with a different channel id, may be used to recover from channel-level exceptions.
+
 = Version 0.8.0
 
   * [API] AMQP::Session#on_skipped_heartbeats callback that can be used to handle skipped heartbeats (for cases when TCP network failure detection is not timely enough)

data/README.md

@@ -71,11 +71,11 @@ with are outdated even in recent (10.10) releases. Learn more in the [RabbitMQ v
 On Microsoft Windows 7
 
     gem install eventmachine --pre
-    gem install amqp --pre
+    gem install amqp
 
 On other OSes or [JRuby](http://jruby.org):
 
-    gem install amqp --pre
+    gem install amqp
 
 
 ### "Hello, World" example ###

data/amqp.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   # Dependencies
   s.add_dependency "eventmachine"
   s.add_dependency "amq-client",   "~> 0.8.3"
-  s.add_dependency "amq-protocol", "~> 0.8.0"
+  s.add_dependency "amq-protocol", "~> 0.8.3"
 
   begin
     require "changelog"

data/docs/GettingStarted.textile

@@ -70,13 +70,13 @@ h4. On Microsoft Windows 7:
 
 <pre>
 gem install eventmachine --pre
-gem install amqp --pre
+gem install amqp
 </pre>
 
 h4. On other OSes or JRuby:
 
 <pre>
-gem install amqp --pre
+gem install amqp
 </pre>
 
 h3. You can also use Bundler to install the gem 
@@ -85,7 +85,7 @@ h3. You can also use Bundler to install the gem
 <code>
 source :rubygems
 
-gem "amqp", "~> 0.8.0.RC15" # optionally: :git => "git://github.com/ruby-amqp/amqp.git", :branch => "master"
+gem "amqp", "~> 0.8.0" # optionally: :git => "git://github.com/ruby-amqp/amqp.git", :branch => "0.8.x-stable"
 </code>
 </pre>
 
@@ -100,7 +100,7 @@ irb -rubygems
 :001 > require "amqp"
 => true
 :002 > AMQP::VERSION
-=> "0.8.0.rc15"
+=> "0.8.0"
 </code>
 </pre>
 

data/lib/amqp/channel.rb

@@ -270,6 +270,25 @@ module AMQP
       end
     end # auto_recover
 
+    # Can be used to recover channels from channel-level exceptions. Allocates a new channel id and reopens
+    # itself with this new id, releasing the old id after the new one is allocated.
+    #
+    # @api public
+    def reuse
+      old_id = @id
+      # must release after we allocate a new id, otherwise we will end up
+      # with the same value. MK.
+      @id    = self.class.next_channel_id
+      self.class.release_channel_id(old_id)
+
+      self.open do
+        @channel_is_open_deferrable.succeed
+
+        # exchanges must be recovered first because queue recovery includes recovery of bindings. MK.
+        @exchanges.each { |name, e| e.auto_recover }
+        @queues.each    { |name, q| q.auto_recover }
+      end
+    end # reuse
 
 
 

data/lib/amqp/queue.rb

@@ -811,7 +811,16 @@ module AMQP
 
       shim = Proc.new { |q, declare_ok| block.call(declare_ok.message_count, declare_ok.consumer_count) }
 
-      @channel.once_open { self.declare(true, @durable, @exclusive, @auto_delete, false, nil, &shim) }
+      @channel.once_open do
+        # we do not use self.declare here to avoid caching of @passive since that will cause unexpected side-effects during automatic
+        # recovery process. MK.
+        @connection.send_frame(AMQ::Protocol::Queue::Declare.encode(@channel.id, @name, true, @opts[:durable], @opts[:exclusive], @opts[:auto_delete], false, @opts[:arguments]))
+
+        self.append_callback(:declare, &shim)
+        @channel.queues_awaiting_declare_ok.push(self)
+      end
+
+      self
     end
 
 

data/lib/amqp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amqp
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Aman Gupta
@@ -17,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-04 00:00:00 +04:00
-default_executable: 
+date: 2011-10-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -58,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 63
+        hash: 57
         segments: 
         - 0
         - 8
-        - 0
-        version: 0.8.0
+        - 3
+        version: 0.8.3
   type: :runtime
   version_requirements: *id003
 description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included.
@@ -329,56 +328,10 @@ files:
 - spec/unit/amqp/client_spec.rb
 - spec/unit/amqp/connection_spec.rb
 - spec/unit/amqp/int_allocator_spec.rb
-has_rdoc: true
 homepage: http://github.com/ruby-amqp/amqp
 licenses: []
 
-post_install_message: "[\e[32mVersion 0.8.0\e[0m] [API] AMQP::Session#on_skipped_heartbeats callback that can be used to handle skipped heartbeats (for cases when TCP network failure detection is not timely enough)\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Exchange#publish calls now use a mutex on the channel exchange is declared on. Sharing channels between threads is discouraged but amqp gem covers your back in the most dangerous case.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Channel#synchronize now can be used to guarantee mutual exclusion of multiple threads on channel instances.\n\
-  [\e[32mVersion 0.8.0\e[0m] [BUG] Empty messages can finally be published fine. Yes, it took us just 3 years.\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] When connected to RabbitMQ, RabbitMQ-specific extensions are required automatically\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] AMQP::Session#broker and AMQP::Broker allow for broker capabilities inspection\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] New bitset-based channel id allocator\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] Multiple consumers per queue with AMQP::Consumer\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] Automatic recovery mode for channels\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] Network connection recovery callbacks for channels, exchanges, queues, consumers\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] Connection URI (string) format for vhosts no longer assumes that vhosts begin with a slash (/), learn more at http://bit.ly/mfzwcB\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] Returned messages, including header & content via AMQP::Exchange#on_publish. Callback accepts 3 args: basic_return, header, body\n\
-  [\e[32mVersion 0.8.0\e[0m] [BUG] Ruby 1.8.7-p249 is not supported because of this (p249-specific) Ruby bug: http://bit.ly/iONBmH\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] AMQP::Utilities::EventLoopHelper detects app server (if any) being used and starts EventMachine reactor in an optimal way.\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] AMQP 0.9.1 support, including tx.* operations class.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] Default authentication handler now raises AMQP::PossibleAuthenticationFailureError\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Channel#initialize now takes 3rd (optional) options hash.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] Broker connection class is now AMQP::Session.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Error instance now may carry cause, an exception that caused exception in question to be raised.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] When initial TCP connection fails, default action is now to raise AMQP::TCPConnectionFailed.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::BasicClient#reconnect now takes 2nd optional argument, period of waiting in seconds.\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] Handlers for initial connection failure, connection loss; channel-level exceptions handlers on Channel instances.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Exchange#initialize now accepts :arguments option that takes a hash.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#initialize now accepts :arguments option that takes a hash.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP#Logger is deprecated. It will be removed before 1.0 release.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP#fork is deprecated. It will be removed before 1.0 release.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::RPC is deprecated. It will be removed before 1.0 release.\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] Significant improvements to the documentation. From now on lack of/poor documentation is considered a severe bug.\n\
-  [\e[32mVersion 0.8.0\e[0m] [FEATURE] Support for RabbitMQ extensions to AMQP 0.9.1\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Exchange#publish now accepts (an optional) callback.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Channel.new now accepts (an optional) callback.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Header#ack now can acknowledge multiple deliveries\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Exchange#delete now takes (an optional) block that is called when exchange.delete-ok response arrives.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Header now implements #to_hash\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#pop block now can take 1, 2 or 3 arguments.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#purge  now takes an optional block which is called when queue.purge-ok response arrives.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#delete now takes an optional block which is called when queue.delete-ok response arrives.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#delete now accepts :nowait option.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#unbind now takes an optional block which is called when queue.unbind-ok response arrives.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#unbind now accepts :routing_key as alias to :key. we believe it is a good idea to use AMQP terms.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Channel#prefetch now takes (an optional) 2nd parameter that specifies that QoS settings should be applied to underlying connection, as well as optional callback.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Channel#recover now takes (an optional) callback that is called when basic.recover-ok is received.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Frame is gone.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Buffer is gone. Serialization & framing are now handled primarily by amq-protocol.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] AMQP::Queue#publish is deprecated.\n\
-  [\e[32mVersion 0.8.0\e[0m] [API] Name argument for AMQP::Queue.new and Channel#queue is optional.\n"
+post_install_message: 
 rdoc_options: 
 - --include=examples --main README.md
 require_paths: 
@@ -404,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: amqp
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included